]> git.proxmox.com Git - mirror_edk2.git/commitdiff
OvmfPkg: Apply uncrustify changes
authorMichael Kubacki <michael.kubacki@microsoft.com>
Sun, 5 Dec 2021 22:54:09 +0000 (14:54 -0800)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Tue, 7 Dec 2021 17:24:28 +0000 (17:24 +0000)
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the OvmfPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Andrew Fish <afish@apple.com>
445 files changed:
OvmfPkg/8254TimerDxe/Timer.c
OvmfPkg/8254TimerDxe/Timer.h
OvmfPkg/8259InterruptControllerDxe/8259.c
OvmfPkg/8259InterruptControllerDxe/8259.h
OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h
OvmfPkg/AcpiPlatformDxe/BootScript.c
OvmfPkg/AcpiPlatformDxe/EntryPoint.c
OvmfPkg/AcpiPlatformDxe/PciDecoding.c
OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatform.c
OvmfPkg/AmdSev/BlobVerifierLibSevHashes/BlobVerifierSevHashes.c
OvmfPkg/AmdSev/SecretDxe/SecretDxe.c
OvmfPkg/AmdSevDxe/AmdSevDxe.c
OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c
OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h
OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c
OvmfPkg/Bhyve/AcpiPlatformDxe/EntryPoint.c
OvmfPkg/Bhyve/AcpiPlatformDxe/PciDecoding.c
OvmfPkg/Bhyve/AcpiTables/Platform.h
OvmfPkg/Bhyve/BhyveRfbDxe/ComponentName.c
OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h
OvmfPkg/Bhyve/BhyveRfbDxe/GopDriver.c
OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c
OvmfPkg/Bhyve/BhyveRfbDxe/VbeShim.c
OvmfPkg/Bhyve/BhyveRfbDxe/VbeShim.h
OvmfPkg/Bhyve/PlatformPei/AmdSev.c
OvmfPkg/Bhyve/PlatformPei/ClearCache.c
OvmfPkg/Bhyve/PlatformPei/Cmos.c
OvmfPkg/Bhyve/PlatformPei/Cmos.h
OvmfPkg/Bhyve/PlatformPei/Fv.c
OvmfPkg/Bhyve/PlatformPei/MemDetect.c
OvmfPkg/Bhyve/PlatformPei/Platform.c
OvmfPkg/Bhyve/PlatformPei/Platform.h
OvmfPkg/Bhyve/SmbiosPlatformDxe/Bhyve.c
OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.c
OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.h
OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.c
OvmfPkg/CpuHotplugSmm/ApicId.h
OvmfPkg/CpuHotplugSmm/CpuHotplug.c
OvmfPkg/CpuHotplugSmm/FirstSmiHandlerContext.h
OvmfPkg/CpuHotplugSmm/QemuCpuhp.c
OvmfPkg/CpuHotplugSmm/QemuCpuhp.h
OvmfPkg/CpuHotplugSmm/Smbase.c
OvmfPkg/CpuHotplugSmm/Smbase.h
OvmfPkg/CpuS3DataDxe/CpuS3Data.c
OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c
OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h
OvmfPkg/Csm/BiosThunk/VideoDxe/ComponentName.c
OvmfPkg/Csm/BiosThunk/VideoDxe/VesaBiosExtensions.h
OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.c
OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.h
OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c
OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.h
OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c
OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.h
OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c
OvmfPkg/Csm/CsmSupportLib/LegacyRegion.h
OvmfPkg/Csm/Include/Framework/BootScript.h
OvmfPkg/Csm/Include/Framework/DxeCis.h
OvmfPkg/Csm/Include/Framework/FirmwareVolumeHeader.h
OvmfPkg/Csm/Include/Framework/FirmwareVolumeImageFormat.h
OvmfPkg/Csm/Include/Framework/FrameworkInternalFormRepresentation.h
OvmfPkg/Csm/Include/Framework/Hob.h
OvmfPkg/Csm/Include/Framework/StatusCode.h
OvmfPkg/Csm/Include/Guid/LegacyBios.h
OvmfPkg/Csm/Include/Guid/LegacyDevOrder.h
OvmfPkg/Csm/Include/Protocol/FirmwareVolume.h
OvmfPkg/Csm/Include/Protocol/IsaAcpi.h
OvmfPkg/Csm/Include/Protocol/IsaIo.h
OvmfPkg/Csm/Include/Protocol/LegacyBios.h
OvmfPkg/Csm/Include/Protocol/LegacyBiosPlatform.h
OvmfPkg/Csm/Include/Protocol/LegacyInterrupt.h
OvmfPkg/Csm/Include/Protocol/VgaMiniPort.h
OvmfPkg/Csm/LegacyBiosDxe/LegacyBbs.c
OvmfPkg/Csm/LegacyBiosDxe/LegacyBda.c
OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c
OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h
OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c
OvmfPkg/Csm/LegacyBiosDxe/LegacyCmos.c
OvmfPkg/Csm/LegacyBiosDxe/LegacyIde.c
OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c
OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c
OvmfPkg/Csm/LegacyBiosDxe/Thunk.c
OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c
OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.h
OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiVfr.h
OvmfPkg/Csm/LegacyBootManagerLib/InternalLegacyBm.h
OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c
OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.h
OvmfPkg/EnrollDefaultKeys/AuthData.c
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c
OvmfPkg/Include/Guid/ConfidentialComputingSecret.h
OvmfPkg/Include/Guid/MicrosoftVendor.h
OvmfPkg/Include/Guid/OvmfPkKek1AppPrefix.h
OvmfPkg/Include/Guid/OvmfPlatformConfig.h
OvmfPkg/Include/Guid/QemuKernelLoaderFsMedia.h
OvmfPkg/Include/Guid/QemuRamfb.h
OvmfPkg/Include/Guid/RootBridgesConnectedEventGroup.h
OvmfPkg/Include/Guid/VirtioMmioTransport.h
OvmfPkg/Include/Guid/XenBusRootDevice.h
OvmfPkg/Include/Guid/XenInfo.h
OvmfPkg/Include/IndustryStandard/Bhyve.h
OvmfPkg/Include/IndustryStandard/E820.h
OvmfPkg/Include/IndustryStandard/FusionMptScsi.h
OvmfPkg/Include/IndustryStandard/I440FxPiix4.h
OvmfPkg/Include/IndustryStandard/InstructionParsing.h
OvmfPkg/Include/IndustryStandard/LegacyVgaBios.h
OvmfPkg/Include/IndustryStandard/LinuxBzimage.h
OvmfPkg/Include/IndustryStandard/LsiScsi.h
OvmfPkg/Include/IndustryStandard/Microvm.h
OvmfPkg/Include/IndustryStandard/PageTable.h
OvmfPkg/Include/IndustryStandard/PvScsi.h
OvmfPkg/Include/IndustryStandard/Q35MchIch9.h
OvmfPkg/Include/IndustryStandard/QemuCpuHotplug.h
OvmfPkg/Include/IndustryStandard/QemuFwCfg.h
OvmfPkg/Include/IndustryStandard/QemuLoader.h
OvmfPkg/Include/IndustryStandard/QemuPciBridgeCapabilities.h
OvmfPkg/Include/IndustryStandard/QemuTpm.h
OvmfPkg/Include/IndustryStandard/Virtio095.h
OvmfPkg/Include/IndustryStandard/Virtio095Net.h
OvmfPkg/Include/IndustryStandard/Virtio10.h
OvmfPkg/Include/IndustryStandard/Virtio10Net.h
OvmfPkg/Include/IndustryStandard/VirtioBlk.h
OvmfPkg/Include/IndustryStandard/VirtioFs.h
OvmfPkg/Include/IndustryStandard/VirtioGpu.h
OvmfPkg/Include/IndustryStandard/VirtioScsi.h
OvmfPkg/Include/IndustryStandard/Xen/arch-arm/xen.h
OvmfPkg/Include/IndustryStandard/Xen/arch-x86/hvm/start_info.h
OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h
OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h
OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h
OvmfPkg/Include/IndustryStandard/Xen/event_channel.h
OvmfPkg/Include/IndustryStandard/Xen/grant_table.h
OvmfPkg/Include/IndustryStandard/Xen/hvm/hvm_op.h
OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h
OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h
OvmfPkg/Include/IndustryStandard/Xen/io/console.h
OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h
OvmfPkg/Include/IndustryStandard/Xen/io/ring.h
OvmfPkg/Include/IndustryStandard/Xen/io/xenbus.h
OvmfPkg/Include/IndustryStandard/Xen/io/xs_wire.h
OvmfPkg/Include/IndustryStandard/Xen/memory.h
OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h
OvmfPkg/Include/IndustryStandard/Xen/xen.h
OvmfPkg/Include/Library/BlobVerifierLib.h
OvmfPkg/Include/Library/LoadLinuxLib.h
OvmfPkg/Include/Library/MemEncryptSevLib.h
OvmfPkg/Include/Library/NvVarsFileLib.h
OvmfPkg/Include/Library/PciCapLib.h
OvmfPkg/Include/Library/PciCapPciIoLib.h
OvmfPkg/Include/Library/PciCapPciSegmentLib.h
OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h
OvmfPkg/Include/Library/PlatformFvbLib.h
OvmfPkg/Include/Library/QemuBootOrderLib.h
OvmfPkg/Include/Library/QemuFwCfgLib.h
OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
OvmfPkg/Include/Library/QemuFwCfgSimpleParserLib.h
OvmfPkg/Include/Library/QemuLoadImageLib.h
OvmfPkg/Include/Library/SerializeVariablesLib.h
OvmfPkg/Include/Library/VirtioLib.h
OvmfPkg/Include/Library/VirtioMmioDeviceLib.h
OvmfPkg/Include/Library/XenHypercallLib.h
OvmfPkg/Include/Library/XenIoMmioLib.h
OvmfPkg/Include/OvmfPlatforms.h
OvmfPkg/Include/Pcd/CpuHotEjectData.h
OvmfPkg/Include/Protocol/Legacy8259.h
OvmfPkg/Include/Protocol/OvmfLoadedX86LinuxKernel.h
OvmfPkg/Include/Protocol/VirtioDevice.h
OvmfPkg/Include/Protocol/XenBus.h
OvmfPkg/Include/Protocol/XenIo.h
OvmfPkg/Include/Register/QemuSmramSaveStateMap.h
OvmfPkg/Include/WorkArea.h
OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
OvmfPkg/IoMmuDxe/AmdSevIoMmu.c
OvmfPkg/IoMmuDxe/IoMmuDxe.c
OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLibInternal.c
OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c
OvmfPkg/Library/BaseMemEncryptSevLib/PeiDxeMemEncryptSevLibInternal.c
OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c
OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c
OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c
OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c
OvmfPkg/Library/BaseMemEncryptSevLib/X64/SecVirtualMemory.c
OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h
OvmfPkg/Library/BasePciCapLib/BasePciCapLib.c
OvmfPkg/Library/BasePciCapLib/BasePciCapLib.h
OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.c
OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.h
OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c
OvmfPkg/Library/BlobVerifierLibNull/BlobVerifierNull.c
OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c
OvmfPkg/Library/EmuVariableFvbLib/EmuVariableFvbLib.c
OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c
OvmfPkg/Library/LoadLinuxLib/Linux.c
OvmfPkg/Library/LoadLinuxLib/LinuxGdt.c
OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.h
OvmfPkg/Library/LockBoxLib/LockBoxDxe.c
OvmfPkg/Library/LockBoxLib/LockBoxLib.c
OvmfPkg/Library/LockBoxLib/LockBoxLib.h
OvmfPkg/Library/NvVarsFileLib/FsAccess.c
OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.c
OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.h
OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridge.h
OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLib.c
OvmfPkg/Library/PciHostBridgeLibScan/ScanForRootBridges.c
OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c
OvmfPkg/Library/PlatformBmPrintScLib/StatusCodeHandler.c
OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
OvmfPkg/Library/PlatformBootManagerLib/PlatformData.c
OvmfPkg/Library/PlatformBootManagerLib/QemuKernel.c
OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.h
OvmfPkg/Library/PlatformBootManagerLibBhyve/PlatformData.c
OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.h
OvmfPkg/Library/PlatformBootManagerLibGrub/PlatformData.c
OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c
OvmfPkg/Library/PlatformDebugLibIoPort/DebugIoPortQemu.c
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
OvmfPkg/Library/PlatformFvbLibNull/PlatformFvbLibNull.c
OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcd.c
OvmfPkg/Library/QemuBootOrderLib/ExtraRootBusMap.c
OvmfPkg/Library/QemuBootOrderLib/ExtraRootBusMap.h
OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibInternal.h
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgNull.c
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c
OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3PeiDxe.c
OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParser.c
OvmfPkg/Library/ResetSystemLib/BaseResetShutdown.c
OvmfPkg/Library/ResetSystemLib/DxeResetShutdown.c
OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.c
OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c
OvmfPkg/Library/ResetSystemLib/ResetSystemLibMicrovm.c
OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c
OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.h
OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c
OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
OvmfPkg/Library/SmmCpuPlatformHookLibQemu/SmmCpuPlatformHookLibQemu.c
OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.c
OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c
OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.c
OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.c
OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.h
OvmfPkg/Library/VirtioLib/VirtioLib.c
OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c
OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h
OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c
OvmfPkg/Library/VmgExitLib/PeiDxeVmgExitVcHandler.c
OvmfPkg/Library/VmgExitLib/SecVmgExitVcHandler.c
OvmfPkg/Library/VmgExitLib/VmgExitLib.c
OvmfPkg/Library/VmgExitLib/VmgExitVcHandler.c
OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.c
OvmfPkg/Library/XenConsoleSerialPortLib/XenConsoleSerialPortLib.c
OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c
OvmfPkg/Library/XenHypercallLib/XenHypercall.c
OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c
OvmfPkg/Library/XenPlatformLib/XenPlatformLib.c
OvmfPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.c
OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c
OvmfPkg/LsiScsiDxe/LsiScsi.c
OvmfPkg/LsiScsiDxe/LsiScsi.h
OvmfPkg/MptScsiDxe/MptScsi.c
OvmfPkg/OvmfXenElfHeaderGenerator.c
OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
OvmfPkg/PlatformDxe/Platform.c
OvmfPkg/PlatformDxe/Platform.h
OvmfPkg/PlatformDxe/PlatformConfig.c
OvmfPkg/PlatformDxe/PlatformConfig.h
OvmfPkg/PlatformPei/AmdSev.c
OvmfPkg/PlatformPei/ClearCache.c
OvmfPkg/PlatformPei/Cmos.c
OvmfPkg/PlatformPei/Cmos.h
OvmfPkg/PlatformPei/FeatureControl.c
OvmfPkg/PlatformPei/Fv.c
OvmfPkg/PlatformPei/MemDetect.c
OvmfPkg/PlatformPei/MemTypeInfo.c
OvmfPkg/PlatformPei/Platform.c
OvmfPkg/PlatformPei/Platform.h
OvmfPkg/PvScsiDxe/PvScsi.c
OvmfPkg/PvScsiDxe/PvScsi.h
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.h
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.h
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c
OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
OvmfPkg/QemuRamfbDxe/QemuRamfb.c
OvmfPkg/QemuVideoDxe/ComponentName.c
OvmfPkg/QemuVideoDxe/Driver.c
OvmfPkg/QemuVideoDxe/Gop.c
OvmfPkg/QemuVideoDxe/Initialize.c
OvmfPkg/QemuVideoDxe/Qemu.h
OvmfPkg/QemuVideoDxe/VbeShim.c
OvmfPkg/QemuVideoDxe/VbeShim.h
OvmfPkg/SataControllerDxe/ComponentName.c
OvmfPkg/SataControllerDxe/SataController.c
OvmfPkg/SataControllerDxe/SataController.h
OvmfPkg/Sec/SecMain.c
OvmfPkg/SioBusDxe/ComponentName.c
OvmfPkg/SioBusDxe/SioBusDxe.c
OvmfPkg/SioBusDxe/SioBusDxe.h
OvmfPkg/SioBusDxe/SioService.c
OvmfPkg/SioBusDxe/SioService.h
OvmfPkg/SmbiosPlatformDxe/Qemu.c
OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h
OvmfPkg/SmbiosPlatformDxe/X86Xen.c
OvmfPkg/SmbiosPlatformDxe/Xen.c
OvmfPkg/SmmAccess/SmmAccess2Dxe.c
OvmfPkg/SmmAccess/SmmAccessPei.c
OvmfPkg/SmmAccess/SmramInternal.c
OvmfPkg/SmmAccess/SmramInternal.h
OvmfPkg/SmmControl2Dxe/SmiFeatures.c
OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c
OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
OvmfPkg/Tcg/Tcg2Config/Tpm12Support.c
OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c
OvmfPkg/Virtio10Dxe/Virtio10.c
OvmfPkg/Virtio10Dxe/Virtio10.h
OvmfPkg/VirtioBlkDxe/VirtioBlk.c
OvmfPkg/VirtioBlkDxe/VirtioBlk.h
OvmfPkg/VirtioFsDxe/DriverBinding.c
OvmfPkg/VirtioFsDxe/FuseFlush.c
OvmfPkg/VirtioFsDxe/FuseForget.c
OvmfPkg/VirtioFsDxe/FuseFsync.c
OvmfPkg/VirtioFsDxe/FuseGetAttr.c
OvmfPkg/VirtioFsDxe/FuseInit.c
OvmfPkg/VirtioFsDxe/FuseLookup.c
OvmfPkg/VirtioFsDxe/FuseMkDir.c
OvmfPkg/VirtioFsDxe/FuseOpen.c
OvmfPkg/VirtioFsDxe/FuseOpenDir.c
OvmfPkg/VirtioFsDxe/FuseOpenOrCreate.c
OvmfPkg/VirtioFsDxe/FuseRead.c
OvmfPkg/VirtioFsDxe/FuseRelease.c
OvmfPkg/VirtioFsDxe/FuseRename.c
OvmfPkg/VirtioFsDxe/FuseSetAttr.c
OvmfPkg/VirtioFsDxe/FuseStatFs.c
OvmfPkg/VirtioFsDxe/FuseUnlink.c
OvmfPkg/VirtioFsDxe/FuseWrite.c
OvmfPkg/VirtioFsDxe/Helpers.c
OvmfPkg/VirtioFsDxe/SimpleFsClose.c
OvmfPkg/VirtioFsDxe/SimpleFsDelete.c
OvmfPkg/VirtioFsDxe/SimpleFsFlush.c
OvmfPkg/VirtioFsDxe/SimpleFsGetInfo.c
OvmfPkg/VirtioFsDxe/SimpleFsGetPosition.c
OvmfPkg/VirtioFsDxe/SimpleFsOpen.c
OvmfPkg/VirtioFsDxe/SimpleFsOpenVolume.c
OvmfPkg/VirtioFsDxe/SimpleFsRead.c
OvmfPkg/VirtioFsDxe/SimpleFsSetInfo.c
OvmfPkg/VirtioFsDxe/SimpleFsSetPosition.c
OvmfPkg/VirtioFsDxe/SimpleFsWrite.c
OvmfPkg/VirtioFsDxe/VirtioFsDxe.h
OvmfPkg/VirtioGpuDxe/Commands.c
OvmfPkg/VirtioGpuDxe/DriverBinding.c
OvmfPkg/VirtioGpuDxe/Gop.c
OvmfPkg/VirtioGpuDxe/VirtioGpu.h
OvmfPkg/VirtioNetDxe/ComponentName.c
OvmfPkg/VirtioNetDxe/DriverBinding.c
OvmfPkg/VirtioNetDxe/EntryPoint.c
OvmfPkg/VirtioNetDxe/Events.c
OvmfPkg/VirtioNetDxe/SnpGetStatus.c
OvmfPkg/VirtioNetDxe/SnpInitialize.c
OvmfPkg/VirtioNetDxe/SnpMcastIpToMac.c
OvmfPkg/VirtioNetDxe/SnpReceive.c
OvmfPkg/VirtioNetDxe/SnpReceiveFilters.c
OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c
OvmfPkg/VirtioNetDxe/SnpShutdown.c
OvmfPkg/VirtioNetDxe/SnpStart.c
OvmfPkg/VirtioNetDxe/SnpStop.c
OvmfPkg/VirtioNetDxe/SnpTransmit.c
OvmfPkg/VirtioNetDxe/SnpUnsupported.c
OvmfPkg/VirtioNetDxe/VirtioNet.h
OvmfPkg/VirtioPciDeviceDxe/VirtioPciDevice.c
OvmfPkg/VirtioPciDeviceDxe/VirtioPciDevice.h
OvmfPkg/VirtioPciDeviceDxe/VirtioPciFunctions.c
OvmfPkg/VirtioRngDxe/VirtioRng.c
OvmfPkg/VirtioRngDxe/VirtioRng.h
OvmfPkg/VirtioScsiDxe/VirtioScsi.c
OvmfPkg/VirtioScsiDxe/VirtioScsi.h
OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.c
OvmfPkg/XenAcpiPlatformDxe/AcpiPlatform.h
OvmfPkg/XenAcpiPlatformDxe/EntryPoint.c
OvmfPkg/XenAcpiPlatformDxe/Xen.c
OvmfPkg/XenBusDxe/ComponentName.c
OvmfPkg/XenBusDxe/EventChannel.c
OvmfPkg/XenBusDxe/EventChannel.h
OvmfPkg/XenBusDxe/GrantTable.c
OvmfPkg/XenBusDxe/GrantTable.h
OvmfPkg/XenBusDxe/Helpers.c
OvmfPkg/XenBusDxe/TestAndClearBit.c
OvmfPkg/XenBusDxe/XenBus.c
OvmfPkg/XenBusDxe/XenBus.h
OvmfPkg/XenBusDxe/XenBusDxe.c
OvmfPkg/XenBusDxe/XenBusDxe.h
OvmfPkg/XenBusDxe/XenStore.c
OvmfPkg/XenBusDxe/XenStore.h
OvmfPkg/XenIoPciDxe/XenIoPciDxe.c
OvmfPkg/XenIoPvhDxe/XenIoPvhDxe.c
OvmfPkg/XenPlatformPei/AmdSev.c
OvmfPkg/XenPlatformPei/ClearCache.c
OvmfPkg/XenPlatformPei/Cmos.c
OvmfPkg/XenPlatformPei/Cmos.h
OvmfPkg/XenPlatformPei/Fv.c
OvmfPkg/XenPlatformPei/MemDetect.c
OvmfPkg/XenPlatformPei/Platform.c
OvmfPkg/XenPlatformPei/Platform.h
OvmfPkg/XenPlatformPei/Xen.c
OvmfPkg/XenPlatformPei/Xen.h
OvmfPkg/XenPvBlkDxe/BlockFront.c
OvmfPkg/XenPvBlkDxe/BlockFront.h
OvmfPkg/XenPvBlkDxe/BlockIo.c
OvmfPkg/XenPvBlkDxe/BlockIo.h
OvmfPkg/XenPvBlkDxe/ComponentName.c
OvmfPkg/XenPvBlkDxe/DriverBinding.h
OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c
OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h
OvmfPkg/XenTimerDxe/XenTimerDxe.c
OvmfPkg/XenTimerDxe/XenTimerDxe.h

index fd1691beb3c75f434c78b916a8e70ed7fb8cbd74..e49a438b4414536a18ddc984a943449dd78ad17c 100644 (file)
@@ -11,12 +11,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // The handle onto which the Timer Architectural Protocol will be installed\r
 //\r
-EFI_HANDLE                mTimerHandle = NULL;\r
+EFI_HANDLE  mTimerHandle = NULL;\r
 \r
 //\r
 // The Timer Architectural Protocol that this driver produces\r
 //\r
-EFI_TIMER_ARCH_PROTOCOL   mTimer = {\r
+EFI_TIMER_ARCH_PROTOCOL  mTimer = {\r
   TimerDriverRegisterHandler,\r
   TimerDriverSetTimerPeriod,\r
   TimerDriverGetTimerPeriod,\r
@@ -26,7 +26,7 @@ EFI_TIMER_ARCH_PROTOCOL   mTimer = {
 //\r
 // Pointer to the CPU Architectural Protocol instance\r
 //\r
-EFI_CPU_ARCH_PROTOCOL     *mCpu;\r
+EFI_CPU_ARCH_PROTOCOL  *mCpu;\r
 \r
 //\r
 // Pointer to the Legacy 8259 Protocol instance\r
@@ -37,16 +37,17 @@ EFI_LEGACY_8259_PROTOCOL  *mLegacy8259;
 // The notification function to call on every timer interrupt.\r
 // A bug in the compiler prevents us from initializing this here.\r
 //\r
-EFI_TIMER_NOTIFY mTimerNotifyFunction;\r
+EFI_TIMER_NOTIFY  mTimerNotifyFunction;\r
 \r
 //\r
 // The current period of the timer interrupt\r
 //\r
-volatile UINT64           mTimerPeriod = 0;\r
+volatile UINT64  mTimerPeriod = 0;\r
 \r
 //\r
 // Worker Functions\r
 //\r
+\r
 /**\r
   Sets the counter value for Timer #0 in a legacy 8254 timer.\r
 \r
@@ -71,11 +72,11 @@ SetPitCount (
 VOID\r
 EFIAPI\r
 TimerInterruptHandler (\r
-  IN EFI_EXCEPTION_TYPE   InterruptType,\r
-  IN EFI_SYSTEM_CONTEXT   SystemContext\r
+  IN EFI_EXCEPTION_TYPE  InterruptType,\r
+  IN EFI_SYSTEM_CONTEXT  SystemContext\r
   )\r
 {\r
-  EFI_TPL OriginalTPL;\r
+  EFI_TPL  OriginalTPL;\r
 \r
   OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL);\r
 \r
@@ -133,11 +134,11 @@ TimerDriverRegisterHandler (
   //\r
   // Check for invalid parameters\r
   //\r
-  if (NotifyFunction == NULL && mTimerNotifyFunction == NULL) {\r
+  if ((NotifyFunction == NULL) && (mTimerNotifyFunction == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (NotifyFunction != NULL && mTimerNotifyFunction != NULL) {\r
+  if ((NotifyFunction != NULL) && (mTimerNotifyFunction != NULL)) {\r
     return EFI_ALREADY_STARTED;\r
   }\r
 \r
@@ -203,29 +204,30 @@ TimerDriverSetTimerPeriod (
     //\r
     mLegacy8259->DisableIrq (mLegacy8259, Efi8259Irq0);\r
   } else {\r
-\r
     //\r
     // Convert TimerPeriod into 8254 counts\r
     //\r
-    TimerCount = DivU64x32 (MultU64x32 (119318, (UINT32) TimerPeriod) + 500000, 1000000);\r
+    TimerCount = DivU64x32 (MultU64x32 (119318, (UINT32)TimerPeriod) + 500000, 1000000);\r
 \r
     //\r
     // Check for overflow\r
     //\r
     if (TimerCount >= 65536) {\r
-      TimerCount = 0;\r
+      TimerCount  = 0;\r
       TimerPeriod = MAX_TIMER_TICK_DURATION;\r
     }\r
+\r
     //\r
     // Program the 8254 timer with the new count value\r
     //\r
-    SetPitCount ((UINT16) TimerCount);\r
+    SetPitCount ((UINT16)TimerCount);\r
 \r
     //\r
     // Enable timer interrupt\r
     //\r
     mLegacy8259->EnableIrq (mLegacy8259, Efi8259Irq0, FALSE);\r
   }\r
+\r
   //\r
   // Save the new timer period\r
   //\r
@@ -253,8 +255,8 @@ TimerDriverSetTimerPeriod (
 EFI_STATUS\r
 EFIAPI\r
 TimerDriverGetTimerPeriod (\r
-  IN EFI_TIMER_ARCH_PROTOCOL   *This,\r
-  OUT UINT64                   *TimerPeriod\r
+  IN EFI_TIMER_ARCH_PROTOCOL  *This,\r
+  OUT UINT64                  *TimerPeriod\r
   )\r
 {\r
   if (TimerPeriod == NULL) {\r
@@ -353,13 +355,13 @@ TimerDriverInitialize (
   //\r
   // Find the CPU architectural protocol.\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **) &mCpu);\r
+  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&mCpu);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   // Find the Legacy8259 protocol.\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiLegacy8259ProtocolGuid, NULL, (VOID **) &mLegacy8259);\r
+  Status = gBS->LocateProtocol (&gEfiLegacy8259ProtocolGuid, NULL, (VOID **)&mLegacy8259);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -372,7 +374,7 @@ TimerDriverInitialize (
   // Get the interrupt vector number corresponding to IRQ0 from the 8259 driver\r
   //\r
   TimerVector = 0;\r
-  Status      = mLegacy8259->GetVector (mLegacy8259, Efi8259Irq0, (UINT8 *) &TimerVector);\r
+  Status      = mLegacy8259->GetVector (mLegacy8259, Efi8259Irq0, (UINT8 *)&TimerVector);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -392,11 +394,11 @@ TimerDriverInitialize (
   //\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &mTimerHandle,\r
-                  &gEfiTimerArchProtocolGuid, &mTimer,\r
+                  &gEfiTimerArchProtocolGuid,\r
+                  &mTimer,\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r
 }\r
-\r
index 4c4b720d50dda8da6faece3c9dbbc14759863e20..b19ef3c1f94eba213b2219e02ecc00328a3812e5 100644 (file)
@@ -32,17 +32,18 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // The maximum tick duration for 8254 timer\r
 //\r
-#define MAX_TIMER_TICK_DURATION     549254\r
+#define MAX_TIMER_TICK_DURATION  549254\r
 //\r
 // The default timer tick duration is set to 10 ms = 100000 100 ns units\r
 //\r
-#define DEFAULT_TIMER_TICK_DURATION 100000\r
-#define TIMER_CONTROL_PORT          0x43\r
-#define TIMER0_COUNT_PORT           0x40\r
+#define DEFAULT_TIMER_TICK_DURATION  100000\r
+#define TIMER_CONTROL_PORT           0x43\r
+#define TIMER0_COUNT_PORT            0x40\r
 \r
 //\r
 // Function Prototypes\r
 //\r
+\r
 /**\r
   Initialize the Timer Architectural Protocol driver\r
 \r
@@ -153,8 +154,8 @@ TimerDriverSetTimerPeriod (
 EFI_STATUS\r
 EFIAPI\r
 TimerDriverGetTimerPeriod (\r
-  IN EFI_TIMER_ARCH_PROTOCOL   *This,\r
-  OUT UINT64                   *TimerPeriod\r
+  IN EFI_TIMER_ARCH_PROTOCOL  *This,\r
+  OUT UINT64                  *TimerPeriod\r
   )\r
 ;\r
 \r
index 7d51ff259f8cb7dd758ef69d1bee0421cf598ebd..e123ac2d96b2abca71d2bdc3004742dfb2cccd4c 100644 (file)
@@ -26,15 +26,15 @@ EFI_LEGACY_8259_PROTOCOL  mInterrupt8259 = {
 //\r
 // Global for the handle that the Legacy 8259 Protocol is installed\r
 //\r
-EFI_HANDLE                m8259Handle             = NULL;\r
+EFI_HANDLE  m8259Handle = NULL;\r
 \r
-UINT8                     mMasterBase             = 0xff;\r
-UINT8                     mSlaveBase              = 0xff;\r
-EFI_8259_MODE             mMode                   = Efi8259ProtectedMode;\r
-UINT16                    mProtectedModeMask      = 0xffff;\r
-UINT16                    mLegacyModeMask;\r
-UINT16                    mProtectedModeEdgeLevel = 0x0000;\r
-UINT16                    mLegacyModeEdgeLevel;\r
+UINT8          mMasterBase        = 0xff;\r
+UINT8          mSlaveBase         = 0xff;\r
+EFI_8259_MODE  mMode              = Efi8259ProtectedMode;\r
+UINT16         mProtectedModeMask = 0xffff;\r
+UINT16         mLegacyModeMask;\r
+UINT16         mProtectedModeEdgeLevel = 0x0000;\r
+UINT16         mLegacyModeEdgeLevel;\r
 \r
 //\r
 // Worker Functions\r
@@ -55,10 +55,10 @@ Interrupt8259WriteMask (
   IN UINT16  EdgeLevel\r
   )\r
 {\r
-  IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, (UINT8) Mask);\r
-  IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, (UINT8) (Mask >> 8));\r
-  IoWrite8 (LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_MASTER, (UINT8) EdgeLevel);\r
-  IoWrite8 (LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_SLAVE, (UINT8) (EdgeLevel >> 8));\r
+  IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, (UINT8)Mask);\r
+  IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, (UINT8)(Mask >> 8));\r
+  IoWrite8 (LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_MASTER, (UINT8)EdgeLevel);\r
+  IoWrite8 (LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_SLAVE, (UINT8)(EdgeLevel >> 8));\r
 }\r
 \r
 /**\r
@@ -83,14 +83,14 @@ Interrupt8259ReadMask (
     MasterValue = IoRead8 (LEGACY_8259_MASK_REGISTER_MASTER);\r
     SlaveValue  = IoRead8 (LEGACY_8259_MASK_REGISTER_SLAVE);\r
 \r
-    *Mask = (UINT16) (MasterValue | (SlaveValue << 8));\r
+    *Mask = (UINT16)(MasterValue | (SlaveValue << 8));\r
   }\r
 \r
   if (EdgeLevel != NULL) {\r
     MasterValue = IoRead8 (LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_MASTER);\r
     SlaveValue  = IoRead8 (LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_SLAVE);\r
 \r
-    *EdgeLevel = (UINT16) (MasterValue | (SlaveValue << 8));\r
+    *EdgeLevel = (UINT16)(MasterValue | (SlaveValue << 8));\r
   }\r
 }\r
 \r
@@ -117,8 +117,8 @@ Interrupt8259SetVectorBase (
   IN UINT8                     SlaveBase\r
   )\r
 {\r
-  UINT8   Mask;\r
-  EFI_TPL OriginalTpl;\r
+  UINT8    Mask;\r
+  EFI_TPL  OriginalTpl;\r
 \r
   OriginalTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);\r
   //\r
@@ -416,9 +416,9 @@ Interrupt8259GetVector (
   }\r
 \r
   if (Irq <= Efi8259Irq7) {\r
-    *Vector = (UINT8) (mMasterBase + Irq);\r
+    *Vector = (UINT8)(mMasterBase + Irq);\r
   } else {\r
-    *Vector = (UINT8) (mSlaveBase + (Irq - Efi8259Irq8));\r
+    *Vector = (UINT8)(mSlaveBase + (Irq - Efi8259Irq8));\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -447,11 +447,11 @@ Interrupt8259EnableIrq (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  mProtectedModeMask = (UINT16) (mProtectedModeMask & ~(1 << Irq));\r
+  mProtectedModeMask = (UINT16)(mProtectedModeMask & ~(1 << Irq));\r
   if (LevelTriggered) {\r
-    mProtectedModeEdgeLevel = (UINT16) (mProtectedModeEdgeLevel | (1 << Irq));\r
+    mProtectedModeEdgeLevel = (UINT16)(mProtectedModeEdgeLevel | (1 << Irq));\r
   } else {\r
-    mProtectedModeEdgeLevel = (UINT16) (mProtectedModeEdgeLevel & ~(1 << Irq));\r
+    mProtectedModeEdgeLevel = (UINT16)(mProtectedModeEdgeLevel & ~(1 << Irq));\r
   }\r
 \r
   Interrupt8259WriteMask (mProtectedModeMask, mProtectedModeEdgeLevel);\r
@@ -480,9 +480,9 @@ Interrupt8259DisableIrq (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  mProtectedModeMask = (UINT16) (mProtectedModeMask | (1 << Irq));\r
+  mProtectedModeMask = (UINT16)(mProtectedModeMask | (1 << Irq));\r
 \r
-  mProtectedModeEdgeLevel = (UINT16) (mProtectedModeEdgeLevel & ~(1 << Irq));\r
+  mProtectedModeEdgeLevel = (UINT16)(mProtectedModeEdgeLevel & ~(1 << Irq));\r
 \r
   Interrupt8259WriteMask (mProtectedModeMask, mProtectedModeEdgeLevel);\r
 \r
@@ -507,14 +507,14 @@ Interrupt8259GetInterruptLine (
   OUT UINT8                     *Vector\r
   )\r
 {\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  UINT8               InterruptLine;\r
-  EFI_STATUS          Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  UINT8                InterruptLine;\r
+  EFI_STATUS           Status;\r
 \r
   Status = gBS->HandleProtocol (\r
                   PciHandle,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo\r
+                  (VOID **)&PciIo\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -583,8 +583,8 @@ Install8259 (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS   Status;\r
-  EFI_8259_IRQ Irq;\r
+  EFI_STATUS    Status;\r
+  EFI_8259_IRQ  Irq;\r
 \r
   //\r
   // Initialze mask values from PCDs\r
index aac82e92e795b7e120733fa33ddebc7d27f00e12..066552ca933ed2f753699b5fbab856a659cc5fea 100644 (file)
@@ -22,11 +22,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 // 8259 Hardware definitions\r
 \r
-#define LEGACY_MODE_BASE_VECTOR_MASTER                    0x08\r
-#define LEGACY_MODE_BASE_VECTOR_SLAVE                     0x70\r
+#define LEGACY_MODE_BASE_VECTOR_MASTER  0x08\r
+#define LEGACY_MODE_BASE_VECTOR_SLAVE   0x70\r
 \r
-#define PROTECTED_MODE_BASE_VECTOR_MASTER                 0x68\r
-#define PROTECTED_MODE_BASE_VECTOR_SLAVE                  0x70\r
+#define PROTECTED_MODE_BASE_VECTOR_MASTER  0x68\r
+#define PROTECTED_MODE_BASE_VECTOR_SLAVE   0x70\r
 \r
 #define LEGACY_8259_CONTROL_REGISTER_MASTER               0x20\r
 #define LEGACY_8259_MASK_REGISTER_MASTER                  0x21\r
@@ -35,7 +35,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_MASTER  0x4D0\r
 #define LEGACY_8259_EDGE_LEVEL_TRIGGERED_REGISTER_SLAVE   0x4D1\r
 \r
-#define LEGACY_8259_EOI                                   0x20\r
+#define LEGACY_8259_EOI  0x20\r
 \r
 // Protocol Function Prototypes\r
 \r
index bd4c26f07fcd5ac9ffc7bd87bff600ee33cb8d5d..1ccca0a368c485bb90c7beee70f3e387ef7981ec 100644 (file)
@@ -13,8 +13,8 @@
 #include <Protocol/PciIo.h>     // EFI_PCI_IO_PROTOCOL\r
 \r
 typedef struct {\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  UINT64              PciAttributes;\r
+  EFI_PCI_IO_PROTOCOL    *PciIo;\r
+  UINT64                 PciAttributes;\r
 } ORIGINAL_ATTRIBUTES;\r
 \r
 typedef struct S3_CONTEXT S3_CONTEXT;\r
@@ -22,51 +22,50 @@ typedef struct S3_CONTEXT S3_CONTEXT;
 EFI_STATUS\r
 EFIAPI\r
 InstallQemuFwCfgTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiProtocol\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 InstallAcpiTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiTable\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiTable\r
   );\r
 \r
 VOID\r
 EnablePciDecoding (\r
-  OUT ORIGINAL_ATTRIBUTES **OriginalAttributes,\r
-  OUT UINTN               *Count\r
+  OUT ORIGINAL_ATTRIBUTES  **OriginalAttributes,\r
+  OUT UINTN                *Count\r
   );\r
 \r
 VOID\r
 RestorePciDecoding (\r
-  IN ORIGINAL_ATTRIBUTES *OriginalAttributes,\r
-  IN UINTN               Count\r
+  IN ORIGINAL_ATTRIBUTES  *OriginalAttributes,\r
+  IN UINTN                Count\r
   );\r
 \r
 EFI_STATUS\r
 AllocateS3Context (\r
-  OUT S3_CONTEXT **S3Context,\r
-  IN  UINTN      WritePointerCount\r
+  OUT S3_CONTEXT  **S3Context,\r
+  IN  UINTN       WritePointerCount\r
   );\r
 \r
 VOID\r
 ReleaseS3Context (\r
-  IN S3_CONTEXT *S3Context\r
+  IN S3_CONTEXT  *S3Context\r
   );\r
 \r
 EFI_STATUS\r
 SaveCondensedWritePointerToS3Context (\r
-  IN OUT S3_CONTEXT *S3Context,\r
-  IN     UINT16     PointerItem,\r
-  IN     UINT8      PointerSize,\r
-  IN     UINT32     PointerOffset,\r
-  IN     UINT64     PointerValue\r
+  IN OUT S3_CONTEXT  *S3Context,\r
+  IN     UINT16      PointerItem,\r
+  IN     UINT8       PointerSize,\r
+  IN     UINT32      PointerOffset,\r
+  IN     UINT64      PointerValue\r
   );\r
 \r
 EFI_STATUS\r
 TransferS3ContextToBootScript (\r
-  IN S3_CONTEXT *S3Context\r
+  IN S3_CONTEXT  *S3Context\r
   );\r
 \r
 #endif\r
-\r
index efcf2e3ba59c7374a26ae91b1cd135986c2fe052..08d0f41bda5cb657fded2631a360dcd613792284 100644 (file)
 \r
 #include "AcpiPlatform.h"\r
 \r
-\r
 //\r
 // Condensed structure for capturing the fw_cfg operations -- select, skip,\r
 // write -- inherent in executing a QEMU_LOADER_WRITE_POINTER command.\r
 //\r
 typedef struct {\r
-  UINT16 PointerItem;   // resolved from QEMU_LOADER_WRITE_POINTER.PointerFile\r
-  UINT8  PointerSize;   // copied as-is from QEMU_LOADER_WRITE_POINTER\r
-  UINT32 PointerOffset; // copied as-is from QEMU_LOADER_WRITE_POINTER\r
-  UINT64 PointerValue;  // resolved from QEMU_LOADER_WRITE_POINTER.PointeeFile\r
-                        //   and QEMU_LOADER_WRITE_POINTER.PointeeOffset\r
+  UINT16    PointerItem;   // resolved from QEMU_LOADER_WRITE_POINTER.PointerFile\r
+  UINT8     PointerSize;   // copied as-is from QEMU_LOADER_WRITE_POINTER\r
+  UINT32    PointerOffset; // copied as-is from QEMU_LOADER_WRITE_POINTER\r
+  UINT64    PointerValue;  // resolved from QEMU_LOADER_WRITE_POINTER.PointeeFile\r
+                           //   and QEMU_LOADER_WRITE_POINTER.PointeeOffset\r
 } CONDENSED_WRITE_POINTER;\r
 \r
-\r
 //\r
 // Context structure to accumulate CONDENSED_WRITE_POINTER objects from\r
 // QEMU_LOADER_WRITE_POINTER commands.\r
@@ -36,27 +34,25 @@ typedef struct {
 // context structure is released, all pointed-to objects must be released too.\r
 //\r
 struct S3_CONTEXT {\r
-  CONDENSED_WRITE_POINTER *WritePointers; // one array element per processed\r
-                                          //   QEMU_LOADER_WRITE_POINTER\r
-                                          //   command\r
-  UINTN                   Allocated;      // number of elements allocated for\r
-                                          //   WritePointers\r
-  UINTN                   Used;           // number of elements populated in\r
-                                          //   WritePointers\r
+  CONDENSED_WRITE_POINTER    *WritePointers; // one array element per processed\r
+                                             //   QEMU_LOADER_WRITE_POINTER\r
+                                             //   command\r
+  UINTN                      Allocated;      // number of elements allocated for\r
+                                             //   WritePointers\r
+  UINTN                      Used;           // number of elements populated in\r
+                                             //   WritePointers\r
 };\r
 \r
-\r
 //\r
 // Scratch buffer, allocated in EfiReservedMemoryType type memory, for the ACPI\r
 // S3 Boot Script opcodes to work on.\r
 //\r
 #pragma pack (1)\r
 typedef union {\r
-  UINT64 PointerValue; // filled in from CONDENSED_WRITE_POINTER.PointerValue\r
+  UINT64    PointerValue; // filled in from CONDENSED_WRITE_POINTER.PointerValue\r
 } SCRATCH_BUFFER;\r
 #pragma pack ()\r
 \r
-\r
 /**\r
   Allocate an S3_CONTEXT object.\r
 \r
@@ -75,12 +71,12 @@ typedef union {
 **/\r
 EFI_STATUS\r
 AllocateS3Context (\r
-  OUT S3_CONTEXT **S3Context,\r
-  IN  UINTN      WritePointerCount\r
+  OUT S3_CONTEXT  **S3Context,\r
+  IN  UINTN       WritePointerCount\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  S3_CONTEXT *Context;\r
+  EFI_STATUS  Status;\r
+  S3_CONTEXT  *Context;\r
 \r
   if (WritePointerCount == 0) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -91,15 +87,17 @@ AllocateS3Context (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Context->WritePointers = AllocatePool (WritePointerCount *\r
-                             sizeof *Context->WritePointers);\r
+  Context->WritePointers = AllocatePool (\r
+                             WritePointerCount *\r
+                             sizeof *Context->WritePointers\r
+                             );\r
   if (Context->WritePointers == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeContext;\r
   }\r
 \r
   Context->Allocated = WritePointerCount;\r
-  *S3Context = Context;\r
+  *S3Context         = Context;\r
   return EFI_SUCCESS;\r
 \r
 FreeContext:\r
@@ -108,7 +106,6 @@ FreeContext:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Release an S3_CONTEXT object.\r
 \r
@@ -116,14 +113,13 @@ FreeContext:
 **/\r
 VOID\r
 ReleaseS3Context (\r
-  IN S3_CONTEXT *S3Context\r
+  IN S3_CONTEXT  *S3Context\r
   )\r
 {\r
   FreePool (S3Context->WritePointers);\r
   FreePool (S3Context);\r
 }\r
 \r
-\r
 /**\r
   Save the information necessary to replicate a QEMU_LOADER_WRITE_POINTER\r
   command during S3 resume, in condensed format.\r
@@ -158,31 +154,38 @@ ReleaseS3Context (
 **/\r
 EFI_STATUS\r
 SaveCondensedWritePointerToS3Context (\r
-  IN OUT S3_CONTEXT *S3Context,\r
-  IN     UINT16     PointerItem,\r
-  IN     UINT8      PointerSize,\r
-  IN     UINT32     PointerOffset,\r
-  IN     UINT64     PointerValue\r
+  IN OUT S3_CONTEXT  *S3Context,\r
+  IN     UINT16      PointerItem,\r
+  IN     UINT8       PointerSize,\r
+  IN     UINT32      PointerOffset,\r
+  IN     UINT64      PointerValue\r
   )\r
 {\r
-  CONDENSED_WRITE_POINTER *Condensed;\r
+  CONDENSED_WRITE_POINTER  *Condensed;\r
 \r
   if (S3Context->Used == S3Context->Allocated) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  Condensed = S3Context->WritePointers + S3Context->Used;\r
+\r
+  Condensed                = S3Context->WritePointers + S3Context->Used;\r
   Condensed->PointerItem   = PointerItem;\r
   Condensed->PointerSize   = PointerSize;\r
   Condensed->PointerOffset = PointerOffset;\r
   Condensed->PointerValue  = PointerValue;\r
-  DEBUG ((DEBUG_VERBOSE, "%a: 0x%04x/[0x%08x+%d] := 0x%Lx (%Lu)\n",\r
-    __FUNCTION__, PointerItem, PointerOffset, PointerSize, PointerValue,\r
-    (UINT64)S3Context->Used));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: 0x%04x/[0x%08x+%d] := 0x%Lx (%Lu)\n",\r
+    __FUNCTION__,\r
+    PointerItem,\r
+    PointerOffset,\r
+    PointerSize,\r
+    PointerValue,\r
+    (UINT64)S3Context->Used\r
+    ));\r
   ++S3Context->Used;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION provided to QemuFwCfgS3Lib.\r
 **/\r
@@ -190,31 +193,33 @@ STATIC
 VOID\r
 EFIAPI\r
 AppendFwCfgBootScript (\r
-  IN OUT VOID *Context               OPTIONAL,\r
-  IN OUT VOID *ExternalScratchBuffer\r
+  IN OUT VOID  *Context               OPTIONAL,\r
+  IN OUT VOID  *ExternalScratchBuffer\r
   )\r
 {\r
-  S3_CONTEXT     *S3Context;\r
-  SCRATCH_BUFFER *ScratchBuffer;\r
-  UINTN          Index;\r
+  S3_CONTEXT      *S3Context;\r
+  SCRATCH_BUFFER  *ScratchBuffer;\r
+  UINTN           Index;\r
 \r
-  S3Context = Context;\r
+  S3Context     = Context;\r
   ScratchBuffer = ExternalScratchBuffer;\r
 \r
   for (Index = 0; Index < S3Context->Used; ++Index) {\r
-    CONST CONDENSED_WRITE_POINTER *Condensed;\r
-    RETURN_STATUS                 Status;\r
+    CONST CONDENSED_WRITE_POINTER  *Condensed;\r
+    RETURN_STATUS                  Status;\r
 \r
     Condensed = &S3Context->WritePointers[Index];\r
 \r
-    Status = QemuFwCfgS3ScriptSkipBytes (Condensed->PointerItem,\r
-               Condensed->PointerOffset);\r
+    Status = QemuFwCfgS3ScriptSkipBytes (\r
+               Condensed->PointerItem,\r
+               Condensed->PointerOffset\r
+               );\r
     if (RETURN_ERROR (Status)) {\r
       goto FatalError;\r
     }\r
 \r
     ScratchBuffer->PointerValue = Condensed->PointerValue;\r
-    Status = QemuFwCfgS3ScriptWriteBytes (-1, Condensed->PointerSize);\r
+    Status                      = QemuFwCfgS3ScriptWriteBytes (-1, Condensed->PointerSize);\r
     if (RETURN_ERROR (Status)) {\r
       goto FatalError;\r
     }\r
@@ -230,7 +235,6 @@ FatalError:
   CpuDeadLoop ();\r
 }\r
 \r
-\r
 /**\r
   Translate and append the information from an S3_CONTEXT object to the ACPI S3\r
   Boot Script.\r
@@ -253,17 +257,20 @@ FatalError:
 **/\r
 EFI_STATUS\r
 TransferS3ContextToBootScript (\r
-  IN S3_CONTEXT *S3Context\r
+  IN S3_CONTEXT  *S3Context\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
+  RETURN_STATUS  Status;\r
 \r
   if (S3Context->Used == 0) {\r
     ReleaseS3Context (S3Context);\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  Status = QemuFwCfgS3CallWhenBootScriptReady (AppendFwCfgBootScript,\r
-             S3Context, sizeof (SCRATCH_BUFFER));\r
+  Status = QemuFwCfgS3CallWhenBootScriptReady (\r
+             AppendFwCfgBootScript,\r
+             S3Context,\r
+             sizeof (SCRATCH_BUFFER)\r
+             );\r
   return (EFI_STATUS)Status;\r
 }\r
index bb5fe82c18d4b44fd9203705e20dbc986fc4c8b3..143e860fe187c2f2b6c84d2769fc41306d9171be 100644 (file)
@@ -21,49 +21,50 @@ FindAcpiTableProtocol (
   VOID\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  EFI_ACPI_TABLE_PROTOCOL *AcpiTable;\r
+  EFI_STATUS               Status;\r
+  EFI_ACPI_TABLE_PROTOCOL  *AcpiTable;\r
 \r
   Status = gBS->LocateProtocol (\r
                   &gEfiAcpiTableProtocolGuid,\r
                   NULL,\r
-                  (VOID**)&AcpiTable\r
+                  (VOID **)&AcpiTable\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
   return AcpiTable;\r
 }\r
 \r
-\r
 STATIC\r
 VOID\r
 EFIAPI\r
 OnRootBridgesConnected (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
-  DEBUG ((DEBUG_INFO,\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
     "%a: root bridges have been connected, installing ACPI tables\n",\r
-    __FUNCTION__));\r
+    __FUNCTION__\r
+    ));\r
   Status = InstallAcpiTables (FindAcpiTableProtocol ());\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: InstallAcpiTables: %r\n", __FUNCTION__, Status));\r
   }\r
+\r
   gBS->CloseEvent (Event);\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 AcpiPlatformEntryPoint (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  EFI_EVENT  RootBridgesConnected;\r
+  EFI_STATUS  Status;\r
+  EFI_EVENT   RootBridgesConnected;\r
 \r
   //\r
   // If the platform doesn't support PCI, or PCI enumeration has been disabled,\r
@@ -71,8 +72,12 @@ AcpiPlatformEntryPoint (
   // the full functionality.\r
   //\r
   if (PcdGetBool (PcdPciDisableBusEnumeration)) {\r
-    DEBUG ((DEBUG_INFO, "%a: PCI or its enumeration disabled, installing "\r
-      "ACPI tables\n", __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: PCI or its enumeration disabled, installing "\r
+      "ACPI tables\n",\r
+      __FUNCTION__\r
+      ));\r
     return InstallAcpiTables (FindAcpiTableProtocol ());\r
   }\r
 \r
@@ -82,13 +87,20 @@ AcpiPlatformEntryPoint (
   // setup. (Note that we're a DXE_DRIVER; our entry point function is invoked\r
   // strictly before BDS is entered and can connect the root bridges.)\r
   //\r
-  Status = gBS->CreateEventEx (EVT_NOTIFY_SIGNAL, TPL_CALLBACK,\r
-                  OnRootBridgesConnected, NULL /* Context */,\r
-                  &gRootBridgesConnectedEventGroupGuid, &RootBridgesConnected);\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  OnRootBridgesConnected,\r
+                  NULL /* Context */,\r
+                  &gRootBridgesConnectedEventGroupGuid,\r
+                  &RootBridgesConnected\r
+                  );\r
   if (!EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_INFO,\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
       "%a: waiting for root bridges to be connected, registered callback\n",\r
-      __FUNCTION__));\r
+      __FUNCTION__\r
+      ));\r
   }\r
 \r
   return Status;\r
index 6ba4c936ad8e3ff068e85809706820f0254cf0ca..c178f857a2244c985173c0717c33fcdcf87cbcc6 100644 (file)
@@ -13,7 +13,6 @@
 \r
 #include "AcpiPlatform.h"\r
 \r
-\r
 /**\r
   Collect all PciIo protocol instances in the system. Save their original\r
   attributes, and enable IO and MMIO decoding for each.\r
 **/\r
 VOID\r
 EnablePciDecoding (\r
-  OUT ORIGINAL_ATTRIBUTES **OriginalAttributes,\r
-  OUT UINTN               *Count\r
+  OUT ORIGINAL_ATTRIBUTES  **OriginalAttributes,\r
+  OUT UINTN                *Count\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  UINTN               NoHandles;\r
-  EFI_HANDLE          *Handles;\r
-  ORIGINAL_ATTRIBUTES *OrigAttrs;\r
-  UINTN               Idx;\r
+  EFI_STATUS           Status;\r
+  UINTN                NoHandles;\r
+  EFI_HANDLE           *Handles;\r
+  ORIGINAL_ATTRIBUTES  *OrigAttrs;\r
+  UINTN                Idx;\r
 \r
   *OriginalAttributes = NULL;\r
   *Count              = 0;\r
@@ -61,8 +60,13 @@ EnablePciDecoding (
     return;\r
   }\r
 \r
-  Status = gBS->LocateHandleBuffer (ByProtocol, &gEfiPciIoProtocolGuid,\r
-                  NULL /* SearchKey */, &NoHandles, &Handles);\r
+  Status = gBS->LocateHandleBuffer (\r
+                  ByProtocol,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  NULL /* SearchKey */,\r
+                  &NoHandles,\r
+                  &Handles\r
+                  );\r
   if (Status == EFI_NOT_FOUND) {\r
     //\r
     // No PCI devices were found on either of the root bridges. We're done.\r
@@ -71,49 +75,75 @@ EnablePciDecoding (
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_WARN, "%a: LocateHandleBuffer(): %r\n", __FUNCTION__,\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
+      "%a: LocateHandleBuffer(): %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return;\r
   }\r
 \r
   OrigAttrs = AllocatePool (NoHandles * sizeof *OrigAttrs);\r
   if (OrigAttrs == NULL) {\r
-    DEBUG ((DEBUG_WARN, "%a: AllocatePool(): out of resources\n",\r
-      __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
+      "%a: AllocatePool(): out of resources\n",\r
+      __FUNCTION__\r
+      ));\r
     goto FreeHandles;\r
   }\r
 \r
   for (Idx = 0; Idx < NoHandles; ++Idx) {\r
-    EFI_PCI_IO_PROTOCOL *PciIo;\r
-    UINT64              Attributes;\r
+    EFI_PCI_IO_PROTOCOL  *PciIo;\r
+    UINT64               Attributes;\r
 \r
     //\r
     // Look up PciIo on the handle and stash it\r
     //\r
-    Status = gBS->HandleProtocol (Handles[Idx], &gEfiPciIoProtocolGuid,\r
-                    (VOID**)&PciIo);\r
+    Status = gBS->HandleProtocol (\r
+                    Handles[Idx],\r
+                    &gEfiPciIoProtocolGuid,\r
+                    (VOID **)&PciIo\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
     OrigAttrs[Idx].PciIo = PciIo;\r
 \r
     //\r
     // Stash the current attributes\r
     //\r
-    Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationGet, 0,\r
-                      &OrigAttrs[Idx].PciAttributes);\r
+    Status = PciIo->Attributes (\r
+                      PciIo,\r
+                      EfiPciIoAttributeOperationGet,\r
+                      0,\r
+                      &OrigAttrs[Idx].PciAttributes\r
+                      );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationGet: %r\n",\r
-        __FUNCTION__, Status));\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a: EfiPciIoAttributeOperationGet: %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       goto RestoreAttributes;\r
     }\r
 \r
     //\r
     // Retrieve supported attributes\r
     //\r
-    Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationSupported, 0,\r
-                      &Attributes);\r
+    Status = PciIo->Attributes (\r
+                      PciIo,\r
+                      EfiPciIoAttributeOperationSupported,\r
+                      0,\r
+                      &Attributes\r
+                      );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationSupported: %r\n",\r
-        __FUNCTION__, Status));\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a: EfiPciIoAttributeOperationSupported: %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       goto RestoreAttributes;\r
     }\r
 \r
@@ -121,11 +151,19 @@ EnablePciDecoding (
     // Enable IO and MMIO decoding\r
     //\r
     Attributes &= EFI_PCI_IO_ATTRIBUTE_IO | EFI_PCI_IO_ATTRIBUTE_MEMORY;\r
-    Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationEnable,\r
-                      Attributes, NULL);\r
+    Status      = PciIo->Attributes (\r
+                           PciIo,\r
+                           EfiPciIoAttributeOperationEnable,\r
+                           Attributes,\r
+                           NULL\r
+                           );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationEnable: %r\n",\r
-        __FUNCTION__, Status));\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a: EfiPciIoAttributeOperationEnable: %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       goto RestoreAttributes;\r
     }\r
   }\r
@@ -141,19 +179,20 @@ EnablePciDecoding (
 RestoreAttributes:\r
   while (Idx > 0) {\r
     --Idx;\r
-    OrigAttrs[Idx].PciIo->Attributes (OrigAttrs[Idx].PciIo,\r
+    OrigAttrs[Idx].PciIo->Attributes (\r
+                            OrigAttrs[Idx].PciIo,\r
                             EfiPciIoAttributeOperationSet,\r
                             OrigAttrs[Idx].PciAttributes,\r
                             NULL\r
                             );\r
   }\r
+\r
   FreePool (OrigAttrs);\r
 \r
 FreeHandles:\r
   FreePool (Handles);\r
 }\r
 \r
-\r
 /**\r
   Restore the original PCI attributes saved with EnablePciDecoding().\r
 \r
@@ -171,11 +210,11 @@ FreeHandles:
 **/\r
 VOID\r
 RestorePciDecoding (\r
-  IN ORIGINAL_ATTRIBUTES *OriginalAttributes,\r
-  IN UINTN               Count\r
+  IN ORIGINAL_ATTRIBUTES  *OriginalAttributes,\r
+  IN UINTN                Count\r
   )\r
 {\r
-  UINTN Idx;\r
+  UINTN  Idx;\r
 \r
   ASSERT ((OriginalAttributes == NULL) == (Count == 0));\r
   if (OriginalAttributes == NULL) {\r
@@ -190,5 +229,6 @@ RestorePciDecoding (
                                      NULL\r
                                      );\r
   }\r
+\r
   FreePool (OriginalAttributes);\r
 }\r
index df800b149275e0fb16d0d5605640134537c7e2f7..b885965a601e427b5ee76c03b2f37b41f65c38d4 100644 (file)
 // blobs under processing.\r
 //\r
 typedef struct {\r
-  UINT8   File[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated name of the fw_cfg\r
-                                        // blob. This is the ordering / search\r
-                                        // key.\r
-  UINTN   Size;                         // The number of bytes in this blob.\r
-  UINT8   *Base;                        // Pointer to the blob data.\r
-  BOOLEAN HostsOnlyTableData;           // TRUE iff the blob has been found to\r
-                                        // only contain data that is directly\r
-                                        // part of ACPI tables.\r
+  UINT8      File[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated name of the fw_cfg\r
+                                           // blob. This is the ordering / search\r
+                                           // key.\r
+  UINTN      Size;                         // The number of bytes in this blob.\r
+  UINT8      *Base;                        // Pointer to the blob data.\r
+  BOOLEAN    HostsOnlyTableData;           // TRUE iff the blob has been found to\r
+                                           // only contain data that is directly\r
+                                           // part of ACPI tables.\r
 } BLOB;\r
 \r
-\r
 /**\r
   Compare a standalone key against a user structure containing an embedded key.\r
 \r
@@ -55,17 +54,16 @@ STATIC
 INTN\r
 EFIAPI\r
 BlobKeyCompare (\r
-  IN CONST VOID *StandaloneKey,\r
-  IN CONST VOID *UserStruct\r
+  IN CONST VOID  *StandaloneKey,\r
+  IN CONST VOID  *UserStruct\r
   )\r
 {\r
-  CONST BLOB *Blob;\r
+  CONST BLOB  *Blob;\r
 \r
   Blob = UserStruct;\r
   return AsciiStrCmp (StandaloneKey, (CONST CHAR8 *)Blob->File);\r
 }\r
 \r
-\r
 /**\r
   Comparator function for two user structures.\r
 \r
@@ -83,17 +81,16 @@ STATIC
 INTN\r
 EFIAPI\r
 BlobCompare (\r
-  IN CONST VOID *UserStruct1,\r
-  IN CONST VOID *UserStruct2\r
+  IN CONST VOID  *UserStruct1,\r
+  IN CONST VOID  *UserStruct2\r
   )\r
 {\r
-  CONST BLOB *Blob1;\r
+  CONST BLOB  *Blob1;\r
 \r
   Blob1 = UserStruct1;\r
   return BlobKeyCompare (Blob1->File, UserStruct2);\r
 }\r
 \r
-\r
 /**\r
   Comparator function for two opaque pointers, ordering on (unsigned) pointer\r
   value itself.\r
@@ -113,20 +110,21 @@ STATIC
 INTN\r
 EFIAPI\r
 PointerCompare (\r
-  IN CONST VOID *Pointer1,\r
-  IN CONST VOID *Pointer2\r
+  IN CONST VOID  *Pointer1,\r
+  IN CONST VOID  *Pointer2\r
   )\r
 {\r
   if (Pointer1 == Pointer2) {\r
     return 0;\r
   }\r
+\r
   if ((UINTN)Pointer1 < (UINTN)Pointer2) {\r
     return -1;\r
   }\r
+\r
   return 1;\r
 }\r
 \r
-\r
 /**\r
   Comparator function for two ASCII strings. Can be used as both Key and\r
   UserStruct comparator.\r
@@ -144,14 +142,13 @@ STATIC
 INTN\r
 EFIAPI\r
 AsciiStringCompare (\r
-  IN CONST VOID *AsciiString1,\r
-  IN CONST VOID *AsciiString2\r
+  IN CONST VOID  *AsciiString1,\r
+  IN CONST VOID  *AsciiString2\r
   )\r
 {\r
   return AsciiStrCmp (AsciiString1, AsciiString2);\r
 }\r
 \r
-\r
 /**\r
   Release the ORDERED_COLLECTION structure populated by\r
   CollectAllocationsRestrictedTo32Bit() (below).\r
@@ -165,21 +162,22 @@ AsciiStringCompare (
 STATIC\r
 VOID\r
 ReleaseAllocationsRestrictedTo32Bit (\r
-  IN ORDERED_COLLECTION *AllocationsRestrictedTo32Bit\r
-)\r
+  IN ORDERED_COLLECTION  *AllocationsRestrictedTo32Bit\r
+  )\r
 {\r
-  ORDERED_COLLECTION_ENTRY *Entry, *Entry2;\r
+  ORDERED_COLLECTION_ENTRY  *Entry, *Entry2;\r
 \r
   for (Entry = OrderedCollectionMin (AllocationsRestrictedTo32Bit);\r
        Entry != NULL;\r
-       Entry = Entry2) {\r
+       Entry = Entry2)\r
+  {\r
     Entry2 = OrderedCollectionNext (Entry);\r
     OrderedCollectionDelete (AllocationsRestrictedTo32Bit, Entry, NULL);\r
   }\r
+\r
   OrderedCollectionUninit (AllocationsRestrictedTo32Bit);\r
 }\r
 \r
-\r
 /**\r
   Iterate over the linker/loader script, and collect the names of the fw_cfg\r
   blobs that are referenced by QEMU_LOADER_ADD_POINTER.PointeeFile fields, such\r
@@ -210,14 +208,14 @@ ReleaseAllocationsRestrictedTo32Bit (
 STATIC\r
 EFI_STATUS\r
 CollectAllocationsRestrictedTo32Bit (\r
-  OUT ORDERED_COLLECTION     **AllocationsRestrictedTo32Bit,\r
-  IN CONST QEMU_LOADER_ENTRY *LoaderStart,\r
-  IN CONST QEMU_LOADER_ENTRY *LoaderEnd\r
-)\r
+  OUT ORDERED_COLLECTION      **AllocationsRestrictedTo32Bit,\r
+  IN CONST QEMU_LOADER_ENTRY  *LoaderStart,\r
+  IN CONST QEMU_LOADER_ENTRY  *LoaderEnd\r
+  )\r
 {\r
-  ORDERED_COLLECTION      *Collection;\r
-  CONST QEMU_LOADER_ENTRY *LoaderEntry;\r
-  EFI_STATUS              Status;\r
+  ORDERED_COLLECTION       *Collection;\r
+  CONST QEMU_LOADER_ENTRY  *LoaderEntry;\r
+  EFI_STATUS               Status;\r
 \r
   Collection = OrderedCollectionInit (AsciiStringCompare, AsciiStringCompare);\r
   if (Collection == NULL) {\r
@@ -225,11 +223,12 @@ CollectAllocationsRestrictedTo32Bit (
   }\r
 \r
   for (LoaderEntry = LoaderStart; LoaderEntry < LoaderEnd; ++LoaderEntry) {\r
-    CONST QEMU_LOADER_ADD_POINTER *AddPointer;\r
+    CONST QEMU_LOADER_ADD_POINTER  *AddPointer;\r
 \r
     if (LoaderEntry->Type != QemuLoaderCmdAddPointer) {\r
       continue;\r
     }\r
+\r
     AddPointer = &LoaderEntry->Command.AddPointer;\r
 \r
     if (AddPointer->PointerSize >= 8) {\r
@@ -248,23 +247,23 @@ CollectAllocationsRestrictedTo32Bit (
                (VOID *)AddPointer->PointeeFile\r
                );\r
     switch (Status) {\r
-    case EFI_SUCCESS:\r
-      DEBUG ((\r
-        DEBUG_VERBOSE,\r
-        "%a: restricting blob \"%a\" from 64-bit allocation\n",\r
-        __FUNCTION__,\r
-        AddPointer->PointeeFile\r
-        ));\r
-      break;\r
-    case EFI_ALREADY_STARTED:\r
-      //\r
-      // The restriction has been recorded already.\r
-      //\r
-      break;\r
-    case EFI_OUT_OF_RESOURCES:\r
-      goto RollBack;\r
-    default:\r
-      ASSERT (FALSE);\r
+      case EFI_SUCCESS:\r
+        DEBUG ((\r
+          DEBUG_VERBOSE,\r
+          "%a: restricting blob \"%a\" from 64-bit allocation\n",\r
+          __FUNCTION__,\r
+          AddPointer->PointeeFile\r
+          ));\r
+        break;\r
+      case EFI_ALREADY_STARTED:\r
+        //\r
+        // The restriction has been recorded already.\r
+        //\r
+        break;\r
+      case EFI_OUT_OF_RESOURCES:\r
+        goto RollBack;\r
+      default:\r
+        ASSERT (FALSE);\r
     }\r
   }\r
 \r
@@ -276,7 +275,6 @@ RollBack:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Process a QEMU_LOADER_ALLOCATE command.\r
 \r
@@ -317,17 +315,17 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 ProcessCmdAllocate (\r
-  IN CONST QEMU_LOADER_ALLOCATE *Allocate,\r
-  IN OUT ORDERED_COLLECTION     *Tracker,\r
-  IN ORDERED_COLLECTION         *AllocationsRestrictedTo32Bit\r
+  IN CONST QEMU_LOADER_ALLOCATE  *Allocate,\r
+  IN OUT ORDERED_COLLECTION      *Tracker,\r
+  IN ORDERED_COLLECTION          *AllocationsRestrictedTo32Bit\r
   )\r
 {\r
-  FIRMWARE_CONFIG_ITEM FwCfgItem;\r
-  UINTN                FwCfgSize;\r
-  EFI_STATUS           Status;\r
-  UINTN                NumPages;\r
-  EFI_PHYSICAL_ADDRESS Address;\r
-  BLOB                 *Blob;\r
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;\r
+  UINTN                 FwCfgSize;\r
+  EFI_STATUS            Status;\r
+  UINTN                 NumPages;\r
+  EFI_PHYSICAL_ADDRESS  Address;\r
+  BLOB                  *Blob;\r
 \r
   if (Allocate->File[QEMU_LOADER_FNAME_SIZE - 1] != '\0') {\r
     DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));\r
@@ -335,28 +333,43 @@ ProcessCmdAllocate (
   }\r
 \r
   if (Allocate->Alignment > EFI_PAGE_SIZE) {\r
-    DEBUG ((DEBUG_ERROR, "%a: unsupported alignment 0x%x\n", __FUNCTION__,\r
-      Allocate->Alignment));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: unsupported alignment 0x%x\n",\r
+      __FUNCTION__,\r
+      Allocate->Alignment\r
+      ));\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   Status = QemuFwCfgFindFile ((CHAR8 *)Allocate->File, &FwCfgItem, &FwCfgSize);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: QemuFwCfgFindFile(\"%a\"): %r\n", __FUNCTION__,\r
-      Allocate->File, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: QemuFwCfgFindFile(\"%a\"): %r\n",\r
+      __FUNCTION__,\r
+      Allocate->File,\r
+      Status\r
+      ));\r
     return Status;\r
   }\r
 \r
   NumPages = EFI_SIZE_TO_PAGES (FwCfgSize);\r
-  Address = MAX_UINT64;\r
+  Address  = MAX_UINT64;\r
   if (OrderedCollectionFind (\r
         AllocationsRestrictedTo32Bit,\r
         Allocate->File\r
-        ) != NULL) {\r
+        ) != NULL)\r
+  {\r
     Address = MAX_UINT32;\r
   }\r
-  Status = gBS->AllocatePages (AllocateMaxAddress, EfiACPIMemoryNVS, NumPages,\r
-                  &Address);\r
+\r
+  Status = gBS->AllocatePages (\r
+                  AllocateMaxAddress,\r
+                  EfiACPIMemoryNVS,\r
+                  NumPages,\r
+                  &Address\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -366,17 +379,23 @@ ProcessCmdAllocate (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreePages;\r
   }\r
+\r
   CopyMem (Blob->File, Allocate->File, QEMU_LOADER_FNAME_SIZE);\r
-  Blob->Size = FwCfgSize;\r
-  Blob->Base = (VOID *)(UINTN)Address;\r
+  Blob->Size               = FwCfgSize;\r
+  Blob->Base               = (VOID *)(UINTN)Address;\r
   Blob->HostsOnlyTableData = TRUE;\r
 \r
   Status = OrderedCollectionInsert (Tracker, NULL, Blob);\r
   if (Status == RETURN_ALREADY_STARTED) {\r
-    DEBUG ((DEBUG_ERROR, "%a: duplicated file \"%a\"\n", __FUNCTION__,\r
-      Allocate->File));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: duplicated file \"%a\"\n",\r
+      __FUNCTION__,\r
+      Allocate->File\r
+      ));\r
     Status = EFI_PROTOCOL_ERROR;\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     goto FreeBlob;\r
   }\r
@@ -385,9 +404,17 @@ ProcessCmdAllocate (
   QemuFwCfgReadBytes (FwCfgSize, Blob->Base);\r
   ZeroMem (Blob->Base + Blob->Size, EFI_PAGES_TO_SIZE (NumPages) - Blob->Size);\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: File=\"%a\" Alignment=0x%x Zone=%d Size=0x%Lx "\r
-    "Address=0x%Lx\n", __FUNCTION__, Allocate->File, Allocate->Alignment,\r
-    Allocate->Zone, (UINT64)Blob->Size, (UINT64)(UINTN)Blob->Base));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: File=\"%a\" Alignment=0x%x Zone=%d Size=0x%Lx "\r
+    "Address=0x%Lx\n",\r
+    __FUNCTION__,\r
+    Allocate->File,\r
+    Allocate->Alignment,\r
+    Allocate->Zone,\r
+    (UINT64)Blob->Size,\r
+    (UINT64)(UINTN)Blob->Base\r
+    ));\r
   return EFI_SUCCESS;\r
 \r
 FreeBlob:\r
@@ -399,7 +426,6 @@ FreePages:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Process a QEMU_LOADER_ADD_POINTER command.\r
 \r
@@ -422,37 +448,48 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 ProcessCmdAddPointer (\r
-  IN CONST QEMU_LOADER_ADD_POINTER *AddPointer,\r
-  IN CONST ORDERED_COLLECTION      *Tracker\r
+  IN CONST QEMU_LOADER_ADD_POINTER  *AddPointer,\r
+  IN CONST ORDERED_COLLECTION       *Tracker\r
   )\r
 {\r
-  ORDERED_COLLECTION_ENTRY *TrackerEntry, *TrackerEntry2;\r
-  BLOB                     *Blob, *Blob2;\r
-  UINT8                    *PointerField;\r
-  UINT64                   PointerValue;\r
-\r
-  if (AddPointer->PointerFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0' ||\r
-      AddPointer->PointeeFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0') {\r
+  ORDERED_COLLECTION_ENTRY  *TrackerEntry, *TrackerEntry2;\r
+  BLOB                      *Blob, *Blob2;\r
+  UINT8                     *PointerField;\r
+  UINT64                    PointerValue;\r
+\r
+  if ((AddPointer->PointerFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0') ||\r
+      (AddPointer->PointeeFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0'))\r
+  {\r
     DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
-  TrackerEntry = OrderedCollectionFind (Tracker, AddPointer->PointerFile);\r
+  TrackerEntry  = OrderedCollectionFind (Tracker, AddPointer->PointerFile);\r
   TrackerEntry2 = OrderedCollectionFind (Tracker, AddPointer->PointeeFile);\r
-  if (TrackerEntry == NULL || TrackerEntry2 == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "%a: invalid blob reference(s) \"%a\" / \"%a\"\n",\r
-      __FUNCTION__, AddPointer->PointerFile, AddPointer->PointeeFile));\r
+  if ((TrackerEntry == NULL) || (TrackerEntry2 == NULL)) {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: invalid blob reference(s) \"%a\" / \"%a\"\n",\r
+      __FUNCTION__,\r
+      AddPointer->PointerFile,\r
+      AddPointer->PointeeFile\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
-  Blob = OrderedCollectionUserStruct (TrackerEntry);\r
+  Blob  = OrderedCollectionUserStruct (TrackerEntry);\r
   Blob2 = OrderedCollectionUserStruct (TrackerEntry2);\r
-  if ((AddPointer->PointerSize != 1 && AddPointer->PointerSize != 2 &&\r
-       AddPointer->PointerSize != 4 && AddPointer->PointerSize != 8) ||\r
-      Blob->Size < AddPointer->PointerSize ||\r
-      Blob->Size - AddPointer->PointerSize < AddPointer->PointerOffset) {\r
-    DEBUG ((DEBUG_ERROR, "%a: invalid pointer location or size in \"%a\"\n",\r
-      __FUNCTION__, AddPointer->PointerFile));\r
+  if (((AddPointer->PointerSize != 1) && (AddPointer->PointerSize != 2) &&\r
+       (AddPointer->PointerSize != 4) && (AddPointer->PointerSize != 8)) ||\r
+      (Blob->Size < AddPointer->PointerSize) ||\r
+      (Blob->Size - AddPointer->PointerSize < AddPointer->PointerOffset))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: invalid pointer location or size in \"%a\"\n",\r
+      __FUNCTION__,\r
+      AddPointer->PointerFile\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
@@ -460,8 +497,12 @@ ProcessCmdAddPointer (
   PointerValue = 0;\r
   CopyMem (&PointerValue, PointerField, AddPointer->PointerSize);\r
   if (PointerValue >= Blob2->Size) {\r
-    DEBUG ((DEBUG_ERROR, "%a: invalid pointer value in \"%a\"\n", __FUNCTION__,\r
-      AddPointer->PointerFile));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: invalid pointer value in \"%a\"\n",\r
+      __FUNCTION__,\r
+      AddPointer->PointerFile\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
@@ -472,23 +513,34 @@ ProcessCmdAddPointer (
   ASSERT ((UINTN)Blob2->Base <= MAX_ADDRESS - Blob2->Size);\r
 \r
   PointerValue += (UINT64)(UINTN)Blob2->Base;\r
-  if (AddPointer->PointerSize < 8 &&\r
-      RShiftU64 (PointerValue, AddPointer->PointerSize * 8) != 0) {\r
-    DEBUG ((DEBUG_ERROR, "%a: relocated pointer value unrepresentable in "\r
-      "\"%a\"\n", __FUNCTION__, AddPointer->PointerFile));\r
+  if ((AddPointer->PointerSize < 8) &&\r
+      (RShiftU64 (PointerValue, AddPointer->PointerSize * 8) != 0))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: relocated pointer value unrepresentable in "\r
+      "\"%a\"\n",\r
+      __FUNCTION__,\r
+      AddPointer->PointerFile\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
   CopyMem (PointerField, &PointerValue, AddPointer->PointerSize);\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: PointerFile=\"%a\" PointeeFile=\"%a\" "\r
-    "PointerOffset=0x%x PointerSize=%d\n", __FUNCTION__,\r
-    AddPointer->PointerFile, AddPointer->PointeeFile,\r
-    AddPointer->PointerOffset, AddPointer->PointerSize));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: PointerFile=\"%a\" PointeeFile=\"%a\" "\r
+    "PointerOffset=0x%x PointerSize=%d\n",\r
+    __FUNCTION__,\r
+    AddPointer->PointerFile,\r
+    AddPointer->PointeeFile,\r
+    AddPointer->PointerOffset,\r
+    AddPointer->PointerSize\r
+    ));\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Process a QEMU_LOADER_ADD_CHECKSUM command.\r
 \r
@@ -508,12 +560,12 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 ProcessCmdAddChecksum (\r
-  IN CONST QEMU_LOADER_ADD_CHECKSUM *AddChecksum,\r
-  IN CONST ORDERED_COLLECTION       *Tracker\r
+  IN CONST QEMU_LOADER_ADD_CHECKSUM  *AddChecksum,\r
+  IN CONST ORDERED_COLLECTION        *Tracker\r
   )\r
 {\r
-  ORDERED_COLLECTION_ENTRY *TrackerEntry;\r
-  BLOB                     *Blob;\r
+  ORDERED_COLLECTION_ENTRY  *TrackerEntry;\r
+  BLOB                      *Blob;\r
 \r
   if (AddChecksum->File[QEMU_LOADER_FNAME_SIZE - 1] != '\0') {\r
     DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));\r
@@ -522,31 +574,46 @@ ProcessCmdAddChecksum (
 \r
   TrackerEntry = OrderedCollectionFind (Tracker, AddChecksum->File);\r
   if (TrackerEntry == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "%a: invalid blob reference \"%a\"\n", __FUNCTION__,\r
-      AddChecksum->File));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: invalid blob reference \"%a\"\n",\r
+      __FUNCTION__,\r
+      AddChecksum->File\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
   Blob = OrderedCollectionUserStruct (TrackerEntry);\r
-  if (Blob->Size <= AddChecksum->ResultOffset ||\r
-      Blob->Size < AddChecksum->Length ||\r
-      Blob->Size - AddChecksum->Length < AddChecksum->Start) {\r
-    DEBUG ((DEBUG_ERROR, "%a: invalid checksum range in \"%a\"\n",\r
-      __FUNCTION__, AddChecksum->File));\r
+  if ((Blob->Size <= AddChecksum->ResultOffset) ||\r
+      (Blob->Size < AddChecksum->Length) ||\r
+      (Blob->Size - AddChecksum->Length < AddChecksum->Start))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: invalid checksum range in \"%a\"\n",\r
+      __FUNCTION__,\r
+      AddChecksum->File\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
   Blob->Base[AddChecksum->ResultOffset] = CalculateCheckSum8 (\r
-                                           Blob->Base + AddChecksum->Start,\r
-                                           AddChecksum->Length\r
-                                           );\r
-  DEBUG ((DEBUG_VERBOSE, "%a: File=\"%a\" ResultOffset=0x%x Start=0x%x "\r
-    "Length=0x%x\n", __FUNCTION__, AddChecksum->File,\r
-    AddChecksum->ResultOffset, AddChecksum->Start, AddChecksum->Length));\r
+                                            Blob->Base + AddChecksum->Start,\r
+                                            AddChecksum->Length\r
+                                            );\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: File=\"%a\" ResultOffset=0x%x Start=0x%x "\r
+    "Length=0x%x\n",\r
+    __FUNCTION__,\r
+    AddChecksum->File,\r
+    AddChecksum->ResultOffset,\r
+    AddChecksum->Start,\r
+    AddChecksum->Length\r
+    ));\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Process a QEMU_LOADER_WRITE_POINTER command.\r
 \r
@@ -581,45 +648,58 @@ ProcessCmdAddChecksum (
 STATIC\r
 EFI_STATUS\r
 ProcessCmdWritePointer (\r
-  IN     CONST QEMU_LOADER_WRITE_POINTER *WritePointer,\r
-  IN     CONST ORDERED_COLLECTION        *Tracker,\r
-  IN OUT       S3_CONTEXT                *S3Context OPTIONAL\r
+  IN     CONST QEMU_LOADER_WRITE_POINTER  *WritePointer,\r
+  IN     CONST ORDERED_COLLECTION         *Tracker,\r
+  IN OUT       S3_CONTEXT                 *S3Context OPTIONAL\r
   )\r
 {\r
-  RETURN_STATUS            Status;\r
-  FIRMWARE_CONFIG_ITEM     PointerItem;\r
-  UINTN                    PointerItemSize;\r
-  ORDERED_COLLECTION_ENTRY *PointeeEntry;\r
-  BLOB                     *PointeeBlob;\r
-  UINT64                   PointerValue;\r
-\r
-  if (WritePointer->PointerFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0' ||\r
-      WritePointer->PointeeFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0') {\r
+  RETURN_STATUS             Status;\r
+  FIRMWARE_CONFIG_ITEM      PointerItem;\r
+  UINTN                     PointerItemSize;\r
+  ORDERED_COLLECTION_ENTRY  *PointeeEntry;\r
+  BLOB                      *PointeeBlob;\r
+  UINT64                    PointerValue;\r
+\r
+  if ((WritePointer->PointerFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0') ||\r
+      (WritePointer->PointeeFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0'))\r
+  {\r
     DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
-  Status = QemuFwCfgFindFile ((CONST CHAR8 *)WritePointer->PointerFile,\r
-             &PointerItem, &PointerItemSize);\r
+  Status = QemuFwCfgFindFile (\r
+             (CONST CHAR8 *)WritePointer->PointerFile,\r
+             &PointerItem,\r
+             &PointerItemSize\r
+             );\r
   PointeeEntry = OrderedCollectionFind (Tracker, WritePointer->PointeeFile);\r
-  if (RETURN_ERROR (Status) || PointeeEntry == NULL) {\r
-    DEBUG ((DEBUG_ERROR,\r
+  if (RETURN_ERROR (Status) || (PointeeEntry == NULL)) {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "%a: invalid fw_cfg file or blob reference \"%a\" / \"%a\"\n",\r
-      __FUNCTION__, WritePointer->PointerFile, WritePointer->PointeeFile));\r
+      __FUNCTION__,\r
+      WritePointer->PointerFile,\r
+      WritePointer->PointeeFile\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
-  if ((WritePointer->PointerSize != 1 && WritePointer->PointerSize != 2 &&\r
-       WritePointer->PointerSize != 4 && WritePointer->PointerSize != 8) ||\r
+  if (((WritePointer->PointerSize != 1) && (WritePointer->PointerSize != 2) &&\r
+       (WritePointer->PointerSize != 4) && (WritePointer->PointerSize != 8)) ||\r
       (PointerItemSize < WritePointer->PointerSize) ||\r
       (PointerItemSize - WritePointer->PointerSize <\r
-       WritePointer->PointerOffset)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: invalid pointer location or size in \"%a\"\n",\r
-      __FUNCTION__, WritePointer->PointerFile));\r
+       WritePointer->PointerOffset))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: invalid pointer location or size in \"%a\"\n",\r
+      __FUNCTION__,\r
+      WritePointer->PointerFile\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
-  PointeeBlob = OrderedCollectionUserStruct (PointeeEntry);\r
+  PointeeBlob  = OrderedCollectionUserStruct (PointeeEntry);\r
   PointerValue = WritePointer->PointeeOffset;\r
   if (PointerValue >= PointeeBlob->Size) {\r
     DEBUG ((DEBUG_ERROR, "%a: invalid PointeeOffset\n", __FUNCTION__));\r
@@ -633,10 +713,15 @@ ProcessCmdWritePointer (
   ASSERT ((UINTN)PointeeBlob->Base <= MAX_ADDRESS - PointeeBlob->Size);\r
 \r
   PointerValue += (UINT64)(UINTN)PointeeBlob->Base;\r
-  if (WritePointer->PointerSize < 8 &&\r
-      RShiftU64 (PointerValue, WritePointer->PointerSize * 8) != 0) {\r
-    DEBUG ((DEBUG_ERROR, "%a: pointer value unrepresentable in \"%a\"\n",\r
-      __FUNCTION__, WritePointer->PointerFile));\r
+  if ((WritePointer->PointerSize < 8) &&\r
+      (RShiftU64 (PointerValue, WritePointer->PointerSize * 8) != 0))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: pointer value unrepresentable in \"%a\"\n",\r
+      __FUNCTION__,\r
+      WritePointer->PointerFile\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
@@ -645,7 +730,7 @@ ProcessCmdWritePointer (
   // form, to be replayed during S3 resume.\r
   //\r
   if (S3Context != NULL) {\r
-    EFI_STATUS SaveStatus;\r
+    EFI_STATUS  SaveStatus;\r
 \r
     SaveStatus = SaveCondensedWritePointerToS3Context (\r
                    S3Context,\r
@@ -670,15 +755,20 @@ ProcessCmdWritePointer (
   //\r
   PointeeBlob->HostsOnlyTableData = FALSE;\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: PointerFile=\"%a\" PointeeFile=\"%a\" "\r
-    "PointerOffset=0x%x PointeeOffset=0x%x PointerSize=%d\n", __FUNCTION__,\r
-    WritePointer->PointerFile, WritePointer->PointeeFile,\r
-    WritePointer->PointerOffset, WritePointer->PointeeOffset,\r
-    WritePointer->PointerSize));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: PointerFile=\"%a\" PointeeFile=\"%a\" "\r
+    "PointerOffset=0x%x PointeeOffset=0x%x PointerSize=%d\n",\r
+    __FUNCTION__,\r
+    WritePointer->PointerFile,\r
+    WritePointer->PointeeFile,\r
+    WritePointer->PointerOffset,\r
+    WritePointer->PointeeOffset,\r
+    WritePointer->PointerSize\r
+    ));\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Undo a QEMU_LOADER_WRITE_POINTER command.\r
 \r
@@ -692,16 +782,19 @@ ProcessCmdWritePointer (
 STATIC\r
 VOID\r
 UndoCmdWritePointer (\r
-  IN CONST QEMU_LOADER_WRITE_POINTER *WritePointer\r
+  IN CONST QEMU_LOADER_WRITE_POINTER  *WritePointer\r
   )\r
 {\r
-  RETURN_STATUS        Status;\r
-  FIRMWARE_CONFIG_ITEM PointerItem;\r
-  UINTN                PointerItemSize;\r
-  UINT64               PointerValue;\r
-\r
-  Status = QemuFwCfgFindFile ((CONST CHAR8 *)WritePointer->PointerFile,\r
-             &PointerItem, &PointerItemSize);\r
+  RETURN_STATUS         Status;\r
+  FIRMWARE_CONFIG_ITEM  PointerItem;\r
+  UINTN                 PointerItemSize;\r
+  UINT64                PointerValue;\r
+\r
+  Status = QemuFwCfgFindFile (\r
+             (CONST CHAR8 *)WritePointer->PointerFile,\r
+             &PointerItem,\r
+             &PointerItemSize\r
+             );\r
   ASSERT_RETURN_ERROR (Status);\r
 \r
   PointerValue = 0;\r
@@ -709,18 +802,21 @@ UndoCmdWritePointer (
   QemuFwCfgSkipBytes (WritePointer->PointerOffset);\r
   QemuFwCfgWriteBytes (WritePointer->PointerSize, &PointerValue);\r
 \r
-  DEBUG ((DEBUG_VERBOSE,\r
-    "%a: PointerFile=\"%a\" PointerOffset=0x%x PointerSize=%d\n", __FUNCTION__,\r
-    WritePointer->PointerFile, WritePointer->PointerOffset,\r
-    WritePointer->PointerSize));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: PointerFile=\"%a\" PointerOffset=0x%x PointerSize=%d\n",\r
+    __FUNCTION__,\r
+    WritePointer->PointerFile,\r
+    WritePointer->PointerOffset,\r
+    WritePointer->PointerSize\r
+    ));\r
 }\r
 \r
-\r
 //\r
 // We'll be saving the keys of installed tables so that we can roll them back\r
 // in case of failure. 128 tables should be enough for anyone (TM).\r
 //\r
-#define INSTALLED_TABLES_MAX 128\r
+#define INSTALLED_TABLES_MAX  128\r
 \r
 /**\r
   Process a QEMU_LOADER_ADD_POINTER command in order to see if its target byte\r
@@ -785,37 +881,37 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 Process2ndPassCmdAddPointer (\r
-  IN     CONST QEMU_LOADER_ADD_POINTER *AddPointer,\r
-  IN     CONST ORDERED_COLLECTION      *Tracker,\r
-  IN     EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol,\r
-  IN OUT UINTN                         InstalledKey[INSTALLED_TABLES_MAX],\r
-  IN OUT INT32                         *NumInstalled,\r
-  IN OUT ORDERED_COLLECTION            *SeenPointers\r
+  IN     CONST QEMU_LOADER_ADD_POINTER  *AddPointer,\r
+  IN     CONST ORDERED_COLLECTION       *Tracker,\r
+  IN     EFI_ACPI_TABLE_PROTOCOL        *AcpiProtocol,\r
+  IN OUT UINTN                          InstalledKey[INSTALLED_TABLES_MAX],\r
+  IN OUT INT32                          *NumInstalled,\r
+  IN OUT ORDERED_COLLECTION             *SeenPointers\r
   )\r
 {\r
-  CONST ORDERED_COLLECTION_ENTRY                     *TrackerEntry;\r
-  CONST ORDERED_COLLECTION_ENTRY                     *TrackerEntry2;\r
-  ORDERED_COLLECTION_ENTRY                           *SeenPointerEntry;\r
-  CONST BLOB                                         *Blob;\r
-  BLOB                                               *Blob2;\r
-  CONST UINT8                                        *PointerField;\r
-  UINT64                                             PointerValue;\r
-  UINTN                                              Blob2Remaining;\r
-  UINTN                                              TableSize;\r
-  CONST EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *Facs;\r
-  CONST EFI_ACPI_DESCRIPTION_HEADER                  *Header;\r
-  EFI_STATUS                                         Status;\r
-\r
-  if (*NumInstalled < 0 || *NumInstalled > INSTALLED_TABLES_MAX) {\r
+  CONST ORDERED_COLLECTION_ENTRY                      *TrackerEntry;\r
+  CONST ORDERED_COLLECTION_ENTRY                      *TrackerEntry2;\r
+  ORDERED_COLLECTION_ENTRY                            *SeenPointerEntry;\r
+  CONST BLOB                                          *Blob;\r
+  BLOB                                                *Blob2;\r
+  CONST UINT8                                         *PointerField;\r
+  UINT64                                              PointerValue;\r
+  UINTN                                               Blob2Remaining;\r
+  UINTN                                               TableSize;\r
+  CONST EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *Facs;\r
+  CONST EFI_ACPI_DESCRIPTION_HEADER                   *Header;\r
+  EFI_STATUS                                          Status;\r
+\r
+  if ((*NumInstalled < 0) || (*NumInstalled > INSTALLED_TABLES_MAX)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  TrackerEntry = OrderedCollectionFind (Tracker, AddPointer->PointerFile);\r
+  TrackerEntry  = OrderedCollectionFind (Tracker, AddPointer->PointerFile);\r
   TrackerEntry2 = OrderedCollectionFind (Tracker, AddPointer->PointeeFile);\r
-  Blob = OrderedCollectionUserStruct (TrackerEntry);\r
-  Blob2 = OrderedCollectionUserStruct (TrackerEntry2);\r
-  PointerField = Blob->Base + AddPointer->PointerOffset;\r
-  PointerValue = 0;\r
+  Blob          = OrderedCollectionUserStruct (TrackerEntry);\r
+  Blob2         = OrderedCollectionUserStruct (TrackerEntry2);\r
+  PointerField  = Blob->Base + AddPointer->PointerOffset;\r
+  PointerValue  = 0;\r
   CopyMem (&PointerValue, PointerField, AddPointer->PointerSize);\r
 \r
   //\r
@@ -823,7 +919,7 @@ Process2ndPassCmdAddPointer (
   // by the Blob2->Size check and later checks in ProcessCmdAddPointer().\r
   //\r
   Blob2Remaining = (UINTN)Blob2->Base;\r
-  ASSERT(PointerValue >= Blob2Remaining);\r
+  ASSERT (PointerValue >= Blob2Remaining);\r
   Blob2Remaining += Blob2->Size;\r
   ASSERT (PointerValue < Blob2Remaining);\r
 \r
@@ -845,13 +941,20 @@ Process2ndPassCmdAddPointer (
         ));\r
       Status = EFI_SUCCESS;\r
     }\r
+\r
     return Status;\r
   }\r
 \r
-  Blob2Remaining -= (UINTN) PointerValue;\r
-  DEBUG ((DEBUG_VERBOSE, "%a: checking for ACPI header in \"%a\" at 0x%Lx "\r
-    "(remaining: 0x%Lx): ", __FUNCTION__, AddPointer->PointeeFile,\r
-    PointerValue, (UINT64)Blob2Remaining));\r
+  Blob2Remaining -= (UINTN)PointerValue;\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: checking for ACPI header in \"%a\" at 0x%Lx "\r
+    "(remaining: 0x%Lx): ",\r
+    __FUNCTION__,\r
+    AddPointer->PointeeFile,\r
+    PointerValue,\r
+    (UINT64)Blob2Remaining\r
+    ));\r
 \r
   TableSize = 0;\r
 \r
@@ -861,12 +964,17 @@ Process2ndPassCmdAddPointer (
   if (sizeof *Facs <= Blob2Remaining) {\r
     Facs = (EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)PointerValue;\r
 \r
-    if (Facs->Length >= sizeof *Facs &&\r
-        Facs->Length <= Blob2Remaining &&\r
-        Facs->Signature ==\r
-                EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) {\r
-      DEBUG ((DEBUG_VERBOSE, "found \"%-4.4a\" size 0x%x\n",\r
-        (CONST CHAR8 *)&Facs->Signature, Facs->Length));\r
+    if ((Facs->Length >= sizeof *Facs) &&\r
+        (Facs->Length <= Blob2Remaining) &&\r
+        (Facs->Signature ==\r
+         EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE))\r
+    {\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "found \"%-4.4a\" size 0x%x\n",\r
+        (CONST CHAR8 *)&Facs->Signature,\r
+        Facs->Length\r
+        ));\r
       TableSize = Facs->Length;\r
     }\r
   }\r
@@ -874,28 +982,34 @@ Process2ndPassCmdAddPointer (
   //\r
   // check for the uniform tables\r
   //\r
-  if (TableSize == 0 && sizeof *Header <= Blob2Remaining) {\r
+  if ((TableSize == 0) && (sizeof *Header <= Blob2Remaining)) {\r
     Header = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)PointerValue;\r
 \r
-    if (Header->Length >= sizeof *Header &&\r
-        Header->Length <= Blob2Remaining &&\r
-        CalculateSum8 ((CONST UINT8 *)Header, Header->Length) == 0) {\r
+    if ((Header->Length >= sizeof *Header) &&\r
+        (Header->Length <= Blob2Remaining) &&\r
+        (CalculateSum8 ((CONST UINT8 *)Header, Header->Length) == 0))\r
+    {\r
       //\r
       // This looks very much like an ACPI table from QEMU:\r
       // - Length field consistent with both ACPI and containing blob size\r
       // - checksum is correct\r
       //\r
-      DEBUG ((DEBUG_VERBOSE, "found \"%-4.4a\" size 0x%x\n",\r
-        (CONST CHAR8 *)&Header->Signature, Header->Length));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "found \"%-4.4a\" size 0x%x\n",\r
+        (CONST CHAR8 *)&Header->Signature,\r
+        Header->Length\r
+        ));\r
       TableSize = Header->Length;\r
 \r
       //\r
       // Skip RSDT and XSDT because those are handled by\r
       // EFI_ACPI_TABLE_PROTOCOL automatically.\r
-      if (Header->Signature ==\r
-                    EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE ||\r
-          Header->Signature ==\r
-                    EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE) {\r
+      if ((Header->Signature ==\r
+           EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE) ||\r
+          (Header->Signature ==\r
+           EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE))\r
+      {\r
         return EFI_SUCCESS;\r
       }\r
     }\r
@@ -908,20 +1022,32 @@ Process2ndPassCmdAddPointer (
   }\r
 \r
   if (*NumInstalled == INSTALLED_TABLES_MAX) {\r
-    DEBUG ((DEBUG_ERROR, "%a: can't install more than %d tables\n",\r
-      __FUNCTION__, INSTALLED_TABLES_MAX));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: can't install more than %d tables\n",\r
+      __FUNCTION__,\r
+      INSTALLED_TABLES_MAX\r
+      ));\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto RollbackSeenPointer;\r
   }\r
 \r
-  Status = AcpiProtocol->InstallAcpiTable (AcpiProtocol,\r
-                           (VOID *)(UINTN)PointerValue, TableSize,\r
-                           &InstalledKey[*NumInstalled]);\r
+  Status = AcpiProtocol->InstallAcpiTable (\r
+                           AcpiProtocol,\r
+                           (VOID *)(UINTN)PointerValue,\r
+                           TableSize,\r
+                           &InstalledKey[*NumInstalled]\r
+                           );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: InstallAcpiTable(): %r\n", __FUNCTION__,\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: InstallAcpiTable(): %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     goto RollbackSeenPointer;\r
   }\r
+\r
   ++*NumInstalled;\r
   return EFI_SUCCESS;\r
 \r
@@ -930,7 +1056,6 @@ RollbackSeenPointer:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Download, process, and install ACPI table data from the QEMU loader\r
   interface.\r
@@ -956,33 +1081,38 @@ RollbackSeenPointer:
 EFI_STATUS\r
 EFIAPI\r
 InstallQemuFwCfgTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiProtocol\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  FIRMWARE_CONFIG_ITEM     FwCfgItem;\r
-  UINTN                    FwCfgSize;\r
-  QEMU_LOADER_ENTRY        *LoaderStart;\r
-  CONST QEMU_LOADER_ENTRY  *LoaderEntry, *LoaderEnd;\r
-  CONST QEMU_LOADER_ENTRY  *WritePointerSubsetEnd;\r
-  ORIGINAL_ATTRIBUTES      *OriginalPciAttributes;\r
-  UINTN                    OriginalPciAttributesCount;\r
-  ORDERED_COLLECTION       *AllocationsRestrictedTo32Bit;\r
-  S3_CONTEXT               *S3Context;\r
-  ORDERED_COLLECTION       *Tracker;\r
-  UINTN                    *InstalledKey;\r
-  INT32                    Installed;\r
-  ORDERED_COLLECTION_ENTRY *TrackerEntry, *TrackerEntry2;\r
-  ORDERED_COLLECTION       *SeenPointers;\r
-  ORDERED_COLLECTION_ENTRY *SeenPointerEntry, *SeenPointerEntry2;\r
+  EFI_STATUS                Status;\r
+  FIRMWARE_CONFIG_ITEM      FwCfgItem;\r
+  UINTN                     FwCfgSize;\r
+  QEMU_LOADER_ENTRY         *LoaderStart;\r
+  CONST QEMU_LOADER_ENTRY   *LoaderEntry, *LoaderEnd;\r
+  CONST QEMU_LOADER_ENTRY   *WritePointerSubsetEnd;\r
+  ORIGINAL_ATTRIBUTES       *OriginalPciAttributes;\r
+  UINTN                     OriginalPciAttributesCount;\r
+  ORDERED_COLLECTION        *AllocationsRestrictedTo32Bit;\r
+  S3_CONTEXT                *S3Context;\r
+  ORDERED_COLLECTION        *Tracker;\r
+  UINTN                     *InstalledKey;\r
+  INT32                     Installed;\r
+  ORDERED_COLLECTION_ENTRY  *TrackerEntry, *TrackerEntry2;\r
+  ORDERED_COLLECTION        *SeenPointers;\r
+  ORDERED_COLLECTION_ENTRY  *SeenPointerEntry, *SeenPointerEntry2;\r
 \r
   Status = QemuFwCfgFindFile ("etc/table-loader", &FwCfgItem, &FwCfgSize);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   if (FwCfgSize % sizeof *LoaderEntry != 0) {\r
-    DEBUG ((DEBUG_ERROR, "%a: \"etc/table-loader\" has invalid size 0x%Lx\n",\r
-      __FUNCTION__, (UINT64)FwCfgSize));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: \"etc/table-loader\" has invalid size 0x%Lx\n",\r
+      __FUNCTION__,\r
+      (UINT64)FwCfgSize\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
@@ -990,6 +1120,7 @@ InstallQemuFwCfgTables (
   if (LoaderStart == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   EnablePciDecoding (&OriginalPciAttributes, &OriginalPciAttributesCount);\r
   QemuFwCfgSelectItem (FwCfgItem);\r
   QemuFwCfgReadBytes (FwCfgSize, LoaderStart);\r
@@ -997,11 +1128,11 @@ InstallQemuFwCfgTables (
   LoaderEnd = LoaderStart + FwCfgSize / sizeof *LoaderEntry;\r
 \r
   AllocationsRestrictedTo32Bit = NULL;\r
-  Status = CollectAllocationsRestrictedTo32Bit (\r
-             &AllocationsRestrictedTo32Bit,\r
-             LoaderStart,\r
-             LoaderEnd\r
-             );\r
+  Status                       = CollectAllocationsRestrictedTo32Bit (\r
+                                   &AllocationsRestrictedTo32Bit,\r
+                                   LoaderStart,\r
+                                   LoaderEnd\r
+                                   );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeLoader;\r
   }\r
@@ -1034,36 +1165,48 @@ InstallQemuFwCfgTables (
   WritePointerSubsetEnd = LoaderStart;\r
   for (LoaderEntry = LoaderStart; LoaderEntry < LoaderEnd; ++LoaderEntry) {\r
     switch (LoaderEntry->Type) {\r
-    case QemuLoaderCmdAllocate:\r
-      Status = ProcessCmdAllocate (\r
-                 &LoaderEntry->Command.Allocate,\r
-                 Tracker,\r
-                 AllocationsRestrictedTo32Bit\r
-                 );\r
-      break;\r
+      case QemuLoaderCmdAllocate:\r
+        Status = ProcessCmdAllocate (\r
+                   &LoaderEntry->Command.Allocate,\r
+                   Tracker,\r
+                   AllocationsRestrictedTo32Bit\r
+                   );\r
+        break;\r
 \r
-    case QemuLoaderCmdAddPointer:\r
-      Status = ProcessCmdAddPointer (&LoaderEntry->Command.AddPointer,\r
-                 Tracker);\r
-      break;\r
+      case QemuLoaderCmdAddPointer:\r
+        Status = ProcessCmdAddPointer (\r
+                   &LoaderEntry->Command.AddPointer,\r
+                   Tracker\r
+                   );\r
+        break;\r
 \r
-    case QemuLoaderCmdAddChecksum:\r
-      Status = ProcessCmdAddChecksum (&LoaderEntry->Command.AddChecksum,\r
-                 Tracker);\r
-      break;\r
+      case QemuLoaderCmdAddChecksum:\r
+        Status = ProcessCmdAddChecksum (\r
+                   &LoaderEntry->Command.AddChecksum,\r
+                   Tracker\r
+                   );\r
+        break;\r
 \r
-    case QemuLoaderCmdWritePointer:\r
-        Status = ProcessCmdWritePointer (&LoaderEntry->Command.WritePointer,\r
-                   Tracker, S3Context);\r
+      case QemuLoaderCmdWritePointer:\r
+        Status = ProcessCmdWritePointer (\r
+                   &LoaderEntry->Command.WritePointer,\r
+                   Tracker,\r
+                   S3Context\r
+                   );\r
         if (!EFI_ERROR (Status)) {\r
           WritePointerSubsetEnd = LoaderEntry + 1;\r
         }\r
+\r
         break;\r
 \r
-    default:\r
-      DEBUG ((DEBUG_VERBOSE, "%a: unknown loader command: 0x%x\n",\r
-        __FUNCTION__, LoaderEntry->Type));\r
-      break;\r
+      default:\r
+        DEBUG ((\r
+          DEBUG_VERBOSE,\r
+          "%a: unknown loader command: 0x%x\n",\r
+          __FUNCTION__,\r
+          LoaderEntry->Type\r
+          ));\r
+        break;\r
     }\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -1113,6 +1256,7 @@ InstallQemuFwCfgTables (
     if (EFI_ERROR (Status)) {\r
       goto UninstallAcpiTables;\r
     }\r
+\r
     //\r
     // Ownership of S3Context has been transferred.\r
     //\r
@@ -1134,10 +1278,12 @@ UninstallAcpiTables:
 \r
   for (SeenPointerEntry = OrderedCollectionMin (SeenPointers);\r
        SeenPointerEntry != NULL;\r
-       SeenPointerEntry = SeenPointerEntry2) {\r
+       SeenPointerEntry = SeenPointerEntry2)\r
+  {\r
     SeenPointerEntry2 = OrderedCollectionNext (SeenPointerEntry);\r
     OrderedCollectionDelete (SeenPointers, SeenPointerEntry, NULL);\r
   }\r
+\r
   OrderedCollectionUninit (SeenPointers);\r
 \r
 FreeKeys:\r
@@ -1164,21 +1310,28 @@ RollbackWritePointersAndFreeTracker:
   // not directly part of some ACPI table.\r
   //\r
   for (TrackerEntry = OrderedCollectionMin (Tracker); TrackerEntry != NULL;\r
-       TrackerEntry = TrackerEntry2) {\r
-    VOID *UserStruct;\r
-    BLOB *Blob;\r
+       TrackerEntry = TrackerEntry2)\r
+  {\r
+    VOID  *UserStruct;\r
+    BLOB  *Blob;\r
 \r
     TrackerEntry2 = OrderedCollectionNext (TrackerEntry);\r
     OrderedCollectionDelete (Tracker, TrackerEntry, &UserStruct);\r
     Blob = UserStruct;\r
 \r
     if (EFI_ERROR (Status) || Blob->HostsOnlyTableData) {\r
-      DEBUG ((DEBUG_VERBOSE, "%a: freeing \"%a\"\n", __FUNCTION__,\r
-        Blob->File));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: freeing \"%a\"\n",\r
+        __FUNCTION__,\r
+        Blob->File\r
+        ));\r
       gBS->FreePages ((UINTN)Blob->Base, EFI_SIZE_TO_PAGES (Blob->Size));\r
     }\r
+\r
     FreePool (Blob);\r
   }\r
+\r
   OrderedCollectionUninit (Tracker);\r
 \r
 FreeS3Context:\r
index 057a450af97a9eef793ae25cd9cf334446f15fcb..aff1ad0c97809019c3adc51887a546ef62445bed 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 InstallAcpiTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiTable\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiTable\r
   )\r
 {\r
-  EFI_STATUS                         Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = InstallQemuFwCfgTables (AcpiTable);\r
   return Status;\r
index b9054879b07fee8da4d56c7663ba820e596ac653..65f040f94758cdb32a322140d1dfb2ac7fc7b0b9 100644 (file)
 #define SEV_CMDLINE_HASH_GUID \\r
   (GUID) { 0x97d02dd8, 0xbd20, 0x4c94, { 0xaa, 0x78, 0xe7, 0x71, 0x4d, 0x36, 0xab, 0x2a } }\r
 \r
-STATIC CONST EFI_GUID mSevKernelHashGuid = SEV_KERNEL_HASH_GUID;\r
-STATIC CONST EFI_GUID mSevInitrdHashGuid = SEV_INITRD_HASH_GUID;\r
-STATIC CONST EFI_GUID mSevCmdlineHashGuid = SEV_CMDLINE_HASH_GUID;\r
+STATIC CONST EFI_GUID  mSevKernelHashGuid  = SEV_KERNEL_HASH_GUID;\r
+STATIC CONST EFI_GUID  mSevInitrdHashGuid  = SEV_INITRD_HASH_GUID;\r
+STATIC CONST EFI_GUID  mSevCmdlineHashGuid = SEV_CMDLINE_HASH_GUID;\r
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  GUID   Guid;\r
-  UINT16 Len;\r
-  UINT8  Data[];\r
+  GUID      Guid;\r
+  UINT16    Len;\r
+  UINT8     Data[];\r
 } HASH_TABLE;\r
 #pragma pack ()\r
 \r
-STATIC HASH_TABLE *mHashesTable;\r
-STATIC UINT16 mHashesTableSize;\r
+STATIC HASH_TABLE  *mHashesTable;\r
+STATIC UINT16      mHashesTableSize;\r
 \r
 STATIC\r
-CONST GUID*\r
+CONST GUID *\r
 FindBlobEntryGuid (\r
-  IN  CONST CHAR16    *BlobName\r
+  IN  CONST CHAR16  *BlobName\r
   )\r
 {\r
   if (StrCmp (BlobName, L"kernel") == 0) {\r
@@ -88,26 +88,32 @@ FindBlobEntryGuid (
 EFI_STATUS\r
 EFIAPI\r
 VerifyBlob (\r
-  IN  CONST CHAR16    *BlobName,\r
-  IN  CONST VOID      *Buf,\r
-  IN  UINT32          BufSize\r
+  IN  CONST CHAR16  *BlobName,\r
+  IN  CONST VOID    *Buf,\r
+  IN  UINT32        BufSize\r
   )\r
 {\r
-  CONST GUID *Guid;\r
-  INT32 Remaining;\r
-  HASH_TABLE *Entry;\r
+  CONST GUID  *Guid;\r
+  INT32       Remaining;\r
+  HASH_TABLE  *Entry;\r
 \r
-  if (mHashesTable == NULL || mHashesTableSize == 0) {\r
-    DEBUG ((DEBUG_ERROR,\r
+  if ((mHashesTable == NULL) || (mHashesTableSize == 0)) {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "%a: Verifier called but no hashes table discoverd in MEMFD\n",\r
-      __FUNCTION__));\r
+      __FUNCTION__\r
+      ));\r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
   Guid = FindBlobEntryGuid (BlobName);\r
   if (Guid == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "%a: Unknown blob name \"%s\"\n", __FUNCTION__,\r
-      BlobName));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: Unknown blob name \"%s\"\n",\r
+      __FUNCTION__,\r
+      BlobName\r
+      ));\r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
@@ -118,10 +124,11 @@ VerifyBlob (
   for (Entry = mHashesTable, Remaining = mHashesTableSize;\r
        Remaining >= sizeof *Entry && Remaining >= Entry->Len;\r
        Remaining -= Entry->Len,\r
-       Entry = (HASH_TABLE *)((UINT8 *)Entry + Entry->Len)) {\r
-    UINTN EntrySize;\r
-    EFI_STATUS Status;\r
-    UINT8 Hash[SHA256_DIGEST_SIZE];\r
+       Entry = (HASH_TABLE *)((UINT8 *)Entry + Entry->Len))\r
+  {\r
+    UINTN       EntrySize;\r
+    EFI_STATUS  Status;\r
+    UINT8       Hash[SHA256_DIGEST_SIZE];\r
 \r
     if (!CompareGuid (&Entry->Guid, Guid)) {\r
       continue;\r
@@ -131,8 +138,13 @@ VerifyBlob (
 \r
     EntrySize = Entry->Len - sizeof Entry->Guid - sizeof Entry->Len;\r
     if (EntrySize != SHA256_DIGEST_SIZE) {\r
-      DEBUG ((DEBUG_ERROR, "%a: Hash has the wrong size %d != %d\n",\r
-        __FUNCTION__, EntrySize, SHA256_DIGEST_SIZE));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Hash has the wrong size %d != %d\n",\r
+        __FUNCTION__,\r
+        EntrySize,\r
+        SHA256_DIGEST_SIZE\r
+        ));\r
       return EFI_ACCESS_DENIED;\r
     }\r
 \r
@@ -144,18 +156,31 @@ VerifyBlob (
 \r
     if (CompareMem (Entry->Data, Hash, EntrySize) == 0) {\r
       Status = EFI_SUCCESS;\r
-      DEBUG ((DEBUG_INFO, "%a: Hash comparison succeeded for \"%s\"\n",\r
-        __FUNCTION__, BlobName));\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "%a: Hash comparison succeeded for \"%s\"\n",\r
+        __FUNCTION__,\r
+        BlobName\r
+        ));\r
     } else {\r
       Status = EFI_ACCESS_DENIED;\r
-      DEBUG ((DEBUG_ERROR, "%a: Hash comparison failed for \"%s\"\n",\r
-        __FUNCTION__, BlobName));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Hash comparison failed for \"%s\"\n",\r
+        __FUNCTION__,\r
+        BlobName\r
+        ));\r
     }\r
+\r
     return Status;\r
   }\r
 \r
-  DEBUG ((DEBUG_ERROR, "%a: Hash GUID %g not found in table\n", __FUNCTION__,\r
-    Guid));\r
+  DEBUG ((\r
+    DEBUG_ERROR,\r
+    "%a: Hash GUID %g not found in table\n",\r
+    __FUNCTION__,\r
+    Guid\r
+    ));\r
   return EFI_ACCESS_DENIED;\r
 }\r
 \r
@@ -174,29 +199,38 @@ BlobVerifierLibSevHashesConstructor (
   VOID\r
   )\r
 {\r
-  HASH_TABLE *Ptr;\r
-  UINT32 Size;\r
+  HASH_TABLE  *Ptr;\r
+  UINT32      Size;\r
 \r
-  mHashesTable = NULL;\r
+  mHashesTable     = NULL;\r
   mHashesTableSize = 0;\r
 \r
-  Ptr = (void *)(UINTN)FixedPcdGet64 (PcdQemuHashTableBase);\r
+  Ptr  = (void *)(UINTN)FixedPcdGet64 (PcdQemuHashTableBase);\r
   Size = FixedPcdGet32 (PcdQemuHashTableSize);\r
 \r
-  if (Ptr == NULL || Size < sizeof *Ptr ||\r
+  if ((Ptr == NULL) || (Size < sizeof *Ptr) ||\r
       !CompareGuid (&Ptr->Guid, &SEV_HASH_TABLE_GUID) ||\r
-      Ptr->Len < sizeof *Ptr || Ptr->Len > Size) {\r
+      (Ptr->Len < sizeof *Ptr) || (Ptr->Len > Size))\r
+  {\r
     return RETURN_SUCCESS;\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO, "%a: Found injected hashes table in secure location\n",\r
-    __FUNCTION__));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: Found injected hashes table in secure location\n",\r
+    __FUNCTION__\r
+    ));\r
 \r
-  mHashesTable = (HASH_TABLE *)Ptr->Data;\r
+  mHashesTable     = (HASH_TABLE *)Ptr->Data;\r
   mHashesTableSize = Ptr->Len - sizeof Ptr->Guid - sizeof Ptr->Len;\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: mHashesTable=0x%p, Size=%u\n", __FUNCTION__,\r
-    mHashesTable, mHashesTableSize));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: mHashesTable=0x%p, Size=%u\n",\r
+    __FUNCTION__,\r
+    mHashesTable,\r
+    mHashesTableSize\r
+    ));\r
 \r
   return RETURN_SUCCESS;\r
 }\r
index 934ad207632b15ff119992bf5da5a6abb752b66f..3d84b25450525dd27a257ce37fa62fc57a861b65 100644 (file)
@@ -8,16 +8,16 @@
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Guid/ConfidentialComputingSecret.h>\r
 \r
-STATIC CONFIDENTIAL_COMPUTING_SECRET_LOCATION mSecretDxeTable = {\r
+STATIC CONFIDENTIAL_COMPUTING_SECRET_LOCATION  mSecretDxeTable = {\r
   FixedPcdGet32 (PcdSevLaunchSecretBase),\r
   FixedPcdGet32 (PcdSevLaunchSecretSize),\r
 };\r
 \r
 EFI_STATUS\r
 EFIAPI\r
-InitializeSecretDxe(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+InitializeSecretDxe (\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return gBS->InstallConfigurationTable (\r
index c66c4e9b9272b122126fc1cd7115cccb813e7a29..be26dde71f9def6c85d427bb6d1b3dfc7a53fbb1 100644 (file)
@@ -22,8 +22,8 @@
 EFI_STATUS\r
 EFIAPI\r
 AmdSevDxeEntryPoint (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_STATUS                       Status;\r
@@ -48,11 +48,12 @@ AmdSevDxeEntryPoint (
   Status = gDS->GetMemorySpaceMap (&NumEntries, &AllDescMap);\r
   if (!EFI_ERROR (Status)) {\r
     for (Index = 0; Index < NumEntries; Index++) {\r
-      CONST EFI_GCD_MEMORY_SPACE_DESCRIPTOR *Desc;\r
+      CONST EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *Desc;\r
 \r
       Desc = &AllDescMap[Index];\r
-      if (Desc->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo ||\r
-          Desc->GcdMemoryType == EfiGcdMemoryTypeNonExistent) {\r
+      if ((Desc->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) ||\r
+          (Desc->GcdMemoryType == EfiGcdMemoryTypeNonExistent))\r
+      {\r
         Status = MemEncryptSevClearMmioPageEncMask (\r
                    0,\r
                    Desc->BaseAddress,\r
@@ -101,8 +102,8 @@ AmdSevDxeEntryPoint (
   // is completed (See OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c).\r
   //\r
   if (FeaturePcdGet (PcdSmmSmramRequire)) {\r
-    UINTN MapPagesBase;\r
-    UINTN MapPagesCount;\r
+    UINTN  MapPagesBase;\r
+    UINTN  MapPagesCount;\r
 \r
     Status = MemEncryptSevLocateInitialSmramSaveStateMapPages (\r
                &MapPagesBase,\r
@@ -123,8 +124,12 @@ AmdSevDxeEntryPoint (
                MapPagesCount  // NumPages\r
                );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: MemEncryptSevClearPageEncMask(): %r\n",\r
-        __FUNCTION__, Status));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: MemEncryptSevClearPageEncMask(): %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       ASSERT (FALSE);\r
       CpuDeadLoop ();\r
     }\r
index 9ccdb4d91cd1eb2b0aeeefa83713a86b7943ca7c..999e9f151ebb48ae979a5c064b8ba88dcd48d49c 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 InstallAcpiTable (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol,\r
-  IN   VOID                          *AcpiTableBuffer,\r
-  IN   UINTN                         AcpiTableBufferSize,\r
-  OUT  UINTN                         *TableKey\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiProtocol,\r
+  IN   VOID                     *AcpiTableBuffer,\r
+  IN   UINTN                    AcpiTableBufferSize,\r
+  OUT  UINTN                    *TableKey\r
   )\r
 {\r
   return AcpiProtocol->InstallAcpiTable (\r
@@ -27,7 +27,6 @@ InstallAcpiTable (
                          );\r
 }\r
 \r
-\r
 /**\r
   Locate the first instance of a protocol.  If the protocol requested is an\r
   FV protocol, then it will return the first FV that contains the ACPI table\r
@@ -42,18 +41,18 @@ InstallAcpiTable (
 **/\r
 EFI_STATUS\r
 LocateFvInstanceWithTables (\r
-  OUT EFI_FIRMWARE_VOLUME2_PROTOCOL **Instance\r
+  OUT EFI_FIRMWARE_VOLUME2_PROTOCOL  **Instance\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_HANDLE                    *HandleBuffer;\r
-  UINTN                         NumberOfHandles;\r
-  EFI_FV_FILETYPE               FileType;\r
-  UINT32                        FvStatus;\r
-  EFI_FV_FILE_ATTRIBUTES        Attributes;\r
-  UINTN                         Size;\r
-  UINTN                         Index;\r
-  EFI_FIRMWARE_VOLUME2_PROTOCOL *FvInstance;\r
+  EFI_STATUS                     Status;\r
+  EFI_HANDLE                     *HandleBuffer;\r
+  UINTN                          NumberOfHandles;\r
+  EFI_FV_FILETYPE                FileType;\r
+  UINT32                         FvStatus;\r
+  EFI_FV_FILE_ATTRIBUTES         Attributes;\r
+  UINTN                          Size;\r
+  UINTN                          Index;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL  *FvInstance;\r
 \r
   FvStatus = 0;\r
 \r
@@ -61,12 +60,12 @@ LocateFvInstanceWithTables (
   // Locate protocol.\r
   //\r
   Status = gBS->LocateHandleBuffer (\r
-                   ByProtocol,\r
-                   &gEfiFirmwareVolume2ProtocolGuid,\r
-                   NULL,\r
-                   &NumberOfHandles,\r
-                   &HandleBuffer\r
-                   );\r
+                  ByProtocol,\r
+                  &gEfiFirmwareVolume2ProtocolGuid,\r
+                  NULL,\r
+                  &NumberOfHandles,\r
+                  &HandleBuffer\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // Defined errors at this time are not found and out of resources.\r
@@ -83,10 +82,10 @@ LocateFvInstanceWithTables (
     // This should not fail because of LocateHandleBuffer\r
     //\r
     Status = gBS->HandleProtocol (\r
-                     HandleBuffer[Index],\r
-                     &gEfiFirmwareVolume2ProtocolGuid,\r
-                     (VOID**) &FvInstance\r
-                     );\r
+                    HandleBuffer[Index],\r
+                    &gEfiFirmwareVolume2ProtocolGuid,\r
+                    (VOID **)&FvInstance\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     //\r
@@ -94,7 +93,7 @@ LocateFvInstanceWithTables (
     //\r
     Status = FvInstance->ReadFile (\r
                            FvInstance,\r
-                           (EFI_GUID*)PcdGetPtr (PcdAcpiTableStorageFile),\r
+                           (EFI_GUID *)PcdGetPtr (PcdAcpiTableStorageFile),\r
                            NULL,\r
                            &Size,\r
                            &FileType,\r
@@ -124,7 +123,6 @@ LocateFvInstanceWithTables (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Find ACPI tables in an FV and install them.\r
 \r
@@ -140,18 +138,18 @@ LocateFvInstanceWithTables (
 EFI_STATUS\r
 EFIAPI\r
 InstallOvmfFvTables (\r
-  IN  EFI_ACPI_TABLE_PROTOCOL     *AcpiTable\r
+  IN  EFI_ACPI_TABLE_PROTOCOL  *AcpiTable\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
-  EFI_FIRMWARE_VOLUME2_PROTOCOL        *FwVol;\r
-  INTN                                 Instance;\r
-  EFI_ACPI_COMMON_HEADER               *CurrentTable;\r
-  UINTN                                TableHandle;\r
-  UINT32                               FvStatus;\r
-  UINTN                                TableSize;\r
-  UINTN                                Size;\r
-  EFI_ACPI_TABLE_INSTALL_ACPI_TABLE    TableInstallFunction;\r
+  EFI_STATUS                         Status;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL      *FwVol;\r
+  INTN                               Instance;\r
+  EFI_ACPI_COMMON_HEADER             *CurrentTable;\r
+  UINTN                              TableHandle;\r
+  UINT32                             FvStatus;\r
+  UINTN                              TableSize;\r
+  UINTN                              Size;\r
+  EFI_ACPI_TABLE_INSTALL_ACPI_TABLE  TableInstallFunction;\r
 \r
   Instance     = 0;\r
   CurrentTable = NULL;\r
@@ -171,19 +169,19 @@ InstallOvmfFvTables (
   if (EFI_ERROR (Status)) {\r
     return EFI_ABORTED;\r
   }\r
+\r
   ASSERT (FwVol != NULL);\r
 \r
   //\r
   // Read tables from the storage file.\r
   //\r
   while (Status == EFI_SUCCESS) {\r
-\r
     Status = FwVol->ReadSection (\r
                       FwVol,\r
-                      (EFI_GUID*)PcdGetPtr (PcdAcpiTableStorageFile),\r
+                      (EFI_GUID *)PcdGetPtr (PcdAcpiTableStorageFile),\r
                       EFI_SECTION_RAW,\r
                       Instance,\r
-                      (VOID**) &CurrentTable,\r
+                      (VOID **)&CurrentTable,\r
                       &Size,\r
                       &FvStatus\r
                       );\r
@@ -193,7 +191,7 @@ InstallOvmfFvTables (
       //\r
       TableHandle = 0;\r
 \r
-      TableSize = ((EFI_ACPI_DESCRIPTION_HEADER *) CurrentTable)->Length;\r
+      TableSize = ((EFI_ACPI_DESCRIPTION_HEADER *)CurrentTable)->Length;\r
       ASSERT (Size >= TableSize);\r
 \r
       //\r
@@ -240,13 +238,12 @@ InstallOvmfFvTables (
 EFI_STATUS\r
 EFIAPI\r
 InstallAcpiTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiTable\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = InstallOvmfFvTables (AcpiTable);\r
 \r
   return Status;\r
 }\r
-\r
index 994ee2c7cded4ffc9f28cd90f20781e6e1147ecc..54d1af073eab6b0d490abbc70593eeab9ba72922 100644 (file)
@@ -22,8 +22,8 @@
 #include <IndustryStandard/Acpi.h>\r
 \r
 typedef struct {\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  UINT64              PciAttributes;\r
+  EFI_PCI_IO_PROTOCOL    *PciIo;\r
+  UINT64                 PciAttributes;\r
 } ORIGINAL_ATTRIBUTES;\r
 \r
 typedef struct S3_CONTEXT S3_CONTEXT;\r
@@ -31,43 +31,43 @@ typedef struct S3_CONTEXT S3_CONTEXT;
 EFI_STATUS\r
 EFIAPI\r
 InstallAcpiTable (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol,\r
-  IN   VOID                          *AcpiTableBuffer,\r
-  IN   UINTN                         AcpiTableBufferSize,\r
-  OUT  UINTN                         *TableKey\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiProtocol,\r
+  IN   VOID                     *AcpiTableBuffer,\r
+  IN   UINTN                    AcpiTableBufferSize,\r
+  OUT  UINTN                    *TableKey\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
-BhyveInstallAcpiTable(\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol,\r
-  IN   VOID                          *AcpiTableBuffer,\r
-  IN   UINTN                         AcpiTableBufferSize,\r
-  OUT  UINTN                         *TableKey\r
+BhyveInstallAcpiTable (\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiProtocol,\r
+  IN   VOID                     *AcpiTableBuffer,\r
+  IN   UINTN                    AcpiTableBufferSize,\r
+  OUT  UINTN                    *TableKey\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 InstallXenTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiProtocol\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 InstallAcpiTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiTable\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiTable\r
   );\r
 \r
 VOID\r
 EnablePciDecoding (\r
-  OUT ORIGINAL_ATTRIBUTES **OriginalAttributes,\r
-  OUT UINTN               *Count\r
+  OUT ORIGINAL_ATTRIBUTES  **OriginalAttributes,\r
+  OUT UINTN                *Count\r
   );\r
 \r
 VOID\r
 RestorePciDecoding (\r
-  IN ORIGINAL_ATTRIBUTES *OriginalAttributes,\r
-  IN UINTN               Count\r
+  IN ORIGINAL_ATTRIBUTES  *OriginalAttributes,\r
+  IN UINTN                Count\r
   );\r
 \r
 #endif /* _ACPI_PLATFORM_H_INCLUDED_ */\r
index 01ee89474667983928f94b57892edda88d0eccc3..8e80aa33e19e2cffacf31474d2a005b519475638 100644 (file)
@@ -16,28 +16,28 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 BhyveInstallAcpiMadtTable (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol,\r
-  IN   VOID                          *AcpiTableBuffer,\r
-  IN   UINTN                         AcpiTableBufferSize,\r
-  OUT  UINTN                         *TableKey\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiProtocol,\r
+  IN   VOID                     *AcpiTableBuffer,\r
+  IN   UINTN                    AcpiTableBufferSize,\r
+  OUT  UINTN                    *TableKey\r
   )\r
 {\r
-  UINT32                                              CpuCount;\r
-  UINTN                                               cSize;\r
-  UINTN                                               NewBufferSize;\r
-  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt;\r
-  EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC_STRUCTURE         *LocalApic;\r
-  EFI_ACPI_1_0_IO_APIC_STRUCTURE                      *IoApic;\r
-  EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE    *Iso;\r
-  VOID                                                *Ptr;\r
-  UINTN                                               Loop;\r
-  EFI_STATUS                                          Status;\r
+  UINT32                                               CpuCount;\r
+  UINTN                                                cSize;\r
+  UINTN                                                NewBufferSize;\r
+  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER  *Madt;\r
+  EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC_STRUCTURE          *LocalApic;\r
+  EFI_ACPI_1_0_IO_APIC_STRUCTURE                       *IoApic;\r
+  EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE     *Iso;\r
+  VOID                                                 *Ptr;\r
+  UINTN                                                Loop;\r
+  EFI_STATUS                                           Status;\r
 \r
   ASSERT (AcpiTableBufferSize >= sizeof (EFI_ACPI_DESCRIPTION_HEADER));\r
 \r
   // Query the host for the number of vCPUs\r
   CpuCount = 0;\r
-  cSize = sizeof(CpuCount);\r
+  cSize    = sizeof (CpuCount);\r
   if (BhyveFwCtlGet ("hw.ncpu", &CpuCount, &cSize) == RETURN_SUCCESS) {\r
     DEBUG ((DEBUG_INFO, "Retrieved CpuCount %d\n", CpuCount));\r
     ASSERT (CpuCount >= 1);\r
@@ -57,44 +57,45 @@ BhyveInstallAcpiMadtTable (
   }\r
 \r
   CopyMem (&(Madt->Header), AcpiTableBuffer, sizeof (EFI_ACPI_DESCRIPTION_HEADER));\r
-  Madt->Header.Length    = (UINT32) NewBufferSize;\r
+  Madt->Header.Length    = (UINT32)NewBufferSize;\r
   Madt->LocalApicAddress = 0xFEE00000;\r
   Madt->Flags            = EFI_ACPI_1_0_PCAT_COMPAT;\r
-  Ptr = Madt + 1;\r
+  Ptr                    = Madt + 1;\r
 \r
   LocalApic = Ptr;\r
   for (Loop = 0; Loop < CpuCount; ++Loop) {\r
     LocalApic->Type            = EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC;\r
     LocalApic->Length          = sizeof (*LocalApic);\r
-    LocalApic->AcpiProcessorId = (UINT8) Loop;\r
-    LocalApic->ApicId          = (UINT8) Loop;\r
+    LocalApic->AcpiProcessorId = (UINT8)Loop;\r
+    LocalApic->ApicId          = (UINT8)Loop;\r
     LocalApic->Flags           = 1; // enabled\r
     ++LocalApic;\r
   }\r
+\r
   Ptr = LocalApic;\r
 \r
-  IoApic = Ptr;\r
+  IoApic                   = Ptr;\r
   IoApic->Type             = EFI_ACPI_1_0_IO_APIC;\r
   IoApic->Length           = sizeof (*IoApic);\r
-  IoApic->IoApicId         = (UINT8) CpuCount;\r
+  IoApic->IoApicId         = (UINT8)CpuCount;\r
   IoApic->Reserved         = EFI_ACPI_RESERVED_BYTE;\r
   IoApic->IoApicAddress    = 0xFEC00000;\r
   IoApic->SystemVectorBase = 0x00000000;\r
-  Ptr = IoApic + 1;\r
+  Ptr                      = IoApic + 1;\r
 \r
   //\r
   // IRQ0 (8254 Timer) => IRQ2 (PIC) Interrupt Source Override Structure\r
   //\r
-  Iso = Ptr;\r
+  Iso                              = Ptr;\r
   Iso->Type                        = EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE;\r
   Iso->Length                      = sizeof (*Iso);\r
   Iso->Bus                         = 0x00; // ISA\r
   Iso->Source                      = 0x00; // IRQ0\r
   Iso->GlobalSystemInterruptVector = 0x00000002;\r
   Iso->Flags                       = 0x0000; // Conforms to specs of the bus\r
-  Ptr = Iso + 1;\r
+  Ptr                              = Iso + 1;\r
 \r
-  ASSERT ((UINTN) ((UINT8 *)Ptr - (UINT8 *)Madt) == NewBufferSize);\r
+  ASSERT ((UINTN)((UINT8 *)Ptr - (UINT8 *)Madt) == NewBufferSize);\r
   Status = InstallAcpiTable (AcpiProtocol, Madt, NewBufferSize, TableKey);\r
 \r
   FreePool (Madt);\r
@@ -105,22 +106,22 @@ BhyveInstallAcpiMadtTable (
 EFI_STATUS\r
 EFIAPI\r
 BhyveInstallAcpiTable (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol,\r
-  IN   VOID                          *AcpiTableBuffer,\r
-  IN   UINTN                         AcpiTableBufferSize,\r
-  OUT  UINTN                         *TableKey\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiProtocol,\r
+  IN   VOID                     *AcpiTableBuffer,\r
+  IN   UINTN                    AcpiTableBufferSize,\r
+  OUT  UINTN                    *TableKey\r
   )\r
 {\r
   EFI_ACPI_DESCRIPTION_HEADER        *Hdr;\r
   EFI_ACPI_TABLE_INSTALL_ACPI_TABLE  TableInstallFunction;\r
 \r
-  Hdr = (EFI_ACPI_DESCRIPTION_HEADER*) AcpiTableBuffer;\r
+  Hdr = (EFI_ACPI_DESCRIPTION_HEADER *)AcpiTableBuffer;\r
   switch (Hdr->Signature) {\r
-  case EFI_ACPI_1_0_APIC_SIGNATURE:\r
-    TableInstallFunction = BhyveInstallAcpiMadtTable;\r
-    break;\r
-  default:\r
-    TableInstallFunction = InstallAcpiTable;\r
+    case EFI_ACPI_1_0_APIC_SIGNATURE:\r
+      TableInstallFunction = BhyveInstallAcpiMadtTable;\r
+      break;\r
+    default:\r
+      TableInstallFunction = InstallAcpiTable;\r
   }\r
 \r
   return TableInstallFunction (\r
index f66f89291157b9036b106639498ca675b355c1a7..b6ef101b2abeaac5029bff3c2ea1da6ed9e61ce8 100644 (file)
@@ -16,49 +16,50 @@ FindAcpiTableProtocol (
   VOID\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  EFI_ACPI_TABLE_PROTOCOL *AcpiTable;\r
+  EFI_STATUS               Status;\r
+  EFI_ACPI_TABLE_PROTOCOL  *AcpiTable;\r
 \r
   Status = gBS->LocateProtocol (\r
                   &gEfiAcpiTableProtocolGuid,\r
                   NULL,\r
-                  (VOID**)&AcpiTable\r
+                  (VOID **)&AcpiTable\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
   return AcpiTable;\r
 }\r
 \r
-\r
 STATIC\r
 VOID\r
 EFIAPI\r
 OnRootBridgesConnected (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
-  DEBUG ((DEBUG_INFO,\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
     "%a: root bridges have been connected, installing ACPI tables\n",\r
-    __FUNCTION__));\r
+    __FUNCTION__\r
+    ));\r
   Status = InstallAcpiTables (FindAcpiTableProtocol ());\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: InstallAcpiTables: %r\n", __FUNCTION__, Status));\r
   }\r
+\r
   gBS->CloseEvent (Event);\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 AcpiPlatformEntryPoint (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  EFI_EVENT  RootBridgesConnected;\r
+  EFI_STATUS  Status;\r
+  EFI_EVENT   RootBridgesConnected;\r
 \r
   //\r
   // If the platform doesn't support PCI, or PCI enumeration has been disabled,\r
@@ -66,8 +67,12 @@ AcpiPlatformEntryPoint (
   // the full functionality.\r
   //\r
   if (PcdGetBool (PcdPciDisableBusEnumeration)) {\r
-    DEBUG ((DEBUG_INFO, "%a: PCI or its enumeration disabled, installing "\r
-      "ACPI tables\n", __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: PCI or its enumeration disabled, installing "\r
+      "ACPI tables\n",\r
+      __FUNCTION__\r
+      ));\r
     return InstallAcpiTables (FindAcpiTableProtocol ());\r
   }\r
 \r
@@ -77,13 +82,20 @@ AcpiPlatformEntryPoint (
   // setup. (Note that we're a DXE_DRIVER; our entry point function is invoked\r
   // strictly before BDS is entered and can connect the root bridges.)\r
   //\r
-  Status = gBS->CreateEventEx (EVT_NOTIFY_SIGNAL, TPL_CALLBACK,\r
-                  OnRootBridgesConnected, NULL /* Context */,\r
-                  &gRootBridgesConnectedEventGroupGuid, &RootBridgesConnected);\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  OnRootBridgesConnected,\r
+                  NULL /* Context */,\r
+                  &gRootBridgesConnectedEventGroupGuid,\r
+                  &RootBridgesConnected\r
+                  );\r
   if (!EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_INFO,\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
       "%a: waiting for root bridges to be connected, registered callback\n",\r
-      __FUNCTION__));\r
+      __FUNCTION__\r
+      ));\r
   }\r
 \r
   return Status;\r
index 73894106c9ec4a4feb91223df6542b194a5d4e2e..d31fd653936374be3c1f635e7cbad2595bfdc183 100644 (file)
@@ -11,7 +11,6 @@
 \r
 #include "AcpiPlatform.h"\r
 \r
-\r
 /**\r
   Collect all PciIo protocol instances in the system. Save their original\r
   attributes, and enable IO and MMIO decoding for each.\r
 **/\r
 VOID\r
 EnablePciDecoding (\r
-  OUT ORIGINAL_ATTRIBUTES **OriginalAttributes,\r
-  OUT UINTN               *Count\r
+  OUT ORIGINAL_ATTRIBUTES  **OriginalAttributes,\r
+  OUT UINTN                *Count\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  UINTN               NoHandles;\r
-  EFI_HANDLE          *Handles;\r
-  ORIGINAL_ATTRIBUTES *OrigAttrs;\r
-  UINTN               Idx;\r
+  EFI_STATUS           Status;\r
+  UINTN                NoHandles;\r
+  EFI_HANDLE           *Handles;\r
+  ORIGINAL_ATTRIBUTES  *OrigAttrs;\r
+  UINTN                Idx;\r
 \r
   *OriginalAttributes = NULL;\r
   *Count              = 0;\r
@@ -59,8 +58,13 @@ EnablePciDecoding (
     return;\r
   }\r
 \r
-  Status = gBS->LocateHandleBuffer (ByProtocol, &gEfiPciIoProtocolGuid,\r
-                  NULL /* SearchKey */, &NoHandles, &Handles);\r
+  Status = gBS->LocateHandleBuffer (\r
+                  ByProtocol,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  NULL /* SearchKey */,\r
+                  &NoHandles,\r
+                  &Handles\r
+                  );\r
   if (Status == EFI_NOT_FOUND) {\r
     //\r
     // No PCI devices were found on either of the root bridges. We're done.\r
@@ -69,49 +73,75 @@ EnablePciDecoding (
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_WARN, "%a: LocateHandleBuffer(): %r\n", __FUNCTION__,\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
+      "%a: LocateHandleBuffer(): %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return;\r
   }\r
 \r
   OrigAttrs = AllocatePool (NoHandles * sizeof *OrigAttrs);\r
   if (OrigAttrs == NULL) {\r
-    DEBUG ((DEBUG_WARN, "%a: AllocatePool(): out of resources\n",\r
-      __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
+      "%a: AllocatePool(): out of resources\n",\r
+      __FUNCTION__\r
+      ));\r
     goto FreeHandles;\r
   }\r
 \r
   for (Idx = 0; Idx < NoHandles; ++Idx) {\r
-    EFI_PCI_IO_PROTOCOL *PciIo;\r
-    UINT64              Attributes;\r
+    EFI_PCI_IO_PROTOCOL  *PciIo;\r
+    UINT64               Attributes;\r
 \r
     //\r
     // Look up PciIo on the handle and stash it\r
     //\r
-    Status = gBS->HandleProtocol (Handles[Idx], &gEfiPciIoProtocolGuid,\r
-                    (VOID**)&PciIo);\r
+    Status = gBS->HandleProtocol (\r
+                    Handles[Idx],\r
+                    &gEfiPciIoProtocolGuid,\r
+                    (VOID **)&PciIo\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
     OrigAttrs[Idx].PciIo = PciIo;\r
 \r
     //\r
     // Stash the current attributes\r
     //\r
-    Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationGet, 0,\r
-                      &OrigAttrs[Idx].PciAttributes);\r
+    Status = PciIo->Attributes (\r
+                      PciIo,\r
+                      EfiPciIoAttributeOperationGet,\r
+                      0,\r
+                      &OrigAttrs[Idx].PciAttributes\r
+                      );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationGet: %r\n",\r
-        __FUNCTION__, Status));\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a: EfiPciIoAttributeOperationGet: %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       goto RestoreAttributes;\r
     }\r
 \r
     //\r
     // Retrieve supported attributes\r
     //\r
-    Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationSupported, 0,\r
-                      &Attributes);\r
+    Status = PciIo->Attributes (\r
+                      PciIo,\r
+                      EfiPciIoAttributeOperationSupported,\r
+                      0,\r
+                      &Attributes\r
+                      );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationSupported: %r\n",\r
-        __FUNCTION__, Status));\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a: EfiPciIoAttributeOperationSupported: %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       goto RestoreAttributes;\r
     }\r
 \r
@@ -119,11 +149,19 @@ EnablePciDecoding (
     // Enable IO and MMIO decoding\r
     //\r
     Attributes &= EFI_PCI_IO_ATTRIBUTE_IO | EFI_PCI_IO_ATTRIBUTE_MEMORY;\r
-    Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationEnable,\r
-                      Attributes, NULL);\r
+    Status      = PciIo->Attributes (\r
+                           PciIo,\r
+                           EfiPciIoAttributeOperationEnable,\r
+                           Attributes,\r
+                           NULL\r
+                           );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationEnable: %r\n",\r
-        __FUNCTION__, Status));\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a: EfiPciIoAttributeOperationEnable: %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       goto RestoreAttributes;\r
     }\r
   }\r
@@ -139,19 +177,20 @@ EnablePciDecoding (
 RestoreAttributes:\r
   while (Idx > 0) {\r
     --Idx;\r
-    OrigAttrs[Idx].PciIo->Attributes (OrigAttrs[Idx].PciIo,\r
+    OrigAttrs[Idx].PciIo->Attributes (\r
+                            OrigAttrs[Idx].PciIo,\r
                             EfiPciIoAttributeOperationSet,\r
                             OrigAttrs[Idx].PciAttributes,\r
                             NULL\r
                             );\r
   }\r
+\r
   FreePool (OrigAttrs);\r
 \r
 FreeHandles:\r
   FreePool (Handles);\r
 }\r
 \r
-\r
 /**\r
   Restore the original PCI attributes saved with EnablePciDecoding().\r
 \r
@@ -169,11 +208,11 @@ FreeHandles:
 **/\r
 VOID\r
 RestorePciDecoding (\r
-  IN ORIGINAL_ATTRIBUTES *OriginalAttributes,\r
-  IN UINTN               Count\r
+  IN ORIGINAL_ATTRIBUTES  *OriginalAttributes,\r
+  IN UINTN                Count\r
   )\r
 {\r
-  UINTN Idx;\r
+  UINTN  Idx;\r
 \r
   ASSERT ((OriginalAttributes == NULL) == (Count == 0));\r
   if (OriginalAttributes == NULL) {\r
@@ -188,5 +227,6 @@ RestorePciDecoding (
                                      NULL\r
                                      );\r
   }\r
+\r
   FreePool (OriginalAttributes);\r
 }\r
index c6d43041f36d6db45b38df34d6d7bb7fdd58d8e7..4561adc9f25cf0c994bb7c46625f0a2e7753a6e6 100644 (file)
 //\r
 // ACPI table information used to initialize tables.\r
 //\r
-#define EFI_ACPI_OEM_ID           'B','H','Y','V','E',' '   // OEMID 6 bytes long\r
-#define EFI_ACPI_OEM_REVISION     0x1\r
-#define EFI_ACPI_CREATOR_ID       SIGNATURE_32('B','H','Y','V')\r
-#define EFI_ACPI_CREATOR_REVISION 0x00000001\r
+#define EFI_ACPI_OEM_ID            'B','H','Y','V','E',' '  // OEMID 6 bytes long\r
+#define EFI_ACPI_OEM_REVISION      0x1\r
+#define EFI_ACPI_CREATOR_ID        SIGNATURE_32('B','H','Y','V')\r
+#define EFI_ACPI_CREATOR_REVISION  0x00000001\r
 \r
-#define INT_MODEL       0x01\r
-#define SCI_INT_VECTOR  0x0009\r
-#define SMI_CMD_IO_PORT 0xB2\r
-#define ACPI_ENABLE     0xA0\r
-#define ACPI_DISABLE    0xA1\r
-#define S4BIOS_REQ      0x00\r
-#define PM1a_EVT_BLK    0x00000400      /* TNXXX */\r
-#define PM1b_EVT_BLK    0x00000000\r
-#define PM1a_CNT_BLK    0x00000404      /* TNXXX */\r
-#define PM1b_CNT_BLK    0x00000000\r
-#define PM2_CNT_BLK     0x00000000\r
-#define PM_TMR_BLK      0x00000408\r
-#define GPE0_BLK        0x00000000\r
-#define GPE1_BLK        0x00000000\r
-#define PM1_EVT_LEN     0x04\r
-#define PM1_CNT_LEN     0x02\r
-#define PM2_CNT_LEN     0x00\r
-#define PM_TM_LEN       0x04\r
-#define GPE0_BLK_LEN    0x00\r
-#define GPE1_BLK_LEN    0x00\r
-#define GPE1_BASE       0x00\r
-#define RESERVED        0x00\r
-#define P_LVL2_LAT      0x0000\r
-#define P_LVL3_LAT      0x0000\r
-#define FLUSH_SIZE      0x0000\r
-#define FLUSH_STRIDE    0x0000\r
-#define DUTY_OFFSET     0x00\r
-#define DUTY_WIDTH      0x00\r
-#define DAY_ALRM        0x00\r
-#define MON_ALRM        0x00\r
-#define CENTURY         0x32\r
-#define IAPC_BOOT_ARCH  0x12    /* 8042 present, disable PCIe ASPM */\r
-#define FACP_FLAGS      (EFI_ACPI_1_0_WBINVD | EFI_ACPI_1_0_PROC_C1 |         \\r
+#define INT_MODEL        0x01\r
+#define SCI_INT_VECTOR   0x0009\r
+#define SMI_CMD_IO_PORT  0xB2\r
+#define ACPI_ENABLE      0xA0\r
+#define ACPI_DISABLE     0xA1\r
+#define S4BIOS_REQ       0x00\r
+#define PM1a_EVT_BLK     0x00000400     /* TNXXX */\r
+#define PM1b_EVT_BLK     0x00000000\r
+#define PM1a_CNT_BLK     0x00000404     /* TNXXX */\r
+#define PM1b_CNT_BLK     0x00000000\r
+#define PM2_CNT_BLK      0x00000000\r
+#define PM_TMR_BLK       0x00000408\r
+#define GPE0_BLK         0x00000000\r
+#define GPE1_BLK         0x00000000\r
+#define PM1_EVT_LEN      0x04\r
+#define PM1_CNT_LEN      0x02\r
+#define PM2_CNT_LEN      0x00\r
+#define PM_TM_LEN        0x04\r
+#define GPE0_BLK_LEN     0x00\r
+#define GPE1_BLK_LEN     0x00\r
+#define GPE1_BASE        0x00\r
+#define RESERVED         0x00\r
+#define P_LVL2_LAT       0x0000\r
+#define P_LVL3_LAT       0x0000\r
+#define FLUSH_SIZE       0x0000\r
+#define FLUSH_STRIDE     0x0000\r
+#define DUTY_OFFSET      0x00\r
+#define DUTY_WIDTH       0x00\r
+#define DAY_ALRM         0x00\r
+#define MON_ALRM         0x00\r
+#define CENTURY          0x32\r
+#define IAPC_BOOT_ARCH   0x12   /* 8042 present, disable PCIe ASPM */\r
+#define FACP_FLAGS       (EFI_ACPI_1_0_WBINVD | EFI_ACPI_1_0_PROC_C1 |        \\r
                         EFI_ACPI_1_0_SLP_BUTTON | EFI_ACPI_1_0_TMR_VAL_EXT |  \\r
                         EFI_ACPI_2_0_RESET_REG_SUP |                          \\r
                         EFI_ACPI_3_0_FORCE_APIC_PHYSICAL_DESTINATION_MODE)\r
-#define FACP_RESET_REG                                                \\r
+#define FACP_RESET_REG   {                                              \\r
         EFI_ACPI_3_0_SYSTEM_IO,         /* Address Space ID */          \\r
         8,                              /* Bit Width */                 \\r
         0,                              /* Bit Offset */                \\r
         EFI_ACPI_3_0_BYTE,              /* Byte Access */               \\r
         0xCF9                           /* I/O Port */                  \\r
 }\r
-#define FACP_RESET_VAL  0x6\r
+#define FACP_RESET_VAL   0x6\r
 #endif\r
index 673cd235a19ce126df5e41272715f5c2eec535e3..5e734d0503e9dd57912d8d1fa918c4cc1fb7da54 100644 (file)
@@ -30,17 +30,17 @@ EmuGopComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 EmuGopComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
 //\r
 // EFI Component Name Protocol\r
 //\r
-EFI_COMPONENT_NAME_PROTOCOL     gEmuGopComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL  gEmuGopComponentName = {\r
   EmuGopComponentNameGetDriverName,\r
   EmuGopComponentNameGetControllerName,\r
   "eng"\r
@@ -49,19 +49,17 @@ EFI_COMPONENT_NAME_PROTOCOL     gEmuGopComponentName = {
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuGopComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) EmuGopComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) EmuGopComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gEmuGopComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)EmuGopComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)EmuGopComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
-EFI_UNICODE_STRING_TABLE mEmuGopDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mEmuGopDriverNameTable[] = {\r
   { "eng", L"Emulator GOP Driver" },\r
-  { NULL , NULL }\r
+  { NULL,  NULL                   }\r
 };\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -118,7 +116,6 @@ EmuGopComponentNameGetDriverName (
            );\r
 }\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -190,11 +187,11 @@ EmuGopComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 EmuGopComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
index 13cf3976266c75e879a497f9fd75b5e6ddaa3b64..128b4a5fd48df2442e4da7a0e0cd5c2d525f772b 100644 (file)
@@ -31,27 +31,27 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include <IndustryStandard/Pci.h>\r
 \r
-#define GRAPHICS_OUTPUT_INVALID_MODE_NUMBER 0xffff\r
+#define GRAPHICS_OUTPUT_INVALID_MODE_NUMBER  0xffff\r
 \r
 typedef struct {\r
-  UINT32                     HorizontalResolution;\r
-  UINT32                     VerticalResolution;\r
-  UINT32                     ColorDepth;\r
-  UINT32                     RefreshRate;\r
+  UINT32    HorizontalResolution;\r
+  UINT32    VerticalResolution;\r
+  UINT32    ColorDepth;\r
+  UINT32    RefreshRate;\r
 } GOP_MODE_DATA;\r
 \r
-#define PIXEL_RED_SHIFT   0\r
-#define PIXEL_GREEN_SHIFT 3\r
-#define PIXEL_BLUE_SHIFT  6\r
+#define PIXEL_RED_SHIFT    0\r
+#define PIXEL_GREEN_SHIFT  3\r
+#define PIXEL_BLUE_SHIFT   6\r
 \r
 #define PIXEL_RED_MASK    (BIT7 | BIT6 | BIT5)\r
 #define PIXEL_GREEN_MASK  (BIT4 | BIT3 | BIT2)\r
 #define PIXEL_BLUE_MASK   (BIT1 | BIT0)\r
 \r
-#define PIXEL_TO_COLOR_BYTE(pixel, mask, shift) ((UINT8) ((pixel & mask) << shift))\r
-#define PIXEL_TO_RED_BYTE(pixel) PIXEL_TO_COLOR_BYTE(pixel, PIXEL_RED_MASK, PIXEL_RED_SHIFT)\r
-#define PIXEL_TO_GREEN_BYTE(pixel) PIXEL_TO_COLOR_BYTE(pixel, PIXEL_GREEN_MASK, PIXEL_GREEN_SHIFT)\r
-#define PIXEL_TO_BLUE_BYTE(pixel) PIXEL_TO_COLOR_BYTE(pixel, PIXEL_BLUE_MASK, PIXEL_BLUE_SHIFT)\r
+#define PIXEL_TO_COLOR_BYTE(pixel, mask, shift)  ((UINT8) ((pixel & mask) << shift))\r
+#define PIXEL_TO_RED_BYTE(pixel)                 PIXEL_TO_COLOR_BYTE(pixel, PIXEL_RED_MASK, PIXEL_RED_SHIFT)\r
+#define PIXEL_TO_GREEN_BYTE(pixel)               PIXEL_TO_COLOR_BYTE(pixel, PIXEL_GREEN_MASK, PIXEL_GREEN_SHIFT)\r
+#define PIXEL_TO_BLUE_BYTE(pixel)                PIXEL_TO_COLOR_BYTE(pixel, PIXEL_BLUE_MASK, PIXEL_BLUE_SHIFT)\r
 \r
 #define RGB_BYTES_TO_PIXEL(Red, Green, Blue) \\r
   (UINT8) ( (((Red) >> PIXEL_RED_SHIFT) & PIXEL_RED_MASK) | \\r
@@ -62,61 +62,60 @@ typedef struct {
 #define PIXEL24_GREEN_MASK  0x0000ff00\r
 #define PIXEL24_BLUE_MASK   0x000000ff\r
 \r
-extern EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName;\r
+extern EFI_DRIVER_BINDING_PROTOCOL  gEmuGopDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL  gEmuGopComponentName;\r
 \r
-#define EMU_UGA_CLASS_NAME       L"EmuGopWindow"\r
+#define EMU_UGA_CLASS_NAME  L"EmuGopWindow"\r
 \r
 #define GOP_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('G', 'o', 'p', 'N')\r
 typedef struct {\r
-  UINT64                            Signature;\r
+  UINT64                          Signature;\r
 \r
-  EFI_HANDLE                        Handle;\r
-  EFI_PCI_IO_PROTOCOL               *PciIo;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL      GraphicsOutput;\r
-  EFI_DEVICE_PATH_PROTOCOL          *GopDevicePath;\r
+  EFI_HANDLE                      Handle;\r
+  EFI_PCI_IO_PROTOCOL             *PciIo;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL    GraphicsOutput;\r
+  EFI_DEVICE_PATH_PROTOCOL        *GopDevicePath;\r
 \r
-  EFI_UNICODE_STRING_TABLE          *ControllerNameTable;\r
+  EFI_UNICODE_STRING_TABLE        *ControllerNameTable;\r
 \r
   //\r
   // GOP Private Data for QueryMode ()\r
   //\r
-  GOP_MODE_DATA                     *ModeData;\r
+  GOP_MODE_DATA                   *ModeData;\r
 \r
-  UINT64                            FbAddr;\r
-  UINT32                            FbSize;\r
+  UINT64                          FbAddr;\r
+  UINT32                          FbSize;\r
 } GOP_PRIVATE_DATA;\r
 \r
-\r
 #define GOP_PRIVATE_DATA_FROM_THIS(a)  \\r
          CR(a, GOP_PRIVATE_DATA, GraphicsOutput, GOP_PRIVATE_DATA_SIGNATURE)\r
 \r
 typedef struct {\r
-  UINT32            FbSize;\r
-  UINT16            Width;\r
-  UINT16            Height;\r
-  UINT16            Depth;\r
-  UINT16            RefreshRate;\r
+  UINT32    FbSize;\r
+  UINT16    Width;\r
+  UINT16    Height;\r
+  UINT16    Depth;\r
+  UINT16    RefreshRate;\r
 } BHYVE_FBUF_MEMREGS;\r
 \r
 //\r
 // Global Protocol Variables\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL  gEmuGopDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gEmuGopComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gEmuGopComponentName2;\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gEmuGopDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gEmuGopComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gEmuGopComponentName2;\r
 \r
 //\r
 // Gop Hardware abstraction internal worker functions\r
 //\r
 EFI_STATUS\r
 EmuGopConstructor (\r
-  IN  GOP_PRIVATE_DATA    *Private\r
+  IN  GOP_PRIVATE_DATA  *Private\r
   );\r
 \r
 EFI_STATUS\r
 EmuGopDestructor (\r
-  IN  GOP_PRIVATE_DATA    *Private\r
+  IN  GOP_PRIVATE_DATA  *Private\r
   );\r
 \r
 VOID\r
@@ -129,21 +128,21 @@ ShutdownGopEvent (
 VOID\r
 BhyveSetGraphicsMode (\r
   GOP_PRIVATE_DATA  *Private,\r
-  UINT16             Width,\r
-  UINT16             Height,\r
-  UINT16             Depth\r
+  UINT16            Width,\r
+  UINT16            Height,\r
+  UINT16            Depth\r
   );\r
 \r
 VOID\r
 BhyveGetMemregs (\r
-  GOP_PRIVATE_DATA  *Private,\r
-  BHYVE_FBUF_MEMREGS *Memregs\r
+  GOP_PRIVATE_DATA    *Private,\r
+  BHYVE_FBUF_MEMREGS  *Memregs\r
   );\r
 \r
 VOID\r
 InstallVbeShim (\r
-  IN CONST CHAR16         *CardName,\r
-  IN EFI_PHYSICAL_ADDRESS FrameBufferBase\r
+  IN CONST CHAR16          *CardName,\r
+  IN EFI_PHYSICAL_ADDRESS  FrameBufferBase\r
   );\r
 \r
 #endif /* _GOP_H_ */\r
index bab4fbda5342cc3ff3b61d11bc9d9c337bb7c458..bd8a0d804b6bcb07b9568f03a7f4ab56e19e8a42 100644 (file)
@@ -13,13 +13,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 STATIC VOID\r
 BhyveGetGraphicsMode (\r
-  EFI_PCI_IO_PROTOCOL *PciIo,\r
-  UINT16              *Width,\r
-  UINT16              *Height,\r
-  UINT16              *Depth\r
+  EFI_PCI_IO_PROTOCOL  *PciIo,\r
+  UINT16               *Width,\r
+  UINT16               *Height,\r
+  UINT16               *Depth\r
   );\r
 \r
-\r
 /**\r
   Tests to see if this driver supports a given controller. If a child device is provided,\r
   it further tests to see if this driver supports creating a handle for the specified child device.\r
@@ -65,15 +64,15 @@ BhyveGetGraphicsMode (
 EFI_STATUS\r
 EFIAPI\r
 EmuGopDriverBindingSupported (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Handle,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Handle,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_PCI_IO_PROTOCOL       *PciIo;\r
-  PCI_TYPE00                Pci;\r
-  UINT16                    Width, Height, Depth;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
+  UINT16               Width, Height, Depth;\r
 \r
   //\r
   // Open the IO Abstraction(s) needed to perform the supported test\r
@@ -81,7 +80,7 @@ EmuGopDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   Handle,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Handle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -107,11 +106,11 @@ EmuGopDriverBindingSupported (
   }\r
 \r
   Status = EFI_UNSUPPORTED;\r
-  if (Pci.Hdr.VendorId == 0xFB5D && Pci.Hdr.DeviceId == 0x40FB) {\r
-    DEBUG((DEBUG_INFO, "BHYVE framebuffer device detected\n"));\r
+  if ((Pci.Hdr.VendorId == 0xFB5D) && (Pci.Hdr.DeviceId == 0x40FB)) {\r
+    DEBUG ((DEBUG_INFO, "BHYVE framebuffer device detected\n"));\r
     Status = EFI_SUCCESS;\r
 \r
-    BhyveGetGraphicsMode(PciIo, &Width, &Height, &Depth);\r
+    BhyveGetGraphicsMode (PciIo, &Width, &Height, &Depth);\r
     PcdSet32S (PcdVideoHorizontalResolution, Width);\r
     PcdSet32S (PcdVideoVerticalResolution, Height);\r
   }\r
@@ -121,16 +120,15 @@ Done:
   // Close the PCI I/O Protocol\r
   //\r
   gBS->CloseProtocol (\r
-        Handle,\r
-        &gEfiPciIoProtocolGuid,\r
-        This->DriverBindingHandle,\r
-        Handle\r
-        );\r
+         Handle,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Handle\r
+         );\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Starts a device controller or a bus controller.\r
 \r
@@ -169,25 +167,25 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 EmuGopDriverBindingStart (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Handle,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Handle,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  BHYVE_FBUF_MEMREGS      Memregs;\r
-  GOP_PRIVATE_DATA        *Private;\r
-  EFI_STATUS              Status;\r
-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *MmioDesc;\r
+  BHYVE_FBUF_MEMREGS                 Memregs;\r
+  GOP_PRIVATE_DATA                   *Private;\r
+  EFI_STATUS                         Status;\r
+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *MmioDesc;\r
 \r
   //\r
   // Allocate Private context data for SGO inteface.\r
   //\r
   Private = NULL;\r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  sizeof (GOP_PRIVATE_DATA),\r
-                  (VOID **)&Private\r
-                  );\r
+  Status  = gBS->AllocatePool (\r
+                   EfiBootServicesData,\r
+                   sizeof (GOP_PRIVATE_DATA),\r
+                   (VOID **)&Private\r
+                   );\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -204,7 +202,7 @@ EmuGopDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Handle,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &Private->PciIo,\r
+                  (VOID **)&Private->PciIo,\r
                   This->DriverBindingHandle,\r
                   Handle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -217,24 +215,30 @@ EmuGopDriverBindingStart (
   // Check if fbuf mmio BAR is present\r
   //\r
   MmioDesc = NULL;\r
-  Status = Private->PciIo->GetBarAttributes (\r
-                      Private->PciIo,\r
-                      PCI_BAR_IDX0,\r
-                      NULL,\r
-                      (VOID**) &MmioDesc\r
-                      );\r
+  Status   = Private->PciIo->GetBarAttributes (\r
+                               Private->PciIo,\r
+                               PCI_BAR_IDX0,\r
+                               NULL,\r
+                               (VOID **)&MmioDesc\r
+                               );\r
   if (EFI_ERROR (Status) ||\r
-      MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM) {\r
+      (MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM))\r
+  {\r
     DEBUG ((DEBUG_INFO, "BHYVE GOP: No mmio bar\n"));\r
   } else {\r
-    DEBUG ((DEBUG_INFO, "BHYVE GOP: Using mmio bar @ 0x%lx\n",\r
-            MmioDesc->AddrRangeMin));\r
-    BhyveGetMemregs(Private, &Memregs);\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "BHYVE GOP: Using mmio bar @ 0x%lx\n",\r
+      MmioDesc->AddrRangeMin\r
+      ));\r
+    BhyveGetMemregs (Private, &Memregs);\r
     Private->FbSize = Memregs.FbSize;\r
   }\r
+\r
   if (MmioDesc != NULL) {\r
     FreePool (MmioDesc);\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -243,18 +247,22 @@ EmuGopDriverBindingStart (
   // Check if fbuf frame-buffer BAR is present\r
   //\r
   MmioDesc = NULL;\r
-  Status = Private->PciIo->GetBarAttributes (\r
-                      Private->PciIo,\r
-                      PCI_BAR_IDX1,\r
-                      NULL,\r
-                      (VOID**) &MmioDesc\r
-                      );\r
+  Status   = Private->PciIo->GetBarAttributes (\r
+                               Private->PciIo,\r
+                               PCI_BAR_IDX1,\r
+                               NULL,\r
+                               (VOID **)&MmioDesc\r
+                               );\r
   if (EFI_ERROR (Status) ||\r
-      MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM) {\r
+      (MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM))\r
+  {\r
     DEBUG ((DEBUG_INFO, "BHYVE GOP: No frame-buffer bar\n"));\r
   } else {\r
-    DEBUG ((DEBUG_INFO, "BHYVE GOP: Using frame-buffer bar @ 0x%lx\n",\r
-            MmioDesc->AddrRangeMin));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "BHYVE GOP: Using frame-buffer bar @ 0x%lx\n",\r
+      MmioDesc->AddrRangeMin\r
+      ));\r
     Private->FbAddr = MmioDesc->AddrRangeMin;\r
     // XXX assert BAR is >= size\r
   }\r
@@ -262,12 +270,17 @@ EmuGopDriverBindingStart (
   if (MmioDesc != NULL) {\r
     FreePool (MmioDesc);\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO, "BHYVE GOP: Framebuf addr 0x%lx, size %x\n",\r
-         Private->FbAddr, Private->FbSize));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "BHYVE GOP: Framebuf addr 0x%lx, size %x\n",\r
+    Private->FbAddr,\r
+    Private->FbSize\r
+    ));\r
 \r
   Status = EmuGopConstructor (Private);\r
   if (EFI_ERROR (Status)) {\r
@@ -279,18 +292,19 @@ EmuGopDriverBindingStart (
   //\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Private->Handle,\r
-                  &gEfiGraphicsOutputProtocolGuid,    &Private->GraphicsOutput,\r
+                  &gEfiGraphicsOutputProtocolGuid,\r
+                  &Private->GraphicsOutput,\r
                   NULL\r
                   );\r
 \r
-  DEBUG((DEBUG_INFO, "BHYVE framebuffer device started\n"));\r
+  DEBUG ((DEBUG_INFO, "BHYVE framebuffer device started\n"));\r
 \r
   //\r
   // Install int10 handler\r
   //\r
-#ifndef CSM_ENABLE\r
+ #ifndef CSM_ENABLE\r
   InstallVbeShim (L"Framebuffer", Private->FbAddr);\r
-#endif\r
+ #endif\r
 \r
 Done:\r
   if (EFI_ERROR (Status)) {\r
@@ -309,8 +323,6 @@ Done:
   return Status;\r
 }\r
 \r
-\r
-\r
 /**\r
   Stops a device controller or a bus controller.\r
 \r
@@ -346,11 +358,11 @@ EmuGopDriverBindingStop (
   IN  EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput;\r
-  EFI_STATUS                   Status;\r
-  GOP_PRIVATE_DATA             *Private;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *GraphicsOutput;\r
+  EFI_STATUS                    Status;\r
+  GOP_PRIVATE_DATA              *Private;\r
 \r
-  DEBUG((DEBUG_INFO, "BHYVE framebuffer device stopping\n"));\r
+  DEBUG ((DEBUG_INFO, "BHYVE framebuffer device stopping\n"));\r
 \r
   Status = gBS->OpenProtocol (\r
                   Handle,\r
@@ -377,7 +389,8 @@ EmuGopDriverBindingStop (
   //\r
   Status = gBS->UninstallMultipleProtocolInterfaces (\r
                   Private->Handle,\r
-                  &gEfiGraphicsOutputProtocolGuid,    &Private->GraphicsOutput,\r
+                  &gEfiGraphicsOutputProtocolGuid,\r
+                  &Private->GraphicsOutput,\r
                   NULL\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
@@ -390,11 +403,11 @@ EmuGopDriverBindingStop (
     }\r
 \r
     gBS->CloseProtocol (\r
-          Handle,\r
-          &gEfiPciIoProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Private->Handle\r
-          );\r
+           Handle,\r
+           &gEfiPciIoProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Private->Handle\r
+           );\r
 \r
     //\r
     // Free our instance data\r
@@ -402,18 +415,16 @@ EmuGopDriverBindingStop (
     FreeUnicodeStringTable (Private->ControllerNameTable);\r
 \r
     gBS->FreePool (Private);\r
-\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 ///\r
 /// This protocol provides the services required to determine if a driver supports a given controller.\r
 /// If a controller is supported, then it also provides routines to start and stop the controller.\r
 ///\r
-EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gEmuGopDriverBinding = {\r
   EmuGopDriverBindingSupported,\r
   EmuGopDriverBindingStart,\r
   EmuGopDriverBindingStop,\r
@@ -422,8 +433,6 @@ EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding = {
   NULL\r
 };\r
 \r
-\r
-\r
 /**\r
   The user Entry Point for module EmuGop. The user code starts with this function.\r
 \r
@@ -437,11 +446,11 @@ EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding = {
 EFI_STATUS\r
 EFIAPI\r
 InitializeEmuGop (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = EfiLibInstallDriverBindingComponentName2 (\r
              ImageHandle,\r
@@ -453,33 +462,31 @@ InitializeEmuGop (
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-\r
   return Status;\r
 }\r
 \r
 STATIC VOID\r
 BhyveGetGraphicsMode (\r
-  EFI_PCI_IO_PROTOCOL *PciIo,\r
-  UINT16              *Width,\r
-  UINT16              *Height,\r
-  UINT16              *Depth\r
+  EFI_PCI_IO_PROTOCOL  *PciIo,\r
+  UINT16               *Width,\r
+  UINT16               *Height,\r
+  UINT16               *Depth\r
   )\r
 {\r
-  BHYVE_FBUF_MEMREGS BhyveRegs;\r
-  UINT64       Offset;\r
-  EFI_STATUS   Status;\r
-\r
+  BHYVE_FBUF_MEMREGS  BhyveRegs;\r
+  UINT64              Offset;\r
+  EFI_STATUS          Status;\r
 \r
   Offset = (UINT64)&BhyveRegs.Width - (UINT64)&BhyveRegs;\r
 \r
   Status = PciIo->Mem.Read (\r
-      PciIo,\r
-      EfiPciIoWidthUint16,\r
-      PCI_BAR_IDX0,\r
-      Offset,\r
-      3,\r
-      &BhyveRegs.Width\r
-      );\r
+                        PciIo,\r
+                        EfiPciIoWidthUint16,\r
+                        PCI_BAR_IDX0,\r
+                        Offset,\r
+                        3,\r
+                        &BhyveRegs.Width\r
+                        );\r
 \r
   *Width  = BhyveRegs.Width;\r
   *Height = BhyveRegs.Height;\r
@@ -493,51 +500,56 @@ BhyveGetGraphicsMode (
 VOID\r
 BhyveSetGraphicsMode (\r
   GOP_PRIVATE_DATA  *Private,\r
-  UINT16             Width,\r
-  UINT16             Height,\r
-  UINT16             Depth\r
+  UINT16            Width,\r
+  UINT16            Height,\r
+  UINT16            Depth\r
   )\r
 {\r
-  BHYVE_FBUF_MEMREGS BhyveRegs;\r
-  UINT64       Offset;\r
-  EFI_STATUS   Status;\r
+  BHYVE_FBUF_MEMREGS  BhyveRegs;\r
+  UINT64              Offset;\r
+  EFI_STATUS          Status;\r
 \r
   DEBUG ((DEBUG_INFO, "BHYVE Set Graphics Mode: w %d, h %d\n", Width, Height));\r
 \r
   BhyveRegs.Width  = Width;\r
   BhyveRegs.Height = Height;\r
   BhyveRegs.Depth  = Depth;\r
-  Offset = (UINT64)&BhyveRegs.Width - (UINT64)&BhyveRegs;\r
+  Offset           = (UINT64)&BhyveRegs.Width - (UINT64)&BhyveRegs;\r
 \r
   Status = Private->PciIo->Mem.Write (\r
-      Private->PciIo,\r
-      EfiPciIoWidthUint16,\r
-      PCI_BAR_IDX0,\r
-      Offset,\r
-      3,\r
-      &BhyveRegs.Width\r
-      );\r
+                                 Private->PciIo,\r
+                                 EfiPciIoWidthUint16,\r
+                                 PCI_BAR_IDX0,\r
+                                 Offset,\r
+                                 3,\r
+                                 &BhyveRegs.Width\r
+                                 );\r
   ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
 VOID\r
 BhyveGetMemregs (\r
-  GOP_PRIVATE_DATA  *Private,\r
-  BHYVE_FBUF_MEMREGS *Memregs\r
+  GOP_PRIVATE_DATA    *Private,\r
+  BHYVE_FBUF_MEMREGS  *Memregs\r
   )\r
 {\r
-  EFI_STATUS   Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = Private->PciIo->Mem.Read (\r
-      Private->PciIo,\r
-      EfiPciIoWidthUint32,\r
-      PCI_BAR_IDX0,\r
-      0,\r
-      3,\r
-      Memregs\r
-      );\r
+                                 Private->PciIo,\r
+                                 EfiPciIoWidthUint32,\r
+                                 PCI_BAR_IDX0,\r
+                                 0,\r
+                                 3,\r
+                                 Memregs\r
+                                 );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  DEBUG ((DEBUG_INFO, "BHYVE Get Memregs, size %d width %d height %d\n",\r
-         Memregs->FbSize, Memregs->Width, Memregs->Height));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "BHYVE Get Memregs, size %d width %d height %d\n",\r
+    Memregs->FbSize,\r
+    Memregs->Width,\r
+    Memregs->Height\r
+    ));\r
 }\r
index 4eaf7001b49d00caca083298cd666127398078b8..2fcc1dd56acfe4dbd85f5596f553c9fbc9e4b980 100644 (file)
@@ -22,45 +22,48 @@ Abstract:
 #include "Gop.h"\r
 #include <Library/FrameBufferBltLib.h>\r
 \r
+EFI_EVENT  mGopScreenExitBootServicesEvent;\r
 \r
-EFI_EVENT               mGopScreenExitBootServicesEvent;\r
-\r
-GOP_MODE_DATA mGopModeData[] = {\r
-    { 0,     0,    32, 0 },    // Filled in with user-spec'd resolution\r
-    { 1024,  768,  32, 0 },\r
-    { 800,   600,  32, 0 },\r
-    { 640,   480,  32, 0 }\r
-    };\r
+GOP_MODE_DATA  mGopModeData[] = {\r
+  { 0,    0,   32, 0 },        // Filled in with user-spec'd resolution\r
+  { 1024, 768, 32, 0 },\r
+  { 800,  600, 32, 0 },\r
+  { 640,  480, 32, 0 }\r
+};\r
 \r
 STATIC\r
 VOID\r
 BhyveGopCompleteModeInfo (\r
-  IN  GOP_MODE_DATA  *ModeData,\r
+  IN  GOP_MODE_DATA                         *ModeData,\r
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info\r
   )\r
 {\r
   Info->Version = 0;\r
   if (ModeData->ColorDepth == 8) {\r
-    Info->PixelFormat = PixelBitMask;\r
-    Info->PixelInformation.RedMask = PIXEL_RED_MASK;\r
-    Info->PixelInformation.GreenMask = PIXEL_GREEN_MASK;\r
-    Info->PixelInformation.BlueMask = PIXEL_BLUE_MASK;\r
+    Info->PixelFormat                   = PixelBitMask;\r
+    Info->PixelInformation.RedMask      = PIXEL_RED_MASK;\r
+    Info->PixelInformation.GreenMask    = PIXEL_GREEN_MASK;\r
+    Info->PixelInformation.BlueMask     = PIXEL_BLUE_MASK;\r
     Info->PixelInformation.ReservedMask = 0;\r
   } else if (ModeData->ColorDepth == 24) {\r
-    Info->PixelFormat = PixelBitMask;\r
-    Info->PixelInformation.RedMask = PIXEL24_RED_MASK;\r
-    Info->PixelInformation.GreenMask = PIXEL24_GREEN_MASK;\r
-    Info->PixelInformation.BlueMask = PIXEL24_BLUE_MASK;\r
+    Info->PixelFormat                   = PixelBitMask;\r
+    Info->PixelInformation.RedMask      = PIXEL24_RED_MASK;\r
+    Info->PixelInformation.GreenMask    = PIXEL24_GREEN_MASK;\r
+    Info->PixelInformation.BlueMask     = PIXEL24_BLUE_MASK;\r
     Info->PixelInformation.ReservedMask = 0;\r
   } else if (ModeData->ColorDepth == 32) {\r
-    DEBUG ((DEBUG_INFO, "%dx%d PixelBlueGreenRedReserved8BitPerColor\n",\r
-     ModeData->HorizontalResolution, ModeData->VerticalResolution));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%dx%d PixelBlueGreenRedReserved8BitPerColor\n",\r
+      ModeData->HorizontalResolution,\r
+      ModeData->VerticalResolution\r
+      ));\r
     Info->PixelFormat = PixelBlueGreenRedReserved8BitPerColor;\r
   }\r
+\r
   Info->PixelsPerScanLine = Info->HorizontalResolution;\r
 }\r
 \r
-\r
 /**\r
   Returns information for an available graphics mode that the graphics device\r
   and the set of active video output devices supports.\r
@@ -91,7 +94,7 @@ EmuGopQuerytMode (
 \r
   Private = GOP_PRIVATE_DATA_FROM_THIS (This);\r
 \r
-  if (Info == NULL || SizeOfInfo == NULL || (UINTN) ModeNumber >= This->Mode->MaxMode) {\r
+  if ((Info == NULL) || (SizeOfInfo == NULL) || ((UINTN)ModeNumber >= This->Mode->MaxMode)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -102,18 +105,16 @@ EmuGopQuerytMode (
 \r
   *SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
 \r
-  ModeData = &Private->ModeData[ModeNumber];\r
-  (*Info)->Version = 0;\r
+  ModeData                      = &Private->ModeData[ModeNumber];\r
+  (*Info)->Version              = 0;\r
   (*Info)->HorizontalResolution = ModeData->HorizontalResolution;\r
   (*Info)->VerticalResolution   = ModeData->VerticalResolution;\r
-  (*Info)->PixelFormat = PixelBitMask;\r
-  (*Info)->PixelsPerScanLine = (*Info)->HorizontalResolution;\r
-  BhyveGopCompleteModeInfo(ModeData, *Info);\r
+  (*Info)->PixelFormat          = PixelBitMask;\r
+  (*Info)->PixelsPerScanLine    = (*Info)->HorizontalResolution;\r
+  BhyveGopCompleteModeInfo (ModeData, *Info);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-\r
 /**\r
   Set the video device into the specified mode and clears the visible portions of\r
   the output display to black.\r
@@ -127,7 +128,7 @@ EmuGopQuerytMode (
 \r
 **/\r
 \r
-FRAME_BUFFER_CONFIGURE *fbconf;\r
+FRAME_BUFFER_CONFIGURE  *fbconf;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -136,37 +137,38 @@ EmuGopSetMode (
   IN  UINT32                        ModeNumber\r
   )\r
 {\r
-  GOP_PRIVATE_DATA                *Private;\r
-  GOP_MODE_DATA                   *ModeData;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL   Fill;\r
+  GOP_PRIVATE_DATA                      *Private;\r
+  GOP_MODE_DATA                         *ModeData;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL         Fill;\r
   EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info;\r
 \r
-  UINTN confsize = 0;\r
+  UINTN  confsize = 0;\r
+\r
   fbconf = NULL;\r
 \r
   Private = GOP_PRIVATE_DATA_FROM_THIS (This);\r
 \r
   if (ModeNumber >= This->Mode->MaxMode) {\r
     // Tell bhyve that we are switching out of vesa\r
-    BhyveSetGraphicsMode(Private, 0, 0, 0);\r
+    BhyveSetGraphicsMode (Private, 0, 0, 0);\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   DEBUG ((DEBUG_INFO, "BHYVE GopSetMode %d\n", ModeNumber));\r
 \r
-  ModeData = &Private->ModeData[ModeNumber];\r
-  This->Mode->Mode = ModeNumber;\r
+  ModeData                                                 = &Private->ModeData[ModeNumber];\r
+  This->Mode->Mode                                         = ModeNumber;\r
   Private->GraphicsOutput.Mode->Info->HorizontalResolution = ModeData->HorizontalResolution;\r
-  Private->GraphicsOutput.Mode->Info->VerticalResolution = ModeData->VerticalResolution;\r
-  Private->GraphicsOutput.Mode->Info->PixelsPerScanLine = ModeData->HorizontalResolution;\r
+  Private->GraphicsOutput.Mode->Info->VerticalResolution   = ModeData->VerticalResolution;\r
+  Private->GraphicsOutput.Mode->Info->PixelsPerScanLine    = ModeData->HorizontalResolution;\r
 \r
   Info = This->Mode->Info;\r
-  BhyveGopCompleteModeInfo(ModeData, Info);\r
+  BhyveGopCompleteModeInfo (ModeData, Info);\r
 \r
   This->Mode->Info->HorizontalResolution = ModeData->HorizontalResolution;\r
-  This->Mode->Info->VerticalResolution = ModeData->VerticalResolution;\r
-  This->Mode->SizeOfInfo = sizeof(EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-  This->Mode->FrameBufferBase = Private->GraphicsOutput.Mode->FrameBufferBase;\r
+  This->Mode->Info->VerticalResolution   = ModeData->VerticalResolution;\r
+  This->Mode->SizeOfInfo                 = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
+  This->Mode->FrameBufferBase            = Private->GraphicsOutput.Mode->FrameBufferBase;\r
 \r
   /*\r
   This->Mode->FrameBufferSize = Info->HorizontalResolution * Info->VerticalResolution\r
@@ -175,18 +177,24 @@ EmuGopSetMode (
   This->Mode->FrameBufferSize = Private->FbSize;\r
   DEBUG ((DEBUG_INFO, "BHYVE GOP FrameBufferBase: 0x%x, FrameBufferSize: 0x%x\n", This->Mode->FrameBufferBase, This->Mode->FrameBufferSize));\r
 \r
-  BhyveSetGraphicsMode(Private, (UINT16)ModeData->HorizontalResolution, (UINT16)ModeData->VerticalResolution, (UINT16)ModeData->ColorDepth);\r
-\r
-  RETURN_STATUS ret = FrameBufferBltConfigure (\r
-    (VOID*)(UINTN) This->Mode->FrameBufferBase,\r
-    This->Mode->Info, fbconf, &confsize\r
-    );\r
-  if (ret == EFI_BUFFER_TOO_SMALL || ret == EFI_INVALID_PARAMETER) {\r
-          fbconf = AllocatePool(confsize);\r
-          ret = FrameBufferBltConfigure(\r
-                         (VOID*)(UINTN)This->Mode->FrameBufferBase,\r
-                         This->Mode->Info, fbconf, &confsize);\r
-          ASSERT(ret == EFI_SUCCESS);\r
+  BhyveSetGraphicsMode (Private, (UINT16)ModeData->HorizontalResolution, (UINT16)ModeData->VerticalResolution, (UINT16)ModeData->ColorDepth);\r
+\r
+  RETURN_STATUS  ret = FrameBufferBltConfigure (\r
+                         (VOID *)(UINTN)This->Mode->FrameBufferBase,\r
+                         This->Mode->Info,\r
+                         fbconf,\r
+                         &confsize\r
+                         );\r
+\r
+  if ((ret == EFI_BUFFER_TOO_SMALL) || (ret == EFI_INVALID_PARAMETER)) {\r
+    fbconf = AllocatePool (confsize);\r
+    ret    = FrameBufferBltConfigure (\r
+               (VOID *)(UINTN)This->Mode->FrameBufferBase,\r
+               This->Mode->Info,\r
+               fbconf,\r
+               &confsize\r
+               );\r
+    ASSERT (ret == EFI_SUCCESS);\r
   }\r
 \r
   Fill.Red   = 0;\r
@@ -207,8 +215,6 @@ EmuGopSetMode (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-\r
 /**\r
   Blt a rectangle of pixels on the graphics screen. Blt stands for BLock Transfer.\r
 \r
@@ -232,26 +238,26 @@ EmuGopSetMode (
 EFI_STATUS\r
 EFIAPI\r
 EmuGopBlt (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL            *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL           *BltBuffer    OPTIONAL,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION       BltOperation,\r
-  IN  UINTN                                   SourceX,\r
-  IN  UINTN                                   SourceY,\r
-  IN  UINTN                                   DestinationX,\r
-  IN  UINTN                                   DestinationY,\r
-  IN  UINTN                                   Width,\r
-  IN  UINTN                                   Height,\r
-  IN  UINTN                                   Delta         OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer    OPTIONAL,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,\r
+  IN  UINTN                              SourceX,\r
+  IN  UINTN                              SourceY,\r
+  IN  UINTN                              DestinationX,\r
+  IN  UINTN                              DestinationY,\r
+  IN  UINTN                              Width,\r
+  IN  UINTN                              Height,\r
+  IN  UINTN                              Delta         OPTIONAL\r
   )\r
 {\r
-  EFI_TPL           OriginalTPL;\r
-  EFI_STATUS        Status;\r
+  EFI_TPL     OriginalTPL;\r
+  EFI_STATUS  Status;\r
 \r
   if ((UINT32)BltOperation >= EfiGraphicsOutputBltOperationMax) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (Width == 0 || Height == 0) {\r
+  if ((Width == 0) || (Height == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -263,27 +269,27 @@ EmuGopBlt (
   OriginalTPL = gBS->RaiseTPL (TPL_NOTIFY);\r
 \r
   switch (BltOperation) {\r
-  case EfiBltVideoToBltBuffer:\r
-  case EfiBltBufferToVideo:\r
-  case EfiBltVideoFill:\r
-  case EfiBltVideoToVideo:\r
-    Status = FrameBufferBlt (\r
-     fbconf,\r
-      BltBuffer,\r
-      BltOperation,\r
-      SourceX,\r
-      SourceY,\r
-      DestinationX,\r
-      DestinationY,\r
-      Width,\r
-      Height,\r
-      Delta\r
-      );\r
-    break;\r
-\r
-  default:\r
-    Status = EFI_INVALID_PARAMETER;\r
-    ASSERT (FALSE);\r
+    case EfiBltVideoToBltBuffer:\r
+    case EfiBltBufferToVideo:\r
+    case EfiBltVideoFill:\r
+    case EfiBltVideoToVideo:\r
+      Status = FrameBufferBlt (\r
+                 fbconf,\r
+                 BltBuffer,\r
+                 BltOperation,\r
+                 SourceX,\r
+                 SourceY,\r
+                 DestinationX,\r
+                 DestinationY,\r
+                 Width,\r
+                 Height,\r
+                 Delta\r
+                 );\r
+      break;\r
+\r
+    default:\r
+      Status = EFI_INVALID_PARAMETER;\r
+      ASSERT (FALSE);\r
   }\r
 \r
   gBS->RestoreTPL (OriginalTPL);\r
@@ -291,25 +297,24 @@ EmuGopBlt (
   return Status;\r
 }\r
 \r
-\r
 //\r
 // Construction and Destruction functions\r
 //\r
 \r
 EFI_STATUS\r
 EmuGopConstructor (\r
-  GOP_PRIVATE_DATA    *Private\r
+  GOP_PRIVATE_DATA  *Private\r
   )\r
 {\r
   // Set mode 0 to be the requested resolution\r
-  mGopModeData[0].HorizontalResolution = PcdGet32 ( PcdVideoHorizontalResolution);\r
-  mGopModeData[0].VerticalResolution = PcdGet32 ( PcdVideoVerticalResolution );\r
+  mGopModeData[0].HorizontalResolution = PcdGet32 (PcdVideoHorizontalResolution);\r
+  mGopModeData[0].VerticalResolution   = PcdGet32 (PcdVideoVerticalResolution);\r
 \r
   Private->ModeData = mGopModeData;\r
 \r
-  Private->GraphicsOutput.QueryMode      = EmuGopQuerytMode;\r
-  Private->GraphicsOutput.SetMode        = EmuGopSetMode;\r
-  Private->GraphicsOutput.Blt            = EmuGopBlt;\r
+  Private->GraphicsOutput.QueryMode = EmuGopQuerytMode;\r
+  Private->GraphicsOutput.SetMode   = EmuGopSetMode;\r
+  Private->GraphicsOutput.Blt       = EmuGopBlt;\r
 \r
   //\r
   // Allocate buffer for Graphics Output Protocol mode information\r
@@ -318,35 +323,33 @@ EmuGopConstructor (
   if (Private->GraphicsOutput.Mode == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   Private->GraphicsOutput.Mode->Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
   if (Private->GraphicsOutput.Mode->Info == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-\r
   DEBUG ((DEBUG_INFO, "BHYVE Gop Constructor\n"));\r
 \r
-  Private->GraphicsOutput.Mode->MaxMode = sizeof(mGopModeData) / sizeof(GOP_MODE_DATA);\r
+  Private->GraphicsOutput.Mode->MaxMode = sizeof (mGopModeData) / sizeof (GOP_MODE_DATA);\r
   //\r
   // Till now, we have no idea about the window size.\r
   //\r
-  Private->GraphicsOutput.Mode->Mode = GRAPHICS_OUTPUT_INVALID_MODE_NUMBER;\r
-  Private->GraphicsOutput.Mode->Info->Version = 0;\r
+  Private->GraphicsOutput.Mode->Mode                       = GRAPHICS_OUTPUT_INVALID_MODE_NUMBER;\r
+  Private->GraphicsOutput.Mode->Info->Version              = 0;\r
   Private->GraphicsOutput.Mode->Info->HorizontalResolution = 0;\r
-  Private->GraphicsOutput.Mode->Info->VerticalResolution = 0;\r
-  Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBitMask;\r
-  Private->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-  Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) Private->FbAddr;\r
-  Private->GraphicsOutput.Mode->FrameBufferSize = Private->FbSize;\r
+  Private->GraphicsOutput.Mode->Info->VerticalResolution   = 0;\r
+  Private->GraphicsOutput.Mode->Info->PixelFormat          = PixelBitMask;\r
+  Private->GraphicsOutput.Mode->SizeOfInfo                 = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
+  Private->GraphicsOutput.Mode->FrameBufferBase            = (EFI_PHYSICAL_ADDRESS)Private->FbAddr;\r
+  Private->GraphicsOutput.Mode->FrameBufferSize            = Private->FbSize;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-\r
 EFI_STATUS\r
 EmuGopDestructor (\r
-  GOP_PRIVATE_DATA     *Private\r
+  GOP_PRIVATE_DATA  *Private\r
   )\r
 {\r
   //\r
@@ -356,6 +359,7 @@ EmuGopDestructor (
     if (Private->GraphicsOutput.Mode->Info != NULL) {\r
       FreePool (Private->GraphicsOutput.Mode->Info);\r
     }\r
+\r
     FreePool (Private->GraphicsOutput.Mode);\r
     Private->GraphicsOutput.Mode = NULL;\r
   }\r
@@ -363,13 +367,13 @@ EmuGopDestructor (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 VOID\r
 EFIAPI\r
 ShutdownGopEvent (\r
   IN EFI_EVENT  Event,\r
   IN VOID       *Context\r
   )\r
+\r
 /*++\r
 \r
 Routine Description:\r
index 740b96679421bbf0d0d22879976dbff0b6225e3b..41f0180001f989057ec481bd905ff55492c2133c 100644 (file)
@@ -28,8 +28,8 @@
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT16 Offset;\r
-  UINT16 Segment;\r
+  UINT16    Offset;\r
+  UINT16    Segment;\r
 } IVT_ENTRY;\r
 #pragma pack ()\r
 \r
@@ -37,52 +37,49 @@ typedef struct {
 // This string is displayed by Windows 2008 R2 SP1 in the Screen Resolution,\r
 // Advanced Settings dialog. It should be short.\r
 //\r
-STATIC CONST CHAR8 mProductRevision[] = "2.0";\r
+STATIC CONST CHAR8  mProductRevision[] = "2.0";\r
 \r
-#define NUM_VBE_MODES 3\r
-STATIC CONST UINT16 vbeModeIds[] = {\r
+#define NUM_VBE_MODES  3\r
+STATIC CONST UINT16  vbeModeIds[] = {\r
   0x13f,  // 640x480x32\r
   0x140,  // 800x600x32\r
   0x141   // 1024x768x32\r
 };\r
 \r
 // Modes can be toggled with bit-0\r
-#define VBE_MODE_ENABLED  0x00BB\r
-#define VBE_MODE_DISABLED 0x00BA\r
+#define VBE_MODE_ENABLED   0x00BB\r
+#define VBE_MODE_DISABLED  0x00BA\r
 \r
-STATIC VBE2_MODE_INFO vbeModes[] = {\r
+STATIC VBE2_MODE_INFO  vbeModes[] = {\r
   { // 0x13f 640x480x32\r
-\r
     // ModeAttr - BytesPerScanLine\r
-    VBE_MODE_DISABLED, 0x07, 0x00, 0x40, 0x40, 0xA000, 0x00, 0x0000, 640*4,\r
+    VBE_MODE_DISABLED, 0x07,   0x00, 0x40, 0x40, 0xA000, 0x00, 0x0000, 640*4,\r
     // Width, Height..., Vbe3\r
-    640, 480, 16, 8, 1, 32, 1, 0x06, 0, 0, 1,\r
+    640,               480,    16,   8,    1,    32,     1,    0x06,   0,     0,  1,\r
     // Masks\r
-    0x08, 0x10, 0x08, 0x08, 0x08, 0x00, 0x08, 0x18, 0x00,\r
+    0x08,              0x10,   0x08, 0x08, 0x08, 0x00,   0x08, 0x18,   0x00,\r
     // Framebuffer\r
-    0xdeadbeef, 0x0000, 0x0000\r
+    0xdeadbeef,        0x0000, 0x0000\r
   },\r
   { // 0x140 800x600x32\r
-\r
     // ModeAttr - BytesPerScanLine\r
-    VBE_MODE_DISABLED, 0x07, 0x00, 0x40, 0x40, 0xA000, 0x00, 0x0000, 800*4,\r
+    VBE_MODE_DISABLED, 0x07,   0x00, 0x40, 0x40, 0xA000, 0x00, 0x0000, 800*4,\r
     // Width, Height..., Vbe3\r
-    800, 600, 16, 8, 1, 32, 1, 0x06, 0, 0, 1,\r
+    800,               600,    16,   8,    1,    32,     1,    0x06,   0,     0,  1,\r
     // Masks\r
-    0x08, 0x10, 0x08, 0x08, 0x08, 0x00, 0x08, 0x18, 0x00,\r
+    0x08,              0x10,   0x08, 0x08, 0x08, 0x00,   0x08, 0x18,   0x00,\r
     // Framebuffer\r
-    0xdeadbeef, 0x0000, 0x0000\r
+    0xdeadbeef,        0x0000, 0x0000\r
   },\r
   { // 0x141 1024x768x32\r
-\r
     // ModeAttr - BytesPerScanLine\r
-    VBE_MODE_ENABLED, 0x07, 0x00, 0x40, 0x40, 0xA000, 0x00, 0x0000, 1024*4,\r
+    VBE_MODE_ENABLED,  0x07,   0x00, 0x40, 0x40, 0xA000, 0x00, 0x0000, 1024*4,\r
     // Width, Height..., Vbe3\r
-    1024, 768, 16, 8, 1, 32, 1, 0x06, 0, 0, 1,\r
+    1024,              768,    16,   8,    1,    32,     1,    0x06,   0,     0,  1,\r
     // Masks\r
-    0x08, 0x10, 0x08, 0x08, 0x08, 0x00, 0x08, 0x18, 0x00,\r
+    0x08,              0x10,   0x08, 0x08, 0x08, 0x00,   0x08, 0x18,   0x00,\r
     // Framebuffer\r
-    0xdeadbeef, 0x0000, 0x0000\r
+    0xdeadbeef,        0x0000, 0x0000\r
   }\r
 };\r
 \r
@@ -98,23 +95,23 @@ STATIC VBE2_MODE_INFO vbeModes[] = {
 **/\r
 VOID\r
 InstallVbeShim (\r
-  IN CONST CHAR16         *CardName,\r
-  IN EFI_PHYSICAL_ADDRESS FrameBufferBase\r
+  IN CONST CHAR16          *CardName,\r
+  IN EFI_PHYSICAL_ADDRESS  FrameBufferBase\r
   )\r
 {\r
-  EFI_PHYSICAL_ADDRESS Segment0, SegmentC, SegmentF;\r
-  UINTN                Segment0Pages;\r
-  IVT_ENTRY            *Int0x10;\r
-  EFI_STATUS           Status;\r
-  UINTN                Pam1Address;\r
-  UINT8                Pam1;\r
-  UINTN                SegmentCPages;\r
-  VBE_INFO             *VbeInfoFull;\r
-  VBE_INFO_BASE        *VbeInfo;\r
-  UINT8                *Ptr;\r
-  UINTN                Printed;\r
-  VBE_MODE_INFO        *VbeModeInfo;\r
-  UINTN                i;\r
+  EFI_PHYSICAL_ADDRESS  Segment0, SegmentC, SegmentF;\r
+  UINTN                 Segment0Pages;\r
+  IVT_ENTRY             *Int0x10;\r
+  EFI_STATUS            Status;\r
+  UINTN                 Pam1Address;\r
+  UINT8                 Pam1;\r
+  UINTN                 SegmentCPages;\r
+  VBE_INFO              *VbeInfoFull;\r
+  VBE_INFO_BASE         *VbeInfo;\r
+  UINT8                 *Ptr;\r
+  UINTN                 Printed;\r
+  VBE_MODE_INFO         *VbeModeInfo;\r
+  UINTN                 i;\r
 \r
   Segment0 = 0x00000;\r
   SegmentC = 0xC0000;\r
@@ -130,11 +127,15 @@ InstallVbeShim (
   //\r
   Segment0Pages = 1;\r
   Int0x10       = (IVT_ENTRY *)(UINTN)Segment0 + 0x10;\r
-  Status = gBS->AllocatePages (AllocateAddress, EfiBootServicesCode,\r
-                  Segment0Pages, &Segment0);\r
+  Status        = gBS->AllocatePages (\r
+                         AllocateAddress,\r
+                         EfiBootServicesCode,\r
+                         Segment0Pages,\r
+                         &Segment0\r
+                         );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    EFI_PHYSICAL_ADDRESS Handler;\r
+    EFI_PHYSICAL_ADDRESS  Handler;\r
 \r
     //\r
     // Check if a video BIOS handler has been installed previously -- we\r
@@ -142,9 +143,14 @@ InstallVbeShim (
     // it's already present.\r
     //\r
     Handler = (Int0x10->Segment << 4) + Int0x10->Offset;\r
-    if (Handler >= SegmentC && Handler < SegmentF) {\r
-      DEBUG ((DEBUG_VERBOSE, "%a: Video BIOS handler found at %04x:%04x\n",\r
-        __FUNCTION__, Int0x10->Segment, Int0x10->Offset));\r
+    if ((Handler >= SegmentC) && (Handler < SegmentF)) {\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: Video BIOS handler found at %04x:%04x\n",\r
+        __FUNCTION__,\r
+        Int0x10->Segment,\r
+        Int0x10->Offset\r
+        ));\r
       return;\r
     }\r
 \r
@@ -152,8 +158,12 @@ InstallVbeShim (
     // Otherwise we'll overwrite the Int10h vector, even though we may not own\r
     // the page at zero.\r
     //\r
-    DEBUG ((DEBUG_VERBOSE, "%a: failed to allocate page at zero: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "%a: failed to allocate page at zero: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
   } else {\r
     //\r
     // We managed to allocate the page at zero. SVN r14218 guarantees that it\r
@@ -203,14 +213,15 @@ InstallVbeShim (
   VbeInfo->Capabilities = BIT1 | BIT0; // DAC can be switched into 8-bit mode\r
 \r
   VbeInfo->ModeListAddress = (UINT32)SegmentC << 12 | (UINT16)((UINTN)Ptr-SegmentC);\r
-  for (i = 0; i < NUM_VBE_MODES; i ++) {\r
-     *(UINT16*)Ptr = vbeModeIds[i];  // mode number\r
-     Ptr += 2;\r
+  for (i = 0; i < NUM_VBE_MODES; i++) {\r
+    *(UINT16 *)Ptr = vbeModeIds[i];  // mode number\r
+    Ptr           += 2;\r
   }\r
-  *(UINT16*)Ptr = 0xFFFF; // mode list terminator\r
-  Ptr += 2;\r
 \r
-  VbeInfo->VideoMem64K = (UINT16)((1024 * 768 * 4 + 65535) / 65536);\r
+  *(UINT16 *)Ptr = 0xFFFF; // mode list terminator\r
+  Ptr           += 2;\r
+\r
+  VbeInfo->VideoMem64K        = (UINT16)((1024 * 768 * 4 + 65535) / 65536);\r
   VbeInfo->OemSoftwareVersion = 0x0200;\r
 \r
   VbeInfo->VendorNameAddress = (UINT32)SegmentC << 12 | (UINT16)((UINTN)Ptr-SegmentC);\r
@@ -218,9 +229,12 @@ InstallVbeShim (
   Ptr += 5;\r
 \r
   VbeInfo->ProductNameAddress = (UINT32)SegmentC << 12 | (UINT16)((UINTN)Ptr-SegmentC);\r
-  Printed = AsciiSPrint ((CHAR8 *)Ptr,\r
-              sizeof VbeInfoFull->Buffer - (Ptr - VbeInfoFull->Buffer), "%s",\r
-              CardName);\r
+  Printed                     = AsciiSPrint (\r
+                                  (CHAR8 *)Ptr,\r
+                                  sizeof VbeInfoFull->Buffer - (Ptr - VbeInfoFull->Buffer),\r
+                                  "%s",\r
+                                  CardName\r
+                                  );\r
   Ptr += Printed + 1;\r
 \r
   VbeInfo->ProductRevAddress = (UINT32)SegmentC << 12 | (UINT16)((UINTN)Ptr-SegmentC);\r
@@ -234,7 +248,7 @@ InstallVbeShim (
   // Fill in the VBE MODE INFO structure list\r
   //\r
   VbeModeInfo = (VBE_MODE_INFO *)(VbeInfoFull + 1);\r
-  Ptr = (UINT8 *)VbeModeInfo;\r
+  Ptr         = (UINT8 *)VbeModeInfo;\r
   for (i = 0; i < NUM_VBE_MODES; i++) {\r
     vbeModes[i].LfbAddress = (UINT32)FrameBufferBase;\r
     CopyMem (Ptr, &vbeModes[i], 0x32);\r
@@ -251,9 +265,14 @@ InstallVbeShim (
   //\r
   // Second, point the Int10h vector at the shim.\r
   //\r
-  Int0x10->Segment = (UINT16) ((UINT32)SegmentC >> 4);\r
-  Int0x10->Offset  = (UINT16) ((UINTN) (VbeModeInfo + 1) - SegmentC);\r
-\r
-  DEBUG ((DEBUG_INFO, "%a: VBE shim installed to %x:%x\n",\r
-         __FUNCTION__, Int0x10->Segment, Int0x10->Offset));\r
+  Int0x10->Segment = (UINT16)((UINT32)SegmentC >> 4);\r
+  Int0x10->Offset  = (UINT16)((UINTN)(VbeModeInfo + 1) - SegmentC);\r
+\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: VBE shim installed to %x:%x\n",\r
+    __FUNCTION__,\r
+    Int0x10->Segment,\r
+    Int0x10->Offset\r
+    ));\r
 }\r
index 72b8a3f25f83dd8c301b41c5fac6cd7f0d9eb46c..4becb1afa1c8153b301a56061b5f28b92cf9cb3e 100644 (file)
 //\r
 // THIS FILE WAS GENERATED BY "VbeShim.sh". DO NOT EDIT.\r
 //\r
+\r
 #ifndef _VBE_SHIM_H_\r
 #define _VBE_SHIM_H_\r
-STATIC CONST UINT8 mVbeShim[] = {\r
-  /* 00000000 nop                            */  0x90,\r
-  /* 00000001 nop                            */  0x90,\r
-  /* 00000002 nop                            */  0x90,\r
-  /* 00000003 nop                            */  0x90,\r
-  /* 00000004 nop                            */  0x90,\r
-  /* 00000005 nop                            */  0x90,\r
-  /* 00000006 nop                            */  0x90,\r
-  /* 00000007 nop                            */  0x90,\r
-  /* 00000008 nop                            */  0x90,\r
-  /* 00000009 nop                            */  0x90,\r
-  /* 0000000A nop                            */  0x90,\r
-  /* 0000000B nop                            */  0x90,\r
-  /* 0000000C nop                            */  0x90,\r
-  /* 0000000D nop                            */  0x90,\r
-  /* 0000000E nop                            */  0x90,\r
-  /* 0000000F nop                            */  0x90,\r
-  /* 00000010 nop                            */  0x90,\r
-  /* 00000011 nop                            */  0x90,\r
-  /* 00000012 nop                            */  0x90,\r
-  /* 00000013 nop                            */  0x90,\r
-  /* 00000014 nop                            */  0x90,\r
-  /* 00000015 nop                            */  0x90,\r
-  /* 00000016 nop                            */  0x90,\r
-  /* 00000017 nop                            */  0x90,\r
-  /* 00000018 nop                            */  0x90,\r
-  /* 00000019 nop                            */  0x90,\r
-  /* 0000001A nop                            */  0x90,\r
-  /* 0000001B nop                            */  0x90,\r
-  /* 0000001C nop                            */  0x90,\r
-  /* 0000001D nop                            */  0x90,\r
-  /* 0000001E nop                            */  0x90,\r
-  /* 0000001F nop                            */  0x90,\r
-  /* 00000020 nop                            */  0x90,\r
-  /* 00000021 nop                            */  0x90,\r
-  /* 00000022 nop                            */  0x90,\r
-  /* 00000023 nop                            */  0x90,\r
-  /* 00000024 nop                            */  0x90,\r
-  /* 00000025 nop                            */  0x90,\r
-  /* 00000026 nop                            */  0x90,\r
-  /* 00000027 nop                            */  0x90,\r
-  /* 00000028 nop                            */  0x90,\r
-  /* 00000029 nop                            */  0x90,\r
-  /* 0000002A nop                            */  0x90,\r
-  /* 0000002B nop                            */  0x90,\r
-  /* 0000002C nop                            */  0x90,\r
-  /* 0000002D nop                            */  0x90,\r
-  /* 0000002E nop                            */  0x90,\r
-  /* 0000002F nop                            */  0x90,\r
-  /* 00000030 nop                            */  0x90,\r
-  /* 00000031 nop                            */  0x90,\r
-  /* 00000032 nop                            */  0x90,\r
-  /* 00000033 nop                            */  0x90,\r
-  /* 00000034 nop                            */  0x90,\r
-  /* 00000035 nop                            */  0x90,\r
-  /* 00000036 nop                            */  0x90,\r
-  /* 00000037 nop                            */  0x90,\r
-  /* 00000038 nop                            */  0x90,\r
-  /* 00000039 nop                            */  0x90,\r
-  /* 0000003A nop                            */  0x90,\r
-  /* 0000003B nop                            */  0x90,\r
-  /* 0000003C nop                            */  0x90,\r
-  /* 0000003D nop                            */  0x90,\r
-  /* 0000003E nop                            */  0x90,\r
-  /* 0000003F nop                            */  0x90,\r
-  /* 00000040 nop                            */  0x90,\r
-  /* 00000041 nop                            */  0x90,\r
-  /* 00000042 nop                            */  0x90,\r
-  /* 00000043 nop                            */  0x90,\r
-  /* 00000044 nop                            */  0x90,\r
-  /* 00000045 nop                            */  0x90,\r
-  /* 00000046 nop                            */  0x90,\r
-  /* 00000047 nop                            */  0x90,\r
-  /* 00000048 nop                            */  0x90,\r
-  /* 00000049 nop                            */  0x90,\r
-  /* 0000004A nop                            */  0x90,\r
-  /* 0000004B nop                            */  0x90,\r
-  /* 0000004C nop                            */  0x90,\r
-  /* 0000004D nop                            */  0x90,\r
-  /* 0000004E nop                            */  0x90,\r
-  /* 0000004F nop                            */  0x90,\r
-  /* 00000050 nop                            */  0x90,\r
-  /* 00000051 nop                            */  0x90,\r
-  /* 00000052 nop                            */  0x90,\r
-  /* 00000053 nop                            */  0x90,\r
-  /* 00000054 nop                            */  0x90,\r
-  /* 00000055 nop                            */  0x90,\r
-  /* 00000056 nop                            */  0x90,\r
-  /* 00000057 nop                            */  0x90,\r
-  /* 00000058 nop                            */  0x90,\r
-  /* 00000059 nop                            */  0x90,\r
-  /* 0000005A nop                            */  0x90,\r
-  /* 0000005B nop                            */  0x90,\r
-  /* 0000005C nop                            */  0x90,\r
-  /* 0000005D nop                            */  0x90,\r
-  /* 0000005E nop                            */  0x90,\r
-  /* 0000005F nop                            */  0x90,\r
-  /* 00000060 nop                            */  0x90,\r
-  /* 00000061 nop                            */  0x90,\r
-  /* 00000062 nop                            */  0x90,\r
-  /* 00000063 nop                            */  0x90,\r
-  /* 00000064 nop                            */  0x90,\r
-  /* 00000065 nop                            */  0x90,\r
-  /* 00000066 nop                            */  0x90,\r
-  /* 00000067 nop                            */  0x90,\r
-  /* 00000068 nop                            */  0x90,\r
-  /* 00000069 nop                            */  0x90,\r
-  /* 0000006A nop                            */  0x90,\r
-  /* 0000006B nop                            */  0x90,\r
-  /* 0000006C nop                            */  0x90,\r
-  /* 0000006D nop                            */  0x90,\r
-  /* 0000006E nop                            */  0x90,\r
-  /* 0000006F nop                            */  0x90,\r
-  /* 00000070 nop                            */  0x90,\r
-  /* 00000071 nop                            */  0x90,\r
-  /* 00000072 nop                            */  0x90,\r
-  /* 00000073 nop                            */  0x90,\r
-  /* 00000074 nop                            */  0x90,\r
-  /* 00000075 nop                            */  0x90,\r
-  /* 00000076 nop                            */  0x90,\r
-  /* 00000077 nop                            */  0x90,\r
-  /* 00000078 nop                            */  0x90,\r
-  /* 00000079 nop                            */  0x90,\r
-  /* 0000007A nop                            */  0x90,\r
-  /* 0000007B nop                            */  0x90,\r
-  /* 0000007C nop                            */  0x90,\r
-  /* 0000007D nop                            */  0x90,\r
-  /* 0000007E nop                            */  0x90,\r
-  /* 0000007F nop                            */  0x90,\r
-  /* 00000080 nop                            */  0x90,\r
-  /* 00000081 nop                            */  0x90,\r
-  /* 00000082 nop                            */  0x90,\r
-  /* 00000083 nop                            */  0x90,\r
-  /* 00000084 nop                            */  0x90,\r
-  /* 00000085 nop                            */  0x90,\r
-  /* 00000086 nop                            */  0x90,\r
-  /* 00000087 nop                            */  0x90,\r
-  /* 00000088 nop                            */  0x90,\r
-  /* 00000089 nop                            */  0x90,\r
-  /* 0000008A nop                            */  0x90,\r
-  /* 0000008B nop                            */  0x90,\r
-  /* 0000008C nop                            */  0x90,\r
-  /* 0000008D nop                            */  0x90,\r
-  /* 0000008E nop                            */  0x90,\r
-  /* 0000008F nop                            */  0x90,\r
-  /* 00000090 nop                            */  0x90,\r
-  /* 00000091 nop                            */  0x90,\r
-  /* 00000092 nop                            */  0x90,\r
-  /* 00000093 nop                            */  0x90,\r
-  /* 00000094 nop                            */  0x90,\r
-  /* 00000095 nop                            */  0x90,\r
-  /* 00000096 nop                            */  0x90,\r
-  /* 00000097 nop                            */  0x90,\r
-  /* 00000098 nop                            */  0x90,\r
-  /* 00000099 nop                            */  0x90,\r
-  /* 0000009A nop                            */  0x90,\r
-  /* 0000009B nop                            */  0x90,\r
-  /* 0000009C nop                            */  0x90,\r
-  /* 0000009D nop                            */  0x90,\r
-  /* 0000009E nop                            */  0x90,\r
-  /* 0000009F nop                            */  0x90,\r
-  /* 000000A0 nop                            */  0x90,\r
-  /* 000000A1 nop                            */  0x90,\r
-  /* 000000A2 nop                            */  0x90,\r
-  /* 000000A3 nop                            */  0x90,\r
-  /* 000000A4 nop                            */  0x90,\r
-  /* 000000A5 nop                            */  0x90,\r
-  /* 000000A6 nop                            */  0x90,\r
-  /* 000000A7 nop                            */  0x90,\r
-  /* 000000A8 nop                            */  0x90,\r
-  /* 000000A9 nop                            */  0x90,\r
-  /* 000000AA nop                            */  0x90,\r
-  /* 000000AB nop                            */  0x90,\r
-  /* 000000AC nop                            */  0x90,\r
-  /* 000000AD nop                            */  0x90,\r
-  /* 000000AE nop                            */  0x90,\r
-  /* 000000AF nop                            */  0x90,\r
-  /* 000000B0 nop                            */  0x90,\r
-  /* 000000B1 nop                            */  0x90,\r
-  /* 000000B2 nop                            */  0x90,\r
-  /* 000000B3 nop                            */  0x90,\r
-  /* 000000B4 nop                            */  0x90,\r
-  /* 000000B5 nop                            */  0x90,\r
-  /* 000000B6 nop                            */  0x90,\r
-  /* 000000B7 nop                            */  0x90,\r
-  /* 000000B8 nop                            */  0x90,\r
-  /* 000000B9 nop                            */  0x90,\r
-  /* 000000BA nop                            */  0x90,\r
-  /* 000000BB nop                            */  0x90,\r
-  /* 000000BC nop                            */  0x90,\r
-  /* 000000BD nop                            */  0x90,\r
-  /* 000000BE nop                            */  0x90,\r
-  /* 000000BF nop                            */  0x90,\r
-  /* 000000C0 nop                            */  0x90,\r
-  /* 000000C1 nop                            */  0x90,\r
-  /* 000000C2 nop                            */  0x90,\r
-  /* 000000C3 nop                            */  0x90,\r
-  /* 000000C4 nop                            */  0x90,\r
-  /* 000000C5 nop                            */  0x90,\r
-  /* 000000C6 nop                            */  0x90,\r
-  /* 000000C7 nop                            */  0x90,\r
-  /* 000000C8 nop                            */  0x90,\r
-  /* 000000C9 nop                            */  0x90,\r
-  /* 000000CA nop                            */  0x90,\r
-  /* 000000CB nop                            */  0x90,\r
-  /* 000000CC nop                            */  0x90,\r
-  /* 000000CD nop                            */  0x90,\r
-  /* 000000CE nop                            */  0x90,\r
-  /* 000000CF nop                            */  0x90,\r
-  /* 000000D0 nop                            */  0x90,\r
-  /* 000000D1 nop                            */  0x90,\r
-  /* 000000D2 nop                            */  0x90,\r
-  /* 000000D3 nop                            */  0x90,\r
-  /* 000000D4 nop                            */  0x90,\r
-  /* 000000D5 nop                            */  0x90,\r
-  /* 000000D6 nop                            */  0x90,\r
-  /* 000000D7 nop                            */  0x90,\r
-  /* 000000D8 nop                            */  0x90,\r
-  /* 000000D9 nop                            */  0x90,\r
-  /* 000000DA nop                            */  0x90,\r
-  /* 000000DB nop                            */  0x90,\r
-  /* 000000DC nop                            */  0x90,\r
-  /* 000000DD nop                            */  0x90,\r
-  /* 000000DE nop                            */  0x90,\r
-  /* 000000DF nop                            */  0x90,\r
-  /* 000000E0 nop                            */  0x90,\r
-  /* 000000E1 nop                            */  0x90,\r
-  /* 000000E2 nop                            */  0x90,\r
-  /* 000000E3 nop                            */  0x90,\r
-  /* 000000E4 nop                            */  0x90,\r
-  /* 000000E5 nop                            */  0x90,\r
-  /* 000000E6 nop                            */  0x90,\r
-  /* 000000E7 nop                            */  0x90,\r
-  /* 000000E8 nop                            */  0x90,\r
-  /* 000000E9 nop                            */  0x90,\r
-  /* 000000EA nop                            */  0x90,\r
-  /* 000000EB nop                            */  0x90,\r
-  /* 000000EC nop                            */  0x90,\r
-  /* 000000ED nop                            */  0x90,\r
-  /* 000000EE nop                            */  0x90,\r
-  /* 000000EF nop                            */  0x90,\r
-  /* 000000F0 nop                            */  0x90,\r
-  /* 000000F1 nop                            */  0x90,\r
-  /* 000000F2 nop                            */  0x90,\r
-  /* 000000F3 nop                            */  0x90,\r
-  /* 000000F4 nop                            */  0x90,\r
-  /* 000000F5 nop                            */  0x90,\r
-  /* 000000F6 nop                            */  0x90,\r
-  /* 000000F7 nop                            */  0x90,\r
-  /* 000000F8 nop                            */  0x90,\r
-  /* 000000F9 nop                            */  0x90,\r
-  /* 000000FA nop                            */  0x90,\r
-  /* 000000FB nop                            */  0x90,\r
-  /* 000000FC nop                            */  0x90,\r
-  /* 000000FD nop                            */  0x90,\r
-  /* 000000FE nop                            */  0x90,\r
-  /* 000000FF nop                            */  0x90,\r
-  /* 00000100 nop                            */  0x90,\r
-  /* 00000101 nop                            */  0x90,\r
-  /* 00000102 nop                            */  0x90,\r
-  /* 00000103 nop                            */  0x90,\r
-  /* 00000104 nop                            */  0x90,\r
-  /* 00000105 nop                            */  0x90,\r
-  /* 00000106 nop                            */  0x90,\r
-  /* 00000107 nop                            */  0x90,\r
-  /* 00000108 nop                            */  0x90,\r
-  /* 00000109 nop                            */  0x90,\r
-  /* 0000010A nop                            */  0x90,\r
-  /* 0000010B nop                            */  0x90,\r
-  /* 0000010C nop                            */  0x90,\r
-  /* 0000010D nop                            */  0x90,\r
-  /* 0000010E nop                            */  0x90,\r
-  /* 0000010F nop                            */  0x90,\r
-  /* 00000110 nop                            */  0x90,\r
-  /* 00000111 nop                            */  0x90,\r
-  /* 00000112 nop                            */  0x90,\r
-  /* 00000113 nop                            */  0x90,\r
-  /* 00000114 nop                            */  0x90,\r
-  /* 00000115 nop                            */  0x90,\r
-  /* 00000116 nop                            */  0x90,\r
-  /* 00000117 nop                            */  0x90,\r
-  /* 00000118 nop                            */  0x90,\r
-  /* 00000119 nop                            */  0x90,\r
-  /* 0000011A nop                            */  0x90,\r
-  /* 0000011B nop                            */  0x90,\r
-  /* 0000011C nop                            */  0x90,\r
-  /* 0000011D nop                            */  0x90,\r
-  /* 0000011E nop                            */  0x90,\r
-  /* 0000011F nop                            */  0x90,\r
-  /* 00000120 nop                            */  0x90,\r
-  /* 00000121 nop                            */  0x90,\r
-  /* 00000122 nop                            */  0x90,\r
-  /* 00000123 nop                            */  0x90,\r
-  /* 00000124 nop                            */  0x90,\r
-  /* 00000125 nop                            */  0x90,\r
-  /* 00000126 nop                            */  0x90,\r
-  /* 00000127 nop                            */  0x90,\r
-  /* 00000128 nop                            */  0x90,\r
-  /* 00000129 nop                            */  0x90,\r
-  /* 0000012A nop                            */  0x90,\r
-  /* 0000012B nop                            */  0x90,\r
-  /* 0000012C nop                            */  0x90,\r
-  /* 0000012D nop                            */  0x90,\r
-  /* 0000012E nop                            */  0x90,\r
-  /* 0000012F nop                            */  0x90,\r
-  /* 00000130 nop                            */  0x90,\r
-  /* 00000131 nop                            */  0x90,\r
-  /* 00000132 nop                            */  0x90,\r
-  /* 00000133 nop                            */  0x90,\r
-  /* 00000134 nop                            */  0x90,\r
-  /* 00000135 nop                            */  0x90,\r
-  /* 00000136 nop                            */  0x90,\r
-  /* 00000137 nop                            */  0x90,\r
-  /* 00000138 nop                            */  0x90,\r
-  /* 00000139 nop                            */  0x90,\r
-  /* 0000013A nop                            */  0x90,\r
-  /* 0000013B nop                            */  0x90,\r
-  /* 0000013C nop                            */  0x90,\r
-  /* 0000013D nop                            */  0x90,\r
-  /* 0000013E nop                            */  0x90,\r
-  /* 0000013F nop                            */  0x90,\r
-  /* 00000140 nop                            */  0x90,\r
-  /* 00000141 nop                            */  0x90,\r
-  /* 00000142 nop                            */  0x90,\r
-  /* 00000143 nop                            */  0x90,\r
-  /* 00000144 nop                            */  0x90,\r
-  /* 00000145 nop                            */  0x90,\r
-  /* 00000146 nop                            */  0x90,\r
-  /* 00000147 nop                            */  0x90,\r
-  /* 00000148 nop                            */  0x90,\r
-  /* 00000149 nop                            */  0x90,\r
-  /* 0000014A nop                            */  0x90,\r
-  /* 0000014B nop                            */  0x90,\r
-  /* 0000014C nop                            */  0x90,\r
-  /* 0000014D nop                            */  0x90,\r
-  /* 0000014E nop                            */  0x90,\r
-  /* 0000014F nop                            */  0x90,\r
-  /* 00000150 nop                            */  0x90,\r
-  /* 00000151 nop                            */  0x90,\r
-  /* 00000152 nop                            */  0x90,\r
-  /* 00000153 nop                            */  0x90,\r
-  /* 00000154 nop                            */  0x90,\r
-  /* 00000155 nop                            */  0x90,\r
-  /* 00000156 nop                            */  0x90,\r
-  /* 00000157 nop                            */  0x90,\r
-  /* 00000158 nop                            */  0x90,\r
-  /* 00000159 nop                            */  0x90,\r
-  /* 0000015A nop                            */  0x90,\r
-  /* 0000015B nop                            */  0x90,\r
-  /* 0000015C nop                            */  0x90,\r
-  /* 0000015D nop                            */  0x90,\r
-  /* 0000015E nop                            */  0x90,\r
-  /* 0000015F nop                            */  0x90,\r
-  /* 00000160 nop                            */  0x90,\r
-  /* 00000161 nop                            */  0x90,\r
-  /* 00000162 nop                            */  0x90,\r
-  /* 00000163 nop                            */  0x90,\r
-  /* 00000164 nop                            */  0x90,\r
-  /* 00000165 nop                            */  0x90,\r
-  /* 00000166 nop                            */  0x90,\r
-  /* 00000167 nop                            */  0x90,\r
-  /* 00000168 nop                            */  0x90,\r
-  /* 00000169 nop                            */  0x90,\r
-  /* 0000016A nop                            */  0x90,\r
-  /* 0000016B nop                            */  0x90,\r
-  /* 0000016C nop                            */  0x90,\r
-  /* 0000016D nop                            */  0x90,\r
-  /* 0000016E nop                            */  0x90,\r
-  /* 0000016F nop                            */  0x90,\r
-  /* 00000170 nop                            */  0x90,\r
-  /* 00000171 nop                            */  0x90,\r
-  /* 00000172 nop                            */  0x90,\r
-  /* 00000173 nop                            */  0x90,\r
-  /* 00000174 nop                            */  0x90,\r
-  /* 00000175 nop                            */  0x90,\r
-  /* 00000176 nop                            */  0x90,\r
-  /* 00000177 nop                            */  0x90,\r
-  /* 00000178 nop                            */  0x90,\r
-  /* 00000179 nop                            */  0x90,\r
-  /* 0000017A nop                            */  0x90,\r
-  /* 0000017B nop                            */  0x90,\r
-  /* 0000017C nop                            */  0x90,\r
-  /* 0000017D nop                            */  0x90,\r
-  /* 0000017E nop                            */  0x90,\r
-  /* 0000017F nop                            */  0x90,\r
-  /* 00000180 nop                            */  0x90,\r
-  /* 00000181 nop                            */  0x90,\r
-  /* 00000182 nop                            */  0x90,\r
-  /* 00000183 nop                            */  0x90,\r
-  /* 00000184 nop                            */  0x90,\r
-  /* 00000185 nop                            */  0x90,\r
-  /* 00000186 nop                            */  0x90,\r
-  /* 00000187 nop                            */  0x90,\r
-  /* 00000188 nop                            */  0x90,\r
-  /* 00000189 nop                            */  0x90,\r
-  /* 0000018A nop                            */  0x90,\r
-  /* 0000018B nop                            */  0x90,\r
-  /* 0000018C nop                            */  0x90,\r
-  /* 0000018D nop                            */  0x90,\r
-  /* 0000018E nop                            */  0x90,\r
-  /* 0000018F nop                            */  0x90,\r
-  /* 00000190 nop                            */  0x90,\r
-  /* 00000191 nop                            */  0x90,\r
-  /* 00000192 nop                            */  0x90,\r
-  /* 00000193 nop                            */  0x90,\r
-  /* 00000194 nop                            */  0x90,\r
-  /* 00000195 nop                            */  0x90,\r
-  /* 00000196 nop                            */  0x90,\r
-  /* 00000197 nop                            */  0x90,\r
-  /* 00000198 nop                            */  0x90,\r
-  /* 00000199 nop                            */  0x90,\r
-  /* 0000019A nop                            */  0x90,\r
-  /* 0000019B nop                            */  0x90,\r
-  /* 0000019C nop                            */  0x90,\r
-  /* 0000019D nop                            */  0x90,\r
-  /* 0000019E nop                            */  0x90,\r
-  /* 0000019F nop                            */  0x90,\r
-  /* 000001A0 nop                            */  0x90,\r
-  /* 000001A1 nop                            */  0x90,\r
-  /* 000001A2 nop                            */  0x90,\r
-  /* 000001A3 nop                            */  0x90,\r
-  /* 000001A4 nop                            */  0x90,\r
-  /* 000001A5 nop                            */  0x90,\r
-  /* 000001A6 nop                            */  0x90,\r
-  /* 000001A7 nop                            */  0x90,\r
-  /* 000001A8 nop                            */  0x90,\r
-  /* 000001A9 nop                            */  0x90,\r
-  /* 000001AA nop                            */  0x90,\r
-  /* 000001AB nop                            */  0x90,\r
-  /* 000001AC nop                            */  0x90,\r
-  /* 000001AD nop                            */  0x90,\r
-  /* 000001AE nop                            */  0x90,\r
-  /* 000001AF nop                            */  0x90,\r
-  /* 000001B0 nop                            */  0x90,\r
-  /* 000001B1 nop                            */  0x90,\r
-  /* 000001B2 nop                            */  0x90,\r
-  /* 000001B3 nop                            */  0x90,\r
-  /* 000001B4 nop                            */  0x90,\r
-  /* 000001B5 nop                            */  0x90,\r
-  /* 000001B6 nop                            */  0x90,\r
-  /* 000001B7 nop                            */  0x90,\r
-  /* 000001B8 nop                            */  0x90,\r
-  /* 000001B9 nop                            */  0x90,\r
-  /* 000001BA nop                            */  0x90,\r
-  /* 000001BB nop                            */  0x90,\r
-  /* 000001BC nop                            */  0x90,\r
-  /* 000001BD nop                            */  0x90,\r
-  /* 000001BE nop                            */  0x90,\r
-  /* 000001BF nop                            */  0x90,\r
-  /* 000001C0 nop                            */  0x90,\r
-  /* 000001C1 nop                            */  0x90,\r
-  /* 000001C2 nop                            */  0x90,\r
-  /* 000001C3 nop                            */  0x90,\r
-  /* 000001C4 nop                            */  0x90,\r
-  /* 000001C5 nop                            */  0x90,\r
-  /* 000001C6 nop                            */  0x90,\r
-  /* 000001C7 nop                            */  0x90,\r
-  /* 000001C8 nop                            */  0x90,\r
-  /* 000001C9 nop                            */  0x90,\r
-  /* 000001CA nop                            */  0x90,\r
-  /* 000001CB nop                            */  0x90,\r
-  /* 000001CC nop                            */  0x90,\r
-  /* 000001CD nop                            */  0x90,\r
-  /* 000001CE nop                            */  0x90,\r
-  /* 000001CF nop                            */  0x90,\r
-  /* 000001D0 nop                            */  0x90,\r
-  /* 000001D1 nop                            */  0x90,\r
-  /* 000001D2 nop                            */  0x90,\r
-  /* 000001D3 nop                            */  0x90,\r
-  /* 000001D4 nop                            */  0x90,\r
-  /* 000001D5 nop                            */  0x90,\r
-  /* 000001D6 nop                            */  0x90,\r
-  /* 000001D7 nop                            */  0x90,\r
-  /* 000001D8 nop                            */  0x90,\r
-  /* 000001D9 nop                            */  0x90,\r
-  /* 000001DA nop                            */  0x90,\r
-  /* 000001DB nop                            */  0x90,\r
-  /* 000001DC nop                            */  0x90,\r
-  /* 000001DD nop                            */  0x90,\r
-  /* 000001DE nop                            */  0x90,\r
-  /* 000001DF nop                            */  0x90,\r
-  /* 000001E0 nop                            */  0x90,\r
-  /* 000001E1 nop                            */  0x90,\r
-  /* 000001E2 nop                            */  0x90,\r
-  /* 000001E3 nop                            */  0x90,\r
-  /* 000001E4 nop                            */  0x90,\r
-  /* 000001E5 nop                            */  0x90,\r
-  /* 000001E6 nop                            */  0x90,\r
-  /* 000001E7 nop                            */  0x90,\r
-  /* 000001E8 nop                            */  0x90,\r
-  /* 000001E9 nop                            */  0x90,\r
-  /* 000001EA nop                            */  0x90,\r
-  /* 000001EB nop                            */  0x90,\r
-  /* 000001EC nop                            */  0x90,\r
-  /* 000001ED nop                            */  0x90,\r
-  /* 000001EE nop                            */  0x90,\r
-  /* 000001EF nop                            */  0x90,\r
-  /* 000001F0 nop                            */  0x90,\r
-  /* 000001F1 nop                            */  0x90,\r
-  /* 000001F2 nop                            */  0x90,\r
-  /* 000001F3 nop                            */  0x90,\r
-  /* 000001F4 nop                            */  0x90,\r
-  /* 000001F5 nop                            */  0x90,\r
-  /* 000001F6 nop                            */  0x90,\r
-  /* 000001F7 nop                            */  0x90,\r
-  /* 000001F8 nop                            */  0x90,\r
-  /* 000001F9 nop                            */  0x90,\r
-  /* 000001FA nop                            */  0x90,\r
-  /* 000001FB nop                            */  0x90,\r
-  /* 000001FC nop                            */  0x90,\r
-  /* 000001FD nop                            */  0x90,\r
-  /* 000001FE nop                            */  0x90,\r
-  /* 000001FF nop                            */  0x90,\r
-  /* 00000200 cmp ax,0x4f00                  */  0x3D, 0x00, 0x4F,\r
-  /* 00000203 jz 0x237                       */  0x74, 0x32,\r
-  /* 00000205 cmp ax,0x4f01                  */  0x3D, 0x01, 0x4F,\r
-  /* 00000208 jz 0x257                       */  0x74, 0x4D,\r
-  /* 0000020A cmp ax,0x4f02                  */  0x3D, 0x02, 0x4F,\r
-  /* 0000020D jz word 0x2c8                  */  0x0F, 0x84, 0xB7, 0x00,\r
-  /* 00000211 cmp ax,0x4f03                  */  0x3D, 0x03, 0x4F,\r
-  /* 00000214 jz word 0x325                  */  0x0F, 0x84, 0x0D, 0x01,\r
-  /* 00000218 cmp ax,0x4f10                  */  0x3D, 0x10, 0x4F,\r
-  /* 0000021B jz word 0x337                  */  0x0F, 0x84, 0x18, 0x01,\r
-  /* 0000021F cmp ax,0x4f15                  */  0x3D, 0x15, 0x4F,\r
-  /* 00000222 jz word 0x344                  */  0x0F, 0x84, 0x1E, 0x01,\r
-  /* 00000226 cmp ah,0x0                     */  0x80, 0xFC, 0x00,\r
-  /* 00000229 jz word 0x363                  */  0x0F, 0x84, 0x36, 0x01,\r
-  /* 0000022D push si                        */  0x56,\r
-  /* 0000022E mov si,0x3d7                   */  0xBE, 0xD7, 0x03,\r
-  /* 00000231 call word 0x3ad                */  0xE8, 0x79, 0x01,\r
-  /* 00000234 pop si                         */  0x5E,\r
-  /* 00000235 jmp short 0x235                */  0xEB, 0xFE,\r
-  /* 00000237 push es                        */  0x06,\r
-  /* 00000238 push di                        */  0x57,\r
-  /* 00000239 push ds                        */  0x1E,\r
-  /* 0000023A push si                        */  0x56,\r
-  /* 0000023B push cx                        */  0x51,\r
-  /* 0000023C push si                        */  0x56,\r
-  /* 0000023D mov si,0x3eb                   */  0xBE, 0xEB, 0x03,\r
-  /* 00000240 call word 0x3ad                */  0xE8, 0x6A, 0x01,\r
-  /* 00000243 pop si                         */  0x5E,\r
-  /* 00000244 push cs                        */  0x0E,\r
-  /* 00000245 pop ds                         */  0x1F,\r
-  /* 00000246 mov si,0x0                     */  0xBE, 0x00, 0x00,\r
-  /* 00000249 mov cx,0x100                   */  0xB9, 0x00, 0x01,\r
-  /* 0000024C cld                            */  0xFC,\r
-  /* 0000024D rep movsb                      */  0xF3, 0xA4,\r
-  /* 0000024F pop cx                         */  0x59,\r
-  /* 00000250 pop si                         */  0x5E,\r
-  /* 00000251 pop ds                         */  0x1F,\r
-  /* 00000252 pop di                         */  0x5F,\r
-  /* 00000253 pop es                         */  0x07,\r
-  /* 00000254 jmp word 0x395                 */  0xE9, 0x3E, 0x01,\r
-  /* 00000257 push es                        */  0x06,\r
-  /* 00000258 push di                        */  0x57,\r
-  /* 00000259 push ds                        */  0x1E,\r
-  /* 0000025A push si                        */  0x56,\r
-  /* 0000025B push cx                        */  0x51,\r
-  /* 0000025C push si                        */  0x56,\r
-  /* 0000025D mov si,0x3f6                   */  0xBE, 0xF6, 0x03,\r
-  /* 00000260 call word 0x3ad                */  0xE8, 0x4A, 0x01,\r
-  /* 00000263 pop si                         */  0x5E,\r
-  /* 00000264 and cx,0xbfff                  */  0x81, 0xE1, 0xFF, 0xBF,\r
-  /* 00000268 cmp cx,0x13f                   */  0x81, 0xF9, 0x3F, 0x01,\r
-  /* 0000026C jz 0x284                       */  0x74, 0x16,\r
-  /* 0000026E cmp cx,0x140                   */  0x81, 0xF9, 0x40, 0x01,\r
-  /* 00000272 jz 0x291                       */  0x74, 0x1D,\r
-  /* 00000274 cmp cx,0x141                   */  0x81, 0xF9, 0x41, 0x01,\r
-  /* 00000278 jz 0x29e                       */  0x74, 0x24,\r
-  /* 0000027A push si                        */  0x56,\r
-  /* 0000027B mov si,0x42c                   */  0xBE, 0x2C, 0x04,\r
-  /* 0000027E call word 0x3ad                */  0xE8, 0x2C, 0x01,\r
-  /* 00000281 pop si                         */  0x5E,\r
-  /* 00000282 jmp short 0x235                */  0xEB, 0xB1,\r
-  /* 00000284 push si                        */  0x56,\r
-  /* 00000285 mov si,0x46b                   */  0xBE, 0x6B, 0x04,\r
-  /* 00000288 call word 0x3ad                */  0xE8, 0x22, 0x01,\r
-  /* 0000028B pop si                         */  0x5E,\r
-  /* 0000028C mov si,0x100                   */  0xBE, 0x00, 0x01,\r
-  /* 0000028F jmp short 0x2b8                */  0xEB, 0x27,\r
-  /* 00000291 push si                        */  0x56,\r
-  /* 00000292 mov si,0x47d                   */  0xBE, 0x7D, 0x04,\r
-  /* 00000295 call word 0x3ad                */  0xE8, 0x15, 0x01,\r
-  /* 00000298 pop si                         */  0x5E,\r
-  /* 00000299 mov si,0x132                   */  0xBE, 0x32, 0x01,\r
-  /* 0000029C jmp short 0x2b8                */  0xEB, 0x1A,\r
-  /* 0000029E push si                        */  0x56,\r
-  /* 0000029F mov si,0x48f                   */  0xBE, 0x8F, 0x04,\r
-  /* 000002A2 call word 0x3ad                */  0xE8, 0x08, 0x01,\r
-  /* 000002A5 pop si                         */  0x5E,\r
-  /* 000002A6 mov si,0x164                   */  0xBE, 0x64, 0x01,\r
-  /* 000002A9 jmp short 0x2b8                */  0xEB, 0x0D,\r
-  /* 000002AB push si                        */  0x56,\r
-  /* 000002AC mov si,0x4a2                   */  0xBE, 0xA2, 0x04,\r
-  /* 000002AF call word 0x3ad                */  0xE8, 0xFB, 0x00,\r
-  /* 000002B2 pop si                         */  0x5E,\r
-  /* 000002B3 mov si,0x196                   */  0xBE, 0x96, 0x01,\r
-  /* 000002B6 jmp short 0x2b8                */  0xEB, 0x00,\r
-  /* 000002B8 push cs                        */  0x0E,\r
-  /* 000002B9 pop ds                         */  0x1F,\r
-  /* 000002BA mov cx,0x32                    */  0xB9, 0x32, 0x00,\r
-  /* 000002BD cld                            */  0xFC,\r
-  /* 000002BE rep movsb                      */  0xF3, 0xA4,\r
-  /* 000002C0 pop cx                         */  0x59,\r
-  /* 000002C1 pop si                         */  0x5E,\r
-  /* 000002C2 pop ds                         */  0x1F,\r
-  /* 000002C3 pop di                         */  0x5F,\r
-  /* 000002C4 pop es                         */  0x07,\r
-  /* 000002C5 jmp word 0x395                 */  0xE9, 0xCD, 0x00,\r
-  /* 000002C8 push dx                        */  0x52,\r
-  /* 000002C9 push ax                        */  0x50,\r
-  /* 000002CA push si                        */  0x56,\r
-  /* 000002CB mov si,0x410                   */  0xBE, 0x10, 0x04,\r
-  /* 000002CE call word 0x3ad                */  0xE8, 0xDC, 0x00,\r
-  /* 000002D1 pop si                         */  0x5E,\r
-  /* 000002D2 and bx,0xbfff                  */  0x81, 0xE3, 0xFF, 0xBF,\r
-  /* 000002D6 cmp bx,0x13f                   */  0x81, 0xFB, 0x3F, 0x01,\r
-  /* 000002DA jz 0x2f3                       */  0x74, 0x17,\r
-  /* 000002DC cmp bx,0x140                   */  0x81, 0xFB, 0x40, 0x01,\r
-  /* 000002E0 jz 0x2fd                       */  0x74, 0x1B,\r
-  /* 000002E2 cmp bx,0x141                   */  0x81, 0xFB, 0x41, 0x01,\r
-  /* 000002E6 jz 0x307                       */  0x74, 0x1F,\r
-  /* 000002E8 push si                        */  0x56,\r
-  /* 000002E9 mov si,0x42c                   */  0xBE, 0x2C, 0x04,\r
-  /* 000002EC call word 0x3ad                */  0xE8, 0xBE, 0x00,\r
-  /* 000002EF pop si                         */  0x5E,\r
-  /* 000002F0 jmp word 0x235                 */  0xE9, 0x42, 0xFF,\r
-  /* 000002F3 push si                        */  0x56,\r
-  /* 000002F4 mov si,0x46b                   */  0xBE, 0x6B, 0x04,\r
-  /* 000002F7 call word 0x3ad                */  0xE8, 0xB3, 0x00,\r
-  /* 000002FA pop si                         */  0x5E,\r
-  /* 000002FB jmp short 0x319                */  0xEB, 0x1C,\r
-  /* 000002FD push si                        */  0x56,\r
-  /* 000002FE mov si,0x47d                   */  0xBE, 0x7D, 0x04,\r
-  /* 00000301 call word 0x3ad                */  0xE8, 0xA9, 0x00,\r
-  /* 00000304 pop si                         */  0x5E,\r
-  /* 00000305 jmp short 0x319                */  0xEB, 0x12,\r
-  /* 00000307 push si                        */  0x56,\r
-  /* 00000308 mov si,0x48f                   */  0xBE, 0x8F, 0x04,\r
-  /* 0000030B call word 0x3ad                */  0xE8, 0x9F, 0x00,\r
-  /* 0000030E pop si                         */  0x5E,\r
-  /* 0000030F jmp short 0x319                */  0xEB, 0x08,\r
-  /* 00000311 push si                        */  0x56,\r
-  /* 00000312 mov si,0x4a2                   */  0xBE, 0xA2, 0x04,\r
-  /* 00000315 call word 0x3ad                */  0xE8, 0x95, 0x00,\r
-  /* 00000318 pop si                         */  0x5E,\r
-  /* 00000319 mov [0x4b0],bl                 */  0x88, 0x1E, 0xB0, 0x04,\r
-  /* 0000031D mov [0x4b1],bh                 */  0x88, 0x3E, 0xB1, 0x04,\r
-  /* 00000321 pop ax                         */  0x58,\r
-  /* 00000322 pop dx                         */  0x5A,\r
-  /* 00000323 jmp short 0x395                */  0xEB, 0x70,\r
-  /* 00000325 push si                        */  0x56,\r
-  /* 00000326 mov si,0x405                   */  0xBE, 0x05, 0x04,\r
-  /* 00000329 call word 0x3ad                */  0xE8, 0x81, 0x00,\r
-  /* 0000032C pop si                         */  0x5E,\r
-  /* 0000032D mov bl,[0x4b0]                 */  0x8A, 0x1E, 0xB0, 0x04,\r
-  /* 00000331 mov bh,[0x4b1]                 */  0x8A, 0x3E, 0xB1, 0x04,\r
-  /* 00000335 jmp short 0x395                */  0xEB, 0x5E,\r
-  /* 00000337 push si                        */  0x56,\r
-  /* 00000338 mov si,0x43b                   */  0xBE, 0x3B, 0x04,\r
-  /* 0000033B call word 0x3ad                */  0xE8, 0x6F, 0x00,\r
-  /* 0000033E pop si                         */  0x5E,\r
-  /* 0000033F mov bx,0x80                    */  0xBB, 0x80, 0x00,\r
-  /* 00000342 jmp short 0x395                */  0xEB, 0x51,\r
-  /* 00000344 push es                        */  0x06,\r
-  /* 00000345 push di                        */  0x57,\r
-  /* 00000346 push ds                        */  0x1E,\r
-  /* 00000347 push si                        */  0x56,\r
-  /* 00000348 push cx                        */  0x51,\r
-  /* 00000349 push si                        */  0x56,\r
-  /* 0000034A mov si,0x450                   */  0xBE, 0x50, 0x04,\r
-  /* 0000034D call word 0x3ad                */  0xE8, 0x5D, 0x00,\r
-  /* 00000350 pop si                         */  0x5E,\r
-  /* 00000351 push cs                        */  0x0E,\r
-  /* 00000352 pop ds                         */  0x1F,\r
-  /* 00000353 mov si,0x4b2                   */  0xBE, 0xB2, 0x04,\r
-  /* 00000356 mov cx,0x80                    */  0xB9, 0x80, 0x00,\r
-  /* 00000359 cld                            */  0xFC,\r
-  /* 0000035A rep movsb                      */  0xF3, 0xA4,\r
-  /* 0000035C pop cx                         */  0x59,\r
-  /* 0000035D pop si                         */  0x5E,\r
-  /* 0000035E pop ds                         */  0x1F,\r
-  /* 0000035F pop di                         */  0x5F,\r
-  /* 00000360 pop es                         */  0x07,\r
-  /* 00000361 jmp short 0x395                */  0xEB, 0x32,\r
-  /* 00000363 push si                        */  0x56,\r
-  /* 00000364 mov si,0x41b                   */  0xBE, 0x1B, 0x04,\r
-  /* 00000367 call word 0x3ad                */  0xE8, 0x43, 0x00,\r
-  /* 0000036A pop si                         */  0x5E,\r
-  /* 0000036B cmp al,0x3                     */  0x3C, 0x03,\r
-  /* 0000036D jz 0x37e                       */  0x74, 0x0F,\r
-  /* 0000036F cmp al,0x12                    */  0x3C, 0x12,\r
-  /* 00000371 jz 0x38a                       */  0x74, 0x17,\r
-  /* 00000373 push si                        */  0x56,\r
-  /* 00000374 mov si,0x42c                   */  0xBE, 0x2C, 0x04,\r
-  /* 00000377 call word 0x3ad                */  0xE8, 0x33, 0x00,\r
-  /* 0000037A pop si                         */  0x5E,\r
-  /* 0000037B jmp word 0x235                 */  0xE9, 0xB7, 0xFE,\r
-  /* 0000037E push si                        */  0x56,\r
-  /* 0000037F mov si,0x45c                   */  0xBE, 0x5C, 0x04,\r
-  /* 00000382 call word 0x3ad                */  0xE8, 0x28, 0x00,\r
-  /* 00000385 pop si                         */  0x5E,\r
-  /* 00000386 mov al,0x0                     */  0xB0, 0x00,\r
-  /* 00000388 jmp short 0x38c                */  0xEB, 0x02,\r
-  /* 0000038A mov al,0x0                     */  0xB0, 0x00,\r
-  /* 0000038C push si                        */  0x56,\r
-  /* 0000038D mov si,0x3c2                   */  0xBE, 0xC2, 0x03,\r
-  /* 00000390 call word 0x3ad                */  0xE8, 0x1A, 0x00,\r
-  /* 00000393 pop si                         */  0x5E,\r
-  /* 00000394 iretw                          */  0xCF,\r
-  /* 00000395 push si                        */  0x56,\r
-  /* 00000396 mov si,0x3c2                   */  0xBE, 0xC2, 0x03,\r
-  /* 00000399 call word 0x3ad                */  0xE8, 0x11, 0x00,\r
-  /* 0000039C pop si                         */  0x5E,\r
-  /* 0000039D mov ax,0x4f                    */  0xB8, 0x4F, 0x00,\r
-  /* 000003A0 iretw                          */  0xCF,\r
-  /* 000003A1 push si                        */  0x56,\r
-  /* 000003A2 mov si,0x3c8                   */  0xBE, 0xC8, 0x03,\r
-  /* 000003A5 call word 0x3ad                */  0xE8, 0x05, 0x00,\r
-  /* 000003A8 pop si                         */  0x5E,\r
-  /* 000003A9 mov ax,0x24f                   */  0xB8, 0x4F, 0x02,\r
-  /* 000003AC iretw                          */  0xCF,\r
-  /* 000003AD pushaw                         */  0x60,\r
-  /* 000003AE push ds                        */  0x1E,\r
-  /* 000003AF push cs                        */  0x0E,\r
-  /* 000003B0 pop ds                         */  0x1F,\r
-  /* 000003B1 mov dx,0x220                   */  0xBA, 0x20, 0x02,\r
-  /* 000003B4 mov ax,0x0                     */  0xB8, 0x00, 0x00,\r
-  /* 000003B7 lodsb                          */  0xAC,\r
-  /* 000003B8 cmp al,0x0                     */  0x3C, 0x00,\r
-  /* 000003BA jz 0x3bf                       */  0x74, 0x03,\r
-  /* 000003BC out dx,al                      */  0xEE,\r
-  /* 000003BD jmp short 0x3b7                */  0xEB, 0xF8,\r
-  /* 000003BF pop ds                         */  0x1F,\r
-  /* 000003C0 popaw                          */  0x61,\r
-  /* 000003C1 ret                            */  0xC3,\r
-  /* 000003C2 jna 0x413                      */  0x76, 0x4F,\r
-  /* 000003C4 imul cx,[di],byte +0xa         */  0x6B, 0x0D, 0x0A,\r
-  /* 000003C7 add [bp+0x55],dh               */  0x00, 0x76, 0x55,\r
-  /* 000003CA outsb                          */  0x6E,\r
-  /* 000003CB jnc 0x442                      */  0x73, 0x75,\r
-  /* 000003CD jo 0x43f                       */  0x70, 0x70,\r
-  /* 000003CF outsw                          */  0x6F,\r
-  /* 000003D0 jc 0x446                       */  0x72, 0x74,\r
-  /* 000003D2 fs or ax,0xa                   */  0x65, 0x64, 0x0D, 0x0A, 0x00,\r
-  /* 000003D7 jna 0x42e                      */  0x76, 0x55,\r
-  /* 000003D9 outsb                          */  0x6E,\r
-  /* 000003DA imul bp,[bp+0x6f],byte +0x77   */  0x6B, 0x6E, 0x6F, 0x77,\r
-  /* 000003DE outsb                          */  0x6E,\r
-  /* 000003DF and [bp+0x75],al               */  0x20, 0x46, 0x75,\r
-  /* 000003E2 outsb                          */  0x6E,\r
-  /* 000003E3 arpl [si+0x69],si              */  0x63, 0x74, 0x69,\r
-  /* 000003E6 outsw                          */  0x6F,\r
-  /* 000003E7 outsb                          */  0x6E,\r
-  /* 000003E8 or ax,0xa                      */  0x0D, 0x0A, 0x00,\r
-  /* 000003EB jna 0x434                      */  0x76, 0x47,\r
-  /* 000003ED gs jz 0x439                    */  0x65, 0x74, 0x49,\r
-  /* 000003F0 outsb                          */  0x6E,\r
-  /* 000003F1 outsd                          */  0x66, 0x6F,\r
-  /* 000003F3 or ax,0xa                      */  0x0D, 0x0A, 0x00,\r
-  /* 000003F6 jna 0x43f                      */  0x76, 0x47,\r
-  /* 000003F8 gs jz 0x448                    */  0x65, 0x74, 0x4D,\r
-  /* 000003FB outsw                          */  0x6F,\r
-  /* 000003FC gs dec cx                      */  0x64, 0x65, 0x49,\r
-  /* 000003FF outsb                          */  0x6E,\r
-  /* 00000400 outsd                          */  0x66, 0x6F,\r
-  /* 00000402 or ax,0xa                      */  0x0D, 0x0A, 0x00,\r
-  /* 00000405 jna 0x44e                      */  0x76, 0x47,\r
-  /* 00000407 gs jz 0x457                    */  0x65, 0x74, 0x4D,\r
-  /* 0000040A outsw                          */  0x6F,\r
-  /* 0000040B gs or ax,0xa                   */  0x64, 0x65, 0x0D, 0x0A, 0x00,\r
-  /* 00000410 jna 0x465                      */  0x76, 0x53,\r
-  /* 00000412 gs jz 0x462                    */  0x65, 0x74, 0x4D,\r
-  /* 00000415 outsw                          */  0x6F,\r
-  /* 00000416 gs or ax,0xa                   */  0x64, 0x65, 0x0D, 0x0A, 0x00,\r
-  /* 0000041B jna 0x470                      */  0x76, 0x53,\r
-  /* 0000041D gs jz 0x46d                    */  0x65, 0x74, 0x4D,\r
-  /* 00000420 outsw                          */  0x6F,\r
-  /* 00000421 gs dec sp                      */  0x64, 0x65, 0x4C,\r
-  /* 00000424 gs a32 popaw                   */  0x65, 0x67, 0x61,\r
-  /* 00000427 arpl [bx+di+0xd],di            */  0x63, 0x79, 0x0D,\r
-  /* 0000042A or al,[bx+si]                  */  0x0A, 0x00,\r
-  /* 0000042C jna 0x483                      */  0x76, 0x55,\r
-  /* 0000042E outsb                          */  0x6E,\r
-  /* 0000042F imul bp,[bx+0x77],byte +0x6e   */  0x6B, 0x6F, 0x77, 0x6E,\r
-  /* 00000433 and [di+0x6f],cl               */  0x20, 0x4D, 0x6F,\r
-  /* 00000436 gs or ax,0xa                   */  0x64, 0x65, 0x0D, 0x0A, 0x00,\r
-  /* 0000043B jna 0x484                      */  0x76, 0x47,\r
-  /* 0000043D gs jz 0x490                    */  0x65, 0x74, 0x50,\r
-  /* 00000440 insw                           */  0x6D,\r
-  /* 00000441 inc bx                         */  0x43,\r
-  /* 00000442 popaw                          */  0x61,\r
-  /* 00000443 jo 0x4a6                       */  0x70, 0x61,\r
-  /* 00000445 bound bp,[bx+di+0x6c]          */  0x62, 0x69, 0x6C,\r
-  /* 00000448 imul si,[si+0x69],word 0x7365  */  0x69, 0x74, 0x69, 0x65, 0x73,\r
-  /* 0000044D or ax,0xa                      */  0x0D, 0x0A, 0x00,\r
-  /* 00000450 jna 0x4a4                      */  0x76, 0x52,\r
-  /* 00000452 gs popaw                       */  0x65, 0x61,\r
-  /* 00000454 fs inc bp                      */  0x64, 0x45,\r
-  /* 00000456 imul sp,[fs:si+0xd],word 0xa   */  0x64, 0x69, 0x64, 0x0D, 0x0A, 0x00,\r
-  /* 0000045C jna 0x4aa                      */  0x76, 0x4C,\r
-  /* 0000045E gs a32 popaw                   */  0x65, 0x67, 0x61,\r
-  /* 00000461 arpl [bx+di+0x4d],di           */  0x63, 0x79, 0x4D,\r
-  /* 00000464 outsw                          */  0x6F,\r
-  /* 00000465 xor cx,[gs:di]                 */  0x64, 0x65, 0x33, 0x0D,\r
-  /* 00000469 or al,[bx+si]                  */  0x0A, 0x00,\r
-  /* 0000046B insw                           */  0x6D,\r
-  /* 0000046C outsw                          */  0x6F,\r
-  /* 0000046D gs pop di                      */  0x64, 0x65, 0x5F,\r
-  /* 00000470 ss xor al,0x30                 */  0x36, 0x34, 0x30,\r
-  /* 00000473 js 0x4a9                       */  0x78, 0x34,\r
-  /* 00000475 cmp [bx+si],dh                 */  0x38, 0x30,\r
-  /* 00000477 js 0x4ac                       */  0x78, 0x33,\r
-  /* 00000479 xor cl,[di]                    */  0x32, 0x0D,\r
-  /* 0000047B or al,[bx+si]                  */  0x0A, 0x00,\r
-  /* 0000047D insw                           */  0x6D,\r
-  /* 0000047E outsw                          */  0x6F,\r
-  /* 0000047F gs pop di                      */  0x64, 0x65, 0x5F,\r
-  /* 00000482 cmp [bx+si],dh                 */  0x38, 0x30,\r
-  /* 00000484 xor [bx+si+0x36],bh            */  0x30, 0x78, 0x36,\r
-  /* 00000487 xor [bx+si],dh                 */  0x30, 0x30,\r
-  /* 00000489 js 0x4be                       */  0x78, 0x33,\r
-  /* 0000048B xor cl,[di]                    */  0x32, 0x0D,\r
-  /* 0000048D or al,[bx+si]                  */  0x0A, 0x00,\r
-  /* 0000048F insw                           */  0x6D,\r
-  /* 00000490 outsw                          */  0x6F,\r
-  /* 00000491 gs pop di                      */  0x64, 0x65, 0x5F,\r
-  /* 00000494 xor [bx+si],si                 */  0x31, 0x30,\r
-  /* 00000496 xor dh,[si]                    */  0x32, 0x34,\r
-  /* 00000498 js 0x4d1                       */  0x78, 0x37,\r
-  /* 0000049A cmp [ss:bx+si+0x33],bh         */  0x36, 0x38, 0x78, 0x33,\r
-  /* 0000049E xor cl,[di]                    */  0x32, 0x0D,\r
-  /* 000004A0 or al,[bx+si]                  */  0x0A, 0x00,\r
-  /* 000004A2 insw                           */  0x6D,\r
-  /* 000004A3 outsw                          */  0x6F,\r
-  /* 000004A4 gs pop di                      */  0x64, 0x65, 0x5F,\r
-  /* 000004A7 jnz 0x517                      */  0x75, 0x6E,\r
-  /* 000004A9 jnz 0x51e                      */  0x75, 0x73,\r
-  /* 000004AB fs or ax,0xa                   */  0x65, 0x64, 0x0D, 0x0A, 0x00,\r
-  /* 000004B0 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004B2 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004B4 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004B6 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004B8 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004BA add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004BC add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004BE add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004C0 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004C2 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004C4 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004C6 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004C8 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004CA add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004CC add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004CE add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004D0 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004D2 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004D4 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004D6 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004D8 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004DA add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004DC add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004DE add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004E0 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004E2 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004E4 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004E6 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004E8 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004EA add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004EC add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004EE add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004F0 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004F2 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004F4 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004F6 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004F8 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004FA add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004FC add [bx+si],al                 */  0x00, 0x00,\r
-  /* 000004FE add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000500 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000502 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000504 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000506 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000508 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 0000050A add [bx+si],al                 */  0x00, 0x00,\r
-  /* 0000050C add [bx+si],al                 */  0x00, 0x00,\r
-  /* 0000050E add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000510 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000512 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000514 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000516 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000518 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 0000051A add [bx+si],al                 */  0x00, 0x00,\r
-  /* 0000051C add [bx+si],al                 */  0x00, 0x00,\r
-  /* 0000051E add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000520 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000522 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000524 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000526 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000528 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 0000052A add [bx+si],al                 */  0x00, 0x00,\r
-  /* 0000052C add [bx+si],al                 */  0x00, 0x00,\r
-  /* 0000052E add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000530 add [bx+si],al                 */  0x00, 0x00,\r
-  /* 00000532 add [bx+si],al                 */  0x00, 0x00,\r
+STATIC CONST UINT8  mVbeShim[] = {\r
+  /* 00000000 nop                            */ 0x90,\r
+  /* 00000001 nop                            */ 0x90,\r
+  /* 00000002 nop                            */ 0x90,\r
+  /* 00000003 nop                            */ 0x90,\r
+  /* 00000004 nop                            */ 0x90,\r
+  /* 00000005 nop                            */ 0x90,\r
+  /* 00000006 nop                            */ 0x90,\r
+  /* 00000007 nop                            */ 0x90,\r
+  /* 00000008 nop                            */ 0x90,\r
+  /* 00000009 nop                            */ 0x90,\r
+  /* 0000000A nop                            */ 0x90,\r
+  /* 0000000B nop                            */ 0x90,\r
+  /* 0000000C nop                            */ 0x90,\r
+  /* 0000000D nop                            */ 0x90,\r
+  /* 0000000E nop                            */ 0x90,\r
+  /* 0000000F nop                            */ 0x90,\r
+  /* 00000010 nop                            */ 0x90,\r
+  /* 00000011 nop                            */ 0x90,\r
+  /* 00000012 nop                            */ 0x90,\r
+  /* 00000013 nop                            */ 0x90,\r
+  /* 00000014 nop                            */ 0x90,\r
+  /* 00000015 nop                            */ 0x90,\r
+  /* 00000016 nop                            */ 0x90,\r
+  /* 00000017 nop                            */ 0x90,\r
+  /* 00000018 nop                            */ 0x90,\r
+  /* 00000019 nop                            */ 0x90,\r
+  /* 0000001A nop                            */ 0x90,\r
+  /* 0000001B nop                            */ 0x90,\r
+  /* 0000001C nop                            */ 0x90,\r
+  /* 0000001D nop                            */ 0x90,\r
+  /* 0000001E nop                            */ 0x90,\r
+  /* 0000001F nop                            */ 0x90,\r
+  /* 00000020 nop                            */ 0x90,\r
+  /* 00000021 nop                            */ 0x90,\r
+  /* 00000022 nop                            */ 0x90,\r
+  /* 00000023 nop                            */ 0x90,\r
+  /* 00000024 nop                            */ 0x90,\r
+  /* 00000025 nop                            */ 0x90,\r
+  /* 00000026 nop                            */ 0x90,\r
+  /* 00000027 nop                            */ 0x90,\r
+  /* 00000028 nop                            */ 0x90,\r
+  /* 00000029 nop                            */ 0x90,\r
+  /* 0000002A nop                            */ 0x90,\r
+  /* 0000002B nop                            */ 0x90,\r
+  /* 0000002C nop                            */ 0x90,\r
+  /* 0000002D nop                            */ 0x90,\r
+  /* 0000002E nop                            */ 0x90,\r
+  /* 0000002F nop                            */ 0x90,\r
+  /* 00000030 nop                            */ 0x90,\r
+  /* 00000031 nop                            */ 0x90,\r
+  /* 00000032 nop                            */ 0x90,\r
+  /* 00000033 nop                            */ 0x90,\r
+  /* 00000034 nop                            */ 0x90,\r
+  /* 00000035 nop                            */ 0x90,\r
+  /* 00000036 nop                            */ 0x90,\r
+  /* 00000037 nop                            */ 0x90,\r
+  /* 00000038 nop                            */ 0x90,\r
+  /* 00000039 nop                            */ 0x90,\r
+  /* 0000003A nop                            */ 0x90,\r
+  /* 0000003B nop                            */ 0x90,\r
+  /* 0000003C nop                            */ 0x90,\r
+  /* 0000003D nop                            */ 0x90,\r
+  /* 0000003E nop                            */ 0x90,\r
+  /* 0000003F nop                            */ 0x90,\r
+  /* 00000040 nop                            */ 0x90,\r
+  /* 00000041 nop                            */ 0x90,\r
+  /* 00000042 nop                            */ 0x90,\r
+  /* 00000043 nop                            */ 0x90,\r
+  /* 00000044 nop                            */ 0x90,\r
+  /* 00000045 nop                            */ 0x90,\r
+  /* 00000046 nop                            */ 0x90,\r
+  /* 00000047 nop                            */ 0x90,\r
+  /* 00000048 nop                            */ 0x90,\r
+  /* 00000049 nop                            */ 0x90,\r
+  /* 0000004A nop                            */ 0x90,\r
+  /* 0000004B nop                            */ 0x90,\r
+  /* 0000004C nop                            */ 0x90,\r
+  /* 0000004D nop                            */ 0x90,\r
+  /* 0000004E nop                            */ 0x90,\r
+  /* 0000004F nop                            */ 0x90,\r
+  /* 00000050 nop                            */ 0x90,\r
+  /* 00000051 nop                            */ 0x90,\r
+  /* 00000052 nop                            */ 0x90,\r
+  /* 00000053 nop                            */ 0x90,\r
+  /* 00000054 nop                            */ 0x90,\r
+  /* 00000055 nop                            */ 0x90,\r
+  /* 00000056 nop                            */ 0x90,\r
+  /* 00000057 nop                            */ 0x90,\r
+  /* 00000058 nop                            */ 0x90,\r
+  /* 00000059 nop                            */ 0x90,\r
+  /* 0000005A nop                            */ 0x90,\r
+  /* 0000005B nop                            */ 0x90,\r
+  /* 0000005C nop                            */ 0x90,\r
+  /* 0000005D nop                            */ 0x90,\r
+  /* 0000005E nop                            */ 0x90,\r
+  /* 0000005F nop                            */ 0x90,\r
+  /* 00000060 nop                            */ 0x90,\r
+  /* 00000061 nop                            */ 0x90,\r
+  /* 00000062 nop                            */ 0x90,\r
+  /* 00000063 nop                            */ 0x90,\r
+  /* 00000064 nop                            */ 0x90,\r
+  /* 00000065 nop                            */ 0x90,\r
+  /* 00000066 nop                            */ 0x90,\r
+  /* 00000067 nop                            */ 0x90,\r
+  /* 00000068 nop                            */ 0x90,\r
+  /* 00000069 nop                            */ 0x90,\r
+  /* 0000006A nop                            */ 0x90,\r
+  /* 0000006B nop                            */ 0x90,\r
+  /* 0000006C nop                            */ 0x90,\r
+  /* 0000006D nop                            */ 0x90,\r
+  /* 0000006E nop                            */ 0x90,\r
+  /* 0000006F nop                            */ 0x90,\r
+  /* 00000070 nop                            */ 0x90,\r
+  /* 00000071 nop                            */ 0x90,\r
+  /* 00000072 nop                            */ 0x90,\r
+  /* 00000073 nop                            */ 0x90,\r
+  /* 00000074 nop                            */ 0x90,\r
+  /* 00000075 nop                            */ 0x90,\r
+  /* 00000076 nop                            */ 0x90,\r
+  /* 00000077 nop                            */ 0x90,\r
+  /* 00000078 nop                            */ 0x90,\r
+  /* 00000079 nop                            */ 0x90,\r
+  /* 0000007A nop                            */ 0x90,\r
+  /* 0000007B nop                            */ 0x90,\r
+  /* 0000007C nop                            */ 0x90,\r
+  /* 0000007D nop                            */ 0x90,\r
+  /* 0000007E nop                            */ 0x90,\r
+  /* 0000007F nop                            */ 0x90,\r
+  /* 00000080 nop                            */ 0x90,\r
+  /* 00000081 nop                            */ 0x90,\r
+  /* 00000082 nop                            */ 0x90,\r
+  /* 00000083 nop                            */ 0x90,\r
+  /* 00000084 nop                            */ 0x90,\r
+  /* 00000085 nop                            */ 0x90,\r
+  /* 00000086 nop                            */ 0x90,\r
+  /* 00000087 nop                            */ 0x90,\r
+  /* 00000088 nop                            */ 0x90,\r
+  /* 00000089 nop                            */ 0x90,\r
+  /* 0000008A nop                            */ 0x90,\r
+  /* 0000008B nop                            */ 0x90,\r
+  /* 0000008C nop                            */ 0x90,\r
+  /* 0000008D nop                            */ 0x90,\r
+  /* 0000008E nop                            */ 0x90,\r
+  /* 0000008F nop                            */ 0x90,\r
+  /* 00000090 nop                            */ 0x90,\r
+  /* 00000091 nop                            */ 0x90,\r
+  /* 00000092 nop                            */ 0x90,\r
+  /* 00000093 nop                            */ 0x90,\r
+  /* 00000094 nop                            */ 0x90,\r
+  /* 00000095 nop                            */ 0x90,\r
+  /* 00000096 nop                            */ 0x90,\r
+  /* 00000097 nop                            */ 0x90,\r
+  /* 00000098 nop                            */ 0x90,\r
+  /* 00000099 nop                            */ 0x90,\r
+  /* 0000009A nop                            */ 0x90,\r
+  /* 0000009B nop                            */ 0x90,\r
+  /* 0000009C nop                            */ 0x90,\r
+  /* 0000009D nop                            */ 0x90,\r
+  /* 0000009E nop                            */ 0x90,\r
+  /* 0000009F nop                            */ 0x90,\r
+  /* 000000A0 nop                            */ 0x90,\r
+  /* 000000A1 nop                            */ 0x90,\r
+  /* 000000A2 nop                            */ 0x90,\r
+  /* 000000A3 nop                            */ 0x90,\r
+  /* 000000A4 nop                            */ 0x90,\r
+  /* 000000A5 nop                            */ 0x90,\r
+  /* 000000A6 nop                            */ 0x90,\r
+  /* 000000A7 nop                            */ 0x90,\r
+  /* 000000A8 nop                            */ 0x90,\r
+  /* 000000A9 nop                            */ 0x90,\r
+  /* 000000AA nop                            */ 0x90,\r
+  /* 000000AB nop                            */ 0x90,\r
+  /* 000000AC nop                            */ 0x90,\r
+  /* 000000AD nop                            */ 0x90,\r
+  /* 000000AE nop                            */ 0x90,\r
+  /* 000000AF nop                            */ 0x90,\r
+  /* 000000B0 nop                            */ 0x90,\r
+  /* 000000B1 nop                            */ 0x90,\r
+  /* 000000B2 nop                            */ 0x90,\r
+  /* 000000B3 nop                            */ 0x90,\r
+  /* 000000B4 nop                            */ 0x90,\r
+  /* 000000B5 nop                            */ 0x90,\r
+  /* 000000B6 nop                            */ 0x90,\r
+  /* 000000B7 nop                            */ 0x90,\r
+  /* 000000B8 nop                            */ 0x90,\r
+  /* 000000B9 nop                            */ 0x90,\r
+  /* 000000BA nop                            */ 0x90,\r
+  /* 000000BB nop                            */ 0x90,\r
+  /* 000000BC nop                            */ 0x90,\r
+  /* 000000BD nop                            */ 0x90,\r
+  /* 000000BE nop                            */ 0x90,\r
+  /* 000000BF nop                            */ 0x90,\r
+  /* 000000C0 nop                            */ 0x90,\r
+  /* 000000C1 nop                            */ 0x90,\r
+  /* 000000C2 nop                            */ 0x90,\r
+  /* 000000C3 nop                            */ 0x90,\r
+  /* 000000C4 nop                            */ 0x90,\r
+  /* 000000C5 nop                            */ 0x90,\r
+  /* 000000C6 nop                            */ 0x90,\r
+  /* 000000C7 nop                            */ 0x90,\r
+  /* 000000C8 nop                            */ 0x90,\r
+  /* 000000C9 nop                            */ 0x90,\r
+  /* 000000CA nop                            */ 0x90,\r
+  /* 000000CB nop                            */ 0x90,\r
+  /* 000000CC nop                            */ 0x90,\r
+  /* 000000CD nop                            */ 0x90,\r
+  /* 000000CE nop                            */ 0x90,\r
+  /* 000000CF nop                            */ 0x90,\r
+  /* 000000D0 nop                            */ 0x90,\r
+  /* 000000D1 nop                            */ 0x90,\r
+  /* 000000D2 nop                            */ 0x90,\r
+  /* 000000D3 nop                            */ 0x90,\r
+  /* 000000D4 nop                            */ 0x90,\r
+  /* 000000D5 nop                            */ 0x90,\r
+  /* 000000D6 nop                            */ 0x90,\r
+  /* 000000D7 nop                            */ 0x90,\r
+  /* 000000D8 nop                            */ 0x90,\r
+  /* 000000D9 nop                            */ 0x90,\r
+  /* 000000DA nop                            */ 0x90,\r
+  /* 000000DB nop                            */ 0x90,\r
+  /* 000000DC nop                            */ 0x90,\r
+  /* 000000DD nop                            */ 0x90,\r
+  /* 000000DE nop                            */ 0x90,\r
+  /* 000000DF nop                            */ 0x90,\r
+  /* 000000E0 nop                            */ 0x90,\r
+  /* 000000E1 nop                            */ 0x90,\r
+  /* 000000E2 nop                            */ 0x90,\r
+  /* 000000E3 nop                            */ 0x90,\r
+  /* 000000E4 nop                            */ 0x90,\r
+  /* 000000E5 nop                            */ 0x90,\r
+  /* 000000E6 nop                            */ 0x90,\r
+  /* 000000E7 nop                            */ 0x90,\r
+  /* 000000E8 nop                            */ 0x90,\r
+  /* 000000E9 nop                            */ 0x90,\r
+  /* 000000EA nop                            */ 0x90,\r
+  /* 000000EB nop                            */ 0x90,\r
+  /* 000000EC nop                            */ 0x90,\r
+  /* 000000ED nop                            */ 0x90,\r
+  /* 000000EE nop                            */ 0x90,\r
+  /* 000000EF nop                            */ 0x90,\r
+  /* 000000F0 nop                            */ 0x90,\r
+  /* 000000F1 nop                            */ 0x90,\r
+  /* 000000F2 nop                            */ 0x90,\r
+  /* 000000F3 nop                            */ 0x90,\r
+  /* 000000F4 nop                            */ 0x90,\r
+  /* 000000F5 nop                            */ 0x90,\r
+  /* 000000F6 nop                            */ 0x90,\r
+  /* 000000F7 nop                            */ 0x90,\r
+  /* 000000F8 nop                            */ 0x90,\r
+  /* 000000F9 nop                            */ 0x90,\r
+  /* 000000FA nop                            */ 0x90,\r
+  /* 000000FB nop                            */ 0x90,\r
+  /* 000000FC nop                            */ 0x90,\r
+  /* 000000FD nop                            */ 0x90,\r
+  /* 000000FE nop                            */ 0x90,\r
+  /* 000000FF nop                            */ 0x90,\r
+  /* 00000100 nop                            */ 0x90,\r
+  /* 00000101 nop                            */ 0x90,\r
+  /* 00000102 nop                            */ 0x90,\r
+  /* 00000103 nop                            */ 0x90,\r
+  /* 00000104 nop                            */ 0x90,\r
+  /* 00000105 nop                            */ 0x90,\r
+  /* 00000106 nop                            */ 0x90,\r
+  /* 00000107 nop                            */ 0x90,\r
+  /* 00000108 nop                            */ 0x90,\r
+  /* 00000109 nop                            */ 0x90,\r
+  /* 0000010A nop                            */ 0x90,\r
+  /* 0000010B nop                            */ 0x90,\r
+  /* 0000010C nop                            */ 0x90,\r
+  /* 0000010D nop                            */ 0x90,\r
+  /* 0000010E nop                            */ 0x90,\r
+  /* 0000010F nop                            */ 0x90,\r
+  /* 00000110 nop                            */ 0x90,\r
+  /* 00000111 nop                            */ 0x90,\r
+  /* 00000112 nop                            */ 0x90,\r
+  /* 00000113 nop                            */ 0x90,\r
+  /* 00000114 nop                            */ 0x90,\r
+  /* 00000115 nop                            */ 0x90,\r
+  /* 00000116 nop                            */ 0x90,\r
+  /* 00000117 nop                            */ 0x90,\r
+  /* 00000118 nop                            */ 0x90,\r
+  /* 00000119 nop                            */ 0x90,\r
+  /* 0000011A nop                            */ 0x90,\r
+  /* 0000011B nop                            */ 0x90,\r
+  /* 0000011C nop                            */ 0x90,\r
+  /* 0000011D nop                            */ 0x90,\r
+  /* 0000011E nop                            */ 0x90,\r
+  /* 0000011F nop                            */ 0x90,\r
+  /* 00000120 nop                            */ 0x90,\r
+  /* 00000121 nop                            */ 0x90,\r
+  /* 00000122 nop                            */ 0x90,\r
+  /* 00000123 nop                            */ 0x90,\r
+  /* 00000124 nop                            */ 0x90,\r
+  /* 00000125 nop                            */ 0x90,\r
+  /* 00000126 nop                            */ 0x90,\r
+  /* 00000127 nop                            */ 0x90,\r
+  /* 00000128 nop                            */ 0x90,\r
+  /* 00000129 nop                            */ 0x90,\r
+  /* 0000012A nop                            */ 0x90,\r
+  /* 0000012B nop                            */ 0x90,\r
+  /* 0000012C nop                            */ 0x90,\r
+  /* 0000012D nop                            */ 0x90,\r
+  /* 0000012E nop                            */ 0x90,\r
+  /* 0000012F nop                            */ 0x90,\r
+  /* 00000130 nop                            */ 0x90,\r
+  /* 00000131 nop                            */ 0x90,\r
+  /* 00000132 nop                            */ 0x90,\r
+  /* 00000133 nop                            */ 0x90,\r
+  /* 00000134 nop                            */ 0x90,\r
+  /* 00000135 nop                            */ 0x90,\r
+  /* 00000136 nop                            */ 0x90,\r
+  /* 00000137 nop                            */ 0x90,\r
+  /* 00000138 nop                            */ 0x90,\r
+  /* 00000139 nop                            */ 0x90,\r
+  /* 0000013A nop                            */ 0x90,\r
+  /* 0000013B nop                            */ 0x90,\r
+  /* 0000013C nop                            */ 0x90,\r
+  /* 0000013D nop                            */ 0x90,\r
+  /* 0000013E nop                            */ 0x90,\r
+  /* 0000013F nop                            */ 0x90,\r
+  /* 00000140 nop                            */ 0x90,\r
+  /* 00000141 nop                            */ 0x90,\r
+  /* 00000142 nop                            */ 0x90,\r
+  /* 00000143 nop                            */ 0x90,\r
+  /* 00000144 nop                            */ 0x90,\r
+  /* 00000145 nop                            */ 0x90,\r
+  /* 00000146 nop                            */ 0x90,\r
+  /* 00000147 nop                            */ 0x90,\r
+  /* 00000148 nop                            */ 0x90,\r
+  /* 00000149 nop                            */ 0x90,\r
+  /* 0000014A nop                            */ 0x90,\r
+  /* 0000014B nop                            */ 0x90,\r
+  /* 0000014C nop                            */ 0x90,\r
+  /* 0000014D nop                            */ 0x90,\r
+  /* 0000014E nop                            */ 0x90,\r
+  /* 0000014F nop                            */ 0x90,\r
+  /* 00000150 nop                            */ 0x90,\r
+  /* 00000151 nop                            */ 0x90,\r
+  /* 00000152 nop                            */ 0x90,\r
+  /* 00000153 nop                            */ 0x90,\r
+  /* 00000154 nop                            */ 0x90,\r
+  /* 00000155 nop                            */ 0x90,\r
+  /* 00000156 nop                            */ 0x90,\r
+  /* 00000157 nop                            */ 0x90,\r
+  /* 00000158 nop                            */ 0x90,\r
+  /* 00000159 nop                            */ 0x90,\r
+  /* 0000015A nop                            */ 0x90,\r
+  /* 0000015B nop                            */ 0x90,\r
+  /* 0000015C nop                            */ 0x90,\r
+  /* 0000015D nop                            */ 0x90,\r
+  /* 0000015E nop                            */ 0x90,\r
+  /* 0000015F nop                            */ 0x90,\r
+  /* 00000160 nop                            */ 0x90,\r
+  /* 00000161 nop                            */ 0x90,\r
+  /* 00000162 nop                            */ 0x90,\r
+  /* 00000163 nop                            */ 0x90,\r
+  /* 00000164 nop                            */ 0x90,\r
+  /* 00000165 nop                            */ 0x90,\r
+  /* 00000166 nop                            */ 0x90,\r
+  /* 00000167 nop                            */ 0x90,\r
+  /* 00000168 nop                            */ 0x90,\r
+  /* 00000169 nop                            */ 0x90,\r
+  /* 0000016A nop                            */ 0x90,\r
+  /* 0000016B nop                            */ 0x90,\r
+  /* 0000016C nop                            */ 0x90,\r
+  /* 0000016D nop                            */ 0x90,\r
+  /* 0000016E nop                            */ 0x90,\r
+  /* 0000016F nop                            */ 0x90,\r
+  /* 00000170 nop                            */ 0x90,\r
+  /* 00000171 nop                            */ 0x90,\r
+  /* 00000172 nop                            */ 0x90,\r
+  /* 00000173 nop                            */ 0x90,\r
+  /* 00000174 nop                            */ 0x90,\r
+  /* 00000175 nop                            */ 0x90,\r
+  /* 00000176 nop                            */ 0x90,\r
+  /* 00000177 nop                            */ 0x90,\r
+  /* 00000178 nop                            */ 0x90,\r
+  /* 00000179 nop                            */ 0x90,\r
+  /* 0000017A nop                            */ 0x90,\r
+  /* 0000017B nop                            */ 0x90,\r
+  /* 0000017C nop                            */ 0x90,\r
+  /* 0000017D nop                            */ 0x90,\r
+  /* 0000017E nop                            */ 0x90,\r
+  /* 0000017F nop                            */ 0x90,\r
+  /* 00000180 nop                            */ 0x90,\r
+  /* 00000181 nop                            */ 0x90,\r
+  /* 00000182 nop                            */ 0x90,\r
+  /* 00000183 nop                            */ 0x90,\r
+  /* 00000184 nop                            */ 0x90,\r
+  /* 00000185 nop                            */ 0x90,\r
+  /* 00000186 nop                            */ 0x90,\r
+  /* 00000187 nop                            */ 0x90,\r
+  /* 00000188 nop                            */ 0x90,\r
+  /* 00000189 nop                            */ 0x90,\r
+  /* 0000018A nop                            */ 0x90,\r
+  /* 0000018B nop                            */ 0x90,\r
+  /* 0000018C nop                            */ 0x90,\r
+  /* 0000018D nop                            */ 0x90,\r
+  /* 0000018E nop                            */ 0x90,\r
+  /* 0000018F nop                            */ 0x90,\r
+  /* 00000190 nop                            */ 0x90,\r
+  /* 00000191 nop                            */ 0x90,\r
+  /* 00000192 nop                            */ 0x90,\r
+  /* 00000193 nop                            */ 0x90,\r
+  /* 00000194 nop                            */ 0x90,\r
+  /* 00000195 nop                            */ 0x90,\r
+  /* 00000196 nop                            */ 0x90,\r
+  /* 00000197 nop                            */ 0x90,\r
+  /* 00000198 nop                            */ 0x90,\r
+  /* 00000199 nop                            */ 0x90,\r
+  /* 0000019A nop                            */ 0x90,\r
+  /* 0000019B nop                            */ 0x90,\r
+  /* 0000019C nop                            */ 0x90,\r
+  /* 0000019D nop                            */ 0x90,\r
+  /* 0000019E nop                            */ 0x90,\r
+  /* 0000019F nop                            */ 0x90,\r
+  /* 000001A0 nop                            */ 0x90,\r
+  /* 000001A1 nop                            */ 0x90,\r
+  /* 000001A2 nop                            */ 0x90,\r
+  /* 000001A3 nop                            */ 0x90,\r
+  /* 000001A4 nop                            */ 0x90,\r
+  /* 000001A5 nop                            */ 0x90,\r
+  /* 000001A6 nop                            */ 0x90,\r
+  /* 000001A7 nop                            */ 0x90,\r
+  /* 000001A8 nop                            */ 0x90,\r
+  /* 000001A9 nop                            */ 0x90,\r
+  /* 000001AA nop                            */ 0x90,\r
+  /* 000001AB nop                            */ 0x90,\r
+  /* 000001AC nop                            */ 0x90,\r
+  /* 000001AD nop                            */ 0x90,\r
+  /* 000001AE nop                            */ 0x90,\r
+  /* 000001AF nop                            */ 0x90,\r
+  /* 000001B0 nop                            */ 0x90,\r
+  /* 000001B1 nop                            */ 0x90,\r
+  /* 000001B2 nop                            */ 0x90,\r
+  /* 000001B3 nop                            */ 0x90,\r
+  /* 000001B4 nop                            */ 0x90,\r
+  /* 000001B5 nop                            */ 0x90,\r
+  /* 000001B6 nop                            */ 0x90,\r
+  /* 000001B7 nop                            */ 0x90,\r
+  /* 000001B8 nop                            */ 0x90,\r
+  /* 000001B9 nop                            */ 0x90,\r
+  /* 000001BA nop                            */ 0x90,\r
+  /* 000001BB nop                            */ 0x90,\r
+  /* 000001BC nop                            */ 0x90,\r
+  /* 000001BD nop                            */ 0x90,\r
+  /* 000001BE nop                            */ 0x90,\r
+  /* 000001BF nop                            */ 0x90,\r
+  /* 000001C0 nop                            */ 0x90,\r
+  /* 000001C1 nop                            */ 0x90,\r
+  /* 000001C2 nop                            */ 0x90,\r
+  /* 000001C3 nop                            */ 0x90,\r
+  /* 000001C4 nop                            */ 0x90,\r
+  /* 000001C5 nop                            */ 0x90,\r
+  /* 000001C6 nop                            */ 0x90,\r
+  /* 000001C7 nop                            */ 0x90,\r
+  /* 000001C8 nop                            */ 0x90,\r
+  /* 000001C9 nop                            */ 0x90,\r
+  /* 000001CA nop                            */ 0x90,\r
+  /* 000001CB nop                            */ 0x90,\r
+  /* 000001CC nop                            */ 0x90,\r
+  /* 000001CD nop                            */ 0x90,\r
+  /* 000001CE nop                            */ 0x90,\r
+  /* 000001CF nop                            */ 0x90,\r
+  /* 000001D0 nop                            */ 0x90,\r
+  /* 000001D1 nop                            */ 0x90,\r
+  /* 000001D2 nop                            */ 0x90,\r
+  /* 000001D3 nop                            */ 0x90,\r
+  /* 000001D4 nop                            */ 0x90,\r
+  /* 000001D5 nop                            */ 0x90,\r
+  /* 000001D6 nop                            */ 0x90,\r
+  /* 000001D7 nop                            */ 0x90,\r
+  /* 000001D8 nop                            */ 0x90,\r
+  /* 000001D9 nop                            */ 0x90,\r
+  /* 000001DA nop                            */ 0x90,\r
+  /* 000001DB nop                            */ 0x90,\r
+  /* 000001DC nop                            */ 0x90,\r
+  /* 000001DD nop                            */ 0x90,\r
+  /* 000001DE nop                            */ 0x90,\r
+  /* 000001DF nop                            */ 0x90,\r
+  /* 000001E0 nop                            */ 0x90,\r
+  /* 000001E1 nop                            */ 0x90,\r
+  /* 000001E2 nop                            */ 0x90,\r
+  /* 000001E3 nop                            */ 0x90,\r
+  /* 000001E4 nop                            */ 0x90,\r
+  /* 000001E5 nop                            */ 0x90,\r
+  /* 000001E6 nop                            */ 0x90,\r
+  /* 000001E7 nop                            */ 0x90,\r
+  /* 000001E8 nop                            */ 0x90,\r
+  /* 000001E9 nop                            */ 0x90,\r
+  /* 000001EA nop                            */ 0x90,\r
+  /* 000001EB nop                            */ 0x90,\r
+  /* 000001EC nop                            */ 0x90,\r
+  /* 000001ED nop                            */ 0x90,\r
+  /* 000001EE nop                            */ 0x90,\r
+  /* 000001EF nop                            */ 0x90,\r
+  /* 000001F0 nop                            */ 0x90,\r
+  /* 000001F1 nop                            */ 0x90,\r
+  /* 000001F2 nop                            */ 0x90,\r
+  /* 000001F3 nop                            */ 0x90,\r
+  /* 000001F4 nop                            */ 0x90,\r
+  /* 000001F5 nop                            */ 0x90,\r
+  /* 000001F6 nop                            */ 0x90,\r
+  /* 000001F7 nop                            */ 0x90,\r
+  /* 000001F8 nop                            */ 0x90,\r
+  /* 000001F9 nop                            */ 0x90,\r
+  /* 000001FA nop                            */ 0x90,\r
+  /* 000001FB nop                            */ 0x90,\r
+  /* 000001FC nop                            */ 0x90,\r
+  /* 000001FD nop                            */ 0x90,\r
+  /* 000001FE nop                            */ 0x90,\r
+  /* 000001FF nop                            */ 0x90,\r
+  /* 00000200 cmp ax,0x4f00                  */ 0x3D,0x00,  0x4F,\r
+  /* 00000203 jz 0x237                       */ 0x74,0x32,\r
+  /* 00000205 cmp ax,0x4f01                  */ 0x3D,0x01,  0x4F,\r
+  /* 00000208 jz 0x257                       */ 0x74,0x4D,\r
+  /* 0000020A cmp ax,0x4f02                  */ 0x3D,0x02,  0x4F,\r
+  /* 0000020D jz word 0x2c8                  */ 0x0F,0x84,  0xB7,0x00,\r
+  /* 00000211 cmp ax,0x4f03                  */ 0x3D,0x03,  0x4F,\r
+  /* 00000214 jz word 0x325                  */ 0x0F,0x84,  0x0D,0x01,\r
+  /* 00000218 cmp ax,0x4f10                  */ 0x3D,0x10,  0x4F,\r
+  /* 0000021B jz word 0x337                  */ 0x0F,0x84,  0x18,0x01,\r
+  /* 0000021F cmp ax,0x4f15                  */ 0x3D,0x15,  0x4F,\r
+  /* 00000222 jz word 0x344                  */ 0x0F,0x84,  0x1E,0x01,\r
+  /* 00000226 cmp ah,0x0                     */ 0x80,0xFC,  0x00,\r
+  /* 00000229 jz word 0x363                  */ 0x0F,0x84,  0x36,0x01,\r
+  /* 0000022D push si                        */ 0x56,\r
+  /* 0000022E mov si,0x3d7                   */ 0xBE,0xD7,  0x03,\r
+  /* 00000231 call word 0x3ad                */ 0xE8,0x79,  0x01,\r
+  /* 00000234 pop si                         */ 0x5E,\r
+  /* 00000235 jmp short 0x235                */ 0xEB,0xFE,\r
+  /* 00000237 push es                        */ 0x06,\r
+  /* 00000238 push di                        */ 0x57,\r
+  /* 00000239 push ds                        */ 0x1E,\r
+  /* 0000023A push si                        */ 0x56,\r
+  /* 0000023B push cx                        */ 0x51,\r
+  /* 0000023C push si                        */ 0x56,\r
+  /* 0000023D mov si,0x3eb                   */ 0xBE,0xEB,  0x03,\r
+  /* 00000240 call word 0x3ad                */ 0xE8,0x6A,  0x01,\r
+  /* 00000243 pop si                         */ 0x5E,\r
+  /* 00000244 push cs                        */ 0x0E,\r
+  /* 00000245 pop ds                         */ 0x1F,\r
+  /* 00000246 mov si,0x0                     */ 0xBE,0x00,  0x00,\r
+  /* 00000249 mov cx,0x100                   */ 0xB9,0x00,  0x01,\r
+  /* 0000024C cld                            */ 0xFC,\r
+  /* 0000024D rep movsb                      */ 0xF3,0xA4,\r
+  /* 0000024F pop cx                         */ 0x59,\r
+  /* 00000250 pop si                         */ 0x5E,\r
+  /* 00000251 pop ds                         */ 0x1F,\r
+  /* 00000252 pop di                         */ 0x5F,\r
+  /* 00000253 pop es                         */ 0x07,\r
+  /* 00000254 jmp word 0x395                 */ 0xE9,0x3E,  0x01,\r
+  /* 00000257 push es                        */ 0x06,\r
+  /* 00000258 push di                        */ 0x57,\r
+  /* 00000259 push ds                        */ 0x1E,\r
+  /* 0000025A push si                        */ 0x56,\r
+  /* 0000025B push cx                        */ 0x51,\r
+  /* 0000025C push si                        */ 0x56,\r
+  /* 0000025D mov si,0x3f6                   */ 0xBE,0xF6,  0x03,\r
+  /* 00000260 call word 0x3ad                */ 0xE8,0x4A,  0x01,\r
+  /* 00000263 pop si                         */ 0x5E,\r
+  /* 00000264 and cx,0xbfff                  */ 0x81,0xE1,  0xFF,0xBF,\r
+  /* 00000268 cmp cx,0x13f                   */ 0x81,0xF9,  0x3F,0x01,\r
+  /* 0000026C jz 0x284                       */ 0x74,0x16,\r
+  /* 0000026E cmp cx,0x140                   */ 0x81,0xF9,  0x40,0x01,\r
+  /* 00000272 jz 0x291                       */ 0x74,0x1D,\r
+  /* 00000274 cmp cx,0x141                   */ 0x81,0xF9,  0x41,0x01,\r
+  /* 00000278 jz 0x29e                       */ 0x74,0x24,\r
+  /* 0000027A push si                        */ 0x56,\r
+  /* 0000027B mov si,0x42c                   */ 0xBE,0x2C,  0x04,\r
+  /* 0000027E call word 0x3ad                */ 0xE8,0x2C,  0x01,\r
+  /* 00000281 pop si                         */ 0x5E,\r
+  /* 00000282 jmp short 0x235                */ 0xEB,0xB1,\r
+  /* 00000284 push si                        */ 0x56,\r
+  /* 00000285 mov si,0x46b                   */ 0xBE,0x6B,  0x04,\r
+  /* 00000288 call word 0x3ad                */ 0xE8,0x22,  0x01,\r
+  /* 0000028B pop si                         */ 0x5E,\r
+  /* 0000028C mov si,0x100                   */ 0xBE,0x00,  0x01,\r
+  /* 0000028F jmp short 0x2b8                */ 0xEB,0x27,\r
+  /* 00000291 push si                        */ 0x56,\r
+  /* 00000292 mov si,0x47d                   */ 0xBE,0x7D,  0x04,\r
+  /* 00000295 call word 0x3ad                */ 0xE8,0x15,  0x01,\r
+  /* 00000298 pop si                         */ 0x5E,\r
+  /* 00000299 mov si,0x132                   */ 0xBE,0x32,  0x01,\r
+  /* 0000029C jmp short 0x2b8                */ 0xEB,0x1A,\r
+  /* 0000029E push si                        */ 0x56,\r
+  /* 0000029F mov si,0x48f                   */ 0xBE,0x8F,  0x04,\r
+  /* 000002A2 call word 0x3ad                */ 0xE8,0x08,  0x01,\r
+  /* 000002A5 pop si                         */ 0x5E,\r
+  /* 000002A6 mov si,0x164                   */ 0xBE,0x64,  0x01,\r
+  /* 000002A9 jmp short 0x2b8                */ 0xEB,0x0D,\r
+  /* 000002AB push si                        */ 0x56,\r
+  /* 000002AC mov si,0x4a2                   */ 0xBE,0xA2,  0x04,\r
+  /* 000002AF call word 0x3ad                */ 0xE8,0xFB,  0x00,\r
+  /* 000002B2 pop si                         */ 0x5E,\r
+  /* 000002B3 mov si,0x196                   */ 0xBE,0x96,  0x01,\r
+  /* 000002B6 jmp short 0x2b8                */ 0xEB,0x00,\r
+  /* 000002B8 push cs                        */ 0x0E,\r
+  /* 000002B9 pop ds                         */ 0x1F,\r
+  /* 000002BA mov cx,0x32                    */ 0xB9,0x32,  0x00,\r
+  /* 000002BD cld                            */ 0xFC,\r
+  /* 000002BE rep movsb                      */ 0xF3,0xA4,\r
+  /* 000002C0 pop cx                         */ 0x59,\r
+  /* 000002C1 pop si                         */ 0x5E,\r
+  /* 000002C2 pop ds                         */ 0x1F,\r
+  /* 000002C3 pop di                         */ 0x5F,\r
+  /* 000002C4 pop es                         */ 0x07,\r
+  /* 000002C5 jmp word 0x395                 */ 0xE9,0xCD,  0x00,\r
+  /* 000002C8 push dx                        */ 0x52,\r
+  /* 000002C9 push ax                        */ 0x50,\r
+  /* 000002CA push si                        */ 0x56,\r
+  /* 000002CB mov si,0x410                   */ 0xBE,0x10,  0x04,\r
+  /* 000002CE call word 0x3ad                */ 0xE8,0xDC,  0x00,\r
+  /* 000002D1 pop si                         */ 0x5E,\r
+  /* 000002D2 and bx,0xbfff                  */ 0x81,0xE3,  0xFF,0xBF,\r
+  /* 000002D6 cmp bx,0x13f                   */ 0x81,0xFB,  0x3F,0x01,\r
+  /* 000002DA jz 0x2f3                       */ 0x74,0x17,\r
+  /* 000002DC cmp bx,0x140                   */ 0x81,0xFB,  0x40,0x01,\r
+  /* 000002E0 jz 0x2fd                       */ 0x74,0x1B,\r
+  /* 000002E2 cmp bx,0x141                   */ 0x81,0xFB,  0x41,0x01,\r
+  /* 000002E6 jz 0x307                       */ 0x74,0x1F,\r
+  /* 000002E8 push si                        */ 0x56,\r
+  /* 000002E9 mov si,0x42c                   */ 0xBE,0x2C,  0x04,\r
+  /* 000002EC call word 0x3ad                */ 0xE8,0xBE,  0x00,\r
+  /* 000002EF pop si                         */ 0x5E,\r
+  /* 000002F0 jmp word 0x235                 */ 0xE9,0x42,  0xFF,\r
+  /* 000002F3 push si                        */ 0x56,\r
+  /* 000002F4 mov si,0x46b                   */ 0xBE,0x6B,  0x04,\r
+  /* 000002F7 call word 0x3ad                */ 0xE8,0xB3,  0x00,\r
+  /* 000002FA pop si                         */ 0x5E,\r
+  /* 000002FB jmp short 0x319                */ 0xEB,0x1C,\r
+  /* 000002FD push si                        */ 0x56,\r
+  /* 000002FE mov si,0x47d                   */ 0xBE,0x7D,  0x04,\r
+  /* 00000301 call word 0x3ad                */ 0xE8,0xA9,  0x00,\r
+  /* 00000304 pop si                         */ 0x5E,\r
+  /* 00000305 jmp short 0x319                */ 0xEB,0x12,\r
+  /* 00000307 push si                        */ 0x56,\r
+  /* 00000308 mov si,0x48f                   */ 0xBE,0x8F,  0x04,\r
+  /* 0000030B call word 0x3ad                */ 0xE8,0x9F,  0x00,\r
+  /* 0000030E pop si                         */ 0x5E,\r
+  /* 0000030F jmp short 0x319                */ 0xEB,0x08,\r
+  /* 00000311 push si                        */ 0x56,\r
+  /* 00000312 mov si,0x4a2                   */ 0xBE,0xA2,  0x04,\r
+  /* 00000315 call word 0x3ad                */ 0xE8,0x95,  0x00,\r
+  /* 00000318 pop si                         */ 0x5E,\r
+  /* 00000319 mov [0x4b0],bl                 */ 0x88,0x1E,  0xB0,0x04,\r
+  /* 0000031D mov [0x4b1],bh                 */ 0x88,0x3E,  0xB1,0x04,\r
+  /* 00000321 pop ax                         */ 0x58,\r
+  /* 00000322 pop dx                         */ 0x5A,\r
+  /* 00000323 jmp short 0x395                */ 0xEB,0x70,\r
+  /* 00000325 push si                        */ 0x56,\r
+  /* 00000326 mov si,0x405                   */ 0xBE,0x05,  0x04,\r
+  /* 00000329 call word 0x3ad                */ 0xE8,0x81,  0x00,\r
+  /* 0000032C pop si                         */ 0x5E,\r
+  /* 0000032D mov bl,[0x4b0]                 */ 0x8A,0x1E,  0xB0,0x04,\r
+  /* 00000331 mov bh,[0x4b1]                 */ 0x8A,0x3E,  0xB1,0x04,\r
+  /* 00000335 jmp short 0x395                */ 0xEB,0x5E,\r
+  /* 00000337 push si                        */ 0x56,\r
+  /* 00000338 mov si,0x43b                   */ 0xBE,0x3B,  0x04,\r
+  /* 0000033B call word 0x3ad                */ 0xE8,0x6F,  0x00,\r
+  /* 0000033E pop si                         */ 0x5E,\r
+  /* 0000033F mov bx,0x80                    */ 0xBB,0x80,  0x00,\r
+  /* 00000342 jmp short 0x395                */ 0xEB,0x51,\r
+  /* 00000344 push es                        */ 0x06,\r
+  /* 00000345 push di                        */ 0x57,\r
+  /* 00000346 push ds                        */ 0x1E,\r
+  /* 00000347 push si                        */ 0x56,\r
+  /* 00000348 push cx                        */ 0x51,\r
+  /* 00000349 push si                        */ 0x56,\r
+  /* 0000034A mov si,0x450                   */ 0xBE,0x50,  0x04,\r
+  /* 0000034D call word 0x3ad                */ 0xE8,0x5D,  0x00,\r
+  /* 00000350 pop si                         */ 0x5E,\r
+  /* 00000351 push cs                        */ 0x0E,\r
+  /* 00000352 pop ds                         */ 0x1F,\r
+  /* 00000353 mov si,0x4b2                   */ 0xBE,0xB2,  0x04,\r
+  /* 00000356 mov cx,0x80                    */ 0xB9,0x80,  0x00,\r
+  /* 00000359 cld                            */ 0xFC,\r
+  /* 0000035A rep movsb                      */ 0xF3,0xA4,\r
+  /* 0000035C pop cx                         */ 0x59,\r
+  /* 0000035D pop si                         */ 0x5E,\r
+  /* 0000035E pop ds                         */ 0x1F,\r
+  /* 0000035F pop di                         */ 0x5F,\r
+  /* 00000360 pop es                         */ 0x07,\r
+  /* 00000361 jmp short 0x395                */ 0xEB,0x32,\r
+  /* 00000363 push si                        */ 0x56,\r
+  /* 00000364 mov si,0x41b                   */ 0xBE,0x1B,  0x04,\r
+  /* 00000367 call word 0x3ad                */ 0xE8,0x43,  0x00,\r
+  /* 0000036A pop si                         */ 0x5E,\r
+  /* 0000036B cmp al,0x3                     */ 0x3C,0x03,\r
+  /* 0000036D jz 0x37e                       */ 0x74,0x0F,\r
+  /* 0000036F cmp al,0x12                    */ 0x3C,0x12,\r
+  /* 00000371 jz 0x38a                       */ 0x74,0x17,\r
+  /* 00000373 push si                        */ 0x56,\r
+  /* 00000374 mov si,0x42c                   */ 0xBE,0x2C,  0x04,\r
+  /* 00000377 call word 0x3ad                */ 0xE8,0x33,  0x00,\r
+  /* 0000037A pop si                         */ 0x5E,\r
+  /* 0000037B jmp word 0x235                 */ 0xE9,0xB7,  0xFE,\r
+  /* 0000037E push si                        */ 0x56,\r
+  /* 0000037F mov si,0x45c                   */ 0xBE,0x5C,  0x04,\r
+  /* 00000382 call word 0x3ad                */ 0xE8,0x28,  0x00,\r
+  /* 00000385 pop si                         */ 0x5E,\r
+  /* 00000386 mov al,0x0                     */ 0xB0,0x00,\r
+  /* 00000388 jmp short 0x38c                */ 0xEB,0x02,\r
+  /* 0000038A mov al,0x0                     */ 0xB0,0x00,\r
+  /* 0000038C push si                        */ 0x56,\r
+  /* 0000038D mov si,0x3c2                   */ 0xBE,0xC2,  0x03,\r
+  /* 00000390 call word 0x3ad                */ 0xE8,0x1A,  0x00,\r
+  /* 00000393 pop si                         */ 0x5E,\r
+  /* 00000394 iretw                          */ 0xCF,\r
+  /* 00000395 push si                        */ 0x56,\r
+  /* 00000396 mov si,0x3c2                   */ 0xBE,0xC2,  0x03,\r
+  /* 00000399 call word 0x3ad                */ 0xE8,0x11,  0x00,\r
+  /* 0000039C pop si                         */ 0x5E,\r
+  /* 0000039D mov ax,0x4f                    */ 0xB8,0x4F,  0x00,\r
+  /* 000003A0 iretw                          */ 0xCF,\r
+  /* 000003A1 push si                        */ 0x56,\r
+  /* 000003A2 mov si,0x3c8                   */ 0xBE,0xC8,  0x03,\r
+  /* 000003A5 call word 0x3ad                */ 0xE8,0x05,  0x00,\r
+  /* 000003A8 pop si                         */ 0x5E,\r
+  /* 000003A9 mov ax,0x24f                   */ 0xB8,0x4F,  0x02,\r
+  /* 000003AC iretw                          */ 0xCF,\r
+  /* 000003AD pushaw                         */ 0x60,\r
+  /* 000003AE push ds                        */ 0x1E,\r
+  /* 000003AF push cs                        */ 0x0E,\r
+  /* 000003B0 pop ds                         */ 0x1F,\r
+  /* 000003B1 mov dx,0x220                   */ 0xBA,0x20,  0x02,\r
+  /* 000003B4 mov ax,0x0                     */ 0xB8,0x00,  0x00,\r
+  /* 000003B7 lodsb                          */ 0xAC,\r
+  /* 000003B8 cmp al,0x0                     */ 0x3C,0x00,\r
+  /* 000003BA jz 0x3bf                       */ 0x74,0x03,\r
+  /* 000003BC out dx,al                      */ 0xEE,\r
+  /* 000003BD jmp short 0x3b7                */ 0xEB,0xF8,\r
+  /* 000003BF pop ds                         */ 0x1F,\r
+  /* 000003C0 popaw                          */ 0x61,\r
+  /* 000003C1 ret                            */ 0xC3,\r
+  /* 000003C2 jna 0x413                      */ 0x76,0x4F,\r
+  /* 000003C4 imul cx,[di],byte +0xa         */ 0x6B,0x0D,  0x0A,\r
+  /* 000003C7 add [bp+0x55],dh               */ 0x00,0x76,  0x55,\r
+  /* 000003CA outsb                          */ 0x6E,\r
+  /* 000003CB jnc 0x442                      */ 0x73,0x75,\r
+  /* 000003CD jo 0x43f                       */ 0x70,0x70,\r
+  /* 000003CF outsw                          */ 0x6F,\r
+  /* 000003D0 jc 0x446                       */ 0x72,0x74,\r
+  /* 000003D2 fs or ax,0xa                   */ 0x65,0x64,  0x0D,0x0A, 0x00,\r
+  /* 000003D7 jna 0x42e                      */ 0x76,0x55,\r
+  /* 000003D9 outsb                          */ 0x6E,\r
+  /* 000003DA imul bp,[bp+0x6f],byte +0x77   */ 0x6B,0x6E,  0x6F,0x77,\r
+  /* 000003DE outsb                          */ 0x6E,\r
+  /* 000003DF and [bp+0x75],al               */ 0x20,0x46,  0x75,\r
+  /* 000003E2 outsb                          */ 0x6E,\r
+  /* 000003E3 arpl [si+0x69],si              */ 0x63,0x74,  0x69,\r
+  /* 000003E6 outsw                          */ 0x6F,\r
+  /* 000003E7 outsb                          */ 0x6E,\r
+  /* 000003E8 or ax,0xa                      */ 0x0D,0x0A,  0x00,\r
+  /* 000003EB jna 0x434                      */ 0x76,0x47,\r
+  /* 000003ED gs jz 0x439                    */ 0x65,0x74,  0x49,\r
+  /* 000003F0 outsb                          */ 0x6E,\r
+  /* 000003F1 outsd                          */ 0x66,0x6F,\r
+  /* 000003F3 or ax,0xa                      */ 0x0D,0x0A,  0x00,\r
+  /* 000003F6 jna 0x43f                      */ 0x76,0x47,\r
+  /* 000003F8 gs jz 0x448                    */ 0x65,0x74,  0x4D,\r
+  /* 000003FB outsw                          */ 0x6F,\r
+  /* 000003FC gs dec cx                      */ 0x64,0x65,  0x49,\r
+  /* 000003FF outsb                          */ 0x6E,\r
+  /* 00000400 outsd                          */ 0x66,0x6F,\r
+  /* 00000402 or ax,0xa                      */ 0x0D,0x0A,  0x00,\r
+  /* 00000405 jna 0x44e                      */ 0x76,0x47,\r
+  /* 00000407 gs jz 0x457                    */ 0x65,0x74,  0x4D,\r
+  /* 0000040A outsw                          */ 0x6F,\r
+  /* 0000040B gs or ax,0xa                   */ 0x64,0x65,  0x0D,0x0A, 0x00,\r
+  /* 00000410 jna 0x465                      */ 0x76,0x53,\r
+  /* 00000412 gs jz 0x462                    */ 0x65,0x74,  0x4D,\r
+  /* 00000415 outsw                          */ 0x6F,\r
+  /* 00000416 gs or ax,0xa                   */ 0x64,0x65,  0x0D,0x0A, 0x00,\r
+  /* 0000041B jna 0x470                      */ 0x76,0x53,\r
+  /* 0000041D gs jz 0x46d                    */ 0x65,0x74,  0x4D,\r
+  /* 00000420 outsw                          */ 0x6F,\r
+  /* 00000421 gs dec sp                      */ 0x64,0x65,  0x4C,\r
+  /* 00000424 gs a32 popaw                   */ 0x65,0x67,  0x61,\r
+  /* 00000427 arpl [bx+di+0xd],di            */ 0x63,0x79,  0x0D,\r
+  /* 0000042A or al,[bx+si]                  */ 0x0A,0x00,\r
+  /* 0000042C jna 0x483                      */ 0x76,0x55,\r
+  /* 0000042E outsb                          */ 0x6E,\r
+  /* 0000042F imul bp,[bx+0x77],byte +0x6e   */ 0x6B,0x6F,  0x77,0x6E,\r
+  /* 00000433 and [di+0x6f],cl               */ 0x20,0x4D,  0x6F,\r
+  /* 00000436 gs or ax,0xa                   */ 0x64,0x65,  0x0D,0x0A, 0x00,\r
+  /* 0000043B jna 0x484                      */ 0x76,0x47,\r
+  /* 0000043D gs jz 0x490                    */ 0x65,0x74,  0x50,\r
+  /* 00000440 insw                           */ 0x6D,\r
+  /* 00000441 inc bx                         */ 0x43,\r
+  /* 00000442 popaw                          */ 0x61,\r
+  /* 00000443 jo 0x4a6                       */ 0x70,0x61,\r
+  /* 00000445 bound bp,[bx+di+0x6c]          */ 0x62,0x69,  0x6C,\r
+  /* 00000448 imul si,[si+0x69],word 0x7365  */ 0x69,0x74,  0x69,0x65, 0x73,\r
+  /* 0000044D or ax,0xa                      */ 0x0D,0x0A,  0x00,\r
+  /* 00000450 jna 0x4a4                      */ 0x76,0x52,\r
+  /* 00000452 gs popaw                       */ 0x65,0x61,\r
+  /* 00000454 fs inc bp                      */ 0x64,0x45,\r
+  /* 00000456 imul sp,[fs:si+0xd],word 0xa   */ 0x64,0x69,  0x64,0x0D, 0x0A, 0x00,\r
+  /* 0000045C jna 0x4aa                      */ 0x76,0x4C,\r
+  /* 0000045E gs a32 popaw                   */ 0x65,0x67,  0x61,\r
+  /* 00000461 arpl [bx+di+0x4d],di           */ 0x63,0x79,  0x4D,\r
+  /* 00000464 outsw                          */ 0x6F,\r
+  /* 00000465 xor cx,[gs:di]                 */ 0x64,0x65,  0x33,0x0D,\r
+  /* 00000469 or al,[bx+si]                  */ 0x0A,0x00,\r
+  /* 0000046B insw                           */ 0x6D,\r
+  /* 0000046C outsw                          */ 0x6F,\r
+  /* 0000046D gs pop di                      */ 0x64,0x65,  0x5F,\r
+  /* 00000470 ss xor al,0x30                 */ 0x36,0x34,  0x30,\r
+  /* 00000473 js 0x4a9                       */ 0x78,0x34,\r
+  /* 00000475 cmp [bx+si],dh                 */ 0x38,0x30,\r
+  /* 00000477 js 0x4ac                       */ 0x78,0x33,\r
+  /* 00000479 xor cl,[di]                    */ 0x32,0x0D,\r
+  /* 0000047B or al,[bx+si]                  */ 0x0A,0x00,\r
+  /* 0000047D insw                           */ 0x6D,\r
+  /* 0000047E outsw                          */ 0x6F,\r
+  /* 0000047F gs pop di                      */ 0x64,0x65,  0x5F,\r
+  /* 00000482 cmp [bx+si],dh                 */ 0x38,0x30,\r
+  /* 00000484 xor [bx+si+0x36],bh            */ 0x30,0x78,  0x36,\r
+  /* 00000487 xor [bx+si],dh                 */ 0x30,0x30,\r
+  /* 00000489 js 0x4be                       */ 0x78,0x33,\r
+  /* 0000048B xor cl,[di]                    */ 0x32,0x0D,\r
+  /* 0000048D or al,[bx+si]                  */ 0x0A,0x00,\r
+  /* 0000048F insw                           */ 0x6D,\r
+  /* 00000490 outsw                          */ 0x6F,\r
+  /* 00000491 gs pop di                      */ 0x64,0x65,  0x5F,\r
+  /* 00000494 xor [bx+si],si                 */ 0x31,0x30,\r
+  /* 00000496 xor dh,[si]                    */ 0x32,0x34,\r
+  /* 00000498 js 0x4d1                       */ 0x78,0x37,\r
+  /* 0000049A cmp [ss:bx+si+0x33],bh         */ 0x36,0x38,  0x78,0x33,\r
+  /* 0000049E xor cl,[di]                    */ 0x32,0x0D,\r
+  /* 000004A0 or al,[bx+si]                  */ 0x0A,0x00,\r
+  /* 000004A2 insw                           */ 0x6D,\r
+  /* 000004A3 outsw                          */ 0x6F,\r
+  /* 000004A4 gs pop di                      */ 0x64,0x65,  0x5F,\r
+  /* 000004A7 jnz 0x517                      */ 0x75,0x6E,\r
+  /* 000004A9 jnz 0x51e                      */ 0x75,0x73,\r
+  /* 000004AB fs or ax,0xa                   */ 0x65,0x64,  0x0D,0x0A, 0x00,\r
+  /* 000004B0 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004B2 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004B4 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004B6 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004B8 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004BA add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004BC add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004BE add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004C0 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004C2 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004C4 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004C6 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004C8 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004CA add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004CC add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004CE add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004D0 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004D2 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004D4 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004D6 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004D8 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004DA add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004DC add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004DE add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004E0 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004E2 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004E4 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004E6 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004E8 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004EA add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004EC add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004EE add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004F0 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004F2 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004F4 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004F6 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004F8 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004FA add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004FC add [bx+si],al                 */ 0x00,0x00,\r
+  /* 000004FE add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000500 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000502 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000504 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000506 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000508 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 0000050A add [bx+si],al                 */ 0x00,0x00,\r
+  /* 0000050C add [bx+si],al                 */ 0x00,0x00,\r
+  /* 0000050E add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000510 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000512 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000514 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000516 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000518 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 0000051A add [bx+si],al                 */ 0x00,0x00,\r
+  /* 0000051C add [bx+si],al                 */ 0x00,0x00,\r
+  /* 0000051E add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000520 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000522 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000524 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000526 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000528 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 0000052A add [bx+si],al                 */ 0x00,0x00,\r
+  /* 0000052C add [bx+si],al                 */ 0x00,0x00,\r
+  /* 0000052E add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000530 add [bx+si],al                 */ 0x00,0x00,\r
+  /* 00000532 add [bx+si],al                 */ 0x00,0x00,\r
 };\r
 #endif\r
index e3ed78581c1b9d925e0f22593d533af2da3a78a7..a85f4b760af95b28d15444de9b23eb35a5353218 100644 (file)
@@ -30,8 +30,8 @@ AmdSevInitialize (
   VOID\r
   )\r
 {\r
-  UINT64                            EncryptionMask;\r
-  RETURN_STATUS                     PcdStatus;\r
+  UINT64         EncryptionMask;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   //\r
   // Check if SEV is enabled\r
@@ -44,7 +44,7 @@ AmdSevInitialize (
   // Set Memory Encryption Mask PCD\r
   //\r
   EncryptionMask = MemEncryptSevGetEncryptionMask ();\r
-  PcdStatus = PcdSet64S (PcdPteMemoryEncryptionAddressOrMask, EncryptionMask);\r
+  PcdStatus      = PcdSet64S (PcdPteMemoryEncryptionAddressOrMask, EncryptionMask);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   DEBUG ((DEBUG_INFO, "SEV is enabled (mask 0x%lx)\n", EncryptionMask));\r
@@ -67,9 +67,9 @@ AmdSevInitialize (
   // hypervisor.\r
   //\r
   if (FeaturePcdGet (PcdSmmSmramRequire) && (mBootMode != BOOT_ON_S3_RESUME)) {\r
-    RETURN_STATUS LocateMapStatus;\r
-    UINTN         MapPagesBase;\r
-    UINTN         MapPagesCount;\r
+    RETURN_STATUS  LocateMapStatus;\r
+    UINTN          MapPagesBase;\r
+    UINTN          MapPagesCount;\r
 \r
     LocateMapStatus = MemEncryptSevLocateInitialSmramSaveStateMapPages (\r
                         &MapPagesBase,\r
index 5c538c59e07416f81ace82e9603a31e39d229d0c..9f23f9a4284745bc733d47a57be99a39bd629ab2 100644 (file)
@@ -29,7 +29,7 @@ STATIC
 VOID\r
 EFIAPI\r
 ClearCache (\r
-  IN OUT VOID *WorkSpace\r
+  IN OUT VOID  *WorkSpace\r
   )\r
 {\r
   WriteBackInvalidateDataCache ();\r
@@ -56,8 +56,8 @@ ClearCacheOnMpServicesAvailable (
   IN VOID                       *Ppi\r
   )\r
 {\r
-  EFI_PEI_MP_SERVICES_PPI *MpServices;\r
-  EFI_STATUS              Status;\r
+  EFI_PEI_MP_SERVICES_PPI  *MpServices;\r
+  EFI_STATUS               Status;\r
 \r
   DEBUG ((DEBUG_INFO, "%a: %a\n", gEfiCallerBaseName, __FUNCTION__));\r
 \r
@@ -65,15 +65,15 @@ ClearCacheOnMpServicesAvailable (
   // Clear cache on all the APs in parallel.\r
   //\r
   MpServices = Ppi;\r
-  Status = MpServices->StartupAllAPs (\r
-                         (CONST EFI_PEI_SERVICES **)PeiServices,\r
-                         MpServices,\r
-                         ClearCache,          // Procedure\r
-                         FALSE,               // SingleThread\r
-                         0,                   // TimeoutInMicroSeconds: inf.\r
-                         NULL                 // ProcedureArgument\r
-                         );\r
-  if (EFI_ERROR (Status) && Status != EFI_NOT_STARTED) {\r
+  Status     = MpServices->StartupAllAPs (\r
+                             (CONST EFI_PEI_SERVICES **)PeiServices,\r
+                             MpServices,\r
+                             ClearCache,      // Procedure\r
+                             FALSE,           // SingleThread\r
+                             0,               // TimeoutInMicroSeconds: inf.\r
+                             NULL             // ProcedureArgument\r
+                             );\r
+  if (EFI_ERROR (Status) && (Status != EFI_NOT_STARTED)) {\r
     DEBUG ((DEBUG_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status));\r
     return Status;\r
   }\r
@@ -89,7 +89,7 @@ ClearCacheOnMpServicesAvailable (
 // Notification object for registering the callback, for when\r
 // EFI_PEI_MP_SERVICES_PPI becomes available.\r
 //\r
-STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mMpServicesNotify = {\r
+STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR  mMpServicesNotify = {\r
   EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | // Flags\r
   EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
   &gEfiPeiMpServicesPpiGuid,               // Guid\r
@@ -101,11 +101,15 @@ InstallClearCacheCallback (
   VOID\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = PeiServicesNotifyPpi (&mMpServicesNotify);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: failed to set up MP Services callback: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: failed to set up MP Services callback: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
   }\r
 }\r
index 9b34e10b17962384f053b2b884f74da227f1a4fe..a01b3866bee478f18070741fc9331a4394c55dbb 100644 (file)
@@ -6,7 +6,6 @@
 \r
 **/\r
 \r
-\r
 #include "Cmos.h"\r
 #include "Library/IoLib.h"\r
 \r
 UINT8\r
 EFIAPI\r
 CmosRead8 (\r
-  IN      UINTN                     Index\r
+  IN      UINTN  Index\r
   )\r
 {\r
-  IoWrite8 (0x70, (UINT8) Index);\r
+  IoWrite8 (0x70, (UINT8)Index);\r
   return IoRead8 (0x71);\r
 }\r
 \r
-\r
 /**\r
   Writes 8-bits of CMOS data.\r
 \r
@@ -47,12 +45,11 @@ CmosRead8 (
 UINT8\r
 EFIAPI\r
 CmosWrite8 (\r
-  IN      UINTN                     Index,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Index,\r
+  IN      UINT8  Value\r
   )\r
 {\r
-  IoWrite8 (0x70, (UINT8) Index);\r
+  IoWrite8 (0x70, (UINT8)Index);\r
   IoWrite8 (0x71, Value);\r
   return Value;\r
 }\r
-\r
index ef7901fbeaa89c8136745ba7676a6debe950d8de..e0ba81d4faf34b5aaa0c787cb59979b542081b39 100644 (file)
@@ -23,7 +23,7 @@
 UINT8\r
 EFIAPI\r
 CmosRead8 (\r
-  IN      UINTN                     Index\r
+  IN      UINTN  Index\r
   );\r
 \r
 /**\r
@@ -41,10 +41,8 @@ CmosRead8 (
 UINT8\r
 EFIAPI\r
 CmosWrite8 (\r
-  IN      UINTN                     Index,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Index,\r
+  IN      UINT8  Value\r
   );\r
 \r
-\r
 #endif /* _CMOS_H_ */\r
-\r
index 94b7e2141562fd4c302b97f641cf29c2b3e32461..575600aa70af41b3ce02a990a05c1b4268742e5a 100644 (file)
@@ -13,7 +13,6 @@
 #include <Library/PcdLib.h>\r
 #include <Library/PeiServicesLib.h>\r
 \r
-\r
 /**\r
   Publish PEI & DXE (Decompressed) Memory based FVs to let PEI\r
   and DXE know about them.\r
@@ -26,7 +25,7 @@ PeiFvInitialization (
   VOID\r
   )\r
 {\r
-  BOOLEAN SecureS3Needed;\r
+  BOOLEAN  SecureS3Needed;\r
 \r
   DEBUG ((DEBUG_INFO, "Platform PEI Firmware Volume Initialization\n"));\r
 \r
@@ -67,7 +66,7 @@ PeiFvInitialization (
   // of DXEFV, so let's keep away the OS from there too.\r
   //\r
   if (SecureS3Needed) {\r
-    UINT32 DxeMemFvEnd;\r
+    UINT32  DxeMemFvEnd;\r
 \r
     DxeMemFvEnd = PcdGet32 (PcdOvmfDxeMemFvBase) +\r
                   PcdGet32 (PcdOvmfDxeMemFvSize);\r
@@ -83,7 +82,7 @@ PeiFvInitialization (
   //\r
   PeiServicesInstallFvInfoPpi (\r
     NULL,\r
-    (VOID *)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase),\r
+    (VOID *)(UINTN)PcdGet32 (PcdOvmfDxeMemFvBase),\r
     PcdGet32 (PcdOvmfDxeMemFvSize),\r
     NULL,\r
     NULL\r
@@ -91,4 +90,3 @@ PeiFvInitialization (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index 1b556be69c020ca6fef9cc3230ee291a2f5ae2d2..1949e586a07edae0d190a5f162983187c6ec9444 100644 (file)
@@ -36,22 +36,22 @@ Module Name:
 #include "Platform.h"\r
 #include "Cmos.h"\r
 \r
-UINT8 mPhysMemAddressWidth;\r
+UINT8  mPhysMemAddressWidth;\r
 \r
-STATIC UINT32 mS3AcpiReservedMemoryBase;\r
-STATIC UINT32 mS3AcpiReservedMemorySize;\r
+STATIC UINT32  mS3AcpiReservedMemoryBase;\r
+STATIC UINT32  mS3AcpiReservedMemorySize;\r
 \r
-STATIC UINT16 mQ35TsegMbytes;\r
+STATIC UINT16  mQ35TsegMbytes;\r
 \r
-BOOLEAN mQ35SmramAtDefaultSmbase = FALSE;\r
+BOOLEAN  mQ35SmramAtDefaultSmbase = FALSE;\r
 \r
 VOID\r
 Q35TsegMbytesInitialization (\r
   VOID\r
   )\r
 {\r
-  UINT16        ExtendedTsegMbytes;\r
-  RETURN_STATUS PcdStatus;\r
+  UINT16         ExtendedTsegMbytes;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   if (mHostBridgeDevId != INTEL_Q35_MCH_DEVICE_ID) {\r
     DEBUG ((\r
@@ -100,14 +100,13 @@ Q35TsegMbytesInitialization (
   mQ35TsegMbytes = ExtendedTsegMbytes;\r
 }\r
 \r
-\r
 UINT32\r
 GetSystemMemorySizeBelow4gb (\r
   VOID\r
   )\r
 {\r
-  UINT8 Cmos0x34;\r
-  UINT8 Cmos0x35;\r
+  UINT8  Cmos0x34;\r
+  UINT8  Cmos0x35;\r
 \r
   //\r
   // CMOS 0x34/0x35 specifies the system memory above 16 MB.\r
@@ -118,20 +117,19 @@ GetSystemMemorySizeBelow4gb (
   //   into the calculation to get the total memory size.\r
   //\r
 \r
-  Cmos0x34 = (UINT8) CmosRead8 (0x34);\r
-  Cmos0x35 = (UINT8) CmosRead8 (0x35);\r
+  Cmos0x34 = (UINT8)CmosRead8 (0x34);\r
+  Cmos0x35 = (UINT8)CmosRead8 (0x35);\r
 \r
-  return (UINT32) (((UINTN)((Cmos0x35 << 8) + Cmos0x34) << 16) + SIZE_16MB);\r
+  return (UINT32)(((UINTN)((Cmos0x35 << 8) + Cmos0x34) << 16) + SIZE_16MB);\r
 }\r
 \r
-\r
 STATIC\r
 UINT64\r
 GetSystemMemorySizeAbove4gb (\r
   )\r
 {\r
-  UINT32 Size;\r
-  UINTN  CmosIndex;\r
+  UINT32  Size;\r
+  UINTN   CmosIndex;\r
 \r
   //\r
   // CMOS 0x5b-0x5d specifies the system memory above 4GB MB.\r
@@ -143,13 +141,12 @@ GetSystemMemorySizeAbove4gb (
 \r
   Size = 0;\r
   for (CmosIndex = 0x5d; CmosIndex >= 0x5b; CmosIndex--) {\r
-    Size = (UINT32) (Size << 8) + (UINT32) CmosRead8 (CmosIndex);\r
+    Size = (UINT32)(Size << 8) + (UINT32)CmosRead8 (CmosIndex);\r
   }\r
 \r
   return LShiftU64 (Size, 16);\r
 }\r
 \r
-\r
 /**\r
   Return the highest address that DXE could possibly use, plus one.\r
 **/\r
@@ -159,9 +156,9 @@ GetFirstNonAddress (
   VOID\r
   )\r
 {\r
-  UINT64               FirstNonAddress;\r
-  UINT64               Pci64Base, Pci64Size;\r
-  RETURN_STATUS        PcdStatus;\r
+  UINT64         FirstNonAddress;\r
+  UINT64         Pci64Base, Pci64Size;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   FirstNonAddress = BASE_4GB + GetSystemMemorySizeAbove4gb ();\r
 \r
@@ -170,11 +167,12 @@ GetFirstNonAddress (
   // resources to 32-bit anyway. See DegradeResource() in\r
   // "PciResourceSupport.c".\r
   //\r
-#ifdef MDE_CPU_IA32\r
+ #ifdef MDE_CPU_IA32\r
   if (!FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {\r
     return FirstNonAddress;\r
   }\r
-#endif\r
+\r
+ #endif\r
 \r
   //\r
   // Otherwise, in order to calculate the highest address plus one, we must\r
@@ -184,8 +182,11 @@ GetFirstNonAddress (
 \r
   if (Pci64Size == 0) {\r
     if (mBootMode != BOOT_ON_S3_RESUME) {\r
-      DEBUG ((DEBUG_INFO, "%a: disabling 64-bit PCI host aperture\n",\r
-        __FUNCTION__));\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "%a: disabling 64-bit PCI host aperture\n",\r
+        __FUNCTION__\r
+        ));\r
       PcdStatus = PcdSet64S (PcdPciMmio64Size, 0);\r
       ASSERT_RETURN_ERROR (PcdStatus);\r
     }\r
@@ -224,8 +225,13 @@ GetFirstNonAddress (
     PcdStatus = PcdSet64S (PcdPciMmio64Size, Pci64Size);\r
     ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
-    DEBUG ((DEBUG_INFO, "%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n",\r
-      __FUNCTION__, Pci64Base, Pci64Size));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n",\r
+      __FUNCTION__,\r
+      Pci64Base,\r
+      Pci64Size\r
+      ));\r
   }\r
 \r
   //\r
@@ -235,7 +241,6 @@ GetFirstNonAddress (
   return FirstNonAddress;\r
 }\r
 \r
-\r
 /**\r
   Initialize the mPhysMemAddressWidth variable, based on guest RAM size.\r
 **/\r
@@ -244,7 +249,7 @@ AddressWidthInitialization (
   VOID\r
   )\r
 {\r
-  UINT64 FirstNonAddress;\r
+  UINT64  FirstNonAddress;\r
 \r
   //\r
   // As guest-physical memory size grows, the permanent PEI RAM requirements\r
@@ -272,10 +277,10 @@ AddressWidthInitialization (
   if (mPhysMemAddressWidth <= 36) {\r
     mPhysMemAddressWidth = 36;\r
   }\r
+\r
   ASSERT (mPhysMemAddressWidth <= 48);\r
 }\r
 \r
-\r
 /**\r
   Calculate the cap for the permanent PEI memory.\r
 **/\r
@@ -285,21 +290,22 @@ GetPeiMemoryCap (
   VOID\r
   )\r
 {\r
-  BOOLEAN Page1GSupport;\r
-  UINT32  RegEax;\r
-  UINT32  RegEdx;\r
-  UINT32  Pml4Entries;\r
-  UINT32  PdpEntries;\r
-  UINTN   TotalPages;\r
+  BOOLEAN  Page1GSupport;\r
+  UINT32   RegEax;\r
+  UINT32   RegEdx;\r
+  UINT32   Pml4Entries;\r
+  UINT32   PdpEntries;\r
+  UINTN    TotalPages;\r
 \r
   //\r
   // If DXE is 32-bit, then just return the traditional 64 MB cap.\r
   //\r
-#ifdef MDE_CPU_IA32\r
+ #ifdef MDE_CPU_IA32\r
   if (!FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {\r
     return SIZE_64MB;\r
   }\r
-#endif\r
+\r
+ #endif\r
 \r
   //\r
   // Dependent on physical address width, PEI memory allocations can be\r
@@ -320,7 +326,7 @@ GetPeiMemoryCap (
 \r
   if (mPhysMemAddressWidth <= 39) {\r
     Pml4Entries = 1;\r
-    PdpEntries = 1 << (mPhysMemAddressWidth - 30);\r
+    PdpEntries  = 1 << (mPhysMemAddressWidth - 30);\r
     ASSERT (PdpEntries <= 0x200);\r
   } else {\r
     Pml4Entries = 1 << (mPhysMemAddressWidth - 39);\r
@@ -329,7 +335,7 @@ GetPeiMemoryCap (
   }\r
 \r
   TotalPages = Page1GSupport ? Pml4Entries + 1 :\r
-                               (PdpEntries + 1) * Pml4Entries + 1;\r
+               (PdpEntries + 1) * Pml4Entries + 1;\r
   ASSERT (TotalPages <= 0x40201);\r
 \r
   //\r
@@ -340,7 +346,6 @@ GetPeiMemoryCap (
   return (UINT32)(EFI_PAGES_TO_SIZE (TotalPages) + SIZE_64MB);\r
 }\r
 \r
-\r
 /**\r
   Publish PEI core memory\r
 \r
@@ -352,11 +357,11 @@ PublishPeiMemory (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase;\r
-  UINT64                      MemorySize;\r
-  UINT32                      LowerMemorySize;\r
-  UINT32                      PeiMemoryCap;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase;\r
+  UINT64                MemorySize;\r
+  UINT32                LowerMemorySize;\r
+  UINT32                PeiMemoryCap;\r
 \r
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
   if (FeaturePcdGet (PcdSmmSmramRequire)) {\r
@@ -373,10 +378,10 @@ PublishPeiMemory (
   //\r
   if (mS3Supported) {\r
     mS3AcpiReservedMemorySize = SIZE_512KB +\r
-      mMaxCpuCount *\r
-      PcdGet32 (PcdCpuApStackSize);\r
+                                mMaxCpuCount *\r
+                                PcdGet32 (PcdCpuApStackSize);\r
     mS3AcpiReservedMemoryBase = LowerMemorySize - mS3AcpiReservedMemorySize;\r
-    LowerMemorySize = mS3AcpiReservedMemoryBase;\r
+    LowerMemorySize           = mS3AcpiReservedMemoryBase;\r
   }\r
 \r
   if (mBootMode == BOOT_ON_S3_RESUME) {\r
@@ -384,8 +389,13 @@ PublishPeiMemory (
     MemorySize = mS3AcpiReservedMemorySize;\r
   } else {\r
     PeiMemoryCap = GetPeiMemoryCap ();\r
-    DEBUG ((DEBUG_INFO, "%a: mPhysMemAddressWidth=%d PeiMemoryCap=%u KB\n",\r
-      __FUNCTION__, mPhysMemAddressWidth, PeiMemoryCap >> 10));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: mPhysMemAddressWidth=%d PeiMemoryCap=%u KB\n",\r
+      __FUNCTION__,\r
+      mPhysMemAddressWidth,\r
+      PeiMemoryCap >> 10\r
+      ));\r
 \r
     //\r
     // Determine the range of memory to use during PEI\r
@@ -398,8 +408,8 @@ PublishPeiMemory (
     // shouldn't overlap with that HOB.\r
     //\r
     MemoryBase = mS3Supported && FeaturePcdGet (PcdSmmSmramRequire) ?\r
-      PcdGet32 (PcdOvmfDecompressionScratchEnd) :\r
-      PcdGet32 (PcdOvmfDxeMemFvBase) + PcdGet32 (PcdOvmfDxeMemFvSize);\r
+                 PcdGet32 (PcdOvmfDecompressionScratchEnd) :\r
+                 PcdGet32 (PcdOvmfDxeMemFvBase) + PcdGet32 (PcdOvmfDxeMemFvSize);\r
     MemorySize = LowerMemorySize - MemoryBase;\r
     if (MemorySize > PeiMemoryCap) {\r
       MemoryBase = LowerMemorySize - PeiMemoryCap;\r
@@ -410,13 +420,12 @@ PublishPeiMemory (
   //\r
   // Publish this memory to the PEI Core\r
   //\r
-  Status = PublishSystemMemory(MemoryBase, MemorySize);\r
+  Status = PublishSystemMemory (MemoryBase, MemorySize);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Peform Memory Detection for QEMU / KVM\r
 \r
@@ -427,10 +436,10 @@ QemuInitializeRam (
   VOID\r
   )\r
 {\r
-  UINT64                      LowerMemorySize;\r
-  UINT64                      UpperMemorySize;\r
-  MTRR_SETTINGS               MtrrSettings;\r
-  EFI_STATUS                  Status;\r
+  UINT64         LowerMemorySize;\r
+  UINT64         UpperMemorySize;\r
+  MTRR_SETTINGS  MtrrSettings;\r
+  EFI_STATUS     Status;\r
 \r
   DEBUG ((DEBUG_INFO, "%a called\n", __FUNCTION__));\r
 \r
@@ -469,12 +478,15 @@ QemuInitializeRam (
     AddMemoryRangeHob (0, BASE_512KB + BASE_128KB);\r
 \r
     if (FeaturePcdGet (PcdSmmSmramRequire)) {\r
-      UINT32 TsegSize;\r
+      UINT32  TsegSize;\r
 \r
       TsegSize = mQ35TsegMbytes * SIZE_1MB;\r
       AddMemoryRangeHob (BASE_1MB, LowerMemorySize - TsegSize);\r
-      AddReservedMemoryBaseSizeHob (LowerMemorySize - TsegSize, TsegSize,\r
-        TRUE);\r
+      AddReservedMemoryBaseSizeHob (\r
+        LowerMemorySize - TsegSize,\r
+        TsegSize,\r
+        TRUE\r
+        );\r
     } else {\r
       AddMemoryRangeHob (BASE_1MB, LowerMemorySize);\r
     }\r
@@ -516,16 +528,22 @@ QemuInitializeRam (
     //\r
     // Set memory range from 640KB to 1MB to uncacheable\r
     //\r
-    Status = MtrrSetMemoryAttribute (BASE_512KB + BASE_128KB,\r
-               BASE_1MB - (BASE_512KB + BASE_128KB), CacheUncacheable);\r
+    Status = MtrrSetMemoryAttribute (\r
+               BASE_512KB + BASE_128KB,\r
+               BASE_1MB - (BASE_512KB + BASE_128KB),\r
+               CacheUncacheable\r
+               );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     //\r
     // Set memory range from the "top of lower RAM" (RAM below 4GB) to 4GB as\r
     // uncacheable\r
     //\r
-    Status = MtrrSetMemoryAttribute (LowerMemorySize,\r
-               SIZE_4GB - LowerMemorySize, CacheUncacheable);\r
+    Status = MtrrSetMemoryAttribute (\r
+               LowerMemorySize,\r
+               SIZE_4GB - LowerMemorySize,\r
+               CacheUncacheable\r
+               );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 }\r
@@ -541,7 +559,7 @@ InitializeRamRegions (
 {\r
   QemuInitializeRam ();\r
 \r
-  if (mS3Supported && mBootMode != BOOT_ON_S3_RESUME) {\r
+  if (mS3Supported && (mBootMode != BOOT_ON_S3_RESUME)) {\r
     //\r
     // This is the memory range that will be used for PEI on S3 resume\r
     //\r
@@ -571,7 +589,7 @@ InitializeRamRegions (
       EfiACPIMemoryNVS\r
       );\r
 \r
-#ifdef MDE_CPU_X64\r
+ #ifdef MDE_CPU_X64\r
     //\r
     // Reserve the initial page tables built by the reset vector code.\r
     //\r
@@ -579,11 +597,11 @@ InitializeRamRegions (
     // resume, it must be reserved as ACPI NVS.\r
     //\r
     BuildMemoryAllocationHob (\r
-      (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSecPageTablesBase),\r
-      (UINT64)(UINTN) PcdGet32 (PcdOvmfSecPageTablesSize),\r
+      (EFI_PHYSICAL_ADDRESS)(UINTN)PcdGet32 (PcdOvmfSecPageTablesBase),\r
+      (UINT64)(UINTN)PcdGet32 (PcdOvmfSecPageTablesSize),\r
       EfiACPIMemoryNVS\r
       );\r
-#endif\r
+ #endif\r
   }\r
 \r
   if (mBootMode != BOOT_ON_S3_RESUME) {\r
@@ -599,18 +617,18 @@ InitializeRamRegions (
       // such that they would overlap the LockBox storage.\r
       //\r
       ZeroMem (\r
-        (VOID*)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageBase),\r
-        (UINTN) PcdGet32 (PcdOvmfLockBoxStorageSize)\r
+        (VOID *)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageBase),\r
+        (UINTN)PcdGet32 (PcdOvmfLockBoxStorageSize)\r
         );\r
       BuildMemoryAllocationHob (\r
-        (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageBase),\r
-        (UINT64)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageSize),\r
+        (EFI_PHYSICAL_ADDRESS)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageBase),\r
+        (UINT64)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageSize),\r
         mS3Supported ? EfiACPIMemoryNVS : EfiBootServicesData\r
         );\r
     }\r
 \r
     if (FeaturePcdGet (PcdSmmSmramRequire)) {\r
-      UINT32 TsegSize;\r
+      UINT32  TsegSize;\r
 \r
       //\r
       // Make sure the TSEG area that we reported as a reserved memory resource\r
@@ -618,7 +636,7 @@ InitializeRamRegions (
       //\r
       TsegSize = mQ35TsegMbytes * SIZE_1MB;\r
       BuildMemoryAllocationHob (\r
-        GetSystemMemorySizeBelow4gb() - TsegSize,\r
+        GetSystemMemorySizeBelow4gb () - TsegSize,\r
         TsegSize,\r
         EfiReservedMemoryType\r
         );\r
index c23b9067332878ba1ff9f068e2abcb13a242ee27..eba7c60fced848209529586d7b149b1ca8b906e9 100644 (file)
@@ -36,7 +36,7 @@
 #include "Platform.h"\r
 #include "Cmos.h"\r
 \r
-EFI_MEMORY_TYPE_INFORMATION mDefaultMemoryTypeInformation[] = {\r
+EFI_MEMORY_TYPE_INFORMATION  mDefaultMemoryTypeInformation[] = {\r
   { EfiACPIMemoryNVS,       0x004 },\r
   { EfiACPIReclaimMemory,   0x008 },\r
   { EfiReservedMemoryType,  0x004 },\r
@@ -47,8 +47,7 @@ EFI_MEMORY_TYPE_INFORMATION mDefaultMemoryTypeInformation[] = {
   { EfiMaxMemoryType,       0x000 }\r
 };\r
 \r
-\r
-EFI_PEI_PPI_DESCRIPTOR   mPpiBootMode[] = {\r
+EFI_PEI_PPI_DESCRIPTOR  mPpiBootMode[] = {\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
     &gEfiPeiMasterBootModePpiGuid,\r
@@ -56,27 +55,26 @@ EFI_PEI_PPI_DESCRIPTOR   mPpiBootMode[] = {
   }\r
 };\r
 \r
+UINT16  mHostBridgeDevId;\r
 \r
-UINT16 mHostBridgeDevId;\r
-\r
-EFI_BOOT_MODE mBootMode = BOOT_WITH_FULL_CONFIGURATION;\r
+EFI_BOOT_MODE  mBootMode = BOOT_WITH_FULL_CONFIGURATION;\r
 \r
-BOOLEAN mS3Supported = FALSE;\r
+BOOLEAN  mS3Supported = FALSE;\r
 \r
-UINT32 mMaxCpuCount;\r
+UINT32  mMaxCpuCount;\r
 \r
 VOID\r
 AddIoMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   )\r
 {\r
   BuildResourceDescriptorHob (\r
     EFI_RESOURCE_MEMORY_MAPPED_IO,\r
-      EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
-      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
-      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_TESTED,\r
+    EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
+    EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+    EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_TESTED,\r
     MemoryBase,\r
     MemorySize\r
     );\r
@@ -84,23 +82,23 @@ AddIoMemoryBaseSizeHob (
 \r
 VOID\r
 AddReservedMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize,\r
-  BOOLEAN                     Cacheable\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize,\r
+  BOOLEAN               Cacheable\r
   )\r
 {\r
   BuildResourceDescriptorHob (\r
     EFI_RESOURCE_MEMORY_RESERVED,\r
-      EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
-      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
-      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
-      (Cacheable ?\r
-       EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
-       EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
-       EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE :\r
-       0\r
-       ) |\r
-      EFI_RESOURCE_ATTRIBUTE_TESTED,\r
+    EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
+    EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+    EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+    (Cacheable ?\r
+     EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
+     EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
+     EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE :\r
+     0\r
+    ) |\r
+    EFI_RESOURCE_ATTRIBUTE_TESTED,\r
     MemoryBase,\r
     MemorySize\r
     );\r
@@ -108,53 +106,50 @@ AddReservedMemoryBaseSizeHob (
 \r
 VOID\r
 AddIoMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   )\r
 {\r
   AddIoMemoryBaseSizeHob (MemoryBase, (UINT64)(MemoryLimit - MemoryBase));\r
 }\r
 \r
-\r
 VOID\r
 AddMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   )\r
 {\r
   BuildResourceDescriptorHob (\r
     EFI_RESOURCE_SYSTEM_MEMORY,\r
-      EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
-      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
-      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_TESTED,\r
+    EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
+    EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+    EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_TESTED,\r
     MemoryBase,\r
     MemorySize\r
     );\r
 }\r
 \r
-\r
 VOID\r
 AddMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   )\r
 {\r
   AddMemoryBaseSizeHob (MemoryBase, (UINT64)(MemoryLimit - MemoryBase));\r
 }\r
 \r
-\r
 VOID\r
 MemMapInitialization (\r
   VOID\r
   )\r
 {\r
-  UINT64        PciIoBase;\r
-  UINT64        PciIoSize;\r
-  RETURN_STATUS PcdStatus;\r
+  UINT64         PciIoBase;\r
+  UINT64         PciIoSize;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   PciIoBase = 0xC000;\r
   PciIoSize = 0x4000;\r
@@ -165,7 +160,7 @@ MemMapInitialization (
   BuildGuidDataHob (\r
     &gEfiMemoryTypeInformationGuid,\r
     mDefaultMemoryTypeInformation,\r
-    sizeof(mDefaultMemoryTypeInformation)\r
+    sizeof (mDefaultMemoryTypeInformation)\r
     );\r
 \r
   //\r
@@ -179,7 +174,7 @@ MemMapInitialization (
     UINT32  PciBase;\r
     UINT32  PciSize;\r
 \r
-    TopOfLowRam = GetSystemMemorySizeBelow4gb ();\r
+    TopOfLowRam  = GetSystemMemorySizeBelow4gb ();\r
     PciExBarBase = 0;\r
     if (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) {\r
       //\r
@@ -192,8 +187,9 @@ MemMapInitialization (
       PciBase = (UINT32)(PciExBarBase + SIZE_256MB);\r
     } else {\r
       PciBase = (UINT32)PcdGet64 (PcdPciMmio32Base);\r
-      if (PciBase == 0)\r
+      if (PciBase == 0) {\r
         PciBase = (TopOfLowRam < BASE_2GB) ? BASE_2GB : TopOfLowRam;\r
+      }\r
     }\r
 \r
     //\r
@@ -242,10 +238,14 @@ MemMapInitialization (
       // uncacheable reserved memory right here.\r
       //\r
       AddReservedMemoryBaseSizeHob (PciExBarBase, SIZE_256MB, FALSE);\r
-      BuildMemoryAllocationHob (PciExBarBase, SIZE_256MB,\r
-        EfiReservedMemoryType);\r
+      BuildMemoryAllocationHob (\r
+        PciExBarBase,\r
+        SIZE_256MB,\r
+        EfiReservedMemoryType\r
+        );\r
     }\r
-    AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);\r
+\r
+    AddIoMemoryBaseSizeHob (PcdGet32 (PcdCpuLocalApicBaseAddress), SIZE_1MB);\r
 \r
     //\r
     // On Q35, the IO Port space is available for PCI resource allocations from\r
@@ -287,8 +287,8 @@ PciExBarInitialization (
   )\r
 {\r
   union {\r
-    UINT64 Uint64;\r
-    UINT32 Uint32[2];\r
+    UINT64    Uint64;\r
+    UINT32    Uint32[2];\r
   } PciExBarBase;\r
 \r
   //\r
@@ -327,13 +327,13 @@ MiscInitialization (
   VOID\r
   )\r
 {\r
-  UINTN         PmCmd;\r
-  UINTN         Pmba;\r
-  UINT32        PmbaAndVal;\r
-  UINT32        PmbaOrVal;\r
-  UINTN         AcpiCtlReg;\r
-  UINT8         AcpiEnBit;\r
-  RETURN_STATUS PcdStatus;\r
+  UINTN          PmCmd;\r
+  UINTN          Pmba;\r
+  UINT32         PmbaAndVal;\r
+  UINT32         PmbaOrVal;\r
+  UINTN          AcpiCtlReg;\r
+  UINT8          AcpiEnBit;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   //\r
   // Disable A20 Mask\r
@@ -370,11 +370,16 @@ MiscInitialization (
       AcpiEnBit  = ICH9_ACPI_CNTL_ACPI_EN;\r
       break;\r
     default:\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, mHostBridgeDevId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        mHostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return;\r
   }\r
+\r
   PcdStatus = PcdSet16S (PcdOvmfHostBridgePciDevId, mHostBridgeDevId);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
@@ -417,17 +422,17 @@ MiscInitialization (
   }\r
 }\r
 \r
-\r
 VOID\r
 BootModeInitialization (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (CmosRead8 (0xF) == 0xFE) {\r
     mBootMode = BOOT_ON_S3_RESUME;\r
   }\r
+\r
   CmosWrite8 (0xF, 0x00);\r
 \r
   Status = PeiServicesSetBootMode (mBootMode);\r
@@ -437,13 +442,12 @@ BootModeInitialization (
   ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
-\r
 VOID\r
 ReserveEmuVariableNvStore (\r
   )\r
 {\r
-  EFI_PHYSICAL_ADDRESS VariableStore;\r
-  RETURN_STATUS        PcdStatus;\r
+  EFI_PHYSICAL_ADDRESS  VariableStore;\r
+  RETURN_STATUS         PcdStatus;\r
 \r
   //\r
   // Allocate storage for NV variables early on so it will be\r
@@ -453,25 +457,25 @@ ReserveEmuVariableNvStore (
   //\r
   VariableStore =\r
     (EFI_PHYSICAL_ADDRESS)(UINTN)\r
-      AllocateRuntimePages (\r
-        EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize))\r
-        );\r
-  DEBUG ((DEBUG_INFO,\r
-          "Reserved variable store memory: 0x%lX; size: %dkb\n",\r
-          VariableStore,\r
-          (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024\r
-        ));\r
+    AllocateRuntimePages (\r
+      EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize))\r
+      );\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "Reserved variable store memory: 0x%lX; size: %dkb\n",\r
+    VariableStore,\r
+    (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024\r
+    ));\r
   PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 }\r
 \r
-\r
 VOID\r
 DebugDumpCmos (\r
   VOID\r
   )\r
 {\r
-  UINT32 Loop;\r
+  UINT32  Loop;\r
 \r
   DEBUG ((DEBUG_INFO, "CMOS:\n"));\r
 \r
@@ -479,6 +483,7 @@ DebugDumpCmos (
     if ((Loop % 0x10) == 0) {\r
       DEBUG ((DEBUG_INFO, "%02x:", Loop));\r
     }\r
+\r
     DEBUG ((DEBUG_INFO, " %02x", CmosRead8 (Loop)));\r
     if ((Loop % 0x10) == 0xf) {\r
       DEBUG ((DEBUG_INFO, "\n"));\r
@@ -486,27 +491,34 @@ DebugDumpCmos (
   }\r
 }\r
 \r
-\r
 VOID\r
 S3Verification (\r
   VOID\r
   )\r
 {\r
-#if defined (MDE_CPU_X64)\r
+ #if defined (MDE_CPU_X64)\r
   if (FeaturePcdGet (PcdSmmSmramRequire) && mS3Supported) {\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n", __FUNCTION__));\r
-    DEBUG ((DEBUG_ERROR,\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n",\r
+      __FUNCTION__\r
+      ));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "%a: Please disable S3 on the QEMU command line (see the README),\n",\r
-      __FUNCTION__));\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a: or build OVMF with \"OvmfPkgIa32X64.dsc\".\n", __FUNCTION__));\r
+      __FUNCTION__\r
+      ));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: or build OVMF with \"OvmfPkgIa32X64.dsc\".\n",\r
+      __FUNCTION__\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
-#endif\r
-}\r
 \r
+ #endif\r
+}\r
 \r
 /**\r
   Fetch the number of boot CPUs from QEMU and expose it to UefiCpuPkg modules.\r
@@ -517,8 +529,8 @@ MaxCpuCountInitialization (
   VOID\r
   )\r
 {\r
-  UINT16        ProcessorCount = 0;\r
-  RETURN_STATUS PcdStatus;\r
+  UINT16         ProcessorCount = 0;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   //\r
   // If the fw_cfg key or fw_cfg entirely is unavailable, load mMaxCpuCount\r
@@ -528,6 +540,7 @@ MaxCpuCountInitialization (
     mMaxCpuCount = PcdGet32 (PcdCpuMaxLogicalProcessorNumber);\r
     return;\r
   }\r
+\r
   //\r
   // Otherwise, set mMaxCpuCount to the value reported by QEMU.\r
   //\r
@@ -542,11 +555,14 @@ MaxCpuCountInitialization (
   ASSERT_RETURN_ERROR (PcdStatus);\r
   PcdStatus = PcdSet32S (PcdCpuApInitTimeOutInMicroSeconds, MAX_UINT32);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
-  DEBUG ((DEBUG_INFO, "%a: QEMU reports %d processor(s)\n", __FUNCTION__,\r
-    ProcessorCount));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: QEMU reports %d processor(s)\n",\r
+    __FUNCTION__,\r
+    ProcessorCount\r
+    ));\r
 }\r
 \r
-\r
 /**\r
   Perform Platform PEI initialization.\r
 \r
@@ -596,6 +612,7 @@ InitializePlatform (
     if (!FeaturePcdGet (PcdSmmSmramRequire)) {\r
       ReserveEmuVariableNvStore ();\r
     }\r
+\r
     PeiFvInitialization ();\r
     MemMapInitialization ();\r
     NoexecDxeInitialization ();\r
index 8239ca05ac040b28de63f59aaf5a375b0a7a0e2f..17b63dfef3ecb392139e5371b0d656fd02a59726 100644 (file)
 \r
 VOID\r
 AddIoMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   );\r
 \r
 VOID\r
 AddIoMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   );\r
 \r
 VOID\r
 AddMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   );\r
 \r
 VOID\r
 AddMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   );\r
 \r
 VOID\r
 AddReservedMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize,\r
-  BOOLEAN                     Cacheable\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize,\r
+  BOOLEAN               Cacheable\r
   );\r
 \r
 VOID\r
@@ -113,25 +113,25 @@ AmdSevInitialize (
   VOID\r
   );\r
 \r
-extern BOOLEAN mXen;\r
+extern BOOLEAN  mXen;\r
 \r
 VOID\r
 XenPublishRamRegions (\r
   VOID\r
   );\r
 \r
-extern EFI_BOOT_MODE mBootMode;\r
+extern EFI_BOOT_MODE  mBootMode;\r
 \r
-extern BOOLEAN mS3Supported;\r
+extern BOOLEAN  mS3Supported;\r
 \r
-extern UINT8 mPhysMemAddressWidth;\r
+extern UINT8  mPhysMemAddressWidth;\r
 \r
-extern UINT32 mMaxCpuCount;\r
+extern UINT32  mMaxCpuCount;\r
 \r
-extern UINT16 mHostBridgeDevId;\r
+extern UINT16  mHostBridgeDevId;\r
 \r
-extern BOOLEAN mQ35SmramAtDefaultSmbase;\r
+extern BOOLEAN  mQ35SmramAtDefaultSmbase;\r
 \r
-extern UINT32 mQemuUc32Base;\r
+extern UINT32  mQemuUc32Base;\r
 \r
 #endif // _PLATFORM_PEI_H_INCLUDED_\r
index 6ca976daa66aec8e1ac127497c81a846438b4de2..b70285bc2aad3c0ca4010f1c8f2ebc4aa9cd6f54 100644 (file)
@@ -7,8 +7,8 @@
 \r
 #include "SmbiosPlatformDxe.h"\r
 \r
-#define BHYVE_SMBIOS_PHYSICAL_ADDRESS       0x000F0000\r
-#define BHYVE_SMBIOS_PHYSICAL_END           0x000FFFFF\r
+#define BHYVE_SMBIOS_PHYSICAL_ADDRESS  0x000F0000\r
+#define BHYVE_SMBIOS_PHYSICAL_END      0x000FFFFF\r
 \r
 /**\r
   Locates the bhyve SMBIOS data if it exists\r
@@ -24,18 +24,17 @@ GetBhyveSmbiosTables (
   UINT8                     *BhyveSmbiosPtr;\r
   SMBIOS_TABLE_ENTRY_POINT  *BhyveSmbiosEntryPointStructure;\r
 \r
-  for (BhyveSmbiosPtr = (UINT8*)(UINTN) BHYVE_SMBIOS_PHYSICAL_ADDRESS;\r
-       BhyveSmbiosPtr < (UINT8*)(UINTN) BHYVE_SMBIOS_PHYSICAL_END;\r
-       BhyveSmbiosPtr += 0x10) {\r
-\r
-    BhyveSmbiosEntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) BhyveSmbiosPtr;\r
-\r
-    if (!AsciiStrnCmp ((CHAR8 *) BhyveSmbiosEntryPointStructure->AnchorString, "_SM_", 4) &&\r
-        !AsciiStrnCmp ((CHAR8 *) BhyveSmbiosEntryPointStructure->IntermediateAnchorString, "_DMI_", 5) &&\r
-        IsEntryPointStructureValid (BhyveSmbiosEntryPointStructure)) {\r
+  for (BhyveSmbiosPtr = (UINT8 *)(UINTN)BHYVE_SMBIOS_PHYSICAL_ADDRESS;\r
+       BhyveSmbiosPtr < (UINT8 *)(UINTN)BHYVE_SMBIOS_PHYSICAL_END;\r
+       BhyveSmbiosPtr += 0x10)\r
+  {\r
+    BhyveSmbiosEntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *)BhyveSmbiosPtr;\r
 \r
+    if (!AsciiStrnCmp ((CHAR8 *)BhyveSmbiosEntryPointStructure->AnchorString, "_SM_", 4) &&\r
+        !AsciiStrnCmp ((CHAR8 *)BhyveSmbiosEntryPointStructure->IntermediateAnchorString, "_DMI_", 5) &&\r
+        IsEntryPointStructureValid (BhyveSmbiosEntryPointStructure))\r
+    {\r
       return BhyveSmbiosEntryPointStructure;\r
-\r
     }\r
   }\r
 \r
index 59f5d77a3b2014cc59c523de9f242a6924973ce5..ba21393f8e8e90f8196f61892fe7cad5f5986922 100644 (file)
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  SMBIOS_TABLE_TYPE0 Base;\r
-  UINT8              Strings[sizeof(TYPE0_STRINGS)];\r
+  SMBIOS_TABLE_TYPE0    Base;\r
+  UINT8                 Strings[sizeof (TYPE0_STRINGS)];\r
 } OVMF_TYPE0;\r
 #pragma pack()\r
 \r
-STATIC CONST OVMF_TYPE0 mOvmfDefaultType0 = {\r
+STATIC CONST OVMF_TYPE0  mOvmfDefaultType0 = {\r
   {\r
     // SMBIOS_STRUCTURE Hdr\r
     {\r
       EFI_SMBIOS_TYPE_BIOS_INFORMATION, // UINT8 Type\r
       sizeof (SMBIOS_TABLE_TYPE0),      // UINT8 Length\r
     },\r
-    1,     // SMBIOS_TABLE_STRING       Vendor\r
-    2,     // SMBIOS_TABLE_STRING       BiosVersion\r
-    0xE800,// UINT16                    BiosSegment\r
-    3,     // SMBIOS_TABLE_STRING       BiosReleaseDate\r
-    0,     // UINT8                     BiosSize\r
+    1,      // SMBIOS_TABLE_STRING       Vendor\r
+    2,      // SMBIOS_TABLE_STRING       BiosVersion\r
+    0xE800, // UINT16                    BiosSegment\r
+    3,      // SMBIOS_TABLE_STRING       BiosReleaseDate\r
+    0,      // UINT8                     BiosSize\r
     {      // MISC_BIOS_CHARACTERISTICS BiosCharacteristics\r
-      0,     // Reserved                                      :2\r
-      0,     // Unknown                                       :1\r
-      1,     // BiosCharacteristicsNotSupported               :1\r
-             // Remaining BiosCharacteristics bits left unset :60\r
+      0,   // Reserved                                      :2\r
+      0,   // Unknown                                       :1\r
+      1,   // BiosCharacteristicsNotSupported               :1\r
+           // Remaining BiosCharacteristics bits left unset :60\r
     },\r
     {      // BIOSCharacteristicsExtensionBytes[2]\r
-      0,     // BiosReserved\r
-      0x1C   // SystemReserved = VirtualMachineSupported |\r
-             //                  UefiSpecificationSupported |\r
-             //                  TargetContentDistributionEnabled\r
+      0,   // BiosReserved\r
+      0x1C // SystemReserved = VirtualMachineSupported |\r
+           //                  UefiSpecificationSupported |\r
+           //                  TargetContentDistributionEnabled\r
     },\r
     0,     // UINT8                     SystemBiosMajorRelease\r
     0,     // UINT8                     SystemBiosMinorRelease\r
@@ -58,7 +58,6 @@ STATIC CONST OVMF_TYPE0 mOvmfDefaultType0 = {
   TYPE0_STRINGS\r
 };\r
 \r
-\r
 /**\r
   Validates the SMBIOS entry point structure\r
 \r
@@ -73,17 +72,17 @@ IsEntryPointStructureValid (
   IN SMBIOS_TABLE_ENTRY_POINT  *EntryPointStructure\r
   )\r
 {\r
-  UINTN                     Index;\r
-  UINT8                     Length;\r
-  UINT8                     Checksum;\r
-  UINT8                     *BytePtr;\r
+  UINTN  Index;\r
+  UINT8  Length;\r
+  UINT8  Checksum;\r
+  UINT8  *BytePtr;\r
 \r
-  BytePtr = (UINT8*) EntryPointStructure;\r
-  Length = EntryPointStructure->EntryPointLength;\r
+  BytePtr  = (UINT8 *)EntryPointStructure;\r
+  Length   = EntryPointStructure->EntryPointLength;\r
   Checksum = 0;\r
 \r
   for (Index = 0; Index < Length; Index++) {\r
-    Checksum = Checksum + (UINT8) BytePtr[Index];\r
+    Checksum = Checksum + (UINT8)BytePtr[Index];\r
   }\r
 \r
   if (Checksum != 0) {\r
@@ -93,7 +92,6 @@ IsEntryPointStructureValid (
   }\r
 }\r
 \r
-\r
 /**\r
   Get SMBIOS record length.\r
 \r
@@ -102,7 +100,7 @@ IsEntryPointStructureValid (
 **/\r
 UINTN\r
 SmbiosTableLength (\r
-  IN SMBIOS_STRUCTURE_POINTER SmbiosTable\r
+  IN SMBIOS_STRUCTURE_POINTER  SmbiosTable\r
   )\r
 {\r
   CHAR8  *AChar;\r
@@ -114,14 +112,14 @@ SmbiosTableLength (
   // Each structure shall be terminated by a double-null (SMBIOS spec.7.1)\r
   //\r
   while ((*AChar != 0) || (*(AChar + 1) != 0)) {\r
-    AChar ++;\r
+    AChar++;\r
   }\r
+\r
   Length = ((UINTN)AChar - (UINTN)SmbiosTable.Raw + 2);\r
 \r
   return Length;\r
 }\r
 \r
-\r
 /**\r
   Install all structures from the given SMBIOS structures block\r
 \r
@@ -131,8 +129,8 @@ SmbiosTableLength (
 **/\r
 EFI_STATUS\r
 InstallAllStructures (\r
-  IN EFI_SMBIOS_PROTOCOL       *Smbios,\r
-  IN UINT8                     *TableAddress\r
+  IN EFI_SMBIOS_PROTOCOL  *Smbios,\r
+  IN UINT8                *TableAddress\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -152,12 +150,12 @@ InstallAllStructures (
     // Log the SMBIOS data for this structure\r
     //\r
     SmbiosHandle = SmbiosTable.Hdr->Handle;\r
-    Status = Smbios->Add (\r
-                       Smbios,\r
-                       NULL,\r
-                       &SmbiosHandle,\r
-                       (EFI_SMBIOS_TABLE_HEADER*) SmbiosTable.Raw\r
-                       );\r
+    Status       = Smbios->Add (\r
+                             Smbios,\r
+                             NULL,\r
+                             &SmbiosHandle,\r
+                             (EFI_SMBIOS_TABLE_HEADER *)SmbiosTable.Raw\r
+                             );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     if (SmbiosTable.Hdr->Type == 0) {\r
@@ -175,19 +173,18 @@ InstallAllStructures (
     // Add OVMF default Type 0 (BIOS Information) table\r
     //\r
     SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
-    Status = Smbios->Add (\r
-                       Smbios,\r
-                       NULL,\r
-                       &SmbiosHandle,\r
-                       (EFI_SMBIOS_TABLE_HEADER*) &mOvmfDefaultType0\r
-                       );\r
+    Status       = Smbios->Add (\r
+                             Smbios,\r
+                             NULL,\r
+                             &SmbiosHandle,\r
+                             (EFI_SMBIOS_TABLE_HEADER *)&mOvmfDefaultType0\r
+                             );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Installs SMBIOS information for OVMF\r
 \r
@@ -201,8 +198,8 @@ InstallAllStructures (
 EFI_STATUS\r
 EFIAPI\r
 SmbiosTablePublishEntry (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -216,7 +213,7 @@ SmbiosTablePublishEntry (
   Status = gBS->LocateProtocol (\r
                   &gEfiSmbiosProtocolGuid,\r
                   NULL,\r
-                  (VOID**)&Smbios\r
+                  (VOID **)&Smbios\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -227,7 +224,7 @@ SmbiosTablePublishEntry (
   //\r
   EntryPointStructure = GetBhyveSmbiosTables ();\r
   if (EntryPointStructure != NULL) {\r
-    SmbiosTables = (UINT8*)(UINTN)EntryPointStructure->TableAddress;\r
+    SmbiosTables = (UINT8 *)(UINTN)EntryPointStructure->TableAddress;\r
   }\r
 \r
   if (SmbiosTables != NULL) {\r
index 12d7be7b2411faa67afe73809c9f74fe73808fea..147370533d34d367db0dca5db11895d1fadf6d67 100644 (file)
@@ -21,7 +21,6 @@
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 \r
-\r
 /**\r
   Locates the bhyve SMBIOS data if it exists\r
 \r
@@ -33,7 +32,6 @@ GetBhyveSmbiosTables (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Validates the SMBIOS entry point structure\r
 \r
index 41ddfbc517b77b0711c98a2d48a265f6a363ff98..c4416494a9bb0e6e0afffe47a989e5cf592bd220 100644 (file)
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Size;\r
-  UINT16  MachineType;\r
-  UINT32  EntryPoint;\r
+  UINT8     Type;\r
+  UINT8     Size;\r
+  UINT16    MachineType;\r
+  UINT32    EntryPoint;\r
 } PE_COMPAT_TYPE1;\r
 #pragma pack ()\r
 \r
@@ -30,9 +30,9 @@ STATIC
 BOOLEAN\r
 EFIAPI\r
 IsImageSupported (\r
-  IN  EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL    *This,\r
-  IN  UINT16                                  ImageType,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL                *DevicePath   OPTIONAL\r
+  IN  EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL  *This,\r
+  IN  UINT16                                ImageType,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL              *DevicePath   OPTIONAL\r
   )\r
 {\r
   return ImageType == EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION;\r
@@ -42,16 +42,16 @@ STATIC
 EFI_IMAGE_ENTRY_POINT\r
 EFIAPI\r
 GetCompatEntryPoint (\r
-  IN  EFI_PHYSICAL_ADDRESS              ImageBase\r
+  IN  EFI_PHYSICAL_ADDRESS  ImageBase\r
   )\r
 {\r
-  EFI_IMAGE_DOS_HEADER                  *DosHdr;\r
-  UINTN                                 PeCoffHeaderOffset;\r
-  EFI_IMAGE_NT_HEADERS32                *Pe32;\r
-  EFI_IMAGE_SECTION_HEADER              *Section;\r
-  UINTN                                 NumberOfSections;\r
-  PE_COMPAT_TYPE1                       *PeCompat;\r
-  UINTN                                 PeCompatEnd;\r
+  EFI_IMAGE_DOS_HEADER      *DosHdr;\r
+  UINTN                     PeCoffHeaderOffset;\r
+  EFI_IMAGE_NT_HEADERS32    *Pe32;\r
+  EFI_IMAGE_SECTION_HEADER  *Section;\r
+  UINTN                     NumberOfSections;\r
+  PE_COMPAT_TYPE1           *PeCompat;\r
+  UINTN                     PeCompatEnd;\r
 \r
   DosHdr = (EFI_IMAGE_DOS_HEADER *)(UINTN)ImageBase;\r
   if (DosHdr->e_magic != EFI_IMAGE_DOS_SIGNATURE) {\r
@@ -59,7 +59,7 @@ GetCompatEntryPoint (
   }\r
 \r
   PeCoffHeaderOffset = DosHdr->e_lfanew;\r
-  Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)ImageBase + PeCoffHeaderOffset);\r
+  Pe32               = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)ImageBase + PeCoffHeaderOffset);\r
 \r
   Section = (EFI_IMAGE_SECTION_HEADER *)((UINTN)&Pe32->OptionalHeader +\r
                                          Pe32->FileHeader.SizeOfOptionalHeader);\r
@@ -70,22 +70,25 @@ GetCompatEntryPoint (
       //\r
       // Dereference the section contents to find the mixed mode entry point\r
       //\r
-      PeCompat = (PE_COMPAT_TYPE1 *)((UINTN)ImageBase + Section->VirtualAddress);\r
+      PeCompat    = (PE_COMPAT_TYPE1 *)((UINTN)ImageBase + Section->VirtualAddress);\r
       PeCompatEnd = (UINTN)(VOID *)PeCompat + Section->Misc.VirtualSize;\r
 \r
       while (PeCompat->Type != 0 && (UINTN)(VOID *)PeCompat < PeCompatEnd) {\r
-        if (PeCompat->Type == 1 &&\r
-            PeCompat->Size >= sizeof (PE_COMPAT_TYPE1) &&\r
-            EFI_IMAGE_MACHINE_TYPE_SUPPORTED (PeCompat->MachineType)) {\r
-\r
+        if ((PeCompat->Type == 1) &&\r
+            (PeCompat->Size >= sizeof (PE_COMPAT_TYPE1)) &&\r
+            EFI_IMAGE_MACHINE_TYPE_SUPPORTED (PeCompat->MachineType))\r
+        {\r
           return (EFI_IMAGE_ENTRY_POINT)((UINTN)ImageBase + PeCompat->EntryPoint);\r
         }\r
+\r
         PeCompat = (PE_COMPAT_TYPE1 *)((UINTN)PeCompat + PeCompat->Size);\r
         ASSERT ((UINTN)(VOID *)PeCompat < PeCompatEnd);\r
       }\r
     }\r
+\r
     Section++;\r
   }\r
+\r
   return NULL;\r
 }\r
 \r
@@ -93,13 +96,13 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 RegisterImage (\r
-  IN      EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL    *This,\r
-  IN      EFI_PHYSICAL_ADDRESS                    ImageBase,\r
-  IN      UINT64                                  ImageSize,\r
-  IN  OUT EFI_IMAGE_ENTRY_POINT                   *EntryPoint\r
+  IN      EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL  *This,\r
+  IN      EFI_PHYSICAL_ADDRESS                  ImageBase,\r
+  IN      UINT64                                ImageSize,\r
+  IN  OUT EFI_IMAGE_ENTRY_POINT                 *EntryPoint\r
   )\r
 {\r
-  EFI_IMAGE_ENTRY_POINT                           CompatEntryPoint;\r
+  EFI_IMAGE_ENTRY_POINT  CompatEntryPoint;\r
 \r
   CompatEntryPoint = GetCompatEntryPoint (ImageBase);\r
   if (CompatEntryPoint == NULL) {\r
@@ -114,14 +117,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 UnregisterImage (\r
-  IN  EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL    *This,\r
-  IN  EFI_PHYSICAL_ADDRESS                    ImageBase\r
+  IN  EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL  *This,\r
+  IN  EFI_PHYSICAL_ADDRESS                  ImageBase\r
   )\r
 {\r
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL mCompatLoaderPeCoffEmuProtocol = {\r
+STATIC EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL  mCompatLoaderPeCoffEmuProtocol = {\r
   IsImageSupported,\r
   RegisterImage,\r
   UnregisterImage,\r
@@ -136,8 +139,10 @@ CompatImageLoaderDxeEntryPoint (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  return gBS->InstallProtocolInterface (&ImageHandle,\r
+  return gBS->InstallProtocolInterface (\r
+                &ImageHandle,\r
                 &gEdkiiPeCoffImageEmulatorProtocolGuid,\r
                 EFI_NATIVE_INTERFACE,\r
-                &mCompatLoaderPeCoffEmuProtocol);\r
+                &mCompatLoaderPeCoffEmuProtocol\r
+                );\r
 }\r
index 3c365148ed02109557c4257f831f5e3046d3106f..c0fa7f7978ffe06efbf912ffef285d5dbd229d2b 100644 (file)
@@ -18,6 +18,6 @@ typedef UINT32 APIC_ID;
 //\r
 // The PrintLib conversion specification for formatting an APIC_ID.\r
 //\r
-#define FMT_APIC_ID "0x%08x"\r
+#define FMT_APIC_ID  "0x%08x"\r
 \r
 #endif // APIC_ID_H_\r
index 2c768f89f1ee0121a53125fc7557d1ea8b71eec5..97ecd32eb6de0b9977c25786236ddf15152dc48e 100644 (file)
 //\r
 // We use this protocol for accessing IO Ports.\r
 //\r
-STATIC EFI_MM_CPU_IO_PROTOCOL *mMmCpuIo;\r
+STATIC EFI_MM_CPU_IO_PROTOCOL  *mMmCpuIo;\r
 //\r
 // The following protocol is used to report the addition or removal of a CPU to\r
 // the SMM CPU driver (PiSmmCpuDxeSmm).\r
 //\r
-STATIC EFI_SMM_CPU_SERVICE_PROTOCOL *mMmCpuService;\r
+STATIC EFI_SMM_CPU_SERVICE_PROTOCOL  *mMmCpuService;\r
 //\r
 // These structures serve as communication side-channels between the\r
 // EFI_SMM_CPU_SERVICE_PROTOCOL consumer (i.e., this driver) and provider\r
 // (i.e., PiSmmCpuDxeSmm).\r
 //\r
-STATIC CPU_HOT_PLUG_DATA *mCpuHotPlugData;\r
-STATIC CPU_HOT_EJECT_DATA *mCpuHotEjectData;\r
+STATIC CPU_HOT_PLUG_DATA   *mCpuHotPlugData;\r
+STATIC CPU_HOT_EJECT_DATA  *mCpuHotEjectData;\r
 //\r
 // SMRAM arrays for fetching the APIC IDs of processors with pending events (of\r
 // known event types), for the time of just one MMI.\r
@@ -56,18 +56,18 @@ STATIC CPU_HOT_EJECT_DATA *mCpuHotEjectData;
 // in a single MMI. The numbers of used (populated) elements in the arrays are\r
 // determined on every MMI separately.\r
 //\r
-STATIC APIC_ID *mPluggedApicIds;\r
-STATIC APIC_ID *mToUnplugApicIds;\r
-STATIC UINT32  *mToUnplugSelectors;\r
+STATIC APIC_ID  *mPluggedApicIds;\r
+STATIC APIC_ID  *mToUnplugApicIds;\r
+STATIC UINT32   *mToUnplugSelectors;\r
 //\r
 // Address of the non-SMRAM reserved memory page that contains the Post-SMM Pen\r
 // for hot-added CPUs.\r
 //\r
-STATIC UINT32 mPostSmmPenAddress;\r
+STATIC UINT32  mPostSmmPenAddress;\r
 //\r
 // Represents the registration of the CPU Hotplug MMI handler.\r
 //\r
-STATIC EFI_HANDLE mDispatchHandle;\r
+STATIC EFI_HANDLE  mDispatchHandle;\r
 \r
 /**\r
   Process CPUs that have been hot-added, per QemuCpuhpCollectApicIds().\r
@@ -93,13 +93,13 @@ STATIC EFI_HANDLE mDispatchHandle;
 STATIC\r
 EFI_STATUS\r
 ProcessHotAddedCpus (\r
-  IN APIC_ID                      *PluggedApicIds,\r
-  IN UINT32                       PluggedCount\r
+  IN APIC_ID  *PluggedApicIds,\r
+  IN UINT32   PluggedCount\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT32     PluggedIdx;\r
-  UINT32     NewSlot;\r
+  EFI_STATUS  Status;\r
+  UINT32      PluggedIdx;\r
+  UINT32      NewSlot;\r
 \r
   //\r
   // The Post-SMM Pen need not be reinstalled multiple times within a single\r
@@ -110,11 +110,11 @@ ProcessHotAddedCpus (
   SmbaseReinstallPostSmmPen (mPostSmmPenAddress);\r
 \r
   PluggedIdx = 0;\r
-  NewSlot = 0;\r
+  NewSlot    = 0;\r
   while (PluggedIdx < PluggedCount) {\r
-    APIC_ID NewApicId;\r
-    UINT32  CheckSlot;\r
-    UINTN   NewProcessorNumberByProtocol;\r
+    APIC_ID  NewApicId;\r
+    UINT32   CheckSlot;\r
+    UINTN    NewProcessorNumberByProtocol;\r
 \r
     NewApicId = PluggedApicIds[PluggedIdx];\r
 \r
@@ -123,14 +123,21 @@ ProcessHotAddedCpus (
     //\r
     for (CheckSlot = 0;\r
          CheckSlot < mCpuHotPlugData->ArrayLength;\r
-         CheckSlot++) {\r
+         CheckSlot++)\r
+    {\r
       if (mCpuHotPlugData->ApicId[CheckSlot] == NewApicId) {\r
         break;\r
       }\r
     }\r
+\r
     if (CheckSlot < mCpuHotPlugData->ArrayLength) {\r
-      DEBUG ((DEBUG_VERBOSE, "%a: APIC ID " FMT_APIC_ID " was hot-plugged "\r
-        "before; ignoring it\n", __FUNCTION__, NewApicId));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: APIC ID " FMT_APIC_ID " was hot-plugged "\r
+                                   "before; ignoring it\n",\r
+        __FUNCTION__,\r
+        NewApicId\r
+        ));\r
       PluggedIdx++;\r
       continue;\r
     }\r
@@ -139,12 +146,18 @@ ProcessHotAddedCpus (
     // Find the first empty slot in CPU_HOT_PLUG_DATA.\r
     //\r
     while (NewSlot < mCpuHotPlugData->ArrayLength &&\r
-           mCpuHotPlugData->ApicId[NewSlot] != MAX_UINT64) {\r
+           mCpuHotPlugData->ApicId[NewSlot] != MAX_UINT64)\r
+    {\r
       NewSlot++;\r
     }\r
+\r
     if (NewSlot == mCpuHotPlugData->ArrayLength) {\r
-      DEBUG ((DEBUG_ERROR, "%a: no room for APIC ID " FMT_APIC_ID "\n",\r
-        __FUNCTION__, NewApicId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: no room for APIC ID " FMT_APIC_ID "\n",\r
+        __FUNCTION__,\r
+        NewApicId\r
+        ));\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
@@ -156,8 +169,11 @@ ProcessHotAddedCpus (
     //\r
     // Relocate the SMBASE of the new CPU.\r
     //\r
-    Status = SmbaseRelocate (NewApicId, mCpuHotPlugData->SmBase[NewSlot],\r
-               mPostSmmPenAddress);\r
+    Status = SmbaseRelocate (\r
+               NewApicId,\r
+               mCpuHotPlugData->SmBase[NewSlot],\r
+               mPostSmmPenAddress\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       goto RevokeNewSlot;\r
     }\r
@@ -165,18 +181,31 @@ ProcessHotAddedCpus (
     //\r
     // Add the new CPU with EFI_SMM_CPU_SERVICE_PROTOCOL.\r
     //\r
-    Status = mMmCpuService->AddProcessor (mMmCpuService, NewApicId,\r
-                              &NewProcessorNumberByProtocol);\r
+    Status = mMmCpuService->AddProcessor (\r
+                              mMmCpuService,\r
+                              NewApicId,\r
+                              &NewProcessorNumberByProtocol\r
+                              );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: AddProcessor(" FMT_APIC_ID "): %r\n",\r
-        __FUNCTION__, NewApicId, Status));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: AddProcessor(" FMT_APIC_ID "): %r\n",\r
+        __FUNCTION__,\r
+        NewApicId,\r
+        Status\r
+        ));\r
       goto RevokeNewSlot;\r
     }\r
 \r
-    DEBUG ((DEBUG_INFO, "%a: hot-added APIC ID " FMT_APIC_ID ", SMBASE 0x%Lx, "\r
-      "EFI_SMM_CPU_SERVICE_PROTOCOL assigned number %Lu\n", __FUNCTION__,\r
-      NewApicId, (UINT64)mCpuHotPlugData->SmBase[NewSlot],\r
-      (UINT64)NewProcessorNumberByProtocol));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: hot-added APIC ID " FMT_APIC_ID ", SMBASE 0x%Lx, "\r
+                                           "EFI_SMM_CPU_SERVICE_PROTOCOL assigned number %Lu\n",\r
+      __FUNCTION__,\r
+      NewApicId,\r
+      (UINT64)mCpuHotPlugData->SmBase[NewSlot],\r
+      (UINT64)NewProcessorNumberByProtocol\r
+      ));\r
 \r
     NewSlot++;\r
     PluggedIdx++;\r
@@ -210,11 +239,11 @@ CheckIfBsp (
   VOID\r
   )\r
 {\r
-  MSR_IA32_APIC_BASE_REGISTER ApicBaseMsr;\r
-  BOOLEAN                     IsBsp;\r
+  MSR_IA32_APIC_BASE_REGISTER  ApicBaseMsr;\r
+  BOOLEAN                      IsBsp;\r
 \r
   ApicBaseMsr.Uint64 = AsmReadMsr64 (MSR_IA32_APIC_BASE);\r
-  IsBsp = (BOOLEAN)(ApicBaseMsr.Bits.BSP == 1);\r
+  IsBsp              = (BOOLEAN)(ApicBaseMsr.Bits.BSP == 1);\r
   return IsBsp;\r
 }\r
 \r
@@ -238,13 +267,13 @@ CheckIfBsp (
 VOID\r
 EFIAPI\r
 EjectCpu (\r
-  IN UINTN ProcessorNum\r
+  IN UINTN  ProcessorNum\r
   )\r
 {\r
-  UINT64 QemuSelector;\r
+  UINT64  QemuSelector;\r
 \r
   if (CheckIfBsp ()) {\r
-    UINT32 Idx;\r
+    UINT32  Idx;\r
 \r
     for (Idx = 0; Idx < mCpuHotEjectData->ArrayLength; Idx++) {\r
       QemuSelector = mCpuHotEjectData->QemuSelectorMap[Idx];\r
@@ -258,7 +287,7 @@ EjectCpu (
         //\r
         // Tell QEMU to context-switch it out.\r
         //\r
-        QemuCpuhpWriteCpuSelector (mMmCpuIo, (UINT32) QemuSelector);\r
+        QemuCpuhpWriteCpuSelector (mMmCpuIo, (UINT32)QemuSelector);\r
         QemuCpuhpWriteCpuStatus (mMmCpuIo, QEMU_CPUHP_STAT_EJECT);\r
 \r
         //\r
@@ -277,8 +306,14 @@ EjectCpu (
         mCpuHotEjectData->QemuSelectorMap[Idx] =\r
           CPU_EJECT_QEMU_SELECTOR_INVALID;\r
 \r
-        DEBUG ((DEBUG_INFO, "%a: Unplugged ProcessorNum %u, "\r
-          "QemuSelector %Lu\n", __FUNCTION__, Idx, QemuSelector));\r
+        DEBUG ((\r
+          DEBUG_INFO,\r
+          "%a: Unplugged ProcessorNum %u, "\r
+          "QemuSelector %Lu\n",\r
+          __FUNCTION__,\r
+          Idx,\r
+          QemuSelector\r
+          ));\r
       }\r
     }\r
 \r
@@ -330,7 +365,7 @@ EjectCpu (
   //\r
   // Keep them penned here until the BSP tells QEMU to eject them.\r
   //\r
-  for (;;) {\r
+  for ( ; ;) {\r
     DisableInterrupts ();\r
     CpuSleep ();\r
   }\r
@@ -371,21 +406,21 @@ EjectCpu (
 STATIC\r
 EFI_STATUS\r
 UnplugCpus (\r
-  IN APIC_ID                      *ToUnplugApicIds,\r
-  IN UINT32                       *ToUnplugSelectors,\r
-  IN UINT32                       ToUnplugCount\r
+  IN APIC_ID  *ToUnplugApicIds,\r
+  IN UINT32   *ToUnplugSelectors,\r
+  IN UINT32   ToUnplugCount\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT32     ToUnplugIdx;\r
-  UINT32     EjectCount;\r
-  UINTN      ProcessorNum;\r
+  EFI_STATUS  Status;\r
+  UINT32      ToUnplugIdx;\r
+  UINT32      EjectCount;\r
+  UINTN       ProcessorNum;\r
 \r
   ToUnplugIdx = 0;\r
-  EjectCount = 0;\r
+  EjectCount  = 0;\r
   while (ToUnplugIdx < ToUnplugCount) {\r
-    APIC_ID    RemoveApicId;\r
-    UINT32     QemuSelector;\r
+    APIC_ID  RemoveApicId;\r
+    UINT32   QemuSelector;\r
 \r
     RemoveApicId = ToUnplugApicIds[ToUnplugIdx];\r
     QemuSelector = ToUnplugSelectors[ToUnplugIdx];\r
@@ -404,7 +439,8 @@ UnplugCpus (
 \r
     for (ProcessorNum = 0;\r
          ProcessorNum < mCpuHotPlugData->ArrayLength;\r
-         ProcessorNum++) {\r
+         ProcessorNum++)\r
+    {\r
       if (mCpuHotPlugData->ApicId[ProcessorNum] == RemoveApicId) {\r
         break;\r
       }\r
@@ -414,8 +450,13 @@ UnplugCpus (
     // Ignore the unplug if APIC ID not found\r
     //\r
     if (ProcessorNum == mCpuHotPlugData->ArrayLength) {\r
-      DEBUG ((DEBUG_VERBOSE, "%a: did not find APIC ID " FMT_APIC_ID\r
-        " to unplug\n", __FUNCTION__, RemoveApicId));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: did not find APIC ID " FMT_APIC_ID\r
+        " to unplug\n",\r
+        __FUNCTION__,\r
+        RemoveApicId\r
+        ));\r
       ToUnplugIdx++;\r
       continue;\r
     }\r
@@ -425,13 +466,19 @@ UnplugCpus (
     //\r
     Status = mMmCpuService->RemoveProcessor (mMmCpuService, ProcessorNum);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: RemoveProcessor(" FMT_APIC_ID "): %r\n",\r
-        __FUNCTION__, RemoveApicId, Status));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: RemoveProcessor(" FMT_APIC_ID "): %r\n",\r
+        __FUNCTION__,\r
+        RemoveApicId,\r
+        Status\r
+        ));\r
       return Status;\r
     }\r
 \r
     if (mCpuHotEjectData->QemuSelectorMap[ProcessorNum] !=\r
-        CPU_EJECT_QEMU_SELECTOR_INVALID) {\r
+        CPU_EJECT_QEMU_SELECTOR_INVALID)\r
+    {\r
       //\r
       // mCpuHotEjectData->QemuSelectorMap[ProcessorNum] is set to\r
       // CPU_EJECT_QEMU_SELECTOR_INVALID when mCpuHotEjectData->QemuSelectorMap\r
@@ -442,9 +489,15 @@ UnplugCpus (
       // never match more than one APIC ID -- nor, by transitivity, designate\r
       // more than one QemuSelector -- in a single invocation of UnplugCpus().\r
       //\r
-      DEBUG ((DEBUG_ERROR, "%a: ProcessorNum %Lu maps to QemuSelector %Lu, "\r
-        "cannot also map to %u\n", __FUNCTION__, (UINT64)ProcessorNum,\r
-        mCpuHotEjectData->QemuSelectorMap[ProcessorNum], QemuSelector));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: ProcessorNum %Lu maps to QemuSelector %Lu, "\r
+        "cannot also map to %u\n",\r
+        __FUNCTION__,\r
+        (UINT64)ProcessorNum,\r
+        mCpuHotEjectData->QemuSelectorMap[ProcessorNum],\r
+        QemuSelector\r
+        ));\r
 \r
       return EFI_ALREADY_STARTED;\r
     }\r
@@ -454,9 +507,15 @@ UnplugCpus (
     //\r
     mCpuHotEjectData->QemuSelectorMap[ProcessorNum] = (UINT64)QemuSelector;\r
 \r
-    DEBUG ((DEBUG_INFO, "%a: Started hot-unplug on ProcessorNum %Lu, APIC ID "\r
-      FMT_APIC_ID ", QemuSelector %u\n", __FUNCTION__, (UINT64)ProcessorNum,\r
-      RemoveApicId, QemuSelector));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: Started hot-unplug on ProcessorNum %Lu, APIC ID "\r
+      FMT_APIC_ID ", QemuSelector %u\n",\r
+      __FUNCTION__,\r
+      (UINT64)ProcessorNum,\r
+      RemoveApicId,\r
+      QemuSelector\r
+      ));\r
 \r
     EjectCount++;\r
     ToUnplugIdx++;\r
@@ -539,16 +598,16 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 CpuHotplugMmi (\r
-  IN EFI_HANDLE DispatchHandle,\r
-  IN CONST VOID *Context        OPTIONAL,\r
-  IN OUT VOID   *CommBuffer     OPTIONAL,\r
-  IN OUT UINTN  *CommBufferSize OPTIONAL\r
+  IN EFI_HANDLE  DispatchHandle,\r
+  IN CONST VOID  *Context        OPTIONAL,\r
+  IN OUT VOID    *CommBuffer     OPTIONAL,\r
+  IN OUT UINTN   *CommBufferSize OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT8      ApmControl;\r
-  UINT32     PluggedCount;\r
-  UINT32     ToUnplugCount;\r
+  EFI_STATUS  Status;\r
+  UINT8       ApmControl;\r
+  UINT32      PluggedCount;\r
+  UINT32      ToUnplugCount;\r
 \r
   //\r
   // Assert that we are entering this function due to our root MMI handler\r
@@ -565,11 +624,20 @@ CpuHotplugMmi (
   // Read the MMI command value from the APM Control Port, to see if this is an\r
   // MMI we should care about.\r
   //\r
-  Status = mMmCpuIo->Io.Read (mMmCpuIo, MM_IO_UINT8, ICH9_APM_CNT, 1,\r
-                          &ApmControl);\r
+  Status = mMmCpuIo->Io.Read (\r
+                          mMmCpuIo,\r
+                          MM_IO_UINT8,\r
+                          ICH9_APM_CNT,\r
+                          1,\r
+                          &ApmControl\r
+                          );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: failed to read ICH9_APM_CNT: %r\n", __FUNCTION__,\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: failed to read ICH9_APM_CNT: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     //\r
     // We couldn't even determine if the MMI was for us or not.\r
     //\r
@@ -628,21 +696,20 @@ Fatal:
   return EFI_INTERRUPT_PENDING;\r
 }\r
 \r
-\r
 //\r
 // Entry point function of this driver.\r
 //\r
 EFI_STATUS\r
 EFIAPI\r
 CpuHotplugEntry (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINTN      Len;\r
-  UINTN      Size;\r
-  UINTN      SizeSel;\r
+  EFI_STATUS  Status;\r
+  UINTN       Len;\r
+  UINTN       Size;\r
+  UINTN       SizeSel;\r
 \r
   //\r
   // This module should only be included when SMM support is required.\r
@@ -663,17 +730,28 @@ CpuHotplugEntry (
   // First, collect the protocols needed later. All of these protocols are\r
   // listed in our module DEPEX.\r
   //\r
-  Status = gMmst->MmLocateProtocol (&gEfiMmCpuIoProtocolGuid,\r
-                    NULL /* Registration */, (VOID **)&mMmCpuIo);\r
+  Status = gMmst->MmLocateProtocol (\r
+                    &gEfiMmCpuIoProtocolGuid,\r
+                    NULL /* Registration */,\r
+                    (VOID **)&mMmCpuIo\r
+                    );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: locate MmCpuIo: %r\n", __FUNCTION__, Status));\r
     goto Fatal;\r
   }\r
-  Status = gMmst->MmLocateProtocol (&gEfiSmmCpuServiceProtocolGuid,\r
-                    NULL /* Registration */, (VOID **)&mMmCpuService);\r
+\r
+  Status = gMmst->MmLocateProtocol (\r
+                    &gEfiSmmCpuServiceProtocolGuid,\r
+                    NULL /* Registration */,\r
+                    (VOID **)&mMmCpuService\r
+                    );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: locate MmCpuService: %r\n", __FUNCTION__,\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: locate MmCpuService: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     goto Fatal;\r
   }\r
 \r
@@ -684,7 +762,7 @@ CpuHotplugEntry (
   // - PcdCpuHotEjectDataAddress to CPU_HOT_EJECT_DATA in SMRAM, if the\r
   //   possible CPU count is greater than 1.\r
   //\r
-  mCpuHotPlugData = (VOID *)(UINTN)PcdGet64 (PcdCpuHotPlugDataAddress);\r
+  mCpuHotPlugData  = (VOID *)(UINTN)PcdGet64 (PcdCpuHotPlugDataAddress);\r
   mCpuHotEjectData = (VOID *)(UINTN)PcdGet64 (PcdCpuHotEjectDataAddress);\r
 \r
   if (mCpuHotPlugData == NULL) {\r
@@ -692,6 +770,7 @@ CpuHotplugEntry (
     DEBUG ((DEBUG_ERROR, "%a: CPU_HOT_PLUG_DATA: %r\n", __FUNCTION__, Status));\r
     goto Fatal;\r
   }\r
+\r
   //\r
   // If the possible CPU count is 1, there's nothing for this driver to do.\r
   //\r
@@ -706,6 +785,7 @@ CpuHotplugEntry (
   } else {\r
     Status = EFI_SUCCESS;\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: CPU_HOT_EJECT_DATA: %r\n", __FUNCTION__, Status));\r
     goto Fatal;\r
@@ -716,25 +796,38 @@ CpuHotplugEntry (
   //\r
   if (RETURN_ERROR (SafeUintnSub (mCpuHotPlugData->ArrayLength, 1, &Len)) ||\r
       RETURN_ERROR (SafeUintnMult (sizeof (APIC_ID), Len, &Size)) ||\r
-      RETURN_ERROR (SafeUintnMult (sizeof (UINT32), Len, &SizeSel))) {\r
+      RETURN_ERROR (SafeUintnMult (sizeof (UINT32), Len, &SizeSel)))\r
+  {\r
     Status = EFI_ABORTED;\r
     DEBUG ((DEBUG_ERROR, "%a: invalid CPU_HOT_PLUG_DATA\n", __FUNCTION__));\r
     goto Fatal;\r
   }\r
-  Status = gMmst->MmAllocatePool (EfiRuntimeServicesData, Size,\r
-                    (VOID **)&mPluggedApicIds);\r
+\r
+  Status = gMmst->MmAllocatePool (\r
+                    EfiRuntimeServicesData,\r
+                    Size,\r
+                    (VOID **)&mPluggedApicIds\r
+                    );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: MmAllocatePool(): %r\n", __FUNCTION__, Status));\r
     goto Fatal;\r
   }\r
-  Status = gMmst->MmAllocatePool (EfiRuntimeServicesData, Size,\r
-                    (VOID **)&mToUnplugApicIds);\r
+\r
+  Status = gMmst->MmAllocatePool (\r
+                    EfiRuntimeServicesData,\r
+                    Size,\r
+                    (VOID **)&mToUnplugApicIds\r
+                    );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: MmAllocatePool(): %r\n", __FUNCTION__, Status));\r
     goto ReleasePluggedApicIds;\r
   }\r
-  Status = gMmst->MmAllocatePool (EfiRuntimeServicesData, SizeSel,\r
-                    (VOID **)&mToUnplugSelectors);\r
+\r
+  Status = gMmst->MmAllocatePool (\r
+                    EfiRuntimeServicesData,\r
+                    SizeSel,\r
+                    (VOID **)&mToUnplugSelectors\r
+                    );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: MmAllocatePool(): %r\n", __FUNCTION__, Status));\r
     goto ReleaseToUnplugApicIds;\r
@@ -743,8 +836,10 @@ CpuHotplugEntry (
   //\r
   // Allocate the Post-SMM Pen for hot-added CPUs.\r
   //\r
-  Status = SmbaseAllocatePostSmmPen (&mPostSmmPenAddress,\r
-             SystemTable->BootServices);\r
+  Status = SmbaseAllocatePostSmmPen (\r
+             &mPostSmmPenAddress,\r
+             SystemTable->BootServices\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto ReleaseToUnplugSelectors;\r
   }\r
@@ -776,8 +871,12 @@ CpuHotplugEntry (
   QemuCpuhpWriteCommand (mMmCpuIo, QEMU_CPUHP_CMD_GET_PENDING);\r
   if (QemuCpuhpReadCommandData2 (mMmCpuIo) != 0) {\r
     Status = EFI_NOT_FOUND;\r
-    DEBUG ((DEBUG_ERROR, "%a: modern CPU hotplug interface: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: modern CPU hotplug interface: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     goto ReleasePostSmmPen;\r
   }\r
 \r
@@ -790,8 +889,12 @@ CpuHotplugEntry (
                     &mDispatchHandle\r
                     );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: MmiHandlerRegister(): %r\n", __FUNCTION__,\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: MmiHandlerRegister(): %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     goto ReleasePostSmmPen;\r
   }\r
 \r
index 029de4cdea35d4f087ca2dcba47fd3fee477932a..6039532fd8a4f8ea28bf764bb9825f0adec08f67 100644 (file)
@@ -29,18 +29,18 @@ typedef struct {
   // This field is intentionally wider than APIC_ID (UINT32) because we need a\r
   // "gate locked" value that is different from all possible APIC_IDs.\r
   //\r
-  UINT64 ApicIdGate;\r
+  UINT64    ApicIdGate;\r
   //\r
   // The new SMBASE value for the hot-added CPU to set in the SMRAM Save State\r
   // Map, before leaving SMM with the RSM instruction.\r
   //\r
-  UINT32 NewSmbase;\r
+  UINT32    NewSmbase;\r
   //\r
   // The hot-added CPU sets this field to 1 right before executing the RSM\r
   // instruction. This tells the SMM Monarch to proceed to polling the last\r
   // byte of the normal RAM reserved page (Post-SMM Pen).\r
   //\r
-  UINT8 AboutToLeaveSmm;\r
+  UINT8     AboutToLeaveSmm;\r
 } FIRST_SMI_HANDLER_CONTEXT;\r
 #pragma pack ()\r
 \r
index dc86ab96777a6f984acaaedaab5124e6a5a43e75..ec3dc379f309ea8f8cc7dbff9632d3532137f036 100644 (file)
 \r
 UINT32\r
 QemuCpuhpReadCommandData2 (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo\r
   )\r
 {\r
-  UINT32     CommandData2;\r
-  EFI_STATUS Status;\r
+  UINT32      CommandData2;\r
+  EFI_STATUS  Status;\r
 \r
   CommandData2 = 0;\r
-  Status = MmCpuIo->Io.Read (\r
-                         MmCpuIo,\r
-                         MM_IO_UINT32,\r
-                         ICH9_CPU_HOTPLUG_BASE + QEMU_CPUHP_R_CMD_DATA2,\r
-                         1,\r
-                         &CommandData2\r
-                         );\r
+  Status       = MmCpuIo->Io.Read (\r
+                               MmCpuIo,\r
+                               MM_IO_UINT32,\r
+                               ICH9_CPU_HOTPLUG_BASE + QEMU_CPUHP_R_CMD_DATA2,\r
+                               1,\r
+                               &CommandData2\r
+                               );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, Status));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
+\r
   return CommandData2;\r
 }\r
 \r
 UINT8\r
 QemuCpuhpReadCpuStatus (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo\r
   )\r
 {\r
-  UINT8      CpuStatus;\r
-  EFI_STATUS Status;\r
+  UINT8       CpuStatus;\r
+  EFI_STATUS  Status;\r
 \r
   CpuStatus = 0;\r
-  Status = MmCpuIo->Io.Read (\r
-                         MmCpuIo,\r
-                         MM_IO_UINT8,\r
-                         ICH9_CPU_HOTPLUG_BASE + QEMU_CPUHP_R_CPU_STAT,\r
-                         1,\r
-                         &CpuStatus\r
-                         );\r
+  Status    = MmCpuIo->Io.Read (\r
+                            MmCpuIo,\r
+                            MM_IO_UINT8,\r
+                            ICH9_CPU_HOTPLUG_BASE + QEMU_CPUHP_R_CPU_STAT,\r
+                            1,\r
+                            &CpuStatus\r
+                            );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, Status));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
+\r
   return CpuStatus;\r
 }\r
 \r
 UINT32\r
 QemuCpuhpReadCommandData (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo\r
   )\r
 {\r
-  UINT32     CommandData;\r
-  EFI_STATUS Status;\r
+  UINT32      CommandData;\r
+  EFI_STATUS  Status;\r
 \r
   CommandData = 0;\r
-  Status = MmCpuIo->Io.Read (\r
-                         MmCpuIo,\r
-                         MM_IO_UINT32,\r
-                         ICH9_CPU_HOTPLUG_BASE + QEMU_CPUHP_RW_CMD_DATA,\r
-                         1,\r
-                         &CommandData\r
-                         );\r
+  Status      = MmCpuIo->Io.Read (\r
+                              MmCpuIo,\r
+                              MM_IO_UINT32,\r
+                              ICH9_CPU_HOTPLUG_BASE + QEMU_CPUHP_RW_CMD_DATA,\r
+                              1,\r
+                              &CommandData\r
+                              );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, Status));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
+\r
   return CommandData;\r
 }\r
 \r
 VOID\r
 QemuCpuhpWriteCpuSelector (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo,\r
-  IN UINT32                       Selector\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo,\r
+  IN UINT32                        Selector\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = MmCpuIo->Io.Write (\r
                          MmCpuIo,\r
@@ -115,11 +118,11 @@ QemuCpuhpWriteCpuSelector (
 \r
 VOID\r
 QemuCpuhpWriteCpuStatus (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo,\r
-  IN UINT8                        CpuStatus\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo,\r
+  IN UINT8                         CpuStatus\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = MmCpuIo->Io.Write (\r
                          MmCpuIo,\r
@@ -137,11 +140,11 @@ QemuCpuhpWriteCpuStatus (
 \r
 VOID\r
 QemuCpuhpWriteCommand (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo,\r
-  IN UINT8                        Command\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo,\r
+  IN UINT8                         Command\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = MmCpuIo->Io.Write (\r
                          MmCpuIo,\r
@@ -206,33 +209,33 @@ QemuCpuhpWriteCommand (
 **/\r
 EFI_STATUS\r
 QemuCpuhpCollectApicIds (\r
-  IN  CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo,\r
-  IN  UINT32                       PossibleCpuCount,\r
-  IN  UINT32                       ApicIdCount,\r
-  OUT APIC_ID                      *PluggedApicIds,\r
-  OUT UINT32                       *PluggedCount,\r
-  OUT APIC_ID                      *ToUnplugApicIds,\r
-  OUT UINT32                       *ToUnplugSelectors,\r
-  OUT UINT32                       *ToUnplugCount\r
+  IN  CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo,\r
+  IN  UINT32                        PossibleCpuCount,\r
+  IN  UINT32                        ApicIdCount,\r
+  OUT APIC_ID                       *PluggedApicIds,\r
+  OUT UINT32                        *PluggedCount,\r
+  OUT APIC_ID                       *ToUnplugApicIds,\r
+  OUT UINT32                        *ToUnplugSelectors,\r
+  OUT UINT32                        *ToUnplugCount\r
   )\r
 {\r
-  UINT32 CurrentSelector;\r
+  UINT32  CurrentSelector;\r
 \r
-  if (PossibleCpuCount == 0 || ApicIdCount == 0) {\r
+  if ((PossibleCpuCount == 0) || (ApicIdCount == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  *PluggedCount = 0;\r
+  *PluggedCount  = 0;\r
   *ToUnplugCount = 0;\r
 \r
   CurrentSelector = 0;\r
   do {\r
-    UINT32  PendingSelector;\r
-    UINT8   CpuStatus;\r
-    APIC_ID *ExtendIds;\r
-    UINT32  *ExtendSels;\r
-    UINT32  *ExtendCount;\r
-    APIC_ID NewApicId;\r
+    UINT32   PendingSelector;\r
+    UINT8    CpuStatus;\r
+    APIC_ID  *ExtendIds;\r
+    UINT32   *ExtendSels;\r
+    UINT32   *ExtendCount;\r
+    APIC_ID  NewApicId;\r
 \r
     //\r
     // Write CurrentSelector (which is valid) to the CPU selector register.\r
@@ -259,10 +262,17 @@ QemuCpuhpCollectApicIds (
     QemuCpuhpWriteCommand (MmCpuIo, QEMU_CPUHP_CMD_GET_PENDING);\r
     PendingSelector = QemuCpuhpReadCommandData (MmCpuIo);\r
     if (PendingSelector < CurrentSelector) {\r
-      DEBUG ((DEBUG_VERBOSE, "%a: CurrentSelector=%u PendingSelector=%u: "\r
-        "wrap-around\n", __FUNCTION__, CurrentSelector, PendingSelector));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: CurrentSelector=%u PendingSelector=%u: "\r
+        "wrap-around\n",\r
+        __FUNCTION__,\r
+        CurrentSelector,\r
+        PendingSelector\r
+        ));\r
       break;\r
     }\r
+\r
     CurrentSelector = PendingSelector;\r
 \r
     //\r
@@ -274,16 +284,26 @@ QemuCpuhpCollectApicIds (
       // The "insert" event guarantees the "enabled" status; plus it excludes\r
       // the "fw_remove" event.\r
       //\r
-      if ((CpuStatus & QEMU_CPUHP_STAT_ENABLED) == 0 ||\r
-          (CpuStatus & QEMU_CPUHP_STAT_FW_REMOVE) != 0) {\r
-        DEBUG ((DEBUG_ERROR, "%a: CurrentSelector=%u CpuStatus=0x%x: "\r
-          "inconsistent CPU status\n", __FUNCTION__, CurrentSelector,\r
-          CpuStatus));\r
+      if (((CpuStatus & QEMU_CPUHP_STAT_ENABLED) == 0) ||\r
+          ((CpuStatus & QEMU_CPUHP_STAT_FW_REMOVE) != 0))\r
+      {\r
+        DEBUG ((\r
+          DEBUG_ERROR,\r
+          "%a: CurrentSelector=%u CpuStatus=0x%x: "\r
+          "inconsistent CPU status\n",\r
+          __FUNCTION__,\r
+          CurrentSelector,\r
+          CpuStatus\r
+          ));\r
         return EFI_PROTOCOL_ERROR;\r
       }\r
 \r
-      DEBUG ((DEBUG_VERBOSE, "%a: CurrentSelector=%u: insert\n", __FUNCTION__,\r
-        CurrentSelector));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: CurrentSelector=%u: insert\n",\r
+        __FUNCTION__,\r
+        CurrentSelector\r
+        ));\r
 \r
       ExtendIds   = PluggedApicIds;\r
       ExtendSels  = NULL;\r
@@ -293,14 +313,23 @@ QemuCpuhpCollectApicIds (
       // "fw_remove" event guarantees "enabled".\r
       //\r
       if ((CpuStatus & QEMU_CPUHP_STAT_ENABLED) == 0) {\r
-        DEBUG ((DEBUG_ERROR, "%a: CurrentSelector=%u CpuStatus=0x%x: "\r
-          "inconsistent CPU status\n", __FUNCTION__, CurrentSelector,\r
-          CpuStatus));\r
+        DEBUG ((\r
+          DEBUG_ERROR,\r
+          "%a: CurrentSelector=%u CpuStatus=0x%x: "\r
+          "inconsistent CPU status\n",\r
+          __FUNCTION__,\r
+          CurrentSelector,\r
+          CpuStatus\r
+          ));\r
         return EFI_PROTOCOL_ERROR;\r
       }\r
 \r
-      DEBUG ((DEBUG_VERBOSE, "%a: CurrentSelector=%u: fw_remove\n",\r
-        __FUNCTION__, CurrentSelector));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: CurrentSelector=%u: fw_remove\n",\r
+        __FUNCTION__,\r
+        CurrentSelector\r
+        ));\r
 \r
       ExtendIds   = ToUnplugApicIds;\r
       ExtendSels  = ToUnplugSelectors;\r
@@ -309,15 +338,23 @@ QemuCpuhpCollectApicIds (
       //\r
       // Let the OSPM deal with the "remove" event.\r
       //\r
-      DEBUG ((DEBUG_VERBOSE, "%a: CurrentSelector=%u: remove (ignored)\n",\r
-        __FUNCTION__, CurrentSelector));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: CurrentSelector=%u: remove (ignored)\n",\r
+        __FUNCTION__,\r
+        CurrentSelector\r
+        ));\r
 \r
       ExtendIds   = NULL;\r
       ExtendSels  = NULL;\r
       ExtendCount = NULL;\r
     } else {\r
-      DEBUG ((DEBUG_VERBOSE, "%a: CurrentSelector=%u: no event\n",\r
-        __FUNCTION__, CurrentSelector));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: CurrentSelector=%u: no event\n",\r
+        __FUNCTION__,\r
+        CurrentSelector\r
+        ));\r
       break;\r
     }\r
 \r
@@ -334,15 +371,22 @@ QemuCpuhpCollectApicIds (
         DEBUG ((DEBUG_ERROR, "%a: APIC ID array too small\n", __FUNCTION__));\r
         return EFI_BUFFER_TOO_SMALL;\r
       }\r
+\r
       QemuCpuhpWriteCommand (MmCpuIo, QEMU_CPUHP_CMD_GET_ARCH_ID);\r
       NewApicId = QemuCpuhpReadCommandData (MmCpuIo);\r
-      DEBUG ((DEBUG_VERBOSE, "%a: ApicId=" FMT_APIC_ID "\n", __FUNCTION__,\r
-        NewApicId));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: ApicId=" FMT_APIC_ID "\n",\r
+        __FUNCTION__,\r
+        NewApicId\r
+        ));\r
       if (ExtendSels != NULL) {\r
         ExtendSels[(*ExtendCount)] = CurrentSelector;\r
       }\r
+\r
       ExtendIds[(*ExtendCount)++] = NewApicId;\r
     }\r
+\r
     //\r
     // We've processed the CPU with (known) pending events, but we must never\r
     // clear events. Therefore we need to advance past this CPU manually;\r
@@ -352,7 +396,12 @@ QemuCpuhpCollectApicIds (
     CurrentSelector++;\r
   } while (CurrentSelector < PossibleCpuCount);\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: PluggedCount=%u ToUnplugCount=%u\n",\r
-    __FUNCTION__, *PluggedCount, *ToUnplugCount));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: PluggedCount=%u ToUnplugCount=%u\n",\r
+    __FUNCTION__,\r
+    *PluggedCount,\r
+    *ToUnplugCount\r
+    ));\r
   return EFI_SUCCESS;\r
 }\r
index 8bb3c66e9b446f119a7c823e80db5260a1f73487..1a4ae02398c75b19c459af20e5520f5669e6f97b 100644 (file)
 \r
 UINT32\r
 QemuCpuhpReadCommandData2 (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo\r
   );\r
 \r
 UINT8\r
 QemuCpuhpReadCpuStatus (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo\r
   );\r
 \r
 UINT32\r
 QemuCpuhpReadCommandData (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo\r
   );\r
 \r
 VOID\r
 QemuCpuhpWriteCpuSelector (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo,\r
-  IN UINT32                       Selector\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo,\r
+  IN UINT32                        Selector\r
   );\r
 \r
 VOID\r
 QemuCpuhpWriteCpuStatus (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo,\r
-  IN UINT8                        CpuStatus\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo,\r
+  IN UINT8                         CpuStatus\r
   );\r
 \r
 VOID\r
 QemuCpuhpWriteCommand (\r
-  IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo,\r
-  IN UINT8                        Command\r
+  IN CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo,\r
+  IN UINT8                         Command\r
   );\r
 \r
 EFI_STATUS\r
 QemuCpuhpCollectApicIds (\r
-  IN  CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo,\r
-  IN  UINT32                       PossibleCpuCount,\r
-  IN  UINT32                       ApicIdCount,\r
-  OUT APIC_ID                      *PluggedApicIds,\r
-  OUT UINT32                       *PluggedCount,\r
-  OUT APIC_ID                      *ToUnplugApicIds,\r
-  OUT UINT32                       *ToUnplugSelectors,\r
-  OUT UINT32                       *ToUnplugCount\r
+  IN  CONST EFI_MM_CPU_IO_PROTOCOL  *MmCpuIo,\r
+  IN  UINT32                        PossibleCpuCount,\r
+  IN  UINT32                        ApicIdCount,\r
+  OUT APIC_ID                       *PluggedApicIds,\r
+  OUT UINT32                        *PluggedCount,\r
+  OUT APIC_ID                       *ToUnplugApicIds,\r
+  OUT UINT32                        *ToUnplugSelectors,\r
+  OUT UINT32                        *ToUnplugCount\r
   );\r
 \r
 #endif // QEMU_CPUHP_H_\r
index d8f45c4313246aaf71a8ff3b04633b42d501bb1f..5d5060589317cff7608db7aa1d2279101b95a3e2 100644 (file)
 \r
 #include "Smbase.h"\r
 \r
-extern CONST UINT8 mPostSmmPen[];\r
-extern CONST UINT16 mPostSmmPenSize;\r
-extern CONST UINT8 mFirstSmiHandler[];\r
-extern CONST UINT16 mFirstSmiHandlerSize;\r
+extern CONST UINT8   mPostSmmPen[];\r
+extern CONST UINT16  mPostSmmPenSize;\r
+extern CONST UINT8   mFirstSmiHandler[];\r
+extern CONST UINT16  mFirstSmiHandlerSize;\r
 \r
 /**\r
   Allocate a non-SMRAM reserved memory page for the Post-SMM Pen for hot-added\r
@@ -46,12 +46,12 @@ extern CONST UINT16 mFirstSmiHandlerSize;
 **/\r
 EFI_STATUS\r
 SmbaseAllocatePostSmmPen (\r
-  OUT UINT32                  *PenAddress,\r
-  IN  CONST EFI_BOOT_SERVICES *BootServices\r
+  OUT UINT32                   *PenAddress,\r
+  IN  CONST EFI_BOOT_SERVICES  *BootServices\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  EFI_PHYSICAL_ADDRESS Address;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  Address;\r
 \r
   //\r
   // The pen code must fit in one page, and the last byte must remain free for\r
@@ -59,14 +59,23 @@ SmbaseAllocatePostSmmPen (
   //\r
   if (mPostSmmPenSize >= EFI_PAGE_SIZE) {\r
     Status = EFI_BAD_BUFFER_SIZE;\r
-    DEBUG ((DEBUG_ERROR, "%a: mPostSmmPenSize=%u: %r\n", __FUNCTION__,\r
-      mPostSmmPenSize, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: mPostSmmPenSize=%u: %r\n",\r
+      __FUNCTION__,\r
+      mPostSmmPenSize,\r
+      Status\r
+      ));\r
     return Status;\r
   }\r
 \r
   Address = BASE_1MB - 1;\r
-  Status = BootServices->AllocatePages (AllocateMaxAddress,\r
-                           EfiReservedMemoryType, 1, &Address);\r
+  Status  = BootServices->AllocatePages (\r
+                            AllocateMaxAddress,\r
+                            EfiReservedMemoryType,\r
+                            1,\r
+                            &Address\r
+                            );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "%a: AllocatePages(): %r\n", __FUNCTION__, Status));\r
     return Status;\r
@@ -90,7 +99,7 @@ SmbaseAllocatePostSmmPen (
 **/\r
 VOID\r
 SmbaseReinstallPostSmmPen (\r
-  IN UINT32 PenAddress\r
+  IN UINT32  PenAddress\r
   )\r
 {\r
   CopyMem ((VOID *)(UINTN)PenAddress, mPostSmmPen, mPostSmmPenSize);\r
@@ -110,8 +119,8 @@ SmbaseReinstallPostSmmPen (
 **/\r
 VOID\r
 SmbaseReleasePostSmmPen (\r
-  IN UINT32                  PenAddress,\r
-  IN CONST EFI_BOOT_SERVICES *BootServices\r
+  IN UINT32                   PenAddress,\r
+  IN CONST EFI_BOOT_SERVICES  *BootServices\r
   )\r
 {\r
   BootServices->FreePages (PenAddress, 1);\r
@@ -133,12 +142,15 @@ SmbaseInstallFirstSmiHandler (
   VOID\r
   )\r
 {\r
-  FIRST_SMI_HANDLER_CONTEXT *Context;\r
+  FIRST_SMI_HANDLER_CONTEXT  *Context;\r
 \r
-  CopyMem ((VOID *)(UINTN)(SMM_DEFAULT_SMBASE + SMM_HANDLER_OFFSET),\r
-    mFirstSmiHandler, mFirstSmiHandlerSize);\r
+  CopyMem (\r
+    (VOID *)(UINTN)(SMM_DEFAULT_SMBASE + SMM_HANDLER_OFFSET),\r
+    mFirstSmiHandler,\r
+    mFirstSmiHandlerSize\r
+    );\r
 \r
-  Context = (VOID *)(UINTN)SMM_DEFAULT_SMBASE;\r
+  Context             = (VOID *)(UINTN)SMM_DEFAULT_SMBASE;\r
   Context->ApicIdGate = MAX_UINT64;\r
 }\r
 \r
@@ -184,25 +196,31 @@ SmbaseInstallFirstSmiHandler (
 **/\r
 EFI_STATUS\r
 SmbaseRelocate (\r
-  IN APIC_ID ApicId,\r
-  IN UINTN   Smbase,\r
-  IN UINT32  PenAddress\r
+  IN APIC_ID  ApicId,\r
+  IN UINTN    Smbase,\r
+  IN UINT32   PenAddress\r
   )\r
 {\r
-  EFI_STATUS                         Status;\r
-  volatile UINT8                     *SmmVacated;\r
-  volatile FIRST_SMI_HANDLER_CONTEXT *Context;\r
-  UINT64                             ExchangeResult;\r
+  EFI_STATUS                          Status;\r
+  volatile UINT8                      *SmmVacated;\r
+  volatile FIRST_SMI_HANDLER_CONTEXT  *Context;\r
+  UINT64                              ExchangeResult;\r
 \r
   if (Smbase > MAX_UINT32) {\r
     Status = EFI_INVALID_PARAMETER;\r
-    DEBUG ((DEBUG_ERROR, "%a: ApicId=" FMT_APIC_ID " Smbase=0x%Lx: %r\n",\r
-      __FUNCTION__, ApicId, (UINT64)Smbase, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: ApicId=" FMT_APIC_ID " Smbase=0x%Lx: %r\n",\r
+      __FUNCTION__,\r
+      ApicId,\r
+      (UINT64)Smbase,\r
+      Status\r
+      ));\r
     return Status;\r
   }\r
 \r
   SmmVacated = (UINT8 *)(UINTN)PenAddress + (EFI_PAGE_SIZE - 1);\r
-  Context = (VOID *)(UINTN)SMM_DEFAULT_SMBASE;\r
+  Context    = (VOID *)(UINTN)SMM_DEFAULT_SMBASE;\r
 \r
   //\r
   // Clear AboutToLeaveSmm, so we notice when the hot-added CPU is just about\r
@@ -261,12 +279,21 @@ SmbaseRelocate (
   //\r
   // Un-gate SMBASE relocation for the hot-added CPU whose APIC ID is ApicId.\r
   //\r
-  ExchangeResult = InterlockedCompareExchange64 (&Context->ApicIdGate,\r
-                     MAX_UINT64, ApicId);\r
+  ExchangeResult = InterlockedCompareExchange64 (\r
+                     &Context->ApicIdGate,\r
+                     MAX_UINT64,\r
+                     ApicId\r
+                     );\r
   if (ExchangeResult != MAX_UINT64) {\r
     Status = EFI_PROTOCOL_ERROR;\r
-    DEBUG ((DEBUG_ERROR, "%a: ApicId=" FMT_APIC_ID " ApicIdGate=0x%Lx: %r\n",\r
-      __FUNCTION__, ApicId, ExchangeResult, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: ApicId=" FMT_APIC_ID " ApicIdGate=0x%Lx: %r\n",\r
+      __FUNCTION__,\r
+      ApicId,\r
+      ExchangeResult,\r
+      Status\r
+      ));\r
     return Status;\r
   }\r
 \r
index e73730d199260e47ccf68ec57a94f2c85504cdb3..31ce2c86de1e0a2bbb3d2ece39b26d6d43b06361 100644 (file)
 \r
 EFI_STATUS\r
 SmbaseAllocatePostSmmPen (\r
-  OUT UINT32                  *PenAddress,\r
-  IN  CONST EFI_BOOT_SERVICES *BootServices\r
+  OUT UINT32                   *PenAddress,\r
+  IN  CONST EFI_BOOT_SERVICES  *BootServices\r
   );\r
 \r
 VOID\r
 SmbaseReinstallPostSmmPen (\r
-  IN UINT32 PenAddress\r
+  IN UINT32  PenAddress\r
   );\r
 \r
 VOID\r
 SmbaseReleasePostSmmPen (\r
-  IN UINT32                  PenAddress,\r
-  IN CONST EFI_BOOT_SERVICES *BootServices\r
+  IN UINT32                   PenAddress,\r
+  IN CONST EFI_BOOT_SERVICES  *BootServices\r
   );\r
 \r
 VOID\r
@@ -38,9 +38,9 @@ SmbaseInstallFirstSmiHandler (
 \r
 EFI_STATUS\r
 SmbaseRelocate (\r
-  IN APIC_ID ApicId,\r
-  IN UINTN   Smbase,\r
-  IN UINT32  PenAddress\r
+  IN APIC_ID  ApicId,\r
+  IN UINTN    Smbase,\r
+  IN UINT32   PenAddress\r
   );\r
 \r
 #endif // SMBASE_H_\r
index de20d875670c14c2a9e636c9cd5acbdadeba4dca..c192a09cf182a0761971d2e1536f71e5326c5a3a 100644 (file)
@@ -34,10 +34,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // Data structure used to allocate ACPI_CPU_DATA and its supporting structures\r
 //\r
 typedef struct {\r
-  ACPI_CPU_DATA             AcpiCpuData;\r
-  MTRR_SETTINGS             MtrrTable;\r
-  IA32_DESCRIPTOR           GdtrProfile;\r
-  IA32_DESCRIPTOR           IdtrProfile;\r
+  ACPI_CPU_DATA      AcpiCpuData;\r
+  MTRR_SETTINGS      MtrrTable;\r
+  IA32_DESCRIPTOR    GdtrProfile;\r
+  IA32_DESCRIPTOR    IdtrProfile;\r
 } ACPI_CPU_DATA_EX;\r
 \r
 /**\r
@@ -57,12 +57,12 @@ AllocateAcpiNvsMemory (
   EFI_STATUS            Status;\r
   VOID                  *Buffer;\r
 \r
-  Status  = gBS->AllocatePages (\r
-                   AllocateAnyPages,\r
-                   EfiACPIMemoryNVS,\r
-                   EFI_SIZE_TO_PAGES (Size),\r
-                   &Address\r
-                   );\r
+  Status = gBS->AllocatePages (\r
+                  AllocateAnyPages,\r
+                  EfiACPIMemoryNVS,\r
+                  EFI_SIZE_TO_PAGES (Size),\r
+                  &Address\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
   }\r
@@ -86,7 +86,7 @@ AllocateZeroPages (
   IN UINTN  Size\r
   )\r
 {\r
-  VOID                  *Buffer;\r
+  VOID  *Buffer;\r
 \r
   Buffer = AllocatePages (EFI_SIZE_TO_PAGES (Size));\r
   if (Buffer != NULL) {\r
@@ -95,6 +95,7 @@ AllocateZeroPages (
 \r
   return Buffer;\r
 }\r
+\r
 /**\r
   Callback function executed when the EndOfDxe event group is signaled.\r
 \r
@@ -110,20 +111,20 @@ CpuS3DataOnEndOfDxe (
   OUT VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS         Status;\r
-  ACPI_CPU_DATA_EX   *AcpiCpuDataEx;\r
+  EFI_STATUS        Status;\r
+  ACPI_CPU_DATA_EX  *AcpiCpuDataEx;\r
 \r
-  AcpiCpuDataEx = (ACPI_CPU_DATA_EX *) Context;\r
+  AcpiCpuDataEx = (ACPI_CPU_DATA_EX *)Context;\r
   //\r
   // Allocate a 4KB reserved page below 1MB\r
   //\r
   AcpiCpuDataEx->AcpiCpuData.StartupVector = BASE_1MB - 1;\r
-  Status = gBS->AllocatePages (\r
-                  AllocateMaxAddress,\r
-                  EfiReservedMemoryType,\r
-                  1,\r
-                  &AcpiCpuDataEx->AcpiCpuData.StartupVector\r
-                  );\r
+  Status                                   = gBS->AllocatePages (\r
+                                                    AllocateMaxAddress,\r
+                                                    EfiReservedMemoryType,\r
+                                                    1,\r
+                                                    &AcpiCpuDataEx->AcpiCpuData.StartupVector\r
+                                                    );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   DEBUG ((DEBUG_VERBOSE, "%a\n", __FUNCTION__));\r
@@ -158,18 +159,18 @@ CpuS3DataInitialize (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  ACPI_CPU_DATA_EX           *AcpiCpuDataEx;\r
-  ACPI_CPU_DATA              *AcpiCpuData;\r
-  EFI_MP_SERVICES_PROTOCOL   *MpServices;\r
-  UINTN                      NumberOfCpus;\r
-  VOID                       *Stack;\r
-  UINTN                      GdtSize;\r
-  UINTN                      IdtSize;\r
-  VOID                       *Gdt;\r
-  VOID                       *Idt;\r
-  EFI_EVENT                  Event;\r
-  ACPI_CPU_DATA              *OldAcpiCpuData;\r
+  EFI_STATUS                Status;\r
+  ACPI_CPU_DATA_EX          *AcpiCpuDataEx;\r
+  ACPI_CPU_DATA             *AcpiCpuData;\r
+  EFI_MP_SERVICES_PROTOCOL  *MpServices;\r
+  UINTN                     NumberOfCpus;\r
+  VOID                      *Stack;\r
+  UINTN                     GdtSize;\r
+  UINTN                     IdtSize;\r
+  VOID                      *Gdt;\r
+  VOID                      *Idt;\r
+  EFI_EVENT                 Event;\r
+  ACPI_CPU_DATA             *OldAcpiCpuData;\r
 \r
   if (!PcdGetBool (PcdAcpiS3Enable)) {\r
     return EFI_UNSUPPORTED;\r
@@ -178,7 +179,7 @@ CpuS3DataInitialize (
   //\r
   // Set PcdCpuS3DataAddress to the base address of the ACPI_CPU_DATA structure\r
   //\r
-  OldAcpiCpuData = (ACPI_CPU_DATA *) (UINTN) PcdGet64 (PcdCpuS3DataAddress);\r
+  OldAcpiCpuData = (ACPI_CPU_DATA *)(UINTN)PcdGet64 (PcdCpuS3DataAddress);\r
 \r
   AcpiCpuDataEx = AllocateZeroPages (sizeof (ACPI_CPU_DATA_EX));\r
   ASSERT (AcpiCpuDataEx != NULL);\r
@@ -187,7 +188,7 @@ CpuS3DataInitialize (
   if (PcdGetBool (PcdQ35SmramAtDefaultSmbase)) {\r
     NumberOfCpus = PcdGet32 (PcdCpuMaxLogicalProcessorNumber);\r
   } else {\r
-    UINTN NumberOfEnabledProcessors;\r
+    UINTN  NumberOfEnabledProcessors;\r
 \r
     //\r
     // Get MP Services Protocol\r
@@ -209,6 +210,7 @@ CpuS3DataInitialize (
                            );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
+\r
   AcpiCpuData->NumberOfCpus = (UINT32)NumberOfCpus;\r
 \r
   //\r
@@ -217,9 +219,9 @@ CpuS3DataInitialize (
   AcpiCpuData->StackSize                 = PcdGet32 (PcdCpuApStackSize);\r
   AcpiCpuData->ApMachineCheckHandlerBase = 0;\r
   AcpiCpuData->ApMachineCheckHandlerSize = 0;\r
-  AcpiCpuData->GdtrProfile  = (EFI_PHYSICAL_ADDRESS)(UINTN)&AcpiCpuDataEx->GdtrProfile;\r
-  AcpiCpuData->IdtrProfile  = (EFI_PHYSICAL_ADDRESS)(UINTN)&AcpiCpuDataEx->IdtrProfile;\r
-  AcpiCpuData->MtrrTable    = (EFI_PHYSICAL_ADDRESS)(UINTN)&AcpiCpuDataEx->MtrrTable;\r
+  AcpiCpuData->GdtrProfile               = (EFI_PHYSICAL_ADDRESS)(UINTN)&AcpiCpuDataEx->GdtrProfile;\r
+  AcpiCpuData->IdtrProfile               = (EFI_PHYSICAL_ADDRESS)(UINTN)&AcpiCpuDataEx->IdtrProfile;\r
+  AcpiCpuData->MtrrTable                 = (EFI_PHYSICAL_ADDRESS)(UINTN)&AcpiCpuDataEx->MtrrTable;\r
 \r
   //\r
   // Allocate stack space for all CPUs.\r
@@ -243,7 +245,7 @@ CpuS3DataInitialize (
   //\r
   GdtSize = AcpiCpuDataEx->GdtrProfile.Limit + 1;\r
   IdtSize = AcpiCpuDataEx->IdtrProfile.Limit + 1;\r
-  Gdt = AllocateZeroPages (GdtSize + IdtSize);\r
+  Gdt     = AllocateZeroPages (GdtSize + IdtSize);\r
   ASSERT (Gdt != NULL);\r
   Idt = (VOID *)((UINTN)Gdt + GdtSize);\r
   CopyMem (Gdt, (VOID *)AcpiCpuDataEx->GdtrProfile.Base, GdtSize);\r
index 24d945b2eb74f9101dcd348062332019ad1bcd0c..35a4a24f340421ecaa8499d085b3d6d95a36dd6f 100644 (file)
@@ -12,7 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // EFI Driver Binding Protocol Instance\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL gBiosVideoDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gBiosVideoDriverBinding = {\r
   BiosVideoDriverBindingSupported,\r
   BiosVideoDriverBindingStart,\r
   BiosVideoDriverBindingStop,\r
@@ -24,17 +24,17 @@ EFI_DRIVER_BINDING_PROTOCOL gBiosVideoDriverBinding = {
 //\r
 // Global lookup tables for VGA graphics modes\r
 //\r
-UINT8                          mVgaLeftMaskTable[]   = { 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01 };\r
+UINT8  mVgaLeftMaskTable[] = { 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01 };\r
 \r
-UINT8                          mVgaRightMaskTable[]  = { 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff };\r
+UINT8  mVgaRightMaskTable[] = { 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff };\r
 \r
-UINT8                          mVgaBitMaskTable[]    = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };\r
+UINT8  mVgaBitMaskTable[] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };\r
 \r
 //\r
 // Save controller attributes during first start\r
 //\r
-UINT64                         mOriginalPciAttributes;\r
-BOOLEAN                        mPciAttributesSaved = FALSE;\r
+UINT64   mOriginalPciAttributes;\r
+BOOLEAN  mPciAttributesSaved = FALSE;\r
 \r
 EFI_GRAPHICS_OUTPUT_BLT_PIXEL  mVgaColorToGraphicsOutputColor[] = {\r
   { 0x00, 0x00, 0x00, 0x00 },\r
@@ -58,33 +58,33 @@ EFI_GRAPHICS_OUTPUT_BLT_PIXEL  mVgaColorToGraphicsOutputColor[] = {
 //\r
 // Standard timing defined by VESA EDID\r
 //\r
-VESA_BIOS_EXTENSIONS_EDID_TIMING mEstablishedEdidTiming[] = {\r
+VESA_BIOS_EXTENSIONS_EDID_TIMING  mEstablishedEdidTiming[] = {\r
   //\r
   // Established Timing I\r
   //\r
-  {800, 600, 60},\r
-  {800, 600, 56},\r
-  {640, 480, 75},\r
-  {640, 480, 72},\r
-  {640, 480, 67},\r
-  {640, 480, 60},\r
-  {720, 400, 88},\r
-  {720, 400, 70},\r
+  { 800,  600,  60 },\r
+  { 800,  600,  56 },\r
+  { 640,  480,  75 },\r
+  { 640,  480,  72 },\r
+  { 640,  480,  67 },\r
+  { 640,  480,  60 },\r
+  { 720,  400,  88 },\r
+  { 720,  400,  70 },\r
   //\r
   // Established Timing II\r
   //\r
-  {1280, 1024, 75},\r
-  {1024,  768, 75},\r
-  {1024,  768, 70},\r
-  {1024,  768, 60},\r
-  {1024,  768, 87},\r
-  {832,   624, 75},\r
-  {800,   600, 75},\r
-  {800,   600, 72},\r
+  { 1280, 1024, 75 },\r
+  { 1024, 768,  75 },\r
+  { 1024, 768,  70 },\r
+  { 1024, 768,  60 },\r
+  { 1024, 768,  87 },\r
+  { 832,  624,  75 },\r
+  { 800,  600,  75 },\r
+  { 800,  600,  72 },\r
   //\r
   // Established Timing III\r
   //\r
-  {1152, 870, 75}\r
+  { 1152, 870,  75 }\r
 };\r
 \r
 /**\r
@@ -117,7 +117,7 @@ BiosVideoDriverBindingSupported (
   //\r
   // See if the Legacy BIOS Protocol is available\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -128,7 +128,7 @@ BiosVideoDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -154,6 +154,7 @@ BiosVideoDriverBindingSupported (
       return EFI_ALREADY_STARTED;\r
     }\r
   }\r
+\r
   //\r
   // See if this is a PCI Graphics Controller by looking at the Command register and\r
   // Class Code Register\r
@@ -171,15 +172,14 @@ BiosVideoDriverBindingSupported (
   }\r
 \r
   Status = EFI_UNSUPPORTED;\r
-  if (Pci.Hdr.ClassCode[2] == 0x03 || (Pci.Hdr.ClassCode[2] == 0x00 && Pci.Hdr.ClassCode[1] == 0x01)) {\r
-\r
+  if ((Pci.Hdr.ClassCode[2] == 0x03) || ((Pci.Hdr.ClassCode[2] == 0x00) && (Pci.Hdr.ClassCode[1] == 0x01))) {\r
     Status = EFI_SUCCESS;\r
     //\r
     // If this is a graphics controller,\r
     // go further check RemainingDevicePath validation\r
     //\r
     if (RemainingDevicePath != NULL) {\r
-      Node = (EFI_DEV_PATH *) RemainingDevicePath;\r
+      Node = (EFI_DEV_PATH *)RemainingDevicePath;\r
       //\r
       // Check if RemainingDevicePath is the End of Device Path Node,\r
       // if yes, return EFI_SUCCESS\r
@@ -189,9 +189,10 @@ BiosVideoDriverBindingSupported (
         // If RemainingDevicePath isn't the End of Device Path Node,\r
         // check its validation\r
         //\r
-        if (Node->DevPath.Type != ACPI_DEVICE_PATH ||\r
-            Node->DevPath.SubType != ACPI_ADR_DP ||\r
-            DevicePathNodeLength(&Node->DevPath) < sizeof(ACPI_ADR_DEVICE_PATH)) {\r
+        if ((Node->DevPath.Type != ACPI_DEVICE_PATH) ||\r
+            (Node->DevPath.SubType != ACPI_ADR_DP) ||\r
+            (DevicePathNodeLength (&Node->DevPath) < sizeof (ACPI_ADR_DEVICE_PATH)))\r
+        {\r
           Status = EFI_UNSUPPORTED;\r
         }\r
       }\r
@@ -209,7 +210,6 @@ Done:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Install Graphics Output Protocol onto VGA device handles.\r
 \r
@@ -246,7 +246,7 @@ BiosVideoDriverBindingStart (
   //\r
   // See if the Legacy BIOS Protocol is available\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -257,7 +257,7 @@ BiosVideoDriverBindingStart (
   Status = gBS->HandleProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath\r
+                  (VOID **)&ParentDevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -269,7 +269,7 @@ BiosVideoDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -292,6 +292,7 @@ BiosVideoDriverBindingStart (
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r
+\r
     mPciAttributesSaved = TRUE;\r
   }\r
 \r
@@ -309,7 +310,7 @@ BiosVideoDriverBindingStart (
   }\r
 \r
   Supports &= (UINT64)(EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16);\r
-  if (Supports == 0 || Supports == (EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16)) {\r
+  if ((Supports == 0) || (Supports == (EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16))) {\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
@@ -323,11 +324,11 @@ BiosVideoDriverBindingStart (
   // Enable the device and make sure VGA cycles are being forwarded to this VGA device\r
   //\r
   Status = PciIo->Attributes (\r
-             PciIo,\r
-             EfiPciIoAttributeOperationEnable,\r
-             EFI_PCI_DEVICE_ENABLE | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | Supports,\r
-             NULL\r
-             );\r
+                    PciIo,\r
+                    EfiPciIoAttributeOperationEnable,\r
+                    EFI_PCI_DEVICE_ENABLE | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | Supports,\r
+                    NULL\r
+                    );\r
   if (EFI_ERROR (Status)) {\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
@@ -336,6 +337,7 @@ BiosVideoDriverBindingStart (
       );\r
     goto Done;\r
   }\r
+\r
   //\r
   // Check to see if there is a legacy option ROM image associated with this PCI device\r
   //\r
@@ -349,6 +351,7 @@ BiosVideoDriverBindingStart (
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
+\r
   //\r
   // Post the legacy option ROM if it is available.\r
   //\r
@@ -378,7 +381,8 @@ BiosVideoDriverBindingStart (
 \r
   if (RemainingDevicePath != NULL) {\r
     if (IsDevicePathEnd (RemainingDevicePath) &&\r
-        (FeaturePcdGet (PcdBiosVideoCheckVbeEnable) || FeaturePcdGet (PcdBiosVideoCheckVgaEnable))) {\r
+        (FeaturePcdGet (PcdBiosVideoCheckVbeEnable) || FeaturePcdGet (PcdBiosVideoCheckVgaEnable)))\r
+    {\r
       //\r
       // If RemainingDevicePath is the End of Device Path Node,\r
       // don't create any child device and return EFI_SUCCESS\r
@@ -418,13 +422,14 @@ Done:
         // Restore original PCI attributes\r
         //\r
         PciIo->Attributes (\r
-                        PciIo,\r
-                        EfiPciIoAttributeOperationSet,\r
-                        mOriginalPciAttributes,\r
-                        NULL\r
-                        );\r
+                 PciIo,\r
+                 EfiPciIoAttributeOperationSet,\r
+                 mOriginalPciAttributes,\r
+                 NULL\r
+                 );\r
       }\r
     }\r
+\r
     //\r
     // Release PCI I/O Protocols on the controller handle.\r
     //\r
@@ -439,7 +444,6 @@ Done:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop.\r
 \r
@@ -455,16 +459,16 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 BiosVideoDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      Controller,\r
-  IN  UINTN                           NumberOfChildren,\r
-  IN  EFI_HANDLE                      *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Controller,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  BOOLEAN                      AllChildrenStopped;\r
-  UINTN                        Index;\r
-  EFI_PCI_IO_PROTOCOL          *PciIo;\r
+  EFI_STATUS           Status;\r
+  BOOLEAN              AllChildrenStopped;\r
+  UINTN                Index;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
 \r
   AllChildrenStopped = TRUE;\r
 \r
@@ -499,7 +503,7 @@ BiosVideoDriverBindingStop (
       Status = gBS->HandleProtocol (\r
                       Controller,\r
                       &gEfiPciIoProtocolGuid,\r
-                      (VOID **) &PciIo\r
+                      (VOID **)&PciIo\r
                       );\r
       ASSERT_EFI_ERROR (Status);\r
 \r
@@ -516,11 +520,9 @@ BiosVideoDriverBindingStop (
     }\r
   }\r
 \r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Install child handles if the Handle supports MBR format.\r
 \r
@@ -545,18 +547,18 @@ BiosVideoChildHandleInstall (
   IN  EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  BIOS_VIDEO_DEV           *BiosVideoPrivate;\r
-  PCI_TYPE00               Pci;\r
-  ACPI_ADR_DEVICE_PATH     AcpiDeviceNode;\r
-  BOOLEAN                  ProtocolInstalled;\r
+  EFI_STATUS            Status;\r
+  BIOS_VIDEO_DEV        *BiosVideoPrivate;\r
+  PCI_TYPE00            Pci;\r
+  ACPI_ADR_DEVICE_PATH  AcpiDeviceNode;\r
+  BOOLEAN               ProtocolInstalled;\r
 \r
   //\r
   // Allocate the private device structure for video device\r
   //\r
-  BiosVideoPrivate = (BIOS_VIDEO_DEV *) AllocateZeroPool (\r
-                                          sizeof (BIOS_VIDEO_DEV)\r
-                                          );\r
+  BiosVideoPrivate = (BIOS_VIDEO_DEV *)AllocateZeroPool (\r
+                                         sizeof (BIOS_VIDEO_DEV)\r
+                                         );\r
   if (NULL == BiosVideoPrivate) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
@@ -566,12 +568,12 @@ BiosVideoChildHandleInstall (
   // See if this is a VGA compatible controller or not\r
   //\r
   Status = ParentPciIo->Pci.Read (\r
-                          ParentPciIo,\r
-                          EfiPciIoWidthUint32,\r
-                          0,\r
-                          sizeof (Pci) / sizeof (UINT32),\r
-                          &Pci\r
-                          );\r
+                              ParentPciIo,\r
+                              EfiPciIoWidthUint32,\r
+                              0,\r
+                              sizeof (Pci) / sizeof (UINT32),\r
+                              &Pci\r
+                              );\r
   if (EFI_ERROR (Status)) {\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
@@ -580,16 +582,17 @@ BiosVideoChildHandleInstall (
       );\r
     goto Done;\r
   }\r
+\r
   BiosVideoPrivate->VgaCompatible = FALSE;\r
-  if (Pci.Hdr.ClassCode[2] == 0x00 && Pci.Hdr.ClassCode[1] == 0x01) {\r
+  if ((Pci.Hdr.ClassCode[2] == 0x00) && (Pci.Hdr.ClassCode[1] == 0x01)) {\r
     BiosVideoPrivate->VgaCompatible = TRUE;\r
   }\r
 \r
-  if (Pci.Hdr.ClassCode[2] == 0x03 && Pci.Hdr.ClassCode[1] == 0x00 && Pci.Hdr.ClassCode[0] == 0x00) {\r
+  if ((Pci.Hdr.ClassCode[2] == 0x03) && (Pci.Hdr.ClassCode[1] == 0x00) && (Pci.Hdr.ClassCode[0] == 0x00)) {\r
     BiosVideoPrivate->VgaCompatible = TRUE;\r
   }\r
 \r
- if (PcdGetBool (PcdBiosVideoSetTextVgaModeEnable)) {\r
 if (PcdGetBool (PcdBiosVideoSetTextVgaModeEnable)) {\r
     //\r
     // Create EXIT_BOOT_SERIVES Event\r
     //\r
@@ -626,21 +629,20 @@ BiosVideoChildHandleInstall (
   BiosVideoPrivate->GraphicsOutput.QueryMode = BiosVideoGraphicsOutputQueryMode;\r
   BiosVideoPrivate->GraphicsOutput.SetMode   = BiosVideoGraphicsOutputSetMode;\r
 \r
-\r
   //\r
   // Allocate buffer for Graphics Output Protocol mode information\r
   //\r
-  BiosVideoPrivate->GraphicsOutput.Mode = (EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *) AllocatePool (\r
-                                             sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE)\r
-                                             );\r
+  BiosVideoPrivate->GraphicsOutput.Mode = (EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *)AllocatePool (\r
+                                                                                 sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE)\r
+                                                                                 );\r
   if (NULL == BiosVideoPrivate->GraphicsOutput.Mode) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
   }\r
 \r
-  BiosVideoPrivate->GraphicsOutput.Mode->Info = (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *) AllocatePool (\r
-                                             sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION)\r
-                                             );\r
+  BiosVideoPrivate->GraphicsOutput.Mode->Info = (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *)AllocatePool (\r
+                                                                                          sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION)\r
+                                                                                          );\r
   if (NULL ==  BiosVideoPrivate->GraphicsOutput.Mode->Info) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
@@ -657,14 +659,14 @@ BiosVideoChildHandleInstall (
   if ((RemainingDevicePath == NULL) || (!IsDevicePathEnd (RemainingDevicePath))) {\r
     if (RemainingDevicePath == NULL) {\r
       ZeroMem (&AcpiDeviceNode, sizeof (ACPI_ADR_DEVICE_PATH));\r
-      AcpiDeviceNode.Header.Type = ACPI_DEVICE_PATH;\r
+      AcpiDeviceNode.Header.Type    = ACPI_DEVICE_PATH;\r
       AcpiDeviceNode.Header.SubType = ACPI_ADR_DP;\r
-      AcpiDeviceNode.ADR = ACPI_DISPLAY_ADR (1, 0, 0, 1, 0, ACPI_ADR_DISPLAY_TYPE_VGA, 0, 0);\r
+      AcpiDeviceNode.ADR            = ACPI_DISPLAY_ADR (1, 0, 0, 1, 0, ACPI_ADR_DISPLAY_TYPE_VGA, 0, 0);\r
       SetDevicePathNodeLength (&AcpiDeviceNode.Header, sizeof (ACPI_ADR_DEVICE_PATH));\r
 \r
       BiosVideoPrivate->GopDevicePath = AppendDevicePathNode (\r
                                           ParentDevicePath,\r
-                                          (EFI_DEVICE_PATH_PROTOCOL *) &AcpiDeviceNode\r
+                                          (EFI_DEVICE_PATH_PROTOCOL *)&AcpiDeviceNode\r
                                           );\r
     } else {\r
       BiosVideoPrivate->GopDevicePath = AppendDevicePathNode (ParentDevicePath, RemainingDevicePath);\r
@@ -674,12 +676,12 @@ BiosVideoChildHandleInstall (
     // Creat child handle and device path protocol firstly\r
     //\r
     BiosVideoPrivate->Handle = NULL;\r
-    Status = gBS->InstallMultipleProtocolInterfaces (\r
-                    &BiosVideoPrivate->Handle,\r
-                    &gEfiDevicePathProtocolGuid,\r
-                    BiosVideoPrivate->GopDevicePath,\r
-                    NULL\r
-                    );\r
+    Status                   = gBS->InstallMultipleProtocolInterfaces (\r
+                                      &BiosVideoPrivate->Handle,\r
+                                      &gEfiDevicePathProtocolGuid,\r
+                                      BiosVideoPrivate->GopDevicePath,\r
+                                      NULL\r
+                                      );\r
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r
@@ -704,7 +706,7 @@ BiosVideoChildHandleInstall (
   //\r
   // When check for VBE, PCI I/O protocol is needed, so use parent's protocol interface temporally\r
   //\r
-  BiosVideoPrivate->PciIo                 = ParentPciIo;\r
+  BiosVideoPrivate->PciIo = ParentPciIo;\r
 \r
   //\r
   // Check for VESA BIOS Extensions for modes that are compatible with Graphics Output\r
@@ -715,6 +717,7 @@ BiosVideoChildHandleInstall (
   } else {\r
     Status = EFI_UNSUPPORTED;\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // The VESA BIOS Extensions are not compatible with Graphics Output, so check for support\r
@@ -740,6 +743,7 @@ BiosVideoChildHandleInstall (
           FreePool (BiosVideoPrivate->GraphicsOutput.Mode->Info);\r
           BiosVideoPrivate->GraphicsOutput.Mode->Info = NULL;\r
         }\r
+\r
         FreePool (BiosVideoPrivate->GraphicsOutput.Mode);\r
         BiosVideoPrivate->GraphicsOutput.Mode = NULL;\r
       }\r
@@ -781,7 +785,7 @@ BiosVideoChildHandleInstall (
       Status = gBS->OpenProtocol (\r
                       ParentHandle,\r
                       &gEfiPciIoProtocolGuid,\r
-                      (VOID **) &BiosVideoPrivate->PciIo,\r
+                      (VOID **)&BiosVideoPrivate->PciIo,\r
                       This->DriverBindingHandle,\r
                       BiosVideoPrivate->Handle,\r
                       EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -789,6 +793,7 @@ BiosVideoChildHandleInstall (
       if (EFI_ERROR (Status)) {\r
         goto Done;\r
       }\r
+\r
       ProtocolInstalled = TRUE;\r
     }\r
   }\r
@@ -810,6 +815,7 @@ Done:
     if ((BiosVideoPrivate != NULL) && (BiosVideoPrivate->ExitBootServicesEvent != NULL)) {\r
       gBS->CloseEvent (BiosVideoPrivate->ExitBootServicesEvent);\r
     }\r
+\r
     //\r
     // Free private data structure\r
     //\r
@@ -819,7 +825,6 @@ Done:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Deregister an video child handle and free resources.\r
 \r
@@ -832,17 +837,17 @@ Done:
 **/\r
 EFI_STATUS\r
 BiosVideoChildHandleUninstall (\r
-  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  EFI_HANDLE                     Controller,\r
-  EFI_HANDLE                     Handle\r
+  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  EFI_HANDLE                   Controller,\r
+  EFI_HANDLE                   Handle\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_IA32_REGISTER_SET        Regs;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput;\r
-  EFI_VGA_MINI_PORT_PROTOCOL   *VgaMiniPort;\r
-  BIOS_VIDEO_DEV               *BiosVideoPrivate;\r
-  EFI_PCI_IO_PROTOCOL          *PciIo;\r
+  EFI_STATUS                    Status;\r
+  EFI_IA32_REGISTER_SET         Regs;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *GraphicsOutput;\r
+  EFI_VGA_MINI_PORT_PROTOCOL    *VgaMiniPort;\r
+  BIOS_VIDEO_DEV                *BiosVideoPrivate;\r
+  EFI_PCI_IO_PROTOCOL           *PciIo;\r
 \r
   BiosVideoPrivate = NULL;\r
   GraphicsOutput   = NULL;\r
@@ -852,24 +857,24 @@ BiosVideoChildHandleUninstall (
   Status = gBS->OpenProtocol (\r
                   Handle,\r
                   &gEfiGraphicsOutputProtocolGuid,\r
-                  (VOID **) &GraphicsOutput,\r
+                  (VOID **)&GraphicsOutput,\r
                   This->DriverBindingHandle,\r
                   Handle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
-      BiosVideoPrivate = BIOS_VIDEO_DEV_FROM_GRAPHICS_OUTPUT_THIS (GraphicsOutput);\r
+    BiosVideoPrivate = BIOS_VIDEO_DEV_FROM_GRAPHICS_OUTPUT_THIS (GraphicsOutput);\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
     Status = gBS->OpenProtocol (\r
-                   Handle,\r
-                   &gEfiVgaMiniPortProtocolGuid,\r
-                   (VOID **) &VgaMiniPort,\r
-                   This->DriverBindingHandle,\r
-                   Handle,\r
-                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
-                   );\r
+                    Handle,\r
+                    &gEfiVgaMiniPortProtocolGuid,\r
+                    (VOID **)&VgaMiniPort,\r
+                    This->DriverBindingHandle,\r
+                    Handle,\r
+                    EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                    );\r
     if (!EFI_ERROR (Status)) {\r
       BiosVideoPrivate = BIOS_VIDEO_DEV_FROM_VGA_MINI_PORT_THIS (VgaMiniPort);\r
     }\r
@@ -918,6 +923,7 @@ BiosVideoChildHandleUninstall (
                     NULL\r
                     );\r
   }\r
+\r
   if (!BiosVideoPrivate->ProduceGraphicsOutput) {\r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
                     Controller,\r
@@ -931,7 +937,7 @@ BiosVideoChildHandleUninstall (
     gBS->OpenProtocol (\r
            Controller,\r
            &gEfiPciIoProtocolGuid,\r
-           (VOID **) &PciIo,\r
+           (VOID **)&PciIo,\r
            This->DriverBindingHandle,\r
            Handle,\r
            EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -954,7 +960,6 @@ BiosVideoChildHandleUninstall (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Release resource for biso video instance.\r
 \r
@@ -967,7 +972,7 @@ BiosVideoDeviceReleaseResource (
   )\r
 {\r
   if (BiosVideoPrivate == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -980,24 +985,28 @@ BiosVideoDeviceReleaseResource (
   if (BiosVideoPrivate->VgaFrameBuffer != NULL) {\r
     FreePool (BiosVideoPrivate->VgaFrameBuffer);\r
   }\r
+\r
   //\r
   // Free VBE Frame Buffer\r
   //\r
   if (BiosVideoPrivate->VbeFrameBuffer != NULL) {\r
     FreePool (BiosVideoPrivate->VbeFrameBuffer);\r
   }\r
+\r
   //\r
   // Free line buffer\r
   //\r
   if (BiosVideoPrivate->LineBuffer != NULL) {\r
     FreePool (BiosVideoPrivate->LineBuffer);\r
   }\r
+\r
   //\r
   // Free mode data\r
   //\r
   if (BiosVideoPrivate->ModeData != NULL) {\r
     FreePool (BiosVideoPrivate->ModeData);\r
   }\r
+\r
   //\r
   // Free memory allocated below 1MB\r
   //\r
@@ -1014,18 +1023,21 @@ BiosVideoDeviceReleaseResource (
   //\r
   if (BiosVideoPrivate->GraphicsOutput.Mode != NULL) {\r
     if (BiosVideoPrivate->GraphicsOutput.Mode->Info != NULL) {\r
-        FreePool (BiosVideoPrivate->GraphicsOutput.Mode->Info);\r
-        BiosVideoPrivate->GraphicsOutput.Mode->Info = NULL;\r
+      FreePool (BiosVideoPrivate->GraphicsOutput.Mode->Info);\r
+      BiosVideoPrivate->GraphicsOutput.Mode->Info = NULL;\r
     }\r
+\r
     FreePool (BiosVideoPrivate->GraphicsOutput.Mode);\r
     BiosVideoPrivate->GraphicsOutput.Mode = NULL;\r
   }\r
+\r
   //\r
   // Free EDID discovered protocol occupied resource\r
   //\r
   if (BiosVideoPrivate->EdidDiscovered.Edid != NULL) {\r
     FreePool (BiosVideoPrivate->EdidDiscovered.Edid);\r
   }\r
+\r
   //\r
   // Free EDID active protocol occupied resource\r
   //\r
@@ -1033,16 +1045,15 @@ BiosVideoDeviceReleaseResource (
     FreePool (BiosVideoPrivate->EdidActive.Edid);\r
   }\r
 \r
-  if (BiosVideoPrivate->GopDevicePath!= NULL) {\r
+  if (BiosVideoPrivate->GopDevicePath != NULL) {\r
     FreePool (BiosVideoPrivate->GopDevicePath);\r
   }\r
 \r
   FreePool (BiosVideoPrivate);\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
-\r
 /**\r
   Generate a search key for a specified timing data.\r
 \r
@@ -1053,10 +1064,10 @@ BiosVideoDeviceReleaseResource (
 **/\r
 UINT32\r
 CalculateEdidKey (\r
-  VESA_BIOS_EXTENSIONS_EDID_TIMING       *EdidTiming\r
+  VESA_BIOS_EXTENSIONS_EDID_TIMING  *EdidTiming\r
   )\r
 {\r
-  UINT32 Key;\r
+  UINT32  Key;\r
 \r
   //\r
   // Be sure no conflicts for all standard timing defined by VESA.\r
@@ -1065,7 +1076,6 @@ CalculateEdidKey (
   return Key;\r
 }\r
 \r
-\r
 /**\r
   Parse the Established Timing and Standard Timing in EDID data block.\r
 \r
@@ -1078,31 +1088,32 @@ CalculateEdidKey (
 **/\r
 BOOLEAN\r
 ParseEdidData (\r
-  UINT8                                      *EdidBuffer,\r
-  VESA_BIOS_EXTENSIONS_VALID_EDID_TIMING     *ValidEdidTiming\r
+  UINT8                                   *EdidBuffer,\r
+  VESA_BIOS_EXTENSIONS_VALID_EDID_TIMING  *ValidEdidTiming\r
   )\r
 {\r
-  UINT8  CheckSum;\r
-  UINT32 Index;\r
-  UINT32 ValidNumber;\r
-  UINT32 TimingBits;\r
-  UINT8  *BufferIndex;\r
-  UINT16 HorizontalResolution;\r
-  UINT16 VerticalResolution;\r
-  UINT8  AspectRatio;\r
-  UINT8  RefreshRate;\r
-  VESA_BIOS_EXTENSIONS_EDID_TIMING     TempTiming;\r
-  VESA_BIOS_EXTENSIONS_EDID_DATA_BLOCK *EdidDataBlock;\r
+  UINT8                                 CheckSum;\r
+  UINT32                                Index;\r
+  UINT32                                ValidNumber;\r
+  UINT32                                TimingBits;\r
+  UINT8                                 *BufferIndex;\r
+  UINT16                                HorizontalResolution;\r
+  UINT16                                VerticalResolution;\r
+  UINT8                                 AspectRatio;\r
+  UINT8                                 RefreshRate;\r
+  VESA_BIOS_EXTENSIONS_EDID_TIMING      TempTiming;\r
+  VESA_BIOS_EXTENSIONS_EDID_DATA_BLOCK  *EdidDataBlock;\r
 \r
-  EdidDataBlock = (VESA_BIOS_EXTENSIONS_EDID_DATA_BLOCK *) EdidBuffer;\r
+  EdidDataBlock = (VESA_BIOS_EXTENSIONS_EDID_DATA_BLOCK *)EdidBuffer;\r
 \r
   //\r
   // Check the checksum of EDID data\r
   //\r
   CheckSum = 0;\r
-  for (Index = 0; Index < VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE; Index ++) {\r
-    CheckSum = (UINT8) (CheckSum + EdidBuffer[Index]);\r
+  for (Index = 0; Index < VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE; Index++) {\r
+    CheckSum = (UINT8)(CheckSum + EdidBuffer[Index]);\r
   }\r
+\r
   if (CheckSum != 0) {\r
     return FALSE;\r
   }\r
@@ -1113,20 +1124,26 @@ ParseEdidData (
   if ((EdidDataBlock->EstablishedTimings[0] != 0) ||\r
       (EdidDataBlock->EstablishedTimings[1] != 0) ||\r
       (EdidDataBlock->EstablishedTimings[2] != 0)\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // Established timing data\r
     //\r
     TimingBits = EdidDataBlock->EstablishedTimings[0] |\r
                  (EdidDataBlock->EstablishedTimings[1] << 8) |\r
-                 ((EdidDataBlock->EstablishedTimings[2] & 0x80) << 9) ;\r
-    for (Index = 0; Index < VESA_BIOS_EXTENSIONS_EDID_ESTABLISHED_TIMING_MAX_NUMBER; Index ++) {\r
+                 ((EdidDataBlock->EstablishedTimings[2] & 0x80) << 9);\r
+    for (Index = 0; Index < VESA_BIOS_EXTENSIONS_EDID_ESTABLISHED_TIMING_MAX_NUMBER; Index++) {\r
       if ((TimingBits & 0x1) != 0) {\r
-        DEBUG ((DEBUG_INFO, "Established Timing: %d x %d\n",\r
-        mEstablishedEdidTiming[Index].HorizontalResolution, mEstablishedEdidTiming[Index].VerticalResolution));\r
+        DEBUG ((\r
+          DEBUG_INFO,\r
+          "Established Timing: %d x %d\n",\r
+          mEstablishedEdidTiming[Index].HorizontalResolution,\r
+          mEstablishedEdidTiming[Index].VerticalResolution\r
+          ));\r
         ValidEdidTiming->Key[ValidNumber] = CalculateEdidKey (&mEstablishedEdidTiming[Index]);\r
-        ValidNumber ++;\r
+        ValidNumber++;\r
       }\r
+\r
       TimingBits = TimingBits >> 1;\r
     }\r
   }\r
@@ -1135,42 +1152,44 @@ ParseEdidData (
   // Parse the standard timing data\r
   //\r
   BufferIndex = &EdidDataBlock->StandardTimingIdentification[0];\r
-  for (Index = 0; Index < 8; Index ++) {\r
+  for (Index = 0; Index < 8; Index++) {\r
     //\r
     // Check if this is a valid Standard Timing entry\r
     // VESA documents unused fields should be set to 01h\r
     //\r
-    if ((BufferIndex[0] != 0x1) && (BufferIndex[1] != 0x1)){\r
+    if ((BufferIndex[0] != 0x1) && (BufferIndex[1] != 0x1)) {\r
       //\r
       // A valid Standard Timing\r
       //\r
-      HorizontalResolution = (UINT16) (BufferIndex[0] * 8 + 248);\r
-      AspectRatio = (UINT8) (BufferIndex[1] >> 6);\r
+      HorizontalResolution = (UINT16)(BufferIndex[0] * 8 + 248);\r
+      AspectRatio          = (UINT8)(BufferIndex[1] >> 6);\r
       switch (AspectRatio) {\r
         case 0:\r
-          VerticalResolution = (UINT16) (HorizontalResolution / 16 * 10);\r
+          VerticalResolution = (UINT16)(HorizontalResolution / 16 * 10);\r
           break;\r
         case 1:\r
-          VerticalResolution = (UINT16) (HorizontalResolution / 4 * 3);\r
+          VerticalResolution = (UINT16)(HorizontalResolution / 4 * 3);\r
           break;\r
         case 2:\r
-          VerticalResolution = (UINT16) (HorizontalResolution / 5 * 4);\r
+          VerticalResolution = (UINT16)(HorizontalResolution / 5 * 4);\r
           break;\r
         case 3:\r
-          VerticalResolution = (UINT16) (HorizontalResolution / 16 * 9);\r
+          VerticalResolution = (UINT16)(HorizontalResolution / 16 * 9);\r
           break;\r
         default:\r
-          VerticalResolution = (UINT16) (HorizontalResolution / 4 * 3);\r
+          VerticalResolution = (UINT16)(HorizontalResolution / 4 * 3);\r
           break;\r
       }\r
-      RefreshRate = (UINT8) ((BufferIndex[1] & 0x1f) + 60);\r
+\r
+      RefreshRate = (UINT8)((BufferIndex[1] & 0x1f) + 60);\r
       DEBUG ((DEBUG_INFO, "Standard Timing: %d x %d\n", HorizontalResolution, VerticalResolution));\r
-      TempTiming.HorizontalResolution = HorizontalResolution;\r
-      TempTiming.VerticalResolution = VerticalResolution;\r
-      TempTiming.RefreshRate = RefreshRate;\r
+      TempTiming.HorizontalResolution   = HorizontalResolution;\r
+      TempTiming.VerticalResolution     = VerticalResolution;\r
+      TempTiming.RefreshRate            = RefreshRate;\r
       ValidEdidTiming->Key[ValidNumber] = CalculateEdidKey (&TempTiming);\r
-      ValidNumber ++;\r
+      ValidNumber++;\r
     }\r
+\r
     BufferIndex += 2;\r
   }\r
 \r
@@ -1178,7 +1197,7 @@ ParseEdidData (
   // Parse the Detailed Timing data\r
   //\r
   BufferIndex = &EdidDataBlock->DetailedTimingDescriptions[0];\r
-  for (Index = 0; Index < 4; Index ++, BufferIndex += VESA_BIOS_EXTENSIONS_DETAILED_TIMING_EACH_DESCRIPTOR_SIZE) {\r
+  for (Index = 0; Index < 4; Index++, BufferIndex += VESA_BIOS_EXTENSIONS_DETAILED_TIMING_EACH_DESCRIPTOR_SIZE) {\r
     if ((BufferIndex[0] == 0x0) && (BufferIndex[1] == 0x0)) {\r
       //\r
       // Check if this is a valid Detailed Timing Descriptor\r
@@ -1186,22 +1205,27 @@ ParseEdidData (
       //\r
       continue;\r
     }\r
+\r
     //\r
     // Calculate Horizontal and Vertical resolution\r
     //\r
     TempTiming.HorizontalResolution = ((UINT16)(BufferIndex[4] & 0xF0) << 4) | (BufferIndex[2]);\r
-    TempTiming.VerticalResolution = ((UINT16)(BufferIndex[7] & 0xF0) << 4) | (BufferIndex[5]);\r
-    DEBUG ((DEBUG_INFO, "Detailed Timing %d: %d x %d\n",\r
-            Index, TempTiming.HorizontalResolution, TempTiming.VerticalResolution));\r
+    TempTiming.VerticalResolution   = ((UINT16)(BufferIndex[7] & 0xF0) << 4) | (BufferIndex[5]);\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "Detailed Timing %d: %d x %d\n",\r
+      Index,\r
+      TempTiming.HorizontalResolution,\r
+      TempTiming.VerticalResolution\r
+      ));\r
     ValidEdidTiming->Key[ValidNumber] = CalculateEdidKey (&TempTiming);\r
-    ValidNumber ++;\r
+    ValidNumber++;\r
   }\r
 \r
   ValidEdidTiming->ValidNumber = ValidNumber;\r
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Search a specified Timing in all the valid EDID timings.\r
 \r
@@ -1214,16 +1238,16 @@ ParseEdidData (
 **/\r
 BOOLEAN\r
 SearchEdidTiming (\r
-  VESA_BIOS_EXTENSIONS_VALID_EDID_TIMING *ValidEdidTiming,\r
-  VESA_BIOS_EXTENSIONS_EDID_TIMING       *EdidTiming\r
+  VESA_BIOS_EXTENSIONS_VALID_EDID_TIMING  *ValidEdidTiming,\r
+  VESA_BIOS_EXTENSIONS_EDID_TIMING        *EdidTiming\r
   )\r
 {\r
-  UINT32 Index;\r
-  UINT32 Key;\r
+  UINT32  Index;\r
+  UINT32  Key;\r
 \r
   Key = CalculateEdidKey (EdidTiming);\r
 \r
-  for (Index = 0; Index < ValidEdidTiming->ValidNumber; Index ++) {\r
+  for (Index = 0; Index < ValidEdidTiming->ValidNumber; Index++) {\r
     if (Key == ValidEdidTiming->Key[Index]) {\r
       return TRUE;\r
     }\r
@@ -1281,34 +1305,34 @@ BiosVideoCheckForVbe (
   IN OUT BIOS_VIDEO_DEV  *BiosVideoPrivate\r
   )\r
 {\r
-  EFI_STATUS                             Status;\r
-  EFI_IA32_REGISTER_SET                  Regs;\r
-  UINT16                                 *ModeNumberPtr;\r
-  UINT16                                 VbeModeNumber;\r
-  BOOLEAN                                ModeFound;\r
-  BOOLEAN                                EdidFound;\r
-  BIOS_VIDEO_MODE_DATA                   *ModeBuffer;\r
-  BIOS_VIDEO_MODE_DATA                   *CurrentModeData;\r
-  UINTN                                  PreferMode;\r
-  UINTN                                  ModeNumber;\r
-  VESA_BIOS_EXTENSIONS_EDID_TIMING       Timing;\r
-  VESA_BIOS_EXTENSIONS_VALID_EDID_TIMING ValidEdidTiming;\r
-  EFI_EDID_OVERRIDE_PROTOCOL             *EdidOverride;\r
-  UINT32                                 EdidAttributes;\r
-  BOOLEAN                                EdidOverrideFound;\r
-  UINTN                                  EdidOverrideDataSize;\r
-  UINT8                                  *EdidOverrideDataBlock;\r
-  UINTN                                  EdidActiveDataSize;\r
-  UINT8                                  *EdidActiveDataBlock;\r
-  UINT32                                 HighestHorizontalResolution;\r
-  UINT32                                 HighestVerticalResolution;\r
-  UINTN                                  HighestResolutionMode;\r
-\r
-  EdidFound             = TRUE;\r
-  EdidOverrideFound     = FALSE;\r
-  EdidOverrideDataBlock = NULL;\r
-  EdidActiveDataSize    = 0;\r
-  EdidActiveDataBlock   = NULL;\r
+  EFI_STATUS                              Status;\r
+  EFI_IA32_REGISTER_SET                   Regs;\r
+  UINT16                                  *ModeNumberPtr;\r
+  UINT16                                  VbeModeNumber;\r
+  BOOLEAN                                 ModeFound;\r
+  BOOLEAN                                 EdidFound;\r
+  BIOS_VIDEO_MODE_DATA                    *ModeBuffer;\r
+  BIOS_VIDEO_MODE_DATA                    *CurrentModeData;\r
+  UINTN                                   PreferMode;\r
+  UINTN                                   ModeNumber;\r
+  VESA_BIOS_EXTENSIONS_EDID_TIMING        Timing;\r
+  VESA_BIOS_EXTENSIONS_VALID_EDID_TIMING  ValidEdidTiming;\r
+  EFI_EDID_OVERRIDE_PROTOCOL              *EdidOverride;\r
+  UINT32                                  EdidAttributes;\r
+  BOOLEAN                                 EdidOverrideFound;\r
+  UINTN                                   EdidOverrideDataSize;\r
+  UINT8                                   *EdidOverrideDataBlock;\r
+  UINTN                                   EdidActiveDataSize;\r
+  UINT8                                   *EdidActiveDataBlock;\r
+  UINT32                                  HighestHorizontalResolution;\r
+  UINT32                                  HighestVerticalResolution;\r
+  UINTN                                   HighestResolutionMode;\r
+\r
+  EdidFound                   = TRUE;\r
+  EdidOverrideFound           = FALSE;\r
+  EdidOverrideDataBlock       = NULL;\r
+  EdidActiveDataSize          = 0;\r
+  EdidActiveDataBlock         = NULL;\r
   HighestHorizontalResolution = 0;\r
   HighestVerticalResolution   = 0;\r
   HighestResolutionMode       = 0;\r
@@ -1340,12 +1364,12 @@ BiosVideoCheckForVbe (
   //\r
   // Fill in the VBE related data structures\r
   //\r
-  BiosVideoPrivate->VbeInformationBlock = (VESA_BIOS_EXTENSIONS_INFORMATION_BLOCK *) (UINTN) (BiosVideoPrivate->PagesBelow1MB);\r
-  BiosVideoPrivate->VbeModeInformationBlock = (VESA_BIOS_EXTENSIONS_MODE_INFORMATION_BLOCK *) (BiosVideoPrivate->VbeInformationBlock + 1);\r
-  BiosVideoPrivate->VbeEdidDataBlock = (VESA_BIOS_EXTENSIONS_EDID_DATA_BLOCK *) (BiosVideoPrivate->VbeModeInformationBlock + 1);\r
-  BiosVideoPrivate->VbeCrtcInformationBlock = (VESA_BIOS_EXTENSIONS_CRTC_INFORMATION_BLOCK *) (BiosVideoPrivate->VbeEdidDataBlock + 1);\r
-  BiosVideoPrivate->VbeSaveRestorePages   = 0;\r
-  BiosVideoPrivate->VbeSaveRestoreBuffer  = 0;\r
+  BiosVideoPrivate->VbeInformationBlock     = (VESA_BIOS_EXTENSIONS_INFORMATION_BLOCK *)(UINTN)(BiosVideoPrivate->PagesBelow1MB);\r
+  BiosVideoPrivate->VbeModeInformationBlock = (VESA_BIOS_EXTENSIONS_MODE_INFORMATION_BLOCK *)(BiosVideoPrivate->VbeInformationBlock + 1);\r
+  BiosVideoPrivate->VbeEdidDataBlock        = (VESA_BIOS_EXTENSIONS_EDID_DATA_BLOCK *)(BiosVideoPrivate->VbeModeInformationBlock + 1);\r
+  BiosVideoPrivate->VbeCrtcInformationBlock = (VESA_BIOS_EXTENSIONS_CRTC_INFORMATION_BLOCK *)(BiosVideoPrivate->VbeEdidDataBlock + 1);\r
+  BiosVideoPrivate->VbeSaveRestorePages     = 0;\r
+  BiosVideoPrivate->VbeSaveRestoreBuffer    = 0;\r
 \r
   //\r
   // Test to see if the Video Adapter is compliant with VBE 3.0\r
@@ -1353,9 +1377,9 @@ BiosVideoCheckForVbe (
   gBS->SetMem (&Regs, sizeof (Regs), 0);\r
   Regs.X.AX = VESA_BIOS_EXTENSIONS_RETURN_CONTROLLER_INFORMATION;\r
   gBS->SetMem (BiosVideoPrivate->VbeInformationBlock, sizeof (VESA_BIOS_EXTENSIONS_INFORMATION_BLOCK), 0);\r
-  BiosVideoPrivate->VbeInformationBlock->VESASignature  = VESA_BIOS_EXTENSIONS_VBE2_SIGNATURE;\r
-  Regs.X.ES = EFI_SEGMENT ((UINTN) BiosVideoPrivate->VbeInformationBlock);\r
-  Regs.X.DI = EFI_OFFSET ((UINTN) BiosVideoPrivate->VbeInformationBlock);\r
+  BiosVideoPrivate->VbeInformationBlock->VESASignature = VESA_BIOS_EXTENSIONS_VBE2_SIGNATURE;\r
+  Regs.X.ES                                            = EFI_SEGMENT ((UINTN)BiosVideoPrivate->VbeInformationBlock);\r
+  Regs.X.DI                                            = EFI_OFFSET ((UINTN)BiosVideoPrivate->VbeInformationBlock);\r
 \r
   BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
 \r
@@ -1367,12 +1391,14 @@ BiosVideoCheckForVbe (
   if (Regs.X.AX != VESA_BIOS_EXTENSIONS_STATUS_SUCCESS) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Check for 'VESA' signature\r
   //\r
   if (BiosVideoPrivate->VbeInformationBlock->VESASignature != VESA_BIOS_EXTENSIONS_VESA_SIGNATURE) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Check to see if this is VBE 2.0 or higher\r
   //\r
@@ -1388,10 +1414,10 @@ BiosVideoCheckForVbe (
   // Find EDID Override protocol firstly, this protocol is installed by platform if needed.\r
   //\r
   Status = gBS->LocateProtocol (\r
-                   &gEfiEdidOverrideProtocolGuid,\r
-                   NULL,\r
-                   (VOID **) &EdidOverride\r
-                   );\r
+                  &gEfiEdidOverrideProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&EdidOverride\r
+                  );\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Allocate double size of VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE to avoid overflow\r
@@ -1407,11 +1433,12 @@ BiosVideoCheckForVbe (
                              BiosVideoPrivate->Handle,\r
                              &EdidAttributes,\r
                              &EdidOverrideDataSize,\r
-                             (UINT8 **) &EdidOverrideDataBlock\r
+                             (UINT8 **)&EdidOverrideDataBlock\r
                              );\r
     if (!EFI_ERROR (Status)  &&\r
-         EdidAttributes == 0 &&\r
-         EdidOverrideDataSize != 0) {\r
+        (EdidAttributes == 0) &&\r
+        (EdidOverrideDataSize != 0))\r
+    {\r
       //\r
       // Succeeded to get EDID Override Data\r
       //\r
@@ -1419,7 +1446,7 @@ BiosVideoCheckForVbe (
     }\r
   }\r
 \r
-  if (!EdidOverrideFound || EdidAttributes == EFI_EDID_OVERRIDE_DONT_OVERRIDE) {\r
+  if (!EdidOverrideFound || (EdidAttributes == EFI_EDID_OVERRIDE_DONT_OVERRIDE)) {\r
     //\r
     // If EDID Override data doesn't exist or EFI_EDID_OVERRIDE_DONT_OVERRIDE returned,\r
     // read EDID information through INT10 call\r
@@ -1430,8 +1457,8 @@ BiosVideoCheckForVbe (
     Regs.X.BX = 1;\r
     Regs.X.CX = 0;\r
     Regs.X.DX = 0;\r
-    Regs.X.ES = EFI_SEGMENT ((UINTN) BiosVideoPrivate->VbeEdidDataBlock);\r
-    Regs.X.DI = EFI_OFFSET  ((UINTN) BiosVideoPrivate->VbeEdidDataBlock);\r
+    Regs.X.ES = EFI_SEGMENT ((UINTN)BiosVideoPrivate->VbeEdidDataBlock);\r
+    Regs.X.DI = EFI_OFFSET ((UINTN)BiosVideoPrivate->VbeEdidDataBlock);\r
 \r
     BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
     //\r
@@ -1442,13 +1469,13 @@ BiosVideoCheckForVbe (
       // Set EDID Discovered Data\r
       //\r
       BiosVideoPrivate->EdidDiscovered.SizeOfEdid = VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE;\r
-       BiosVideoPrivate->EdidDiscovered.Edid = (UINT8 *) AllocateCopyPool (\r
-                                                          VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE,\r
-                                                          BiosVideoPrivate->VbeEdidDataBlock\r
-                                                           );\r
+      BiosVideoPrivate->EdidDiscovered.Edid       = (UINT8 *)AllocateCopyPool (\r
+                                                               VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE,\r
+                                                               BiosVideoPrivate->VbeEdidDataBlock\r
+                                                               );\r
 \r
       if (NULL == BiosVideoPrivate->EdidDiscovered.Edid) {\r
-         Status = EFI_OUT_OF_RESOURCES;\r
+        Status = EFI_OUT_OF_RESOURCES;\r
         goto Done;\r
       }\r
 \r
@@ -1462,41 +1489,41 @@ BiosVideoCheckForVbe (
   } else if (EdidOverrideFound) {\r
     EdidActiveDataSize  = EdidOverrideDataSize;\r
     EdidActiveDataBlock = EdidOverrideDataBlock;\r
-    EdidFound = TRUE;\r
-   }\r
+    EdidFound           = TRUE;\r
+  }\r
 \r
-   if (EdidFound) {\r
+  if (EdidFound) {\r
     //\r
     // Parse EDID data structure to retrieve modes supported by monitor\r
     //\r
-    if (ParseEdidData ((UINT8 *) EdidActiveDataBlock, &ValidEdidTiming)) {\r
+    if (ParseEdidData ((UINT8 *)EdidActiveDataBlock, &ValidEdidTiming)) {\r
       //\r
       // Copy EDID Override Data to EDID Active Data\r
       //\r
-      BiosVideoPrivate->EdidActive.SizeOfEdid = (UINT32) EdidActiveDataSize;\r
-      BiosVideoPrivate->EdidActive.Edid = (UINT8 *) AllocateCopyPool (\r
-                                                      EdidActiveDataSize,\r
-                                                      EdidActiveDataBlock\r
-                                                      );\r
+      BiosVideoPrivate->EdidActive.SizeOfEdid = (UINT32)EdidActiveDataSize;\r
+      BiosVideoPrivate->EdidActive.Edid       = (UINT8 *)AllocateCopyPool (\r
+                                                           EdidActiveDataSize,\r
+                                                           EdidActiveDataBlock\r
+                                                           );\r
       if (NULL ==  BiosVideoPrivate->EdidActive.Edid) {\r
-         Status = EFI_OUT_OF_RESOURCES;\r
+        Status = EFI_OUT_OF_RESOURCES;\r
         goto Done;\r
       }\r
     }\r
   } else {\r
     BiosVideoPrivate->EdidActive.SizeOfEdid = 0;\r
-    BiosVideoPrivate->EdidActive.Edid = NULL;\r
-    EdidFound = FALSE;\r
+    BiosVideoPrivate->EdidActive.Edid       = NULL;\r
+    EdidFound                               = FALSE;\r
   }\r
 \r
   //\r
   // Walk through the mode list to see if there is at least one mode the is compatible with the EDID mode\r
   //\r
   ModeNumberPtr = (UINT16 *)\r
-    (\r
-      (((UINTN) BiosVideoPrivate->VbeInformationBlock->VideoModePtr & 0xffff0000) >> 12) |\r
-        ((UINTN) BiosVideoPrivate->VbeInformationBlock->VideoModePtr & 0x0000ffff)\r
-    );\r
+                  (\r
+                   (((UINTN)BiosVideoPrivate->VbeInformationBlock->VideoModePtr & 0xffff0000) >> 12) |\r
+                   ((UINTN)BiosVideoPrivate->VbeInformationBlock->VideoModePtr & 0x0000ffff)\r
+                  );\r
 \r
   PreferMode = 0;\r
   ModeNumber = 0;\r
@@ -1506,13 +1533,15 @@ BiosVideoCheckForVbe (
   //\r
   for (VbeModeNumber = ReadUnaligned16 (ModeNumberPtr);\r
        VbeModeNumber != VESA_BIOS_EXTENSIONS_END_OF_MODE_LIST;\r
-       VbeModeNumber = ReadUnaligned16 (++ModeNumberPtr)) {\r
+       VbeModeNumber = ReadUnaligned16 (++ModeNumberPtr))\r
+  {\r
     //\r
     // Make sure this is a mode number defined by the VESA VBE specification.  If it isn'tm then skip this mode number.\r
     //\r
     if ((VbeModeNumber & VESA_BIOS_EXTENSIONS_MODE_NUMBER_VESA) == 0) {\r
       continue;\r
     }\r
+\r
     //\r
     // Get the information about the mode\r
     //\r
@@ -1520,8 +1549,8 @@ BiosVideoCheckForVbe (
     Regs.X.AX = VESA_BIOS_EXTENSIONS_RETURN_MODE_INFORMATION;\r
     Regs.X.CX = VbeModeNumber;\r
     gBS->SetMem (BiosVideoPrivate->VbeModeInformationBlock, sizeof (VESA_BIOS_EXTENSIONS_MODE_INFORMATION_BLOCK), 0);\r
-    Regs.X.ES = EFI_SEGMENT ((UINTN) BiosVideoPrivate->VbeModeInformationBlock);\r
-    Regs.X.DI = EFI_OFFSET ((UINTN) BiosVideoPrivate->VbeModeInformationBlock);\r
+    Regs.X.ES = EFI_SEGMENT ((UINTN)BiosVideoPrivate->VbeModeInformationBlock);\r
+    Regs.X.DI = EFI_OFFSET ((UINTN)BiosVideoPrivate->VbeModeInformationBlock);\r
 \r
     BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
 \r
@@ -1531,24 +1560,28 @@ BiosVideoCheckForVbe (
     if (Regs.X.AX != VESA_BIOS_EXTENSIONS_STATUS_SUCCESS) {\r
       continue;\r
     }\r
+\r
     //\r
     // See if the mode supports color.  If it doesn't then try the next mode.\r
     //\r
     if ((BiosVideoPrivate->VbeModeInformationBlock->ModeAttributes & VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_COLOR) == 0) {\r
       continue;\r
     }\r
+\r
     //\r
     // See if the mode supports graphics.  If it doesn't then try the next mode.\r
     //\r
     if ((BiosVideoPrivate->VbeModeInformationBlock->ModeAttributes & VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_GRAPHICS) == 0) {\r
       continue;\r
     }\r
+\r
     //\r
     // See if the mode supports a linear frame buffer.  If it doesn't then try the next mode.\r
     //\r
     if ((BiosVideoPrivate->VbeModeInformationBlock->ModeAttributes & VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER) == 0) {\r
       continue;\r
     }\r
+\r
     //\r
     // See if the mode supports 32 bit color.  If it doesn't then try the next mode.\r
     // 32 bit mode can be implemented by 24 Bits Per Pixels. Also make sure the\r
@@ -1565,6 +1598,7 @@ BiosVideoCheckForVbe (
     if ((BiosVideoPrivate->VbeModeInformationBlock->BitsPerPixel % 8) != 0) {\r
       continue;\r
     }\r
+\r
     //\r
     // See if the physical base pointer for the linear mode is valid.  If it isn't then try the next mode.\r
     //\r
@@ -1572,25 +1606,31 @@ BiosVideoCheckForVbe (
       continue;\r
     }\r
 \r
-    DEBUG ((DEBUG_INFO, "Video Controller Mode 0x%x: %d x %d\n",\r
-            VbeModeNumber, BiosVideoPrivate->VbeModeInformationBlock->XResolution, BiosVideoPrivate->VbeModeInformationBlock->YResolution));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "Video Controller Mode 0x%x: %d x %d\n",\r
+      VbeModeNumber,\r
+      BiosVideoPrivate->VbeModeInformationBlock->XResolution,\r
+      BiosVideoPrivate->VbeModeInformationBlock->YResolution\r
+      ));\r
 \r
     if (EdidFound && (ValidEdidTiming.ValidNumber > 0)) {\r
       //\r
       // EDID exist, check whether this mode match with any mode in EDID\r
       //\r
       Timing.HorizontalResolution = BiosVideoPrivate->VbeModeInformationBlock->XResolution;\r
-      Timing.VerticalResolution = BiosVideoPrivate->VbeModeInformationBlock->YResolution;\r
+      Timing.VerticalResolution   = BiosVideoPrivate->VbeModeInformationBlock->YResolution;\r
       if (!SearchEdidTiming (&ValidEdidTiming, &Timing)) {\r
         //\r
         // When EDID comes from INT10 call, EDID does not include 800x600, 640x480 and 1024x768,\r
         // but INT10 can support these modes, we add them into GOP mode.\r
         //\r
         if ((BiosVideoPrivate->EdidDiscovered.SizeOfEdid != 0) &&\r
-            !((Timing.HorizontalResolution) == 1024 && (Timing.VerticalResolution == 768)) &&\r
-            !((Timing.HorizontalResolution) == 800 && (Timing.VerticalResolution == 600)) &&\r
-            !((Timing.HorizontalResolution) == 640 && (Timing.VerticalResolution == 480))) {\r
-        continue;\r
+            !(((Timing.HorizontalResolution) == 1024) && (Timing.VerticalResolution == 768)) &&\r
+            !(((Timing.HorizontalResolution) == 800) && (Timing.VerticalResolution == 600)) &&\r
+            !(((Timing.HorizontalResolution) == 640) && (Timing.VerticalResolution == 480)))\r
+        {\r
+          continue;\r
         }\r
       }\r
     }\r
@@ -1600,20 +1640,25 @@ BiosVideoCheckForVbe (
     //\r
     ModeFound = FALSE;\r
 \r
-    if (BiosVideoPrivate->VbeModeInformationBlock->XResolution == 1024 &&\r
-        BiosVideoPrivate->VbeModeInformationBlock->YResolution == 768\r
-        ) {\r
+    if ((BiosVideoPrivate->VbeModeInformationBlock->XResolution == 1024) &&\r
+        (BiosVideoPrivate->VbeModeInformationBlock->YResolution == 768)\r
+        )\r
+    {\r
       ModeFound = TRUE;\r
     }\r
-    if (BiosVideoPrivate->VbeModeInformationBlock->XResolution == 800 &&\r
-        BiosVideoPrivate->VbeModeInformationBlock->YResolution == 600\r
-        ) {\r
-      ModeFound = TRUE;\r
+\r
+    if ((BiosVideoPrivate->VbeModeInformationBlock->XResolution == 800) &&\r
+        (BiosVideoPrivate->VbeModeInformationBlock->YResolution == 600)\r
+        )\r
+    {\r
+      ModeFound  = TRUE;\r
       PreferMode = ModeNumber;\r
     }\r
-    if (BiosVideoPrivate->VbeModeInformationBlock->XResolution == 640 &&\r
-        BiosVideoPrivate->VbeModeInformationBlock->YResolution == 480\r
-        ) {\r
+\r
+    if ((BiosVideoPrivate->VbeModeInformationBlock->XResolution == 640) &&\r
+        (BiosVideoPrivate->VbeModeInformationBlock->YResolution == 480)\r
+        )\r
+    {\r
       ModeFound = TRUE;\r
     }\r
 \r
@@ -1629,19 +1674,20 @@ BiosVideoCheckForVbe (
     //\r
     if ((BiosVideoPrivate->VbeModeInformationBlock->XResolution > HighestHorizontalResolution) ||\r
         ((BiosVideoPrivate->VbeModeInformationBlock->XResolution == HighestHorizontalResolution) &&\r
-         (BiosVideoPrivate->VbeModeInformationBlock->YResolution > HighestVerticalResolution))) {\r
+         (BiosVideoPrivate->VbeModeInformationBlock->YResolution > HighestVerticalResolution)))\r
+    {\r
       HighestHorizontalResolution = BiosVideoPrivate->VbeModeInformationBlock->XResolution;\r
-      HighestVerticalResolution = BiosVideoPrivate->VbeModeInformationBlock->YResolution;\r
-      HighestResolutionMode = ModeNumber;\r
+      HighestVerticalResolution   = BiosVideoPrivate->VbeModeInformationBlock->YResolution;\r
+      HighestResolutionMode       = ModeNumber;\r
     }\r
 \r
     //\r
     // Add mode to the list of available modes\r
     //\r
-    ModeNumber ++;\r
-    ModeBuffer = (BIOS_VIDEO_MODE_DATA *) AllocatePool (\r
-                                            ModeNumber * sizeof (BIOS_VIDEO_MODE_DATA)\r
-                                            );\r
+    ModeNumber++;\r
+    ModeBuffer = (BIOS_VIDEO_MODE_DATA *)AllocatePool (\r
+                                           ModeNumber * sizeof (BIOS_VIDEO_MODE_DATA)\r
+                                           );\r
     if (NULL == ModeBuffer) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Done;\r
@@ -1659,33 +1705,34 @@ BiosVideoCheckForVbe (
       FreePool (BiosVideoPrivate->ModeData);\r
     }\r
 \r
-    CurrentModeData = &ModeBuffer[ModeNumber - 1];\r
+    CurrentModeData                = &ModeBuffer[ModeNumber - 1];\r
     CurrentModeData->VbeModeNumber = VbeModeNumber;\r
     if (BiosVideoPrivate->VbeInformationBlock->VESAVersion >= VESA_BIOS_EXTENSIONS_VERSION_3_0) {\r
-      CurrentModeData->BytesPerScanLine = BiosVideoPrivate->VbeModeInformationBlock->LinBytesPerScanLine;\r
-      CurrentModeData->Red.Position = BiosVideoPrivate->VbeModeInformationBlock->LinRedFieldPosition;\r
-      CurrentModeData->Red.Mask = (UINT8) ((1 << BiosVideoPrivate->VbeModeInformationBlock->LinRedMaskSize) - 1);\r
-      CurrentModeData->Blue.Position = BiosVideoPrivate->VbeModeInformationBlock->LinBlueFieldPosition;\r
-      CurrentModeData->Blue.Mask = (UINT8) ((1 << BiosVideoPrivate->VbeModeInformationBlock->LinBlueMaskSize) - 1);\r
-      CurrentModeData->Green.Position = BiosVideoPrivate->VbeModeInformationBlock->LinGreenFieldPosition;\r
-      CurrentModeData->Green.Mask = (UINT8) ((1 << BiosVideoPrivate->VbeModeInformationBlock->LinGreenMaskSize) - 1);\r
+      CurrentModeData->BytesPerScanLine  = BiosVideoPrivate->VbeModeInformationBlock->LinBytesPerScanLine;\r
+      CurrentModeData->Red.Position      = BiosVideoPrivate->VbeModeInformationBlock->LinRedFieldPosition;\r
+      CurrentModeData->Red.Mask          = (UINT8)((1 << BiosVideoPrivate->VbeModeInformationBlock->LinRedMaskSize) - 1);\r
+      CurrentModeData->Blue.Position     = BiosVideoPrivate->VbeModeInformationBlock->LinBlueFieldPosition;\r
+      CurrentModeData->Blue.Mask         = (UINT8)((1 << BiosVideoPrivate->VbeModeInformationBlock->LinBlueMaskSize) - 1);\r
+      CurrentModeData->Green.Position    = BiosVideoPrivate->VbeModeInformationBlock->LinGreenFieldPosition;\r
+      CurrentModeData->Green.Mask        = (UINT8)((1 << BiosVideoPrivate->VbeModeInformationBlock->LinGreenMaskSize) - 1);\r
       CurrentModeData->Reserved.Position = BiosVideoPrivate->VbeModeInformationBlock->LinRsvdFieldPosition;\r
-      CurrentModeData->Reserved.Mask = (UINT8) ((1 << BiosVideoPrivate->VbeModeInformationBlock->LinRsvdMaskSize) - 1);\r
+      CurrentModeData->Reserved.Mask     = (UINT8)((1 << BiosVideoPrivate->VbeModeInformationBlock->LinRsvdMaskSize) - 1);\r
     } else {\r
-      CurrentModeData->BytesPerScanLine = BiosVideoPrivate->VbeModeInformationBlock->BytesPerScanLine;\r
-      CurrentModeData->Red.Position = BiosVideoPrivate->VbeModeInformationBlock->RedFieldPosition;\r
-      CurrentModeData->Red.Mask = (UINT8) ((1 << BiosVideoPrivate->VbeModeInformationBlock->RedMaskSize) - 1);\r
-      CurrentModeData->Blue.Position = BiosVideoPrivate->VbeModeInformationBlock->BlueFieldPosition;\r
-      CurrentModeData->Blue.Mask = (UINT8) ((1 << BiosVideoPrivate->VbeModeInformationBlock->BlueMaskSize) - 1);\r
-      CurrentModeData->Green.Position = BiosVideoPrivate->VbeModeInformationBlock->GreenFieldPosition;\r
-      CurrentModeData->Green.Mask = (UINT8) ((1 << BiosVideoPrivate->VbeModeInformationBlock->GreenMaskSize) - 1);\r
+      CurrentModeData->BytesPerScanLine  = BiosVideoPrivate->VbeModeInformationBlock->BytesPerScanLine;\r
+      CurrentModeData->Red.Position      = BiosVideoPrivate->VbeModeInformationBlock->RedFieldPosition;\r
+      CurrentModeData->Red.Mask          = (UINT8)((1 << BiosVideoPrivate->VbeModeInformationBlock->RedMaskSize) - 1);\r
+      CurrentModeData->Blue.Position     = BiosVideoPrivate->VbeModeInformationBlock->BlueFieldPosition;\r
+      CurrentModeData->Blue.Mask         = (UINT8)((1 << BiosVideoPrivate->VbeModeInformationBlock->BlueMaskSize) - 1);\r
+      CurrentModeData->Green.Position    = BiosVideoPrivate->VbeModeInformationBlock->GreenFieldPosition;\r
+      CurrentModeData->Green.Mask        = (UINT8)((1 << BiosVideoPrivate->VbeModeInformationBlock->GreenMaskSize) - 1);\r
       CurrentModeData->Reserved.Position = BiosVideoPrivate->VbeModeInformationBlock->RsvdFieldPosition;\r
-      CurrentModeData->Reserved.Mask = (UINT8) ((1 << BiosVideoPrivate->VbeModeInformationBlock->RsvdMaskSize) - 1);\r
+      CurrentModeData->Reserved.Mask     = (UINT8)((1 << BiosVideoPrivate->VbeModeInformationBlock->RsvdMaskSize) - 1);\r
     }\r
 \r
     CurrentModeData->PixelFormat = PixelBitMask;\r
     if ((BiosVideoPrivate->VbeModeInformationBlock->BitsPerPixel == 32) &&\r
-        (CurrentModeData->Red.Mask == 0xff) && (CurrentModeData->Green.Mask == 0xff) && (CurrentModeData->Blue.Mask == 0xff)) {\r
+        (CurrentModeData->Red.Mask == 0xff) && (CurrentModeData->Green.Mask == 0xff) && (CurrentModeData->Blue.Mask == 0xff))\r
+    {\r
       if ((CurrentModeData->Red.Position == 0) && (CurrentModeData->Green.Position == 8) && (CurrentModeData->Blue.Position == 16)) {\r
         CurrentModeData->PixelFormat = PixelRedGreenBlueReserved8BitPerColor;\r
       } else if ((CurrentModeData->Blue.Position == 0) && (CurrentModeData->Green.Position == 8) && (CurrentModeData->Red.Position == 16)) {\r
@@ -1693,16 +1740,16 @@ BiosVideoCheckForVbe (
       }\r
     }\r
 \r
-    CurrentModeData->PixelBitMask.RedMask = ((UINT32) CurrentModeData->Red.Mask) << CurrentModeData->Red.Position;\r
-    CurrentModeData->PixelBitMask.GreenMask = ((UINT32) CurrentModeData->Green.Mask) << CurrentModeData->Green.Position;\r
-    CurrentModeData->PixelBitMask.BlueMask = ((UINT32) CurrentModeData->Blue.Mask) << CurrentModeData->Blue.Position;\r
-    CurrentModeData->PixelBitMask.ReservedMask = ((UINT32) CurrentModeData->Reserved.Mask) << CurrentModeData->Reserved.Position;\r
+    CurrentModeData->PixelBitMask.RedMask      = ((UINT32)CurrentModeData->Red.Mask) << CurrentModeData->Red.Position;\r
+    CurrentModeData->PixelBitMask.GreenMask    = ((UINT32)CurrentModeData->Green.Mask) << CurrentModeData->Green.Position;\r
+    CurrentModeData->PixelBitMask.BlueMask     = ((UINT32)CurrentModeData->Blue.Mask) << CurrentModeData->Blue.Position;\r
+    CurrentModeData->PixelBitMask.ReservedMask = ((UINT32)CurrentModeData->Reserved.Mask) << CurrentModeData->Reserved.Position;\r
 \r
-    CurrentModeData->LinearFrameBuffer = (VOID *) (UINTN)BiosVideoPrivate->VbeModeInformationBlock->PhysBasePtr;\r
+    CurrentModeData->LinearFrameBuffer    = (VOID *)(UINTN)BiosVideoPrivate->VbeModeInformationBlock->PhysBasePtr;\r
     CurrentModeData->HorizontalResolution = BiosVideoPrivate->VbeModeInformationBlock->XResolution;\r
-    CurrentModeData->VerticalResolution = BiosVideoPrivate->VbeModeInformationBlock->YResolution;\r
+    CurrentModeData->VerticalResolution   = BiosVideoPrivate->VbeModeInformationBlock->YResolution;\r
 \r
-    CurrentModeData->BitsPerPixel  = BiosVideoPrivate->VbeModeInformationBlock->BitsPerPixel;\r
+    CurrentModeData->BitsPerPixel    = BiosVideoPrivate->VbeModeInformationBlock->BitsPerPixel;\r
     CurrentModeData->FrameBufferSize = CurrentModeData->BytesPerScanLine * CurrentModeData->VerticalResolution;\r
     //\r
     // Make sure the FrameBufferSize does not exceed the max available frame buffer size reported by VEB.\r
@@ -1711,6 +1758,7 @@ BiosVideoCheckForVbe (
 \r
     BiosVideoPrivate->ModeData = ModeBuffer;\r
   }\r
+\r
   //\r
   // Check to see if we found any modes that are compatible with GRAPHICS OUTPUT\r
   //\r
@@ -1722,9 +1770,9 @@ BiosVideoCheckForVbe (
   //\r
   // Assign Gop's Blt function\r
   //\r
-  BiosVideoPrivate->GraphicsOutput.Blt     = BiosVideoGraphicsOutputVbeBlt;\r
+  BiosVideoPrivate->GraphicsOutput.Blt = BiosVideoGraphicsOutputVbeBlt;\r
 \r
-  BiosVideoPrivate->GraphicsOutput.Mode->MaxMode = (UINT32) ModeNumber;\r
+  BiosVideoPrivate->GraphicsOutput.Mode->MaxMode = (UINT32)ModeNumber;\r
   //\r
   // Current mode is unknow till now, set it to an invalid mode.\r
   //\r
@@ -1737,22 +1785,28 @@ BiosVideoCheckForVbe (
     DEBUG_CODE (\r
       BIOS_VIDEO_MODE_DATA    *ModeData;\r
       ModeData = &BiosVideoPrivate->ModeData[HighestResolutionMode];\r
-      DEBUG ((DEBUG_INFO, "BiosVideo set highest resolution %d x %d\n",\r
-              ModeData->HorizontalResolution, ModeData->VerticalResolution));\r
-    );\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "BiosVideo set highest resolution %d x %d\n",\r
+        ModeData->HorizontalResolution,\r
+        ModeData->VerticalResolution\r
+        ));\r
+      );\r
     PreferMode = HighestResolutionMode;\r
   }\r
-  Status = BiosVideoGraphicsOutputSetMode (&BiosVideoPrivate->GraphicsOutput, (UINT32) PreferMode);\r
+\r
+  Status = BiosVideoGraphicsOutputSetMode (&BiosVideoPrivate->GraphicsOutput, (UINT32)PreferMode);\r
   if (EFI_ERROR (Status)) {\r
-    for (PreferMode = 0; PreferMode < ModeNumber; PreferMode ++) {\r
+    for (PreferMode = 0; PreferMode < ModeNumber; PreferMode++) {\r
       Status = BiosVideoGraphicsOutputSetMode (\r
-                &BiosVideoPrivate->GraphicsOutput,\r
-                (UINT32) PreferMode\r
-                );\r
+                 &BiosVideoPrivate->GraphicsOutput,\r
+                 (UINT32)PreferMode\r
+                 );\r
       if (!EFI_ERROR (Status)) {\r
         break;\r
       }\r
     }\r
+\r
     if (PreferMode == ModeNumber) {\r
       //\r
       // None mode is set successfully.\r
@@ -1768,9 +1822,10 @@ Done:
   if (EFI_ERROR (Status)) {\r
     if (BiosVideoPrivate->ModeData != NULL) {\r
       FreePool (BiosVideoPrivate->ModeData);\r
-      BiosVideoPrivate->ModeData  = NULL;\r
-      BiosVideoPrivate->MaxMode   = 0;\r
+      BiosVideoPrivate->ModeData = NULL;\r
+      BiosVideoPrivate->MaxMode  = 0;\r
     }\r
+\r
     if (EdidOverrideDataBlock != NULL) {\r
       FreePool (EdidOverrideDataBlock);\r
     }\r
@@ -1779,7 +1834,6 @@ Done:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Check for VGA device.\r
 \r
@@ -1801,7 +1855,7 @@ BiosVideoCheckForVga (
   //\r
   // Assign Gop's Blt function\r
   //\r
-  BiosVideoPrivate->GraphicsOutput.Blt     = BiosVideoGraphicsOutputVgaBlt;\r
+  BiosVideoPrivate->GraphicsOutput.Blt = BiosVideoGraphicsOutputVgaBlt;\r
 \r
   //\r
   // Add mode to the list of available modes\r
@@ -1810,23 +1864,23 @@ BiosVideoCheckForVga (
   ASSERT (BiosVideoPrivate->GraphicsOutput.Mode != NULL);\r
   BiosVideoPrivate->GraphicsOutput.Mode->MaxMode = 1;\r
 \r
-  ModeBuffer = (BIOS_VIDEO_MODE_DATA *) AllocatePool (\r
-                                          sizeof (BIOS_VIDEO_MODE_DATA)\r
-                                          );\r
+  ModeBuffer = (BIOS_VIDEO_MODE_DATA *)AllocatePool (\r
+                                         sizeof (BIOS_VIDEO_MODE_DATA)\r
+                                         );\r
   if (NULL == ModeBuffer) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
   }\r
 \r
-  ModeBuffer->VbeModeNumber         = 0x0012;\r
-  ModeBuffer->BytesPerScanLine      = 640;\r
-  ModeBuffer->LinearFrameBuffer     = (VOID *) (UINTN) (0xa0000);\r
-  ModeBuffer->HorizontalResolution  = 640;\r
-  ModeBuffer->VerticalResolution    = 480;\r
-  ModeBuffer->PixelFormat           = PixelBltOnly;\r
-  ModeBuffer->BitsPerPixel          = 8;\r
-  ModeBuffer->ColorDepth            = 32;\r
-  ModeBuffer->RefreshRate           = 60;\r
+  ModeBuffer->VbeModeNumber        = 0x0012;\r
+  ModeBuffer->BytesPerScanLine     = 640;\r
+  ModeBuffer->LinearFrameBuffer    = (VOID *)(UINTN)(0xa0000);\r
+  ModeBuffer->HorizontalResolution = 640;\r
+  ModeBuffer->VerticalResolution   = 480;\r
+  ModeBuffer->PixelFormat          = PixelBltOnly;\r
+  ModeBuffer->BitsPerPixel         = 8;\r
+  ModeBuffer->ColorDepth           = 32;\r
+  ModeBuffer->RefreshRate          = 60;\r
 \r
   BiosVideoPrivate->ModeData = ModeBuffer;\r
 \r
@@ -1834,7 +1888,7 @@ BiosVideoCheckForVga (
   // Test to see if the Video Adapter support the 640x480 16 color mode\r
   //\r
   BiosVideoPrivate->GraphicsOutput.Mode->Mode = GRAPHICS_OUTPUT_INVALIDE_MODE_NUMBER;\r
-  Status = BiosVideoGraphicsOutputSetMode (&BiosVideoPrivate->GraphicsOutput, 0);\r
+  Status                                      = BiosVideoGraphicsOutputSetMode (&BiosVideoPrivate->GraphicsOutput, 0);\r
 \r
 Done:\r
   //\r
@@ -1845,15 +1899,18 @@ Done:
       FreePool (BiosVideoPrivate->ModeData);\r
       BiosVideoPrivate->ModeData = NULL;\r
     }\r
+\r
     if (BiosVideoPrivate->GraphicsOutput.Mode != NULL) {\r
       if (BiosVideoPrivate->GraphicsOutput.Mode->Info != NULL) {\r
         FreePool (BiosVideoPrivate->GraphicsOutput.Mode->Info);\r
         BiosVideoPrivate->GraphicsOutput.Mode->Info = NULL;\r
       }\r
+\r
       FreePool (BiosVideoPrivate->GraphicsOutput.Mode);\r
       BiosVideoPrivate->GraphicsOutput.Mode = NULL;\r
     }\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -1901,11 +1958,11 @@ BiosVideoGraphicsOutputQueryMode (
     return EFI_NOT_STARTED;\r
   }\r
 \r
-  if (This == NULL || Info == NULL || SizeOfInfo == NULL || ModeNumber >= This->Mode->MaxMode) {\r
+  if ((This == NULL) || (Info == NULL) || (SizeOfInfo == NULL) || (ModeNumber >= This->Mode->MaxMode)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  *Info = (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *) AllocatePool (\r
+  *Info = (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *)AllocatePool (\r
                                                     sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION)\r
                                                     );\r
   if (NULL == *Info) {\r
@@ -1914,12 +1971,12 @@ BiosVideoGraphicsOutputQueryMode (
 \r
   *SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
 \r
-  ModeData = &BiosVideoPrivate->ModeData[ModeNumber];\r
-  (*Info)->Version = 0;\r
+  ModeData                      = &BiosVideoPrivate->ModeData[ModeNumber];\r
+  (*Info)->Version              = 0;\r
   (*Info)->HorizontalResolution = ModeData->HorizontalResolution;\r
   (*Info)->VerticalResolution   = ModeData->VerticalResolution;\r
-  (*Info)->PixelFormat = ModeData->PixelFormat;\r
-  CopyMem (&((*Info)->PixelInformation), &(ModeData->PixelBitMask), sizeof(ModeData->PixelBitMask));\r
+  (*Info)->PixelFormat          = ModeData->PixelFormat;\r
+  CopyMem (&((*Info)->PixelInformation), &(ModeData->PixelBitMask), sizeof (ModeData->PixelBitMask));\r
 \r
   (*Info)->PixelsPerScanLine =  (ModeData->BytesPerScanLine * 8) / ModeData->BitsPerPixel;\r
 \r
@@ -1941,13 +1998,13 @@ BiosVideoGraphicsOutputQueryMode (
 **/\r
 EFI_STATUS\r
 BiosVideoSetModeWorker (\r
-  IN  BIOS_VIDEO_DEV               *BiosVideoPrivate,\r
-  IN  BIOS_VIDEO_MODE_DATA         *ModeData,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
+  IN  BIOS_VIDEO_DEV            *BiosVideoPrivate,\r
+  IN  BIOS_VIDEO_MODE_DATA      *ModeData,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  EFI_IA32_REGISTER_SET   Regs;\r
+  EFI_STATUS             Status;\r
+  EFI_IA32_REGISTER_SET  Regs;\r
 \r
   if (BiosVideoPrivate->LineBuffer != NULL) {\r
     FreePool (BiosVideoPrivate->LineBuffer);\r
@@ -1961,12 +2018,13 @@ BiosVideoSetModeWorker (
     FreePool (BiosVideoPrivate->VbeFrameBuffer);\r
   }\r
 \r
-  BiosVideoPrivate->LineBuffer = (UINT8 *) AllocatePool (\r
-                                             ModeData->BytesPerScanLine\r
-                                             );\r
+  BiosVideoPrivate->LineBuffer = (UINT8 *)AllocatePool (\r
+                                            ModeData->BytesPerScanLine\r
+                                            );\r
   if (NULL == BiosVideoPrivate->LineBuffer) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Clear all registers\r
   //\r
@@ -1976,35 +2034,36 @@ BiosVideoSetModeWorker (
     //\r
     // Allocate a working buffer for BLT operations to the VGA frame buffer\r
     //\r
-    BiosVideoPrivate->VgaFrameBuffer = (UINT8 *) AllocatePool (4 * 480 * 80);\r
+    BiosVideoPrivate->VgaFrameBuffer = (UINT8 *)AllocatePool (4 * 480 * 80);\r
     if (NULL == BiosVideoPrivate->VgaFrameBuffer) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     //\r
     // Set VGA Mode\r
     //\r
     Regs.X.AX = ModeData->VbeModeNumber;\r
     BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
-\r
   } else {\r
     //\r
     // Allocate a working buffer for BLT operations to the VBE frame buffer\r
     //\r
     BiosVideoPrivate->VbeFrameBuffer =\r
-      (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) AllocatePool (\r
-                                          ModeData->BytesPerScanLine * ModeData->VerticalResolution\r
-                                          );\r
+      (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)AllocatePool (\r
+                                         ModeData->BytesPerScanLine * ModeData->VerticalResolution\r
+                                         );\r
     if (NULL == BiosVideoPrivate->VbeFrameBuffer) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     //\r
     // Set VBE mode\r
     //\r
     Regs.X.AX = VESA_BIOS_EXTENSIONS_SET_MODE;\r
-    Regs.X.BX = (UINT16) (ModeData->VbeModeNumber | VESA_BIOS_EXTENSIONS_MODE_NUMBER_LINEAR_FRAME_BUFFER);\r
+    Regs.X.BX = (UINT16)(ModeData->VbeModeNumber | VESA_BIOS_EXTENSIONS_MODE_NUMBER_LINEAR_FRAME_BUFFER);\r
     ZeroMem (BiosVideoPrivate->VbeCrtcInformationBlock, sizeof (VESA_BIOS_EXTENSIONS_CRTC_INFORMATION_BLOCK));\r
-    Regs.X.ES = EFI_SEGMENT ((UINTN) BiosVideoPrivate->VbeCrtcInformationBlock);\r
-    Regs.X.DI = EFI_OFFSET ((UINTN) BiosVideoPrivate->VbeCrtcInformationBlock);\r
+    Regs.X.ES = EFI_SEGMENT ((UINTN)BiosVideoPrivate->VbeCrtcInformationBlock);\r
+    Regs.X.DI = EFI_OFFSET ((UINTN)BiosVideoPrivate->VbeCrtcInformationBlock);\r
     BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
 \r
     //\r
@@ -2018,6 +2077,7 @@ BiosVideoSetModeWorker (
         );\r
       return EFI_DEVICE_ERROR;\r
     }\r
+\r
     //\r
     // Initialize the state of the VbeFrameBuffer\r
     //\r
@@ -2025,7 +2085,7 @@ BiosVideoSetModeWorker (
                                             BiosVideoPrivate->PciIo,\r
                                             EfiPciIoWidthUint32,\r
                                             EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                                            (UINT64) (UINTN) ModeData->LinearFrameBuffer,\r
+                                            (UINT64)(UINTN)ModeData->LinearFrameBuffer,\r
                                             (ModeData->BytesPerScanLine * ModeData->VerticalResolution) >> 2,\r
                                             BiosVideoPrivate->VbeFrameBuffer\r
                                             );\r
@@ -2052,14 +2112,14 @@ BiosVideoSetModeWorker (
 EFI_STATUS\r
 EFIAPI\r
 BiosVideoGraphicsOutputSetMode (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL This,\r
-  IN  UINT32                       ModeNumber\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL  *This,\r
+  IN  UINT32                        ModeNumber\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  BIOS_VIDEO_DEV          *BiosVideoPrivate;\r
-  BIOS_VIDEO_MODE_DATA    *ModeData;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background;\r
+  EFI_STATUS                     Status;\r
+  BIOS_VIDEO_DEV                 *BiosVideoPrivate;\r
+  BIOS_VIDEO_MODE_DATA           *ModeData;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL  Background;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -2079,17 +2139,17 @@ BiosVideoGraphicsOutputSetMode (
     //\r
     ZeroMem (&Background, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));\r
     BiosVideoGraphicsOutputVbeBlt (\r
-                        This,\r
-                        &Background,\r
-                        EfiBltVideoFill,\r
-                        0,\r
-                        0,\r
-                        0,\r
-                        0,\r
-                        ModeData->HorizontalResolution,\r
-                        ModeData->VerticalResolution,\r
-                        0\r
-    );\r
+      This,\r
+      &Background,\r
+      EfiBltVideoFill,\r
+      0,\r
+      0,\r
+      0,\r
+      0,\r
+      ModeData->HorizontalResolution,\r
+      ModeData->VerticalResolution,\r
+      0\r
+      );\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -2098,16 +2158,16 @@ BiosVideoGraphicsOutputSetMode (
     return Status;\r
   }\r
 \r
-  This->Mode->Mode = ModeNumber;\r
-  This->Mode->Info->Version = 0;\r
+  This->Mode->Mode                       = ModeNumber;\r
+  This->Mode->Info->Version              = 0;\r
   This->Mode->Info->HorizontalResolution = ModeData->HorizontalResolution;\r
-  This->Mode->Info->VerticalResolution = ModeData->VerticalResolution;\r
-  This->Mode->Info->PixelFormat = ModeData->PixelFormat;\r
+  This->Mode->Info->VerticalResolution   = ModeData->VerticalResolution;\r
+  This->Mode->Info->PixelFormat          = ModeData->PixelFormat;\r
   CopyMem (&(This->Mode->Info->PixelInformation), &(ModeData->PixelBitMask), sizeof (ModeData->PixelBitMask));\r
   This->Mode->Info->PixelsPerScanLine =  (ModeData->BytesPerScanLine * 8) / ModeData->BitsPerPixel;\r
-  This->Mode->SizeOfInfo = sizeof(EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-  This->Mode->FrameBufferSize = ModeData->FrameBufferSize;\r
-  This->Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) ModeData->LinearFrameBuffer;\r
+  This->Mode->SizeOfInfo              = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
+  This->Mode->FrameBufferSize         = ModeData->FrameBufferSize;\r
+  This->Mode->FrameBufferBase         = (EFI_PHYSICAL_ADDRESS)(UINTN)ModeData->LinearFrameBuffer;\r
 \r
   BiosVideoPrivate->HardwareNeedsStarting = FALSE;\r
 \r
@@ -2129,36 +2189,36 @@ BiosVideoGraphicsOutputSetMode (
 **/\r
 VOID\r
 CopyVideoBuffer (\r
-  IN  EFI_PCI_IO_PROTOCOL   *PciIo,\r
-  IN  UINT8                 *VbeBuffer,\r
-  IN  VOID                  *MemAddress,\r
-  IN  UINTN                 DestinationX,\r
-  IN  UINTN                 DestinationY,\r
-  IN  UINTN                 TotalBytes,\r
-  IN  UINT32                VbePixelWidth,\r
-  IN  UINTN                 BytesPerScanLine\r
+  IN  EFI_PCI_IO_PROTOCOL  *PciIo,\r
+  IN  UINT8                *VbeBuffer,\r
+  IN  VOID                 *MemAddress,\r
+  IN  UINTN                DestinationX,\r
+  IN  UINTN                DestinationY,\r
+  IN  UINTN                TotalBytes,\r
+  IN  UINT32               VbePixelWidth,\r
+  IN  UINTN                BytesPerScanLine\r
   )\r
 {\r
-  UINTN                 FrameBufferAddr;\r
-  UINTN                 CopyBlockNum;\r
-  UINTN                 RemainingBytes;\r
-  UINTN                 UnalignedBytes;\r
-  EFI_STATUS            Status;\r
+  UINTN       FrameBufferAddr;\r
+  UINTN       CopyBlockNum;\r
+  UINTN       RemainingBytes;\r
+  UINTN       UnalignedBytes;\r
+  EFI_STATUS  Status;\r
 \r
-  FrameBufferAddr = (UINTN) MemAddress + (DestinationY * BytesPerScanLine) + DestinationX * VbePixelWidth;\r
+  FrameBufferAddr = (UINTN)MemAddress + (DestinationY * BytesPerScanLine) + DestinationX * VbePixelWidth;\r
 \r
   //\r
   // If TotalBytes is less than 4 bytes, only start byte copy.\r
   //\r
   if (TotalBytes < 4) {\r
     Status = PciIo->Mem.Write (\r
-                     PciIo,\r
-                     EfiPciIoWidthUint8,\r
-                     EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                     (UINT64) FrameBufferAddr,\r
-                     TotalBytes,\r
-                     VbeBuffer\r
-                     );\r
+                          PciIo,\r
+                          EfiPciIoWidthUint8,\r
+                          EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                          (UINT64)FrameBufferAddr,\r
+                          TotalBytes,\r
+                          VbeBuffer\r
+                          );\r
     ASSERT_EFI_ERROR (Status);\r
     return;\r
   }\r
@@ -2166,17 +2226,17 @@ CopyVideoBuffer (
   //\r
   // If VbeBuffer is not 4-byte aligned, start byte copy.\r
   //\r
-  UnalignedBytes  = (4 - ((UINTN) VbeBuffer & 0x3)) & 0x3;\r
+  UnalignedBytes = (4 - ((UINTN)VbeBuffer & 0x3)) & 0x3;\r
 \r
   if (UnalignedBytes != 0) {\r
     Status = PciIo->Mem.Write (\r
-                     PciIo,\r
-                     EfiPciIoWidthUint8,\r
-                     EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                     (UINT64) FrameBufferAddr,\r
-                     UnalignedBytes,\r
-                     VbeBuffer\r
-                     );\r
+                          PciIo,\r
+                          EfiPciIoWidthUint8,\r
+                          EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                          (UINT64)FrameBufferAddr,\r
+                          UnalignedBytes,\r
+                          VbeBuffer\r
+                          );\r
     ASSERT_EFI_ERROR (Status);\r
     FrameBufferAddr += UnalignedBytes;\r
     VbeBuffer       += UnalignedBytes;\r
@@ -2193,27 +2253,27 @@ CopyVideoBuffer (
   //\r
   if (CopyBlockNum != 0) {\r
     Status = PciIo->Mem.Write (\r
-                    PciIo,\r
-                    EfiPciIoWidthUint32,\r
-                    EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                    (UINT64) FrameBufferAddr,\r
-                    CopyBlockNum,\r
-                    VbeBuffer\r
-                    );\r
+                          PciIo,\r
+                          EfiPciIoWidthUint32,\r
+                          EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                          (UINT64)FrameBufferAddr,\r
+                          CopyBlockNum,\r
+                          VbeBuffer\r
+                          );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
   if (RemainingBytes != 0) {\r
     FrameBufferAddr += (CopyBlockNum << 2);\r
     VbeBuffer       += (CopyBlockNum << 2);\r
-    Status = PciIo->Mem.Write (\r
-                    PciIo,\r
-                    EfiPciIoWidthUint8,\r
-                    EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                    (UINT64) FrameBufferAddr,\r
-                    RemainingBytes,\r
-                    VbeBuffer\r
-                    );\r
+    Status           = PciIo->Mem.Write (\r
+                                    PciIo,\r
+                                    EfiPciIoWidthUint8,\r
+                                    EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                                    (UINT64)FrameBufferAddr,\r
+                                    RemainingBytes,\r
+                                    VbeBuffer\r
+                                    );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 }\r
@@ -2278,22 +2338,23 @@ BiosVideoVbeBltWorker (
   UINT32                         Pixel;\r
   UINTN                          TotalBytes;\r
 \r
-  PciIo             = BiosVideoPrivate->PciIo;\r
+  PciIo = BiosVideoPrivate->PciIo;\r
 \r
-  VbeFrameBuffer    = BiosVideoPrivate->VbeFrameBuffer;\r
-  MemAddress        = Mode->LinearFrameBuffer;\r
-  BytesPerScanLine  = Mode->BytesPerScanLine;\r
-  VbePixelWidth     = Mode->BitsPerPixel / 8;\r
-  BltUint8          = (UINT8 *) BltBuffer;\r
-  TotalBytes        = Width * VbePixelWidth;\r
+  VbeFrameBuffer   = BiosVideoPrivate->VbeFrameBuffer;\r
+  MemAddress       = Mode->LinearFrameBuffer;\r
+  BytesPerScanLine = Mode->BytesPerScanLine;\r
+  VbePixelWidth    = Mode->BitsPerPixel / 8;\r
+  BltUint8         = (UINT8 *)BltBuffer;\r
+  TotalBytes       = Width * VbePixelWidth;\r
 \r
-  if (((UINTN) BltOperation) >= EfiGraphicsOutputBltOperationMax) {\r
+  if (((UINTN)BltOperation) >= EfiGraphicsOutputBltOperationMax) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (Width == 0 || Height == 0) {\r
+  if ((Width == 0) || (Height == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // We need to fill the Virtual Screen buffer with the blt data.\r
   // The virtual screen is upside down, as the first row is the bootom row of\r
@@ -2322,6 +2383,7 @@ BiosVideoVbeBltWorker (
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
+\r
   //\r
   // If Delta is zero, then the entire BltBuffer is being used, so Delta\r
   // is the number of bytes in each row of BltBuffer.  Since BltBuffer is Width pixels size,\r
@@ -2330,6 +2392,7 @@ BiosVideoVbeBltWorker (
   if (Delta == 0) {\r
     Delta = Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL);\r
   }\r
+\r
   //\r
   // We have to raise to TPL Notify, so we make an atomic write the frame buffer.\r
   // We would not want a timer based event (Cursor, ...) to come in while we are\r
@@ -2338,148 +2401,151 @@ BiosVideoVbeBltWorker (
   OriginalTPL = gBS->RaiseTPL (TPL_NOTIFY);\r
 \r
   switch (BltOperation) {\r
-  case EfiBltVideoToBltBuffer:\r
-    for (SrcY = SourceY, DstY = DestinationY; DstY < (Height + DestinationY); SrcY++, DstY++) {\r
-      Blt = (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) (BltUint8 + DstY * Delta + DestinationX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));\r
-      //\r
-      // Shuffle the packed bytes in the hardware buffer to match EFI_GRAPHICS_OUTPUT_BLT_PIXEL\r
-      //\r
-      VbeBuffer = ((UINT8 *) VbeFrameBuffer + (SrcY * BytesPerScanLine + SourceX * VbePixelWidth));\r
-      for (DstX = DestinationX; DstX < (Width + DestinationX); DstX++) {\r
-        Pixel         = VbeBuffer[0] | VbeBuffer[1] << 8 | VbeBuffer[2] << 16 | VbeBuffer[3] << 24;\r
-        Blt->Red      = (UINT8) ((Pixel >> Mode->Red.Position) & Mode->Red.Mask);\r
-        Blt->Blue     = (UINT8) ((Pixel >> Mode->Blue.Position) & Mode->Blue.Mask);\r
-        Blt->Green    = (UINT8) ((Pixel >> Mode->Green.Position) & Mode->Green.Mask);\r
-        Blt->Reserved = 0;\r
-        Blt++;\r
-        VbeBuffer += VbePixelWidth;\r
+    case EfiBltVideoToBltBuffer:\r
+      for (SrcY = SourceY, DstY = DestinationY; DstY < (Height + DestinationY); SrcY++, DstY++) {\r
+        Blt = (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)(BltUint8 + DstY * Delta + DestinationX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));\r
+        //\r
+        // Shuffle the packed bytes in the hardware buffer to match EFI_GRAPHICS_OUTPUT_BLT_PIXEL\r
+        //\r
+        VbeBuffer = ((UINT8 *)VbeFrameBuffer + (SrcY * BytesPerScanLine + SourceX * VbePixelWidth));\r
+        for (DstX = DestinationX; DstX < (Width + DestinationX); DstX++) {\r
+          Pixel         = VbeBuffer[0] | VbeBuffer[1] << 8 | VbeBuffer[2] << 16 | VbeBuffer[3] << 24;\r
+          Blt->Red      = (UINT8)((Pixel >> Mode->Red.Position) & Mode->Red.Mask);\r
+          Blt->Blue     = (UINT8)((Pixel >> Mode->Blue.Position) & Mode->Blue.Mask);\r
+          Blt->Green    = (UINT8)((Pixel >> Mode->Green.Position) & Mode->Green.Mask);\r
+          Blt->Reserved = 0;\r
+          Blt++;\r
+          VbeBuffer += VbePixelWidth;\r
+        }\r
       }\r
 \r
-    }\r
-    break;\r
+      break;\r
 \r
-  case EfiBltVideoToVideo:\r
-    for (Index = 0; Index < Height; Index++) {\r
-      if (DestinationY <= SourceY) {\r
-        SrcY  = SourceY + Index;\r
-        DstY  = DestinationY + Index;\r
-      } else {\r
-        SrcY  = SourceY + Height - Index - 1;\r
-        DstY  = DestinationY + Height - Index - 1;\r
-      }\r
+    case EfiBltVideoToVideo:\r
+      for (Index = 0; Index < Height; Index++) {\r
+        if (DestinationY <= SourceY) {\r
+          SrcY = SourceY + Index;\r
+          DstY = DestinationY + Index;\r
+        } else {\r
+          SrcY = SourceY + Height - Index - 1;\r
+          DstY = DestinationY + Height - Index - 1;\r
+        }\r
 \r
-      VbeBuffer   = ((UINT8 *) VbeFrameBuffer + DstY * BytesPerScanLine + DestinationX * VbePixelWidth);\r
-      VbeBuffer1  = ((UINT8 *) VbeFrameBuffer + SrcY * BytesPerScanLine + SourceX * VbePixelWidth);\r
+        VbeBuffer  = ((UINT8 *)VbeFrameBuffer + DstY * BytesPerScanLine + DestinationX * VbePixelWidth);\r
+        VbeBuffer1 = ((UINT8 *)VbeFrameBuffer + SrcY * BytesPerScanLine + SourceX * VbePixelWidth);\r
 \r
-      gBS->CopyMem (\r
-            VbeBuffer,\r
-            VbeBuffer1,\r
-            TotalBytes\r
-            );\r
+        gBS->CopyMem (\r
+               VbeBuffer,\r
+               VbeBuffer1,\r
+               TotalBytes\r
+               );\r
+\r
+        //\r
+        // Update physical frame buffer.\r
+        //\r
+        CopyVideoBuffer (\r
+          PciIo,\r
+          VbeBuffer,\r
+          MemAddress,\r
+          DestinationX,\r
+          DstY,\r
+          TotalBytes,\r
+          VbePixelWidth,\r
+          BytesPerScanLine\r
+          );\r
+      }\r
+\r
+      break;\r
 \r
+    case EfiBltVideoFill:\r
+      VbeBuffer = (UINT8 *)((UINTN)VbeFrameBuffer + (DestinationY * BytesPerScanLine) + DestinationX * VbePixelWidth);\r
+      Blt       = (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)BltUint8;\r
       //\r
-      // Update physical frame buffer.\r
+      // Shuffle the RGB fields in EFI_GRAPHICS_OUTPUT_BLT_PIXEL to match the hardware buffer\r
       //\r
-      CopyVideoBuffer (\r
-        PciIo,\r
-        VbeBuffer,\r
-        MemAddress,\r
-        DestinationX,\r
-        DstY,\r
-        TotalBytes,\r
-        VbePixelWidth,\r
-        BytesPerScanLine\r
-        );\r
-    }\r
-    break;\r
+      Pixel = ((Blt->Red & Mode->Red.Mask) << Mode->Red.Position) |\r
+              (\r
+               (Blt->Green & Mode->Green.Mask) <<\r
+               Mode->Green.Position\r
+              ) |\r
+              ((Blt->Blue & Mode->Blue.Mask) << Mode->Blue.Position);\r
+\r
+      for (Index = 0; Index < Width; Index++) {\r
+        gBS->CopyMem (\r
+               VbeBuffer,\r
+               &Pixel,\r
+               VbePixelWidth\r
+               );\r
+        VbeBuffer += VbePixelWidth;\r
+      }\r
 \r
-  case EfiBltVideoFill:\r
-    VbeBuffer = (UINT8 *) ((UINTN) VbeFrameBuffer + (DestinationY * BytesPerScanLine) + DestinationX * VbePixelWidth);\r
-    Blt       = (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) BltUint8;\r
-    //\r
-    // Shuffle the RGB fields in EFI_GRAPHICS_OUTPUT_BLT_PIXEL to match the hardware buffer\r
-    //\r
-    Pixel = ((Blt->Red & Mode->Red.Mask) << Mode->Red.Position) |\r
-      (\r
-        (Blt->Green & Mode->Green.Mask) <<\r
-        Mode->Green.Position\r
-      ) |\r
-          ((Blt->Blue & Mode->Blue.Mask) << Mode->Blue.Position);\r
+      VbeBuffer = (UINT8 *)((UINTN)VbeFrameBuffer + (DestinationY * BytesPerScanLine) + DestinationX * VbePixelWidth);\r
+      for (DstY = DestinationY + 1; DstY < (Height + DestinationY); DstY++) {\r
+        gBS->CopyMem (\r
+               (VOID *)((UINTN)VbeFrameBuffer + (DstY * BytesPerScanLine) + DestinationX * VbePixelWidth),\r
+               VbeBuffer,\r
+               TotalBytes\r
+               );\r
+      }\r
 \r
-    for (Index = 0; Index < Width; Index++) {\r
-      gBS->CopyMem (\r
-            VbeBuffer,\r
-            &Pixel,\r
-            VbePixelWidth\r
-            );\r
-      VbeBuffer += VbePixelWidth;\r
-    }\r
+      for (DstY = DestinationY; DstY < (Height + DestinationY); DstY++) {\r
+        //\r
+        // Update physical frame buffer.\r
+        //\r
+        CopyVideoBuffer (\r
+          PciIo,\r
+          VbeBuffer,\r
+          MemAddress,\r
+          DestinationX,\r
+          DstY,\r
+          TotalBytes,\r
+          VbePixelWidth,\r
+          BytesPerScanLine\r
+          );\r
+      }\r
 \r
-    VbeBuffer = (UINT8 *) ((UINTN) VbeFrameBuffer + (DestinationY * BytesPerScanLine) + DestinationX * VbePixelWidth);\r
-    for (DstY = DestinationY + 1; DstY < (Height + DestinationY); DstY++) {\r
-      gBS->CopyMem (\r
-            (VOID *) ((UINTN) VbeFrameBuffer + (DstY * BytesPerScanLine) + DestinationX * VbePixelWidth),\r
-            VbeBuffer,\r
-            TotalBytes\r
-            );\r
-    }\r
+      break;\r
 \r
-    for (DstY = DestinationY; DstY < (Height + DestinationY); DstY++) {\r
-      //\r
-      // Update physical frame buffer.\r
-      //\r
-      CopyVideoBuffer (\r
-        PciIo,\r
-        VbeBuffer,\r
-        MemAddress,\r
-        DestinationX,\r
-        DstY,\r
-        TotalBytes,\r
-        VbePixelWidth,\r
-        BytesPerScanLine\r
-        );\r
-    }\r
-    break;\r
+    case EfiBltBufferToVideo:\r
+      for (SrcY = SourceY, DstY = DestinationY; SrcY < (Height + SourceY); SrcY++, DstY++) {\r
+        Blt       = (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)(BltUint8 + (SrcY * Delta) + (SourceX) * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));\r
+        VbeBuffer = ((UINT8 *)VbeFrameBuffer + (DstY * BytesPerScanLine + DestinationX * VbePixelWidth));\r
+        for (DstX = DestinationX; DstX < (Width + DestinationX); DstX++) {\r
+          //\r
+          // Shuffle the RGB fields in EFI_GRAPHICS_OUTPUT_BLT_PIXEL to match the hardware buffer\r
+          //\r
+          Pixel = ((Blt->Red & Mode->Red.Mask) << Mode->Red.Position) |\r
+                  ((Blt->Green & Mode->Green.Mask) << Mode->Green.Position) |\r
+                  ((Blt->Blue & Mode->Blue.Mask) << Mode->Blue.Position);\r
+          gBS->CopyMem (\r
+                 VbeBuffer,\r
+                 &Pixel,\r
+                 VbePixelWidth\r
+                 );\r
+          Blt++;\r
+          VbeBuffer += VbePixelWidth;\r
+        }\r
+\r
+        VbeBuffer = ((UINT8 *)VbeFrameBuffer + (DstY * BytesPerScanLine + DestinationX * VbePixelWidth));\r
 \r
-  case EfiBltBufferToVideo:\r
-    for (SrcY = SourceY, DstY = DestinationY; SrcY < (Height + SourceY); SrcY++, DstY++) {\r
-      Blt       = (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) (BltUint8 + (SrcY * Delta) + (SourceX) * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));\r
-      VbeBuffer = ((UINT8 *) VbeFrameBuffer + (DstY * BytesPerScanLine + DestinationX * VbePixelWidth));\r
-      for (DstX = DestinationX; DstX < (Width + DestinationX); DstX++) {\r
         //\r
-        // Shuffle the RGB fields in EFI_GRAPHICS_OUTPUT_BLT_PIXEL to match the hardware buffer\r
+        // Update physical frame buffer.\r
         //\r
-        Pixel = ((Blt->Red & Mode->Red.Mask) << Mode->Red.Position) |\r
-          ((Blt->Green & Mode->Green.Mask) << Mode->Green.Position) |\r
-            ((Blt->Blue & Mode->Blue.Mask) << Mode->Blue.Position);\r
-        gBS->CopyMem (\r
-              VbeBuffer,\r
-              &Pixel,\r
-              VbePixelWidth\r
-              );\r
-        Blt++;\r
-        VbeBuffer += VbePixelWidth;\r
+        CopyVideoBuffer (\r
+          PciIo,\r
+          VbeBuffer,\r
+          MemAddress,\r
+          DestinationX,\r
+          DstY,\r
+          TotalBytes,\r
+          VbePixelWidth,\r
+          BytesPerScanLine\r
+          );\r
       }\r
 \r
-      VbeBuffer = ((UINT8 *) VbeFrameBuffer + (DstY * BytesPerScanLine + DestinationX * VbePixelWidth));\r
+      break;\r
 \r
-      //\r
-      // Update physical frame buffer.\r
-      //\r
-      CopyVideoBuffer (\r
-        PciIo,\r
-        VbeBuffer,\r
-        MemAddress,\r
-        DestinationX,\r
-        DstY,\r
-        TotalBytes,\r
-        VbePixelWidth,\r
-        BytesPerScanLine\r
-        );\r
-    }\r
-    break;\r
-\r
-    default: ;\r
+    default:;\r
   }\r
 \r
   gBS->RestoreTPL (OriginalTPL);\r
@@ -2529,15 +2595,15 @@ BiosVideoGraphicsOutputVbeBlt (
   IN  UINTN                              Delta\r
   )\r
 {\r
-  BIOS_VIDEO_DEV                 *BiosVideoPrivate;\r
-  BIOS_VIDEO_MODE_DATA           *Mode;\r
+  BIOS_VIDEO_DEV        *BiosVideoPrivate;\r
+  BIOS_VIDEO_MODE_DATA  *Mode;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  BiosVideoPrivate  = BIOS_VIDEO_DEV_FROM_GRAPHICS_OUTPUT_THIS (This);\r
-  Mode              = &BiosVideoPrivate->ModeData[This->Mode->Mode];\r
+  BiosVideoPrivate = BIOS_VIDEO_DEV_FROM_GRAPHICS_OUTPUT_THIS (This);\r
+  Mode             = &BiosVideoPrivate->ModeData[This->Mode->Mode];\r
 \r
   return BiosVideoVbeBltWorker (\r
            BiosVideoPrivate,\r
@@ -2583,7 +2649,6 @@ WriteGraphicsController (
               );\r
 }\r
 \r
-\r
 /**\r
   Read the four bit plane of VGA frame buffer.\r
 \r
@@ -2606,11 +2671,11 @@ VgaReadBitPlanes (
   UINTN                Height\r
   )\r
 {\r
-  UINTN BitPlane;\r
-  UINTN Rows;\r
-  UINTN FrameBufferOffset;\r
-  UINT8 *Source;\r
-  UINT8 *Destination;\r
+  UINTN  BitPlane;\r
+  UINTN  Rows;\r
+  UINTN  FrameBufferOffset;\r
+  UINT8  *Source;\r
+  UINT8  *Destination;\r
 \r
   //\r
   // Program the Mode Register Write mode 0, Read mode 0\r
@@ -2624,7 +2689,8 @@ VgaReadBitPlanes (
   for (BitPlane = 0, FrameBufferOffset = 0;\r
        BitPlane < VGA_NUMBER_OF_BIT_PLANES;\r
        BitPlane++, FrameBufferOffset += VGA_BYTES_PER_BIT_PLANE\r
-      ) {\r
+       )\r
+  {\r
     //\r
     // Program the Read Map Select Register to select the correct bit plane\r
     //\r
@@ -2639,18 +2705,17 @@ VgaReadBitPlanes (
 \r
     for (Rows = 0; Rows < Height; Rows++, Source += VGA_BYTES_PER_SCAN_LINE, Destination += VGA_BYTES_PER_SCAN_LINE) {\r
       PciIo->Mem.Read (\r
-                  PciIo,\r
-                  EfiPciIoWidthUint8,\r
-                  EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                  (UINT64) (UINTN) Source,\r
-                  WidthInBytes,\r
-                  (VOID *) Destination\r
-                  );\r
+                   PciIo,\r
+                   EfiPciIoWidthUint8,\r
+                   EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                   (UINT64)(UINTN)Source,\r
+                   WidthInBytes,\r
+                   (VOID *)Destination\r
+                   );\r
     }\r
   }\r
 }\r
 \r
-\r
 /**\r
   Internal routine to convert VGA color to Grahpics Output color.\r
 \r
@@ -2670,12 +2735,12 @@ VgaConvertToGraphicsOutputColor (
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL  *BltBuffer\r
   )\r
 {\r
-  UINTN Mask;\r
-  UINTN Bit;\r
-  UINTN Color;\r
+  UINTN  Mask;\r
+  UINTN  Bit;\r
+  UINTN  Color;\r
 \r
   MemoryBuffer += ((CoordinateY << 6) + (CoordinateY << 4) + (CoordinateX >> 3));\r
-  Mask = mVgaBitMaskTable[CoordinateX & 0x07];\r
+  Mask          = mVgaBitMaskTable[CoordinateX & 0x07];\r
   for (Bit = 0x01, Color = 0; Bit < 0x10; Bit <<= 1, MemoryBuffer += VGA_BYTES_PER_BIT_PLANE) {\r
     if ((*MemoryBuffer & Mask) != 0) {\r
       Color |= Bit;\r
@@ -2695,12 +2760,12 @@ VgaConvertToGraphicsOutputColor (
 **/\r
 UINT8\r
 VgaConvertColor (\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL          *BltBuffer\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL  *BltBuffer\r
   )\r
 {\r
-  UINT8 Color;\r
+  UINT8  Color;\r
 \r
-  Color = (UINT8) ((BltBuffer->Blue >> 7) | ((BltBuffer->Green >> 6) & 0x02) | ((BltBuffer->Red >> 5) & 0x04));\r
+  Color = (UINT8)((BltBuffer->Blue >> 7) | ((BltBuffer->Green >> 6) & 0x02) | ((BltBuffer->Red >> 5) & 0x04));\r
   if ((BltBuffer->Red + BltBuffer->Green + BltBuffer->Blue) > 0x180) {\r
     Color |= 0x08;\r
   }\r
@@ -2708,7 +2773,6 @@ VgaConvertColor (
   return Color;\r
 }\r
 \r
-\r
 /**\r
   Grahpics Output protocol instance to block transfer for VGA device.\r
 \r
@@ -2751,51 +2815,51 @@ BiosVideoGraphicsOutputVgaBlt (
   IN  UINTN                              Delta\r
   )\r
 {\r
-  BIOS_VIDEO_DEV      *BiosVideoPrivate;\r
-  EFI_TPL             OriginalTPL;\r
-  UINT8               *MemAddress;\r
-  UINTN               BytesPerScanLine;\r
-  UINTN               Bit;\r
-  UINTN               Index;\r
-  UINTN               Index1;\r
-  UINTN               StartAddress;\r
-  UINTN               Bytes;\r
-  UINTN               Offset;\r
-  UINT8               LeftMask;\r
-  UINT8               RightMask;\r
-  UINTN               Address;\r
-  UINTN               AddressFix;\r
-  UINT8               *Address1;\r
-  UINT8               *SourceAddress;\r
-  UINT8               *DestinationAddress;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  UINT8               Data;\r
-  UINT8               PixelColor;\r
-  UINT8               *VgaFrameBuffer;\r
-  UINTN               SourceOffset;\r
-  UINTN               SourceWidth;\r
-  UINTN               Rows;\r
-  UINTN               Columns;\r
-  UINTN               CoordinateX;\r
-  UINTN               CoordinateY;\r
-  UINTN               CurrentMode;\r
-\r
-  if (This == NULL || ((UINTN) BltOperation) >= EfiGraphicsOutputBltOperationMax) {\r
+  BIOS_VIDEO_DEV       *BiosVideoPrivate;\r
+  EFI_TPL              OriginalTPL;\r
+  UINT8                *MemAddress;\r
+  UINTN                BytesPerScanLine;\r
+  UINTN                Bit;\r
+  UINTN                Index;\r
+  UINTN                Index1;\r
+  UINTN                StartAddress;\r
+  UINTN                Bytes;\r
+  UINTN                Offset;\r
+  UINT8                LeftMask;\r
+  UINT8                RightMask;\r
+  UINTN                Address;\r
+  UINTN                AddressFix;\r
+  UINT8                *Address1;\r
+  UINT8                *SourceAddress;\r
+  UINT8                *DestinationAddress;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  UINT8                Data;\r
+  UINT8                PixelColor;\r
+  UINT8                *VgaFrameBuffer;\r
+  UINTN                SourceOffset;\r
+  UINTN                SourceWidth;\r
+  UINTN                Rows;\r
+  UINTN                Columns;\r
+  UINTN                CoordinateX;\r
+  UINTN                CoordinateY;\r
+  UINTN                CurrentMode;\r
+\r
+  if ((This == NULL) || (((UINTN)BltOperation) >= EfiGraphicsOutputBltOperationMax)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  BiosVideoPrivate  = BIOS_VIDEO_DEV_FROM_GRAPHICS_OUTPUT_THIS (This);\r
-\r
-  CurrentMode = This->Mode->Mode;\r
-  PciIo             = BiosVideoPrivate->PciIo;\r
-  MemAddress        = BiosVideoPrivate->ModeData[CurrentMode].LinearFrameBuffer;\r
-  BytesPerScanLine  = BiosVideoPrivate->ModeData[CurrentMode].BytesPerScanLine >> 3;\r
-  VgaFrameBuffer    = BiosVideoPrivate->VgaFrameBuffer;\r
+  BiosVideoPrivate = BIOS_VIDEO_DEV_FROM_GRAPHICS_OUTPUT_THIS (This);\r
 \r
+  CurrentMode      = This->Mode->Mode;\r
+  PciIo            = BiosVideoPrivate->PciIo;\r
+  MemAddress       = BiosVideoPrivate->ModeData[CurrentMode].LinearFrameBuffer;\r
+  BytesPerScanLine = BiosVideoPrivate->ModeData[CurrentMode].BytesPerScanLine >> 3;\r
+  VgaFrameBuffer   = BiosVideoPrivate->VgaFrameBuffer;\r
 \r
-  if (Width == 0 || Height == 0) {\r
+  if ((Width == 0) || (Height == 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // We need to fill the Virtual Screen buffer with the blt data.\r
   // The virtual screen is upside down, as the first row is the bootom row of\r
@@ -2824,6 +2888,7 @@ BiosVideoGraphicsOutputVgaBlt (
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
+\r
   //\r
   // If Delta is zero, then the entire BltBuffer is being used, so Delta\r
   // is the number of bytes in each row of BltBuffer.  Since BltBuffer is Width pixels size,\r
@@ -2832,6 +2897,7 @@ BiosVideoGraphicsOutputVgaBlt (
   if (Delta == 0) {\r
     Delta = Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL);\r
   }\r
+\r
   //\r
   // We have to raise to TPL Notify, so we make an atomic write the frame buffer.\r
   // We would not want a timer based event (Cursor, ...) to come in while we are\r
@@ -2843,67 +2909,10 @@ BiosVideoGraphicsOutputVgaBlt (
   // Compute some values we need for VGA\r
   //\r
   switch (BltOperation) {\r
-  case EfiBltVideoToBltBuffer:\r
-\r
-    SourceOffset  = (SourceY << 6) + (SourceY << 4) + (SourceX >> 3);\r
-    SourceWidth   = ((SourceX + Width - 1) >> 3) - (SourceX >> 3) + 1;\r
-\r
-    //\r
-    // Read all the pixels in the 4 bit planes into a memory buffer that looks like the VGA buffer\r
-    //\r
-    VgaReadBitPlanes (\r
-      PciIo,\r
-      MemAddress + SourceOffset,\r
-      VgaFrameBuffer + SourceOffset,\r
-      SourceWidth,\r
-      Height\r
-      );\r
-\r
-    //\r
-    // Convert VGA Bit Planes to a Graphics Output 32-bit color value\r
-    //\r
-    BltBuffer += (DestinationY * (Delta >> 2) + DestinationX);\r
-    for (Rows = 0, CoordinateY = SourceY; Rows < Height; Rows++, CoordinateY++, BltBuffer += (Delta >> 2)) {\r
-      for (Columns = 0, CoordinateX = SourceX; Columns < Width; Columns++, CoordinateX++, BltBuffer++) {\r
-        VgaConvertToGraphicsOutputColor (VgaFrameBuffer, CoordinateX, CoordinateY, BltBuffer);\r
-      }\r
-\r
-      BltBuffer -= Width;\r
-    }\r
+    case EfiBltVideoToBltBuffer:\r
 \r
-    break;\r
-\r
-  case EfiBltVideoToVideo:\r
-    //\r
-    // Check for an aligned Video to Video operation\r
-    //\r
-    if ((SourceX & 0x07) == 0x00 && (DestinationX & 0x07) == 0x00 && (Width & 0x07) == 0x00) {\r
-      //\r
-      // Program the Mode Register Write mode 1, Read mode 0\r
-      //\r
-      WriteGraphicsController (\r
-        PciIo,\r
-        VGA_GRAPHICS_CONTROLLER_MODE_REGISTER,\r
-        VGA_GRAPHICS_CONTROLLER_READ_MODE_0 | VGA_GRAPHICS_CONTROLLER_WRITE_MODE_1\r
-        );\r
-\r
-      SourceAddress       = (UINT8 *) (MemAddress + (SourceY << 6) + (SourceY << 4) + (SourceX >> 3));\r
-      DestinationAddress  = (UINT8 *) (MemAddress + (DestinationY << 6) + (DestinationY << 4) + (DestinationX >> 3));\r
-      Bytes               = Width >> 3;\r
-      for (Index = 0, Offset = 0; Index < Height; Index++, Offset += BytesPerScanLine) {\r
-        PciIo->CopyMem (\r
-                PciIo,\r
-                EfiPciIoWidthUint8,\r
-                EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                (UINT64) (UINTN) (DestinationAddress + Offset),\r
-                EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                (UINT64) (UINTN) (SourceAddress + Offset),\r
-                Bytes\r
-                );\r
-      }\r
-    } else {\r
-      SourceOffset  = (SourceY << 6) + (SourceY << 4) + (SourceX >> 3);\r
-      SourceWidth   = ((SourceX + Width - 1) >> 3) - (SourceX >> 3) + 1;\r
+      SourceOffset = (SourceY << 6) + (SourceY << 4) + (SourceX >> 3);\r
+      SourceWidth  = ((SourceX + Width - 1) >> 3) - (SourceX >> 3) + 1;\r
 \r
       //\r
       // Read all the pixels in the 4 bit planes into a memory buffer that looks like the VGA buffer\r
@@ -2915,218 +2924,277 @@ BiosVideoGraphicsOutputVgaBlt (
         SourceWidth,\r
         Height\r
         );\r
-    }\r
 \r
-    break;\r
-\r
-  case EfiBltVideoFill:\r
-    StartAddress  = (UINTN) (MemAddress + (DestinationY << 6) + (DestinationY << 4) + (DestinationX >> 3));\r
-    Bytes         = ((DestinationX + Width - 1) >> 3) - (DestinationX >> 3);\r
-    LeftMask      = mVgaLeftMaskTable[DestinationX & 0x07];\r
-    RightMask     = mVgaRightMaskTable[(DestinationX + Width - 1) & 0x07];\r
-    if (Bytes == 0) {\r
-      LeftMask = (UINT8) (LeftMask & RightMask);\r
-      RightMask = 0;\r
-    }\r
-\r
-    if (LeftMask == 0xff) {\r
-      StartAddress--;\r
-      Bytes++;\r
-      LeftMask = 0;\r
-    }\r
-\r
-    if (RightMask == 0xff) {\r
-      Bytes++;\r
-      RightMask = 0;\r
-    }\r
-\r
-    PixelColor = VgaConvertColor (BltBuffer);\r
+      //\r
+      // Convert VGA Bit Planes to a Graphics Output 32-bit color value\r
+      //\r
+      BltBuffer += (DestinationY * (Delta >> 2) + DestinationX);\r
+      for (Rows = 0, CoordinateY = SourceY; Rows < Height; Rows++, CoordinateY++, BltBuffer += (Delta >> 2)) {\r
+        for (Columns = 0, CoordinateX = SourceX; Columns < Width; Columns++, CoordinateX++, BltBuffer++) {\r
+          VgaConvertToGraphicsOutputColor (VgaFrameBuffer, CoordinateX, CoordinateY, BltBuffer);\r
+        }\r
 \r
-    //\r
-    // Program the Mode Register Write mode 2, Read mode 0\r
-    //\r
-    WriteGraphicsController (\r
-      PciIo,\r
-      VGA_GRAPHICS_CONTROLLER_MODE_REGISTER,\r
-      VGA_GRAPHICS_CONTROLLER_READ_MODE_0 | VGA_GRAPHICS_CONTROLLER_WRITE_MODE_2\r
-      );\r
+        BltBuffer -= Width;\r
+      }\r
 \r
-    //\r
-    // Program the Data Rotate/Function Select Register to replace\r
-    //\r
-    WriteGraphicsController (\r
-      PciIo,\r
-      VGA_GRAPHICS_CONTROLLER_DATA_ROTATE_REGISTER,\r
-      VGA_GRAPHICS_CONTROLLER_FUNCTION_REPLACE\r
-      );\r
+      break;\r
 \r
-    if (LeftMask != 0) {\r
+    case EfiBltVideoToVideo:\r
       //\r
-      // Program the BitMask register with the Left column mask\r
+      // Check for an aligned Video to Video operation\r
       //\r
-      WriteGraphicsController (\r
-        PciIo,\r
-        VGA_GRAPHICS_CONTROLLER_BIT_MASK_REGISTER,\r
-        LeftMask\r
-        );\r
-\r
-      for (Index = 0, Address = StartAddress; Index < Height; Index++, Address += BytesPerScanLine) {\r
+      if (((SourceX & 0x07) == 0x00) && ((DestinationX & 0x07) == 0x00) && ((Width & 0x07) == 0x00)) {\r
         //\r
-        // Read data from the bit planes into the latches\r
+        // Program the Mode Register Write mode 1, Read mode 0\r
         //\r
-        PciIo->Mem.Read (\r
-                    PciIo,\r
-                    EfiPciIoWidthUint8,\r
-                    EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                    (UINT64) (UINTN) Address,\r
-                    1,\r
-                    &Data\r
-                    );\r
+        WriteGraphicsController (\r
+          PciIo,\r
+          VGA_GRAPHICS_CONTROLLER_MODE_REGISTER,\r
+          VGA_GRAPHICS_CONTROLLER_READ_MODE_0 | VGA_GRAPHICS_CONTROLLER_WRITE_MODE_1\r
+          );\r
+\r
+        SourceAddress      = (UINT8 *)(MemAddress + (SourceY << 6) + (SourceY << 4) + (SourceX >> 3));\r
+        DestinationAddress = (UINT8 *)(MemAddress + (DestinationY << 6) + (DestinationY << 4) + (DestinationX >> 3));\r
+        Bytes              = Width >> 3;\r
+        for (Index = 0, Offset = 0; Index < Height; Index++, Offset += BytesPerScanLine) {\r
+          PciIo->CopyMem (\r
+                   PciIo,\r
+                   EfiPciIoWidthUint8,\r
+                   EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                   (UINT64)(UINTN)(DestinationAddress + Offset),\r
+                   EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                   (UINT64)(UINTN)(SourceAddress + Offset),\r
+                   Bytes\r
+                   );\r
+        }\r
+      } else {\r
+        SourceOffset = (SourceY << 6) + (SourceY << 4) + (SourceX >> 3);\r
+        SourceWidth  = ((SourceX + Width - 1) >> 3) - (SourceX >> 3) + 1;\r
+\r
         //\r
-        // Write the lower 4 bits of PixelColor to the bit planes in the pixels enabled by BitMask\r
+        // Read all the pixels in the 4 bit planes into a memory buffer that looks like the VGA buffer\r
         //\r
-        PciIo->Mem.Write (\r
-                    PciIo,\r
-                    EfiPciIoWidthUint8,\r
-                    EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                    (UINT64) (UINTN) Address,\r
-                    1,\r
-                    &PixelColor\r
-                    );\r
+        VgaReadBitPlanes (\r
+          PciIo,\r
+          MemAddress + SourceOffset,\r
+          VgaFrameBuffer + SourceOffset,\r
+          SourceWidth,\r
+          Height\r
+          );\r
       }\r
-    }\r
 \r
-    if (Bytes > 1) {\r
+      break;\r
+\r
+    case EfiBltVideoFill:\r
+      StartAddress = (UINTN)(MemAddress + (DestinationY << 6) + (DestinationY << 4) + (DestinationX >> 3));\r
+      Bytes        = ((DestinationX + Width - 1) >> 3) - (DestinationX >> 3);\r
+      LeftMask     = mVgaLeftMaskTable[DestinationX & 0x07];\r
+      RightMask    = mVgaRightMaskTable[(DestinationX + Width - 1) & 0x07];\r
+      if (Bytes == 0) {\r
+        LeftMask  = (UINT8)(LeftMask & RightMask);\r
+        RightMask = 0;\r
+      }\r
+\r
+      if (LeftMask == 0xff) {\r
+        StartAddress--;\r
+        Bytes++;\r
+        LeftMask = 0;\r
+      }\r
+\r
+      if (RightMask == 0xff) {\r
+        Bytes++;\r
+        RightMask = 0;\r
+      }\r
+\r
+      PixelColor = VgaConvertColor (BltBuffer);\r
+\r
       //\r
-      // Program the BitMask register with the middle column mask of 0xff\r
+      // Program the Mode Register Write mode 2, Read mode 0\r
       //\r
       WriteGraphicsController (\r
         PciIo,\r
-        VGA_GRAPHICS_CONTROLLER_BIT_MASK_REGISTER,\r
-        0xff\r
+        VGA_GRAPHICS_CONTROLLER_MODE_REGISTER,\r
+        VGA_GRAPHICS_CONTROLLER_READ_MODE_0 | VGA_GRAPHICS_CONTROLLER_WRITE_MODE_2\r
         );\r
 \r
-      for (Index = 0, Address = StartAddress + 1; Index < Height; Index++, Address += BytesPerScanLine) {\r
-        PciIo->Mem.Write (\r
-                    PciIo,\r
-                    EfiPciIoWidthFillUint8,\r
-                    EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                    (UINT64) (UINTN) Address,\r
-                    Bytes - 1,\r
-                    &PixelColor\r
-                    );\r
-      }\r
-    }\r
-\r
-    if (RightMask != 0) {\r
       //\r
-      // Program the BitMask register with the Right column mask\r
+      // Program the Data Rotate/Function Select Register to replace\r
       //\r
       WriteGraphicsController (\r
         PciIo,\r
-        VGA_GRAPHICS_CONTROLLER_BIT_MASK_REGISTER,\r
-        RightMask\r
+        VGA_GRAPHICS_CONTROLLER_DATA_ROTATE_REGISTER,\r
+        VGA_GRAPHICS_CONTROLLER_FUNCTION_REPLACE\r
         );\r
 \r
-      for (Index = 0, Address = StartAddress + Bytes; Index < Height; Index++, Address += BytesPerScanLine) {\r
-        //\r
-        // Read data from the bit planes into the latches\r
-        //\r
-        PciIo->Mem.Read (\r
-                    PciIo,\r
-                    EfiPciIoWidthUint8,\r
-                    EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                    (UINT64) (UINTN) Address,\r
-                    1,\r
-                    &Data\r
-                    );\r
+      if (LeftMask != 0) {\r
         //\r
-        // Write the lower 4 bits of PixelColor to the bit planes in the pixels enabled by BitMask\r
+        // Program the BitMask register with the Left column mask\r
         //\r
-        PciIo->Mem.Write (\r
-                    PciIo,\r
-                    EfiPciIoWidthUint8,\r
-                    EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                    (UINT64) (UINTN) Address,\r
-                    1,\r
-                    &PixelColor\r
-                    );\r
-      }\r
-    }\r
-    break;\r
-\r
-  case EfiBltBufferToVideo:\r
-    StartAddress  = (UINTN) (MemAddress + (DestinationY << 6) + (DestinationY << 4) + (DestinationX >> 3));\r
-    LeftMask      = mVgaBitMaskTable[DestinationX & 0x07];\r
+        WriteGraphicsController (\r
+          PciIo,\r
+          VGA_GRAPHICS_CONTROLLER_BIT_MASK_REGISTER,\r
+          LeftMask\r
+          );\r
 \r
-    //\r
-    // Program the Mode Register Write mode 2, Read mode 0\r
-    //\r
-    WriteGraphicsController (\r
-      PciIo,\r
-      VGA_GRAPHICS_CONTROLLER_MODE_REGISTER,\r
-      VGA_GRAPHICS_CONTROLLER_READ_MODE_0 | VGA_GRAPHICS_CONTROLLER_WRITE_MODE_2\r
-      );\r
+        for (Index = 0, Address = StartAddress; Index < Height; Index++, Address += BytesPerScanLine) {\r
+          //\r
+          // Read data from the bit planes into the latches\r
+          //\r
+          PciIo->Mem.Read (\r
+                       PciIo,\r
+                       EfiPciIoWidthUint8,\r
+                       EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                       (UINT64)(UINTN)Address,\r
+                       1,\r
+                       &Data\r
+                       );\r
+          //\r
+          // Write the lower 4 bits of PixelColor to the bit planes in the pixels enabled by BitMask\r
+          //\r
+          PciIo->Mem.Write (\r
+                       PciIo,\r
+                       EfiPciIoWidthUint8,\r
+                       EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                       (UINT64)(UINTN)Address,\r
+                       1,\r
+                       &PixelColor\r
+                       );\r
+        }\r
+      }\r
 \r
-    //\r
-    // Program the Data Rotate/Function Select Register to replace\r
-    //\r
-    WriteGraphicsController (\r
-      PciIo,\r
-      VGA_GRAPHICS_CONTROLLER_DATA_ROTATE_REGISTER,\r
-      VGA_GRAPHICS_CONTROLLER_FUNCTION_REPLACE\r
-      );\r
+      if (Bytes > 1) {\r
+        //\r
+        // Program the BitMask register with the middle column mask of 0xff\r
+        //\r
+        WriteGraphicsController (\r
+          PciIo,\r
+          VGA_GRAPHICS_CONTROLLER_BIT_MASK_REGISTER,\r
+          0xff\r
+          );\r
 \r
-    for (Index = 0, Address = StartAddress; Index < Height; Index++, Address += BytesPerScanLine) {\r
-      for (Index1 = 0; Index1 < Width; Index1++) {\r
-        BiosVideoPrivate->LineBuffer[Index1] = VgaConvertColor (&BltBuffer[(SourceY + Index) * (Delta >> 2) + SourceX + Index1]);\r
+        for (Index = 0, Address = StartAddress + 1; Index < Height; Index++, Address += BytesPerScanLine) {\r
+          PciIo->Mem.Write (\r
+                       PciIo,\r
+                       EfiPciIoWidthFillUint8,\r
+                       EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                       (UINT64)(UINTN)Address,\r
+                       Bytes - 1,\r
+                       &PixelColor\r
+                       );\r
+        }\r
       }\r
-      AddressFix = Address;\r
 \r
-      for (Bit = 0; Bit < 8; Bit++) {\r
+      if (RightMask != 0) {\r
         //\r
-        // Program the BitMask register with the Left column mask\r
+        // Program the BitMask register with the Right column mask\r
         //\r
         WriteGraphicsController (\r
           PciIo,\r
           VGA_GRAPHICS_CONTROLLER_BIT_MASK_REGISTER,\r
-          LeftMask\r
+          RightMask\r
           );\r
 \r
-        for (Index1 = Bit, Address1 = (UINT8 *) AddressFix; Index1 < Width; Index1 += 8, Address1++) {\r
+        for (Index = 0, Address = StartAddress + Bytes; Index < Height; Index++, Address += BytesPerScanLine) {\r
           //\r
           // Read data from the bit planes into the latches\r
           //\r
           PciIo->Mem.Read (\r
-                      PciIo,\r
-                      EfiPciIoWidthUint8,\r
-                      EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                      (UINT64) (UINTN) Address1,\r
-                      1,\r
-                      &Data\r
-                      );\r
-\r
+                       PciIo,\r
+                       EfiPciIoWidthUint8,\r
+                       EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                       (UINT64)(UINTN)Address,\r
+                       1,\r
+                       &Data\r
+                       );\r
+          //\r
+          // Write the lower 4 bits of PixelColor to the bit planes in the pixels enabled by BitMask\r
+          //\r
           PciIo->Mem.Write (\r
-                      PciIo,\r
-                      EfiPciIoWidthUint8,\r
-                      EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                      (UINT64) (UINTN) Address1,\r
-                      1,\r
-                      &BiosVideoPrivate->LineBuffer[Index1]\r
-                      );\r
+                       PciIo,\r
+                       EfiPciIoWidthUint8,\r
+                       EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                       (UINT64)(UINTN)Address,\r
+                       1,\r
+                       &PixelColor\r
+                       );\r
         }\r
+      }\r
+\r
+      break;\r
+\r
+    case EfiBltBufferToVideo:\r
+      StartAddress = (UINTN)(MemAddress + (DestinationY << 6) + (DestinationY << 4) + (DestinationX >> 3));\r
+      LeftMask     = mVgaBitMaskTable[DestinationX & 0x07];\r
+\r
+      //\r
+      // Program the Mode Register Write mode 2, Read mode 0\r
+      //\r
+      WriteGraphicsController (\r
+        PciIo,\r
+        VGA_GRAPHICS_CONTROLLER_MODE_REGISTER,\r
+        VGA_GRAPHICS_CONTROLLER_READ_MODE_0 | VGA_GRAPHICS_CONTROLLER_WRITE_MODE_2\r
+        );\r
+\r
+      //\r
+      // Program the Data Rotate/Function Select Register to replace\r
+      //\r
+      WriteGraphicsController (\r
+        PciIo,\r
+        VGA_GRAPHICS_CONTROLLER_DATA_ROTATE_REGISTER,\r
+        VGA_GRAPHICS_CONTROLLER_FUNCTION_REPLACE\r
+        );\r
 \r
-        LeftMask = (UINT8) (LeftMask >> 1);\r
-        if (LeftMask == 0) {\r
-          LeftMask = 0x80;\r
-          AddressFix++;\r
+      for (Index = 0, Address = StartAddress; Index < Height; Index++, Address += BytesPerScanLine) {\r
+        for (Index1 = 0; Index1 < Width; Index1++) {\r
+          BiosVideoPrivate->LineBuffer[Index1] = VgaConvertColor (&BltBuffer[(SourceY + Index) * (Delta >> 2) + SourceX + Index1]);\r
+        }\r
+\r
+        AddressFix = Address;\r
+\r
+        for (Bit = 0; Bit < 8; Bit++) {\r
+          //\r
+          // Program the BitMask register with the Left column mask\r
+          //\r
+          WriteGraphicsController (\r
+            PciIo,\r
+            VGA_GRAPHICS_CONTROLLER_BIT_MASK_REGISTER,\r
+            LeftMask\r
+            );\r
+\r
+          for (Index1 = Bit, Address1 = (UINT8 *)AddressFix; Index1 < Width; Index1 += 8, Address1++) {\r
+            //\r
+            // Read data from the bit planes into the latches\r
+            //\r
+            PciIo->Mem.Read (\r
+                         PciIo,\r
+                         EfiPciIoWidthUint8,\r
+                         EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                         (UINT64)(UINTN)Address1,\r
+                         1,\r
+                         &Data\r
+                         );\r
+\r
+            PciIo->Mem.Write (\r
+                         PciIo,\r
+                         EfiPciIoWidthUint8,\r
+                         EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                         (UINT64)(UINTN)Address1,\r
+                         1,\r
+                         &BiosVideoPrivate->LineBuffer[Index1]\r
+                         );\r
+          }\r
+\r
+          LeftMask = (UINT8)(LeftMask >> 1);\r
+          if (LeftMask == 0) {\r
+            LeftMask = 0x80;\r
+            AddressFix++;\r
+          }\r
         }\r
       }\r
-    }\r
 \r
-    break;\r
+      break;\r
 \r
-    default: ;\r
+    default:;\r
   }\r
 \r
   gBS->RestoreTPL (OriginalTPL);\r
@@ -3155,8 +3223,8 @@ BiosVideoVgaMiniPortSetMode (
   IN  UINTN                       ModeNumber\r
   )\r
 {\r
-  BIOS_VIDEO_DEV        *BiosVideoPrivate;\r
-  EFI_IA32_REGISTER_SET Regs;\r
+  BIOS_VIDEO_DEV         *BiosVideoPrivate;\r
+  EFI_IA32_REGISTER_SET  Regs;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -3168,41 +3236,42 @@ BiosVideoVgaMiniPortSetMode (
   if (ModeNumber >= This->MaxMode) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   //\r
   // Get the device structure for this device\r
   //\r
   BiosVideoPrivate = BIOS_VIDEO_DEV_FROM_VGA_MINI_PORT_THIS (This);\r
 \r
   switch (ModeNumber) {\r
-  case 0:\r
-    //\r
-    // Set the 80x25 Text VGA Mode\r
-    //\r
-    Regs.H.AH = 0x00;\r
-    Regs.H.AL = 0x83;\r
-    BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
+    case 0:\r
+      //\r
+      // Set the 80x25 Text VGA Mode\r
+      //\r
+      Regs.H.AH = 0x00;\r
+      Regs.H.AL = 0x83;\r
+      BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
 \r
-    Regs.H.AH = 0x11;\r
-    Regs.H.AL = 0x14;\r
-    Regs.H.BL = 0;\r
-    BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
-    break;\r
+      Regs.H.AH = 0x11;\r
+      Regs.H.AL = 0x14;\r
+      Regs.H.BL = 0;\r
+      BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
+      break;\r
 \r
-  case 1:\r
-    //\r
-    // Set the 80x50 Text VGA Mode\r
-    //\r
-    Regs.H.AH = 0x00;\r
-    Regs.H.AL = 0x83;\r
-    BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
-    Regs.H.AH = 0x11;\r
-    Regs.H.AL = 0x12;\r
-    Regs.H.BL = 0;\r
-    BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
-    break;\r
+    case 1:\r
+      //\r
+      // Set the 80x50 Text VGA Mode\r
+      //\r
+      Regs.H.AH = 0x00;\r
+      Regs.H.AL = 0x83;\r
+      BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
+      Regs.H.AH = 0x11;\r
+      Regs.H.AL = 0x12;\r
+      Regs.H.BL = 0;\r
+      BiosVideoPrivate->LegacyBios->Int86 (BiosVideoPrivate->LegacyBios, 0x10, &Regs);\r
+      break;\r
 \r
-  default:\r
-    return EFI_UNSUPPORTED;\r
+    default:\r
+      return EFI_UNSUPPORTED;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -3218,14 +3287,14 @@ BiosVideoVgaMiniPortSetMode (
 VOID\r
 EFIAPI\r
 BiosVideoNotifyExitBootServices (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
   BIOS_VIDEO_DEV         *BiosVideoPrivate;\r
   EFI_IA32_REGISTER_SET  Regs;\r
 \r
-  BiosVideoPrivate  = (BIOS_VIDEO_DEV *)Context;\r
+  BiosVideoPrivate = (BIOS_VIDEO_DEV *)Context;\r
 \r
   //\r
   // Set the 80x25 Text VGA Mode\r
@@ -3256,9 +3325,9 @@ BiosVideoNotifyExitBootServices (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-BiosVideoEntryPoint(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+BiosVideoEntryPoint (\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_STATUS  Status;\r
index fb4cc65fd924f41881a92c0bac8539928f40eb50..a2cb624d5a9aca9c1f741e33271feccf957a10c6 100644 (file)
@@ -42,88 +42,88 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // position of RGB in the frame buffer is specified in the VBE Mode information\r
 //\r
 typedef struct {\r
-  UINT8 Position; // Position of the color\r
-  UINT8 Mask;     // The number of bits expressed as a mask\r
+  UINT8    Position; // Position of the color\r
+  UINT8    Mask;     // The number of bits expressed as a mask\r
 } BIOS_VIDEO_COLOR_PLACEMENT;\r
 \r
 //\r
 // BIOS Graphics Output Graphical Mode Data\r
 //\r
 typedef struct {\r
-  UINT16                      VbeModeNumber;\r
-  UINT16                      BytesPerScanLine;\r
-  VOID                        *LinearFrameBuffer;\r
-  UINTN                       FrameBufferSize;\r
-  UINT32                      HorizontalResolution;\r
-  UINT32                      VerticalResolution;\r
-  UINT32                      ColorDepth;\r
-  UINT32                      RefreshRate;\r
-  UINT32                      BitsPerPixel;\r
-  BIOS_VIDEO_COLOR_PLACEMENT  Red;\r
-  BIOS_VIDEO_COLOR_PLACEMENT  Green;\r
-  BIOS_VIDEO_COLOR_PLACEMENT  Blue;\r
-  BIOS_VIDEO_COLOR_PLACEMENT  Reserved;\r
-  EFI_GRAPHICS_PIXEL_FORMAT   PixelFormat;\r
-  EFI_PIXEL_BITMASK           PixelBitMask;\r
+  UINT16                        VbeModeNumber;\r
+  UINT16                        BytesPerScanLine;\r
+  VOID                          *LinearFrameBuffer;\r
+  UINTN                         FrameBufferSize;\r
+  UINT32                        HorizontalResolution;\r
+  UINT32                        VerticalResolution;\r
+  UINT32                        ColorDepth;\r
+  UINT32                        RefreshRate;\r
+  UINT32                        BitsPerPixel;\r
+  BIOS_VIDEO_COLOR_PLACEMENT    Red;\r
+  BIOS_VIDEO_COLOR_PLACEMENT    Green;\r
+  BIOS_VIDEO_COLOR_PLACEMENT    Blue;\r
+  BIOS_VIDEO_COLOR_PLACEMENT    Reserved;\r
+  EFI_GRAPHICS_PIXEL_FORMAT     PixelFormat;\r
+  EFI_PIXEL_BITMASK             PixelBitMask;\r
 } BIOS_VIDEO_MODE_DATA;\r
 \r
 //\r
 // BIOS video child handle private data Structure\r
 //\r
-#define BIOS_VIDEO_DEV_SIGNATURE    SIGNATURE_32 ('B', 'V', 'M', 'p')\r
+#define BIOS_VIDEO_DEV_SIGNATURE  SIGNATURE_32 ('B', 'V', 'M', 'p')\r
 \r
 typedef struct {\r
-  UINTN                                       Signature;\r
-  EFI_HANDLE                                  Handle;\r
+  UINTN                                          Signature;\r
+  EFI_HANDLE                                     Handle;\r
 \r
   //\r
   // Consumed Protocols\r
   //\r
-  EFI_PCI_IO_PROTOCOL                         *PciIo;\r
-  EFI_LEGACY_BIOS_PROTOCOL                    *LegacyBios;\r
+  EFI_PCI_IO_PROTOCOL                            *PciIo;\r
+  EFI_LEGACY_BIOS_PROTOCOL                       *LegacyBios;\r
 \r
   //\r
   // Produced Protocols\r
   //\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL                GraphicsOutput;\r
-  EFI_EDID_DISCOVERED_PROTOCOL                EdidDiscovered;\r
-  EFI_EDID_ACTIVE_PROTOCOL                    EdidActive;\r
-  EFI_VGA_MINI_PORT_PROTOCOL                  VgaMiniPort;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL                   GraphicsOutput;\r
+  EFI_EDID_DISCOVERED_PROTOCOL                   EdidDiscovered;\r
+  EFI_EDID_ACTIVE_PROTOCOL                       EdidActive;\r
+  EFI_VGA_MINI_PORT_PROTOCOL                     VgaMiniPort;\r
 \r
   //\r
   // General fields\r
   //\r
-  BOOLEAN                                     VgaCompatible;\r
-  BOOLEAN                                     ProduceGraphicsOutput;\r
+  BOOLEAN                                        VgaCompatible;\r
+  BOOLEAN                                        ProduceGraphicsOutput;\r
 \r
   //\r
   // Graphics Output Protocol related fields\r
   //\r
-  BOOLEAN                                     HardwareNeedsStarting;\r
-  UINTN                                       CurrentMode;\r
-  UINTN                                       MaxMode;\r
-  BIOS_VIDEO_MODE_DATA                        *ModeData;\r
-  UINT8                                       *LineBuffer;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL               *VbeFrameBuffer;\r
-  UINT8                                       *VgaFrameBuffer;\r
+  BOOLEAN                                        HardwareNeedsStarting;\r
+  UINTN                                          CurrentMode;\r
+  UINTN                                          MaxMode;\r
+  BIOS_VIDEO_MODE_DATA                           *ModeData;\r
+  UINT8                                          *LineBuffer;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL                  *VbeFrameBuffer;\r
+  UINT8                                          *VgaFrameBuffer;\r
 \r
   //\r
   // VESA Bios Extensions related fields\r
   //\r
-  UINTN                                       NumberOfPagesBelow1MB;     // Number of 4KB pages in PagesBelow1MB\r
-  EFI_PHYSICAL_ADDRESS                        PagesBelow1MB;             // Buffer for all VBE Information Blocks\r
-  VESA_BIOS_EXTENSIONS_INFORMATION_BLOCK      *VbeInformationBlock;      // 0x200 bytes.  Must be allocated below 1MB\r
-  VESA_BIOS_EXTENSIONS_MODE_INFORMATION_BLOCK *VbeModeInformationBlock;  // 0x100 bytes.  Must be allocated below 1MB\r
-  VESA_BIOS_EXTENSIONS_EDID_DATA_BLOCK        *VbeEdidDataBlock;         // 0x80  bytes.  Must be allocated below 1MB\r
-  VESA_BIOS_EXTENSIONS_CRTC_INFORMATION_BLOCK *VbeCrtcInformationBlock;  // 59 bytes.  Must be allocated below 1MB\r
-  UINTN                                       VbeSaveRestorePages;       // Number of 4KB pages in VbeSaveRestoreBuffer\r
-  EFI_PHYSICAL_ADDRESS                        VbeSaveRestoreBuffer;      // Must be allocated below 1MB\r
+  UINTN                                          NumberOfPagesBelow1MB;    // Number of 4KB pages in PagesBelow1MB\r
+  EFI_PHYSICAL_ADDRESS                           PagesBelow1MB;            // Buffer for all VBE Information Blocks\r
+  VESA_BIOS_EXTENSIONS_INFORMATION_BLOCK         *VbeInformationBlock;     // 0x200 bytes.  Must be allocated below 1MB\r
+  VESA_BIOS_EXTENSIONS_MODE_INFORMATION_BLOCK    *VbeModeInformationBlock; // 0x100 bytes.  Must be allocated below 1MB\r
+  VESA_BIOS_EXTENSIONS_EDID_DATA_BLOCK           *VbeEdidDataBlock;        // 0x80  bytes.  Must be allocated below 1MB\r
+  VESA_BIOS_EXTENSIONS_CRTC_INFORMATION_BLOCK    *VbeCrtcInformationBlock; // 59 bytes.  Must be allocated below 1MB\r
+  UINTN                                          VbeSaveRestorePages;      // Number of 4KB pages in VbeSaveRestoreBuffer\r
+  EFI_PHYSICAL_ADDRESS                           VbeSaveRestoreBuffer;     // Must be allocated below 1MB\r
   //\r
   // Status code\r
   //\r
-  EFI_DEVICE_PATH_PROTOCOL                    *GopDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL                       *GopDevicePath;\r
 \r
-  EFI_EVENT                                   ExitBootServicesEvent;\r
+  EFI_EVENT                                      ExitBootServicesEvent;\r
 } BIOS_VIDEO_DEV;\r
 \r
 #define BIOS_VIDEO_DEV_FROM_PCI_IO_THIS(a)           CR (a, BIOS_VIDEO_DEV, PciIo, BIOS_VIDEO_DEV_SIGNATURE)\r
@@ -164,7 +164,6 @@ BiosVideoDriverBindingSupported (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   );\r
 \r
-\r
 /**\r
   Install Graphics Output Protocol onto VGA device handles.\r
 \r
@@ -184,7 +183,6 @@ BiosVideoDriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   );\r
 \r
-\r
 /**\r
   Stop.\r
 \r
@@ -223,7 +221,6 @@ BiosVideoCheckForVbe (
   IN OUT BIOS_VIDEO_DEV  *BiosVideoPrivate\r
   );\r
 \r
-\r
 /**\r
   Check for VGA device.\r
 \r
@@ -237,9 +234,6 @@ BiosVideoCheckForVga (
   IN OUT BIOS_VIDEO_DEV  *BiosVideoPrivate\r
   );\r
 \r
-\r
-\r
-\r
 /**\r
   Release resource for BIOS video instance.\r
 \r
@@ -282,7 +276,6 @@ BiosVideoGraphicsOutputQueryMode (
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  **Info\r
   );\r
 \r
-\r
 /**\r
   Graphics Output protocol interface to set video mode.\r
 \r
@@ -298,11 +291,10 @@ BiosVideoGraphicsOutputQueryMode (
 EFI_STATUS\r
 EFIAPI\r
 BiosVideoGraphicsOutputSetMode (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL This,\r
-  IN  UINT32                       ModeNumber\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL  *This,\r
+  IN  UINT32                        ModeNumber\r
   );\r
 \r
-\r
 /**\r
   Graphics Output protocol instance to block transfer for VBE device.\r
 \r
@@ -345,7 +337,6 @@ BiosVideoGraphicsOutputVbeBlt (
   IN  UINTN                              Delta\r
   );\r
 \r
-\r
 /**\r
   Graphics Output protocol instance to block transfer for VGA device.\r
 \r
@@ -419,50 +410,50 @@ BiosVideoVgaMiniPortSetMode (
 VOID\r
 EFIAPI\r
 BiosVideoNotifyExitBootServices (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   );\r
 \r
 //\r
 // Standard VGA Definitions\r
 //\r
-#define VGA_HORIZONTAL_RESOLUTION                         640\r
-#define VGA_VERTICAL_RESOLUTION                           480\r
-#define VGA_NUMBER_OF_BIT_PLANES                          4\r
-#define VGA_PIXELS_PER_BYTE                               8\r
-#define VGA_BYTES_PER_SCAN_LINE                           (VGA_HORIZONTAL_RESOLUTION / VGA_PIXELS_PER_BYTE)\r
-#define VGA_BYTES_PER_BIT_PLANE                           (VGA_VERTICAL_RESOLUTION * VGA_BYTES_PER_SCAN_LINE)\r
+#define VGA_HORIZONTAL_RESOLUTION  640\r
+#define VGA_VERTICAL_RESOLUTION    480\r
+#define VGA_NUMBER_OF_BIT_PLANES   4\r
+#define VGA_PIXELS_PER_BYTE        8\r
+#define VGA_BYTES_PER_SCAN_LINE    (VGA_HORIZONTAL_RESOLUTION / VGA_PIXELS_PER_BYTE)\r
+#define VGA_BYTES_PER_BIT_PLANE    (VGA_VERTICAL_RESOLUTION * VGA_BYTES_PER_SCAN_LINE)\r
 \r
-#define VGA_GRAPHICS_CONTROLLER_ADDRESS_REGISTER          0x3ce\r
-#define VGA_GRAPHICS_CONTROLLER_DATA_REGISTER             0x3cf\r
+#define VGA_GRAPHICS_CONTROLLER_ADDRESS_REGISTER  0x3ce\r
+#define VGA_GRAPHICS_CONTROLLER_DATA_REGISTER     0x3cf\r
 \r
-#define VGA_GRAPHICS_CONTROLLER_SET_RESET_REGISTER        0x00\r
+#define VGA_GRAPHICS_CONTROLLER_SET_RESET_REGISTER  0x00\r
 \r
-#define VGA_GRAPHICS_CONTROLLER_ENABLE_SET_RESET_REGISTER 0x01\r
+#define VGA_GRAPHICS_CONTROLLER_ENABLE_SET_RESET_REGISTER  0x01\r
 \r
-#define VGA_GRAPHICS_CONTROLLER_COLOR_COMPARE_REGISTER    0x02\r
+#define VGA_GRAPHICS_CONTROLLER_COLOR_COMPARE_REGISTER  0x02\r
 \r
-#define VGA_GRAPHICS_CONTROLLER_DATA_ROTATE_REGISTER      0x03\r
-#define VGA_GRAPHICS_CONTROLLER_FUNCTION_REPLACE          0x00\r
-#define VGA_GRAPHICS_CONTROLLER_FUNCTION_AND              0x08\r
-#define VGA_GRAPHICS_CONTROLLER_FUNCTION_OR               0x10\r
-#define VGA_GRAPHICS_CONTROLLER_FUNCTION_XOR              0x18\r
+#define VGA_GRAPHICS_CONTROLLER_DATA_ROTATE_REGISTER  0x03\r
+#define VGA_GRAPHICS_CONTROLLER_FUNCTION_REPLACE      0x00\r
+#define VGA_GRAPHICS_CONTROLLER_FUNCTION_AND          0x08\r
+#define VGA_GRAPHICS_CONTROLLER_FUNCTION_OR           0x10\r
+#define VGA_GRAPHICS_CONTROLLER_FUNCTION_XOR          0x18\r
 \r
 #define VGA_GRAPHICS_CONTROLLER_READ_MAP_SELECT_REGISTER  0x04\r
 \r
-#define VGA_GRAPHICS_CONTROLLER_MODE_REGISTER             0x05\r
-#define VGA_GRAPHICS_CONTROLLER_READ_MODE_0               0x00\r
-#define VGA_GRAPHICS_CONTROLLER_READ_MODE_1               0x08\r
-#define VGA_GRAPHICS_CONTROLLER_WRITE_MODE_0              0x00\r
-#define VGA_GRAPHICS_CONTROLLER_WRITE_MODE_1              0x01\r
-#define VGA_GRAPHICS_CONTROLLER_WRITE_MODE_2              0x02\r
-#define VGA_GRAPHICS_CONTROLLER_WRITE_MODE_3              0x03\r
+#define VGA_GRAPHICS_CONTROLLER_MODE_REGISTER  0x05\r
+#define VGA_GRAPHICS_CONTROLLER_READ_MODE_0    0x00\r
+#define VGA_GRAPHICS_CONTROLLER_READ_MODE_1    0x08\r
+#define VGA_GRAPHICS_CONTROLLER_WRITE_MODE_0   0x00\r
+#define VGA_GRAPHICS_CONTROLLER_WRITE_MODE_1   0x01\r
+#define VGA_GRAPHICS_CONTROLLER_WRITE_MODE_2   0x02\r
+#define VGA_GRAPHICS_CONTROLLER_WRITE_MODE_3   0x03\r
 \r
-#define VGA_GRAPHICS_CONTROLLER_MISCELLANEOUS_REGISTER    0x06\r
+#define VGA_GRAPHICS_CONTROLLER_MISCELLANEOUS_REGISTER  0x06\r
 \r
 #define VGA_GRAPHICS_CONTROLLER_COLOR_DONT_CARE_REGISTER  0x07\r
 \r
-#define VGA_GRAPHICS_CONTROLLER_BIT_MASK_REGISTER         0x08\r
+#define VGA_GRAPHICS_CONTROLLER_BIT_MASK_REGISTER  0x08\r
 \r
 /**\r
   Install child handles if the Handle supports MBR format.\r
@@ -500,9 +491,9 @@ BiosVideoChildHandleInstall (
 **/\r
 EFI_STATUS\r
 BiosVideoChildHandleUninstall (\r
-  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  EFI_HANDLE                     Controller,\r
-  EFI_HANDLE                     Handle\r
+  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  EFI_HANDLE                   Controller,\r
+  EFI_HANDLE                   Handle\r
   );\r
 \r
 /**\r
@@ -529,4 +520,5 @@ BOOLEAN
 HasChildHandle (\r
   IN EFI_HANDLE  Controller\r
   );\r
+\r
 #endif\r
index dc914aa2f3d193eff85a5bd07c0e4b3969b77070..c401ed943b19dea45a24acf7742ff4945f847e12 100644 (file)
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // EFI Component Name Functions\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -58,7 +59,6 @@ BiosVideoComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -130,14 +130,13 @@ BiosVideoComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 BiosVideoComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 //\r
 // EFI Component Name Protocol\r
 //\r
@@ -150,14 +149,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gBiosVideoComponentNa
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gBiosVideoComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) BiosVideoComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) BiosVideoComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gBiosVideoComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)BiosVideoComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)BiosVideoComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mBiosVideoDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mBiosVideoDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     L"BIOS[INT10] Video Driver"\r
@@ -295,11 +293,11 @@ BiosVideoComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 BiosVideoComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
index 88065f15c645d12851bd182f1900f36fd8736bf6..0c8e62c0641e95c3f8eff4f1adb59c46715944ec 100644 (file)
@@ -16,7 +16,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // VESA BIOS Extensions status codes\r
 //\r
-#define VESA_BIOS_EXTENSIONS_STATUS_SUCCESS 0x004f\r
+#define VESA_BIOS_EXTENSIONS_STATUS_SUCCESS  0x004f\r
 \r
 //\r
 // VESA BIOS Extensions Services\r
@@ -52,7 +52,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
       AX    = Return Status\r
 \r
 --*/\r
-#define VESA_BIOS_EXTENSIONS_SET_MODE 0x4f02\r
+#define VESA_BIOS_EXTENSIONS_SET_MODE  0x4f02\r
 \r
 /*++\r
 \r
@@ -97,7 +97,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
                 = 1 - Memory not cleared at last mode set\r
 \r
 --*/\r
-#define VESA_BIOS_EXTENSIONS_SAVE_RESTORE_STATE 0x4f04\r
+#define VESA_BIOS_EXTENSIONS_SAVE_RESTORE_STATE  0x4f04\r
 \r
 /*++\r
 \r
@@ -158,89 +158,89 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Timing data from EDID data block\r
 //\r
-#define VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE                    128\r
-#define VESA_BIOS_EXTENSIONS_EDID_ESTABLISHED_TIMING_MAX_NUMBER 17\r
+#define VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE                     128\r
+#define VESA_BIOS_EXTENSIONS_EDID_ESTABLISHED_TIMING_MAX_NUMBER  17\r
 \r
 //\r
 // Established Timings: 24 possible resolutions\r
 // Standard Timings: 8 possible resolutions\r
 // Detailed Timings: 4 possible resolutions\r
 //\r
-#define VESA_BIOS_EXTENSIONS_EDID_TIMING_MAX_NUMBER             36\r
+#define VESA_BIOS_EXTENSIONS_EDID_TIMING_MAX_NUMBER  36\r
 \r
 //\r
 // Timing data size for Established Timings, Standard Timings and Detailed Timings\r
 //\r
-#define VESA_BIOS_EXTENSIONS_ESTABLISHED_TIMING_SIZE                  3\r
-#define VESA_BIOS_EXTENSIONS_STANDARD_TIMING_SIZE                     16\r
-#define VESA_BIOS_EXTENSIONS_DETAILED_TIMING_EACH_DESCRIPTOR_SIZE     18\r
-#define VESA_BIOS_EXTENSIONS_DETAILED_TIMING_DESCRIPTOR_MAX_SIZE      72\r
+#define VESA_BIOS_EXTENSIONS_ESTABLISHED_TIMING_SIZE               3\r
+#define VESA_BIOS_EXTENSIONS_STANDARD_TIMING_SIZE                  16\r
+#define VESA_BIOS_EXTENSIONS_DETAILED_TIMING_EACH_DESCRIPTOR_SIZE  18\r
+#define VESA_BIOS_EXTENSIONS_DETAILED_TIMING_DESCRIPTOR_MAX_SIZE   72\r
 \r
 typedef struct {\r
-  UINT16  HorizontalResolution;\r
-  UINT16  VerticalResolution;\r
-  UINT16  RefreshRate;\r
+  UINT16    HorizontalResolution;\r
+  UINT16    VerticalResolution;\r
+  UINT16    RefreshRate;\r
 } VESA_BIOS_EXTENSIONS_EDID_TIMING;\r
 \r
 typedef struct {\r
-  UINT32  ValidNumber;\r
-  UINT32  Key[VESA_BIOS_EXTENSIONS_EDID_TIMING_MAX_NUMBER];\r
+  UINT32    ValidNumber;\r
+  UINT32    Key[VESA_BIOS_EXTENSIONS_EDID_TIMING_MAX_NUMBER];\r
 } VESA_BIOS_EXTENSIONS_VALID_EDID_TIMING;\r
 \r
 typedef struct {\r
-  UINT8   Header[8];                        //EDID header "00 FF FF FF FF FF FF 00"\r
-  UINT16  ManufactureName;                  //EISA 3-character ID\r
-  UINT16  ProductCode;                      //Vendor assigned code\r
-  UINT32  SerialNumber;                     //32-bit serial number\r
-  UINT8   WeekOfManufacture;                //Week number\r
-  UINT8   YearOfManufacture;                //Year\r
-  UINT8   EdidVersion;                      //EDID Structure Version\r
-  UINT8   EdidRevision;                     //EDID Structure Revision\r
-  UINT8   VideoInputDefinition;\r
-  UINT8   MaxHorizontalImageSize;           //cm\r
-  UINT8   MaxVerticalImageSize;             //cm\r
-  UINT8   DisplayTransferCharacteristic;\r
-  UINT8   FeatureSupport;\r
-  UINT8   RedGreenLowBits;                  //Rx1 Rx0 Ry1 Ry0 Gx1 Gx0 Gy1Gy0\r
-  UINT8   BlueWhiteLowBits;                 //Bx1 Bx0 By1 By0 Wx1 Wx0 Wy1 Wy0\r
-  UINT8   RedX;                             //Red-x Bits 9 - 2\r
-  UINT8   RedY;                             //Red-y Bits 9 - 2\r
-  UINT8   GreenX;                           //Green-x Bits 9 - 2\r
-  UINT8   GreenY;                           //Green-y Bits 9 - 2\r
-  UINT8   BlueX;                            //Blue-x Bits 9 - 2\r
-  UINT8   BlueY;                            //Blue-y Bits 9 - 2\r
-  UINT8   WhiteX;                           //White-x Bits 9 - 2\r
-  UINT8   WhiteY;                           //White-x Bits 9 - 2\r
-  UINT8   EstablishedTimings[VESA_BIOS_EXTENSIONS_ESTABLISHED_TIMING_SIZE];\r
-  UINT8   StandardTimingIdentification[VESA_BIOS_EXTENSIONS_STANDARD_TIMING_SIZE];\r
-  UINT8   DetailedTimingDescriptions[VESA_BIOS_EXTENSIONS_DETAILED_TIMING_DESCRIPTOR_MAX_SIZE];\r
-  UINT8   ExtensionFlag;                    //Number of (optional) 128-byte EDID extension blocks to follow\r
-  UINT8   Checksum;\r
+  UINT8     Header[8];                      // EDID header "00 FF FF FF FF FF FF 00"\r
+  UINT16    ManufactureName;                // EISA 3-character ID\r
+  UINT16    ProductCode;                    // Vendor assigned code\r
+  UINT32    SerialNumber;                   // 32-bit serial number\r
+  UINT8     WeekOfManufacture;              // Week number\r
+  UINT8     YearOfManufacture;              // Year\r
+  UINT8     EdidVersion;                    // EDID Structure Version\r
+  UINT8     EdidRevision;                   // EDID Structure Revision\r
+  UINT8     VideoInputDefinition;\r
+  UINT8     MaxHorizontalImageSize;         // cm\r
+  UINT8     MaxVerticalImageSize;           // cm\r
+  UINT8     DisplayTransferCharacteristic;\r
+  UINT8     FeatureSupport;\r
+  UINT8     RedGreenLowBits;                // Rx1 Rx0 Ry1 Ry0 Gx1 Gx0 Gy1Gy0\r
+  UINT8     BlueWhiteLowBits;               // Bx1 Bx0 By1 By0 Wx1 Wx0 Wy1 Wy0\r
+  UINT8     RedX;                           // Red-x Bits 9 - 2\r
+  UINT8     RedY;                           // Red-y Bits 9 - 2\r
+  UINT8     GreenX;                         // Green-x Bits 9 - 2\r
+  UINT8     GreenY;                         // Green-y Bits 9 - 2\r
+  UINT8     BlueX;                          // Blue-x Bits 9 - 2\r
+  UINT8     BlueY;                          // Blue-y Bits 9 - 2\r
+  UINT8     WhiteX;                         // White-x Bits 9 - 2\r
+  UINT8     WhiteY;                         // White-x Bits 9 - 2\r
+  UINT8     EstablishedTimings[VESA_BIOS_EXTENSIONS_ESTABLISHED_TIMING_SIZE];\r
+  UINT8     StandardTimingIdentification[VESA_BIOS_EXTENSIONS_STANDARD_TIMING_SIZE];\r
+  UINT8     DetailedTimingDescriptions[VESA_BIOS_EXTENSIONS_DETAILED_TIMING_DESCRIPTOR_MAX_SIZE];\r
+  UINT8     ExtensionFlag;                  // Number of (optional) 128-byte EDID extension blocks to follow\r
+  UINT8     Checksum;\r
 } VESA_BIOS_EXTENSIONS_EDID_DATA_BLOCK;\r
 \r
 //\r
 // Super VGA Information Block\r
 //\r
 typedef struct {\r
-  UINT32  VESASignature;      // 'VESA' 4 byte signature\r
-  UINT16  VESAVersion;        // VBE version number\r
-  UINT32  OEMStringPtr;      // Pointer to OEM string\r
-  UINT32  Capabilities;       // Capabilities of video card\r
-  UINT32  VideoModePtr;      // Pointer to an array of 16-bit supported modes values terminated by 0xFFFF\r
-  UINT16  TotalMemory;        // Number of 64kb memory blocks\r
-  UINT16  OemSoftwareRev;     // VBE implementation Software revision\r
-  UINT32  OemVendorNamePtr;  // VbeFarPtr to Vendor Name String\r
-  UINT32  OemProductNamePtr; // VbeFarPtr to Product Name String\r
-  UINT32  OemProductRevPtr;  // VbeFarPtr to Product Revision String\r
-  UINT8   Reserved[222];      // Reserved for VBE implementation scratch area\r
-  UINT8   OemData[256];       // Data area for OEM strings.  Pad to 512 byte block size\r
+  UINT32    VESASignature;     // 'VESA' 4 byte signature\r
+  UINT16    VESAVersion;       // VBE version number\r
+  UINT32    OEMStringPtr;      // Pointer to OEM string\r
+  UINT32    Capabilities;      // Capabilities of video card\r
+  UINT32    VideoModePtr;      // Pointer to an array of 16-bit supported modes values terminated by 0xFFFF\r
+  UINT16    TotalMemory;       // Number of 64kb memory blocks\r
+  UINT16    OemSoftwareRev;    // VBE implementation Software revision\r
+  UINT32    OemVendorNamePtr;  // VbeFarPtr to Vendor Name String\r
+  UINT32    OemProductNamePtr; // VbeFarPtr to Product Name String\r
+  UINT32    OemProductRevPtr;  // VbeFarPtr to Product Revision String\r
+  UINT8     Reserved[222];     // Reserved for VBE implementation scratch area\r
+  UINT8     OemData[256];      // Data area for OEM strings.  Pad to 512 byte block size\r
 } VESA_BIOS_EXTENSIONS_INFORMATION_BLOCK;\r
 \r
 //\r
 // Super VGA Information Block VESASignature values\r
 //\r
-#define VESA_BIOS_EXTENSIONS_VESA_SIGNATURE SIGNATURE_32 ('V', 'E', 'S', 'A')\r
-#define VESA_BIOS_EXTENSIONS_VBE2_SIGNATURE SIGNATURE_32 ('V', 'B', 'E', '2')\r
+#define VESA_BIOS_EXTENSIONS_VESA_SIGNATURE  SIGNATURE_32 ('V', 'E', 'S', 'A')\r
+#define VESA_BIOS_EXTENSIONS_VBE2_SIGNATURE  SIGNATURE_32 ('V', 'B', 'E', '2')\r
 \r
 //\r
 // Super VGA Information Block VESAVersion values\r
@@ -252,13 +252,13 @@ typedef struct {
 //\r
 // Super VGA Information Block Capabilities field bit definitions\r
 //\r
-#define VESA_BIOS_EXTENSIONS_CAPABILITY_8_BIT_DAC 0x01  // 0: DAC width is fixed at 6 bits/color\r
+#define VESA_BIOS_EXTENSIONS_CAPABILITY_8_BIT_DAC  0x01 // 0: DAC width is fixed at 6 bits/color\r
 // 1: DAC width switchable to 8 bits/color\r
 //\r
-#define VESA_BIOS_EXTENSIONS_CAPABILITY_NOT_VGA 0x02  // 0: Controller is VGA compatible\r
+#define VESA_BIOS_EXTENSIONS_CAPABILITY_NOT_VGA  0x02 // 0: Controller is VGA compatible\r
 // 1: Controller is not VGA compatible\r
 //\r
-#define VESA_BIOS_EXTENSIONS_CAPABILITY_NOT_NORMAL_RAMDAC 0x04  // 0: Normal RAMDAC operation\r
+#define VESA_BIOS_EXTENSIONS_CAPABILITY_NOT_NORMAL_RAMDAC  0x04 // 0: Normal RAMDAC operation\r
 // 1: Use blank bit in function 9 to program RAMDAC\r
 //\r
 #define VESA_BIOS_EXTENSIONS_CAPABILITY_STEREOSCOPIC  0x08  // 0: No hardware stereoscopic signal support\r
@@ -269,10 +269,10 @@ typedef struct {
 //\r
 // Super VGA mode number bite field definitions\r
 //\r
-#define VESA_BIOS_EXTENSIONS_MODE_NUMBER_VESA 0x0100  // 0: Not a VESA defined VBE mode\r
+#define VESA_BIOS_EXTENSIONS_MODE_NUMBER_VESA  0x0100 // 0: Not a VESA defined VBE mode\r
 // 1: A VESA defined VBE mode\r
 //\r
-#define VESA_BIOS_EXTENSIONS_MODE_NUMBER_REFRESH_CONTROL_USER 0x0800  // 0: Use current BIOS default referesh rate\r
+#define VESA_BIOS_EXTENSIONS_MODE_NUMBER_REFRESH_CONTROL_USER  0x0800 // 0: Use current BIOS default referesh rate\r
 // 1: Use the user specified CRTC values for refresh rate\r
 //\r
 #define VESA_BIOS_EXTENSIONS_MODE_NUMBER_LINEAR_FRAME_BUFFER  0x4000  // 0: Use a banked/windowed frame buffer\r
@@ -283,7 +283,7 @@ typedef struct {
 //\r
 // Super VGA Information Block mode list terminator value\r
 //\r
-#define VESA_BIOS_EXTENSIONS_END_OF_MODE_LIST 0xffff\r
+#define VESA_BIOS_EXTENSIONS_END_OF_MODE_LIST  0xffff\r
 \r
 //\r
 // Window Function\r
@@ -301,60 +301,60 @@ typedef struct {
   //\r
   // Manadory fields for all VESA Bios Extensions revisions\r
   //\r
-  UINT16                                ModeAttributes;   // Mode attributes\r
-  UINT8                                 WinAAttributes;   // Window A attributes\r
-  UINT8                                 WinBAttributes;   // Window B attributes\r
-  UINT16                                WinGranularity;   // Window granularity in k\r
-  UINT16                                WinSize;          // Window size in k\r
-  UINT16                                WinASegment;      // Window A segment\r
-  UINT16                                WinBSegment;      // Window B segment\r
-  UINT32                                WindowFunction;   // Pointer to window function\r
-  UINT16                                BytesPerScanLine; // Bytes per scanline\r
+  UINT16    ModeAttributes;                               // Mode attributes\r
+  UINT8     WinAAttributes;                               // Window A attributes\r
+  UINT8     WinBAttributes;                               // Window B attributes\r
+  UINT16    WinGranularity;                               // Window granularity in k\r
+  UINT16    WinSize;                                      // Window size in k\r
+  UINT16    WinASegment;                                  // Window A segment\r
+  UINT16    WinBSegment;                                  // Window B segment\r
+  UINT32    WindowFunction;                               // Pointer to window function\r
+  UINT16    BytesPerScanLine;                             // Bytes per scanline\r
   //\r
   // Manadory fields for VESA Bios Extensions 1.2 and above\r
   //\r
-  UINT16                                XResolution;          // Horizontal resolution\r
-  UINT16                                YResolution;          // Vertical resolution\r
-  UINT8                                 XCharSize;            // Character cell width\r
-  UINT8                                 YCharSize;            // Character cell height\r
-  UINT8                                 NumberOfPlanes;       // Number of memory planes\r
-  UINT8                                 BitsPerPixel;         // Bits per pixel\r
-  UINT8                                 NumberOfBanks;        // Number of CGA style banks\r
-  UINT8                                 MemoryModel;          // Memory model type\r
-  UINT8                                 BankSize;             // Size of CGA style banks\r
-  UINT8                                 NumberOfImagePages;   // Number of images pages\r
-  UINT8                                 Reserved1;            // Reserved\r
-  UINT8                                 RedMaskSize;          // Size of direct color red mask\r
-  UINT8                                 RedFieldPosition;     // Bit posn of lsb of red mask\r
-  UINT8                                 GreenMaskSize;        // Size of direct color green mask\r
-  UINT8                                 GreenFieldPosition;   // Bit posn of lsb of green mask\r
-  UINT8                                 BlueMaskSize;         // Size of direct color blue mask\r
-  UINT8                                 BlueFieldPosition;    // Bit posn of lsb of blue mask\r
-  UINT8                                 RsvdMaskSize;         // Size of direct color res mask\r
-  UINT8                                 RsvdFieldPosition;    // Bit posn of lsb of res mask\r
-  UINT8                                 DirectColorModeInfo;  // Direct color mode attributes\r
+  UINT16    XResolution;                                      // Horizontal resolution\r
+  UINT16    YResolution;                                      // Vertical resolution\r
+  UINT8     XCharSize;                                        // Character cell width\r
+  UINT8     YCharSize;                                        // Character cell height\r
+  UINT8     NumberOfPlanes;                                   // Number of memory planes\r
+  UINT8     BitsPerPixel;                                     // Bits per pixel\r
+  UINT8     NumberOfBanks;                                    // Number of CGA style banks\r
+  UINT8     MemoryModel;                                      // Memory model type\r
+  UINT8     BankSize;                                         // Size of CGA style banks\r
+  UINT8     NumberOfImagePages;                               // Number of images pages\r
+  UINT8     Reserved1;                                        // Reserved\r
+  UINT8     RedMaskSize;                                      // Size of direct color red mask\r
+  UINT8     RedFieldPosition;                                 // Bit posn of lsb of red mask\r
+  UINT8     GreenMaskSize;                                    // Size of direct color green mask\r
+  UINT8     GreenFieldPosition;                               // Bit posn of lsb of green mask\r
+  UINT8     BlueMaskSize;                                     // Size of direct color blue mask\r
+  UINT8     BlueFieldPosition;                                // Bit posn of lsb of blue mask\r
+  UINT8     RsvdMaskSize;                                     // Size of direct color res mask\r
+  UINT8     RsvdFieldPosition;                                // Bit posn of lsb of res mask\r
+  UINT8     DirectColorModeInfo;                              // Direct color mode attributes\r
   //\r
   // Manadory fields for VESA Bios Extensions 2.0 and above\r
   //\r
-  UINT32                                PhysBasePtr;  // Physical Address for flat memory frame buffer\r
-  UINT32                                Reserved2;    // Reserved\r
-  UINT16                                Reserved3;    // Reserved\r
+  UINT32    PhysBasePtr;                              // Physical Address for flat memory frame buffer\r
+  UINT32    Reserved2;                                // Reserved\r
+  UINT16    Reserved3;                                // Reserved\r
   //\r
   // Manadory fields for VESA Bios Extensions 3.0 and above\r
   //\r
-  UINT16                                LinBytesPerScanLine;    // Bytes/scan line for linear modes\r
-  UINT8                                 BnkNumberOfImagePages;  // Number of images for banked modes\r
-  UINT8                                 LinNumberOfImagePages;  // Number of images for linear modes\r
-  UINT8                                 LinRedMaskSize;         // Size of direct color red mask (linear mode)\r
-  UINT8                                 LinRedFieldPosition;    // Bit posiiton of lsb of red mask (linear modes)\r
-  UINT8                                 LinGreenMaskSize;       // Size of direct color green mask (linear mode)\r
-  UINT8                                 LinGreenFieldPosition;  // Bit posiiton of lsb of green mask (linear modes)\r
-  UINT8                                 LinBlueMaskSize;        // Size of direct color blue mask (linear mode)\r
-  UINT8                                 LinBlueFieldPosition;   // Bit posiiton of lsb of blue mask (linear modes)\r
-  UINT8                                 LinRsvdMaskSize;        // Size of direct color reserved mask (linear mode)\r
-  UINT8                                 LinRsvdFieldPosition;   // Bit posiiton of lsb of reserved mask (linear modes)\r
-  UINT32                                MaxPixelClock;          // Maximum pixel clock (in Hz) for graphics mode\r
-  UINT8                                 Pad[190];               // Pad to 256 byte block size\r
+  UINT16    LinBytesPerScanLine;                                // Bytes/scan line for linear modes\r
+  UINT8     BnkNumberOfImagePages;                              // Number of images for banked modes\r
+  UINT8     LinNumberOfImagePages;                              // Number of images for linear modes\r
+  UINT8     LinRedMaskSize;                                     // Size of direct color red mask (linear mode)\r
+  UINT8     LinRedFieldPosition;                                // Bit posiiton of lsb of red mask (linear modes)\r
+  UINT8     LinGreenMaskSize;                                   // Size of direct color green mask (linear mode)\r
+  UINT8     LinGreenFieldPosition;                              // Bit posiiton of lsb of green mask (linear modes)\r
+  UINT8     LinBlueMaskSize;                                    // Size of direct color blue mask (linear mode)\r
+  UINT8     LinBlueFieldPosition;                               // Bit posiiton of lsb of blue mask (linear modes)\r
+  UINT8     LinRsvdMaskSize;                                    // Size of direct color reserved mask (linear mode)\r
+  UINT8     LinRsvdFieldPosition;                               // Bit posiiton of lsb of reserved mask (linear modes)\r
+  UINT32    MaxPixelClock;                                      // Maximum pixel clock (in Hz) for graphics mode\r
+  UINT8     Pad[190];                                           // Pad to 256 byte block size\r
 } VESA_BIOS_EXTENSIONS_MODE_INFORMATION_BLOCK;\r
 \r
 //\r
@@ -363,31 +363,31 @@ typedef struct {
 #define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_HARDWARE  0x0001  // 0: Mode not supported in handware\r
 // 1: Mode supported in handware\r
 //\r
-#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_TTY 0x0004  // 0: TTY Output functions not supported by BIOS\r
+#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_TTY  0x0004 // 0: TTY Output functions not supported by BIOS\r
 // 1: TTY Output functions supported by BIOS\r
 //\r
-#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_COLOR 0x0008  // 0: Monochrome mode\r
+#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_COLOR  0x0008 // 0: Monochrome mode\r
 // 1: Color mode\r
 //\r
 #define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_GRAPHICS  0x0010  // 0: Text mode\r
 // 1: Graphics mode\r
 //\r
-#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_NOT_VGA 0x0020  // 0: VGA compatible mode\r
+#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_NOT_VGA  0x0020 // 0: VGA compatible mode\r
 // 1: Not a VGA compatible mode\r
 //\r
 #define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_NOT_WINDOWED  0x0040  // 0: VGA compatible windowed memory mode\r
 // 1: Not a VGA compatible windowed memory mode\r
 //\r
-#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER 0x0080  // 0: No linear fram buffer mode available\r
+#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER  0x0080 // 0: No linear fram buffer mode available\r
 // 1: Linear frame buffer mode available\r
 //\r
-#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_DOUBLE_SCAN 0x0100  // 0: No double scan mode available\r
+#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_DOUBLE_SCAN  0x0100 // 0: No double scan mode available\r
 // 1: Double scan mode available\r
 //\r
 #define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_INTERLACED  0x0200  // 0: No interlaced mode is available\r
 // 1: Interlaced mode is available\r
 //\r
-#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_NO_TRIPPLE_BUFFER 0x0400  // 0: No hardware triple buffer mode support available\r
+#define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_NO_TRIPPLE_BUFFER  0x0400 // 0: No hardware triple buffer mode support available\r
 // 1: Hardware triple buffer mode support available\r
 //\r
 #define VESA_BIOS_EXTENSIONS_MODE_ATTRIBUTE_STEREOSCOPIC  0x0800  // 0: No hardware steroscopic display support\r
@@ -398,7 +398,7 @@ typedef struct {
 //\r
 // Super VGA Mode Information Block WinAAttribite/WinBAttributes field bit definitions\r
 //\r
-#define VESA_BIOS_EXTENSIONS_WINX_ATTRIBUTE_RELOCATABLE 0x01  // 0: Single non-relocatable window only\r
+#define VESA_BIOS_EXTENSIONS_WINX_ATTRIBUTE_RELOCATABLE  0x01 // 0: Single non-relocatable window only\r
 // 1: Relocatable window(s) are supported\r
 //\r
 #define VESA_BIOS_EXTENSIONS_WINX_ATTRIBUTE_READABLE  0x02  // 0: Window is not readable\r
@@ -418,38 +418,38 @@ typedef struct {
 // Super VGA Memory Models\r
 //\r
 typedef enum {\r
-  MemPL = 3,  // Planar memory model\r
-  MemPK = 4,  // Packed pixel memory model\r
-  MemRGB= 6,  // Direct color RGB memory model\r
-  MemYUV= 7   // Direct color YUV memory model\r
+  MemPL  = 3, // Planar memory model\r
+  MemPK  = 4, // Packed pixel memory model\r
+  MemRGB = 6, // Direct color RGB memory model\r
+  MemYUV = 7  // Direct color YUV memory model\r
 } VESA_BIOS_EXTENSIONS_MEMORY_MODELS;\r
 \r
 //\r
 // Super VGA CRTC Information Block\r
 //\r
 typedef struct {\r
-  UINT16  HorizontalTotal;      // Horizontal total in pixels\r
-  UINT16  HorizontalSyncStart;  // Horizontal sync start in pixels\r
-  UINT16  HorizontalSyncEnd;    // Horizontal sync end in pixels\r
-  UINT16  VericalTotal;         // Vertical total in pixels\r
-  UINT16  VericalSyncStart;     // Vertical sync start in pixels\r
-  UINT16  VericalSyncEnd;       // Vertical sync end in pixels\r
-  UINT8   Flags;                // Flags (Interlaced/DoubleScan/etc).\r
-  UINT32  PixelClock;           // Pixel clock in units of Hz\r
-  UINT16  RefreshRate;          // Refresh rate in units of 0.01 Hz\r
-  UINT8   Reserved[40];         // Pad\r
+  UINT16    HorizontalTotal;     // Horizontal total in pixels\r
+  UINT16    HorizontalSyncStart; // Horizontal sync start in pixels\r
+  UINT16    HorizontalSyncEnd;   // Horizontal sync end in pixels\r
+  UINT16    VericalTotal;        // Vertical total in pixels\r
+  UINT16    VericalSyncStart;    // Vertical sync start in pixels\r
+  UINT16    VericalSyncEnd;      // Vertical sync end in pixels\r
+  UINT8     Flags;               // Flags (Interlaced/DoubleScan/etc).\r
+  UINT32    PixelClock;          // Pixel clock in units of Hz\r
+  UINT16    RefreshRate;         // Refresh rate in units of 0.01 Hz\r
+  UINT8     Reserved[40];        // Pad\r
 } VESA_BIOS_EXTENSIONS_CRTC_INFORMATION_BLOCK;\r
 \r
-#define VESA_BIOS_EXTENSIONS_CRTC_FLAGS_DOUBLE_SCAN 0x01  // 0: Graphics mode is not souble scanned\r
+#define VESA_BIOS_EXTENSIONS_CRTC_FLAGS_DOUBLE_SCAN  0x01 // 0: Graphics mode is not souble scanned\r
 // 1: Graphics mode is double scanned\r
 //\r
-#define VESA_BIOS_EXTENSIONS_CRTC_FLAGSINTERLACED 0x02  // 0: Graphics mode is not interlaced\r
+#define VESA_BIOS_EXTENSIONS_CRTC_FLAGSINTERLACED  0x02 // 0: Graphics mode is not interlaced\r
 // 1: Graphics mode is interlaced\r
 //\r
 #define VESA_BIOS_EXTENSIONS_CRTC_HORIZONTAL_SYNC_NEGATIVE  0x04  // 0: Horizontal sync polarity is positive(+)\r
 // 0: Horizontal sync polarity is negative(-)\r
 //\r
-#define VESA_BIOS_EXTENSIONS_CRTC_VERITICAL_SYNC_NEGATIVE 0x08  // 0: Verical sync polarity is positive(+)\r
+#define VESA_BIOS_EXTENSIONS_CRTC_VERITICAL_SYNC_NEGATIVE  0x08 // 0: Verical sync polarity is positive(+)\r
 // 0: Verical sync polarity is negative(-)\r
 //\r
 // Turn off byte packing of data structures\r
index 533b078593788bfcced5af736ee30e51eb871254..3ffd6e92b282e0a781cbf86021dec63dc6d338bd 100644 (file)
@@ -29,4 +29,3 @@ CsmSupportLibConstructor (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index 922a6aba2cd5f5abe61487a88da46ef2d8f45c77..a6ee93f167393f1b4f3bc063d31f16e52cd1ee32 100644 (file)
@@ -46,4 +46,3 @@ LegacyBiosPlatformInstall (
   );\r
 \r
 #endif\r
-\r
index 97ca21945fe7a0106918633bb730411126ba449f..5bed2e2b5107a17021d8164cecc31255c6201e0d 100644 (file)
 //\r
 // Handle for the Legacy Interrupt Protocol instance produced by this driver\r
 //\r
-STATIC EFI_HANDLE mLegacyInterruptHandle = NULL;\r
+STATIC EFI_HANDLE  mLegacyInterruptHandle = NULL;\r
 \r
 //\r
 // Legacy Interrupt Device number (0x01 on piix4, 0x1f on q35/mch)\r
 //\r
-STATIC UINT8      mLegacyInterruptDevice;\r
+STATIC UINT8  mLegacyInterruptDevice;\r
 \r
 //\r
 // The Legacy Interrupt Protocol instance produced by this driver\r
 //\r
-STATIC EFI_LEGACY_INTERRUPT_PROTOCOL mLegacyInterrupt = {\r
+STATIC EFI_LEGACY_INTERRUPT_PROTOCOL  mLegacyInterrupt = {\r
   GetNumberPirqs,\r
   GetLocation,\r
   ReadPirq,\r
   WritePirq\r
 };\r
 \r
-STATIC UINT8 PirqReg[MAX_PIRQ_NUMBER] = { PIRQA, PIRQB, PIRQC, PIRQD, PIRQE, PIRQF, PIRQG, PIRQH };\r
-\r
+STATIC UINT8  PirqReg[MAX_PIRQ_NUMBER] = { PIRQA, PIRQB, PIRQC, PIRQD, PIRQE, PIRQF, PIRQG, PIRQH };\r
 \r
 /**\r
   Return the number of PIRQs supported by this chipset.\r
@@ -53,7 +52,6 @@ GetNumberPirqs (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Return PCI location of this device.\r
   $PIR table requires this info.\r
@@ -82,7 +80,6 @@ GetLocation (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Builds the PCI configuration address for the register specified by PirqNumber\r
 \r
@@ -95,12 +92,12 @@ GetAddress (
   UINT8  PirqNumber\r
   )\r
 {\r
-  return PCI_LIB_ADDRESS(\r
-          LEGACY_INT_BUS,\r
-          mLegacyInterruptDevice,\r
-          LEGACY_INT_FUNC,\r
-          PirqReg[PirqNumber]\r
-          );\r
+  return PCI_LIB_ADDRESS (\r
+           LEGACY_INT_BUS,\r
+           mLegacyInterruptDevice,\r
+           LEGACY_INT_FUNC,\r
+           PirqReg[PirqNumber]\r
+           );\r
 }\r
 \r
 /**\r
@@ -127,12 +124,11 @@ ReadPirq (
   }\r
 \r
   *PirqData = PciRead8 (GetAddress (PirqNumber));\r
-  *PirqData = (UINT8) (*PirqData & 0x7f);\r
+  *PirqData = (UINT8)(*PirqData & 0x7f);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Write the given PIRQ register\r
 \r
@@ -160,7 +156,6 @@ WritePirq (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Initialize Legacy Interrupt support\r
 \r
@@ -178,7 +173,7 @@ LegacyInterruptInstall (
   //\r
   // Make sure the Legacy Interrupt Protocol is not already installed in the system\r
   //\r
-  ASSERT_PROTOCOL_ALREADY_INSTALLED(NULL, &gEfiLegacyInterruptProtocolGuid);\r
+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiLegacyInterruptProtocolGuid);\r
 \r
   //\r
   // Query Host Bridge DID to determine platform type, then set device number\r
@@ -192,8 +187,12 @@ LegacyInterruptInstall (
       mLegacyInterruptDevice = LEGACY_INT_DEV_Q35;\r
       break;\r
     default:\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, HostBridgeDevId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        HostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return EFI_UNSUPPORTED;\r
   }\r
@@ -207,8 +206,7 @@ LegacyInterruptInstall (
                   &mLegacyInterrupt,\r
                   NULL\r
                   );\r
-  ASSERT_EFI_ERROR(Status);\r
+  ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r
 }\r
-\r
index 1e37a41a57bcd82e670fcf0911e04aa6b034124b..132365b9cc0e8cae3ef083ecd32161bc79e50bca 100644 (file)
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <OvmfPlatforms.h>\r
 \r
-\r
-#define LEGACY_INT_BUS  0\r
+#define LEGACY_INT_BUS        0\r
 #define LEGACY_INT_DEV_PIIX4  0x01\r
 #define LEGACY_INT_DEV_Q35    0x1f\r
-#define LEGACY_INT_FUNC 0\r
+#define LEGACY_INT_FUNC       0\r
 \r
-#define PIRQN           0x00  // PIRQ Null\r
-#define PIRQA           0x60\r
-#define PIRQB           0x61\r
-#define PIRQC           0x62\r
-#define PIRQD           0x63\r
-#define PIRQE           0x68\r
-#define PIRQF           0x69\r
-#define PIRQG           0x6A\r
-#define PIRQH           0x6B\r
+#define PIRQN  0x00           // PIRQ Null\r
+#define PIRQA  0x60\r
+#define PIRQB  0x61\r
+#define PIRQC  0x62\r
+#define PIRQD  0x63\r
+#define PIRQE  0x68\r
+#define PIRQF  0x69\r
+#define PIRQG  0x6A\r
+#define PIRQH  0x6B\r
 \r
-#define MAX_PIRQ_NUMBER 8\r
+#define MAX_PIRQ_NUMBER  8\r
 \r
 /**\r
   Return the number of PIRQs supported by this chipset.\r
@@ -114,4 +113,3 @@ WritePirq (
   );\r
 \r
 #endif\r
-\r
index 4bd6d70a1a65ee6339da9b02850393730be48fe5..491897adbdf2a6c65b1fb0fe0ef246e4a5c17694 100644 (file)
@@ -9,15 +9,15 @@
 \r
 #include "LegacyPlatform.h"\r
 \r
-EFI_SETUP_BBS_MAP mSetupBbsMap[] = {\r
-  { 1, 2,     1, 1 },     // ATA HardDrive\r
-  { 2, 3,     1, 1 },     // ATAPI CDROM\r
-  { 3, 0x80,  2, 0 },     // PXE\r
-  { 4, 1,     0, 6 },     // USB Floppy\r
-  { 4, 2,     0, 6 },     // USB HDD\r
-  { 4, 3,     0, 6 },     // USB CD\r
-  { 4, 1,     0, 0 },     // USB ZIP Bugbug since Class/SubClass code is uninitialized\r
-  { 4, 2,     0, 0 }      // USB ZIP Bugbug since Class/SubClass code is uninitialized\r
+EFI_SETUP_BBS_MAP  mSetupBbsMap[] = {\r
+  { 1, 2,    1, 1 },      // ATA HardDrive\r
+  { 2, 3,    1, 1 },      // ATAPI CDROM\r
+  { 3, 0x80, 2, 0 },      // PXE\r
+  { 4, 1,    0, 6 },      // USB Floppy\r
+  { 4, 2,    0, 6 },      // USB HDD\r
+  { 4, 3,    0, 6 },      // USB CD\r
+  { 4, 1,    0, 0 },      // USB ZIP Bugbug since Class/SubClass code is uninitialized\r
+  { 4, 2,    0, 0 }       // USB ZIP Bugbug since Class/SubClass code is uninitialized\r
 };\r
 \r
 //\r
@@ -29,23 +29,23 @@ EFI_SETUP_BBS_MAP mSetupBbsMap[] = {
 #define NULL_ROM_FILE_GUID \\r
 { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }\r
 \r
-SYSTEM_ROM_TABLE mSystemRomTable[] = {\r
-  { SYSTEM_ROM_FILE_GUID,  1 },\r
-  { NULL_ROM_FILE_GUID,    0 }\r
+SYSTEM_ROM_TABLE  mSystemRomTable[] = {\r
+  { SYSTEM_ROM_FILE_GUID, 1 },\r
+  { NULL_ROM_FILE_GUID,   0 }\r
 };\r
 \r
 EFI_HANDLE  mVgaHandles[0x20];\r
 EFI_HANDLE  mDiskHandles[0x20];\r
 EFI_HANDLE  mIsaHandles[0x20];\r
 \r
-EFI_LEGACY_IRQ_PRIORITY_TABLE_ENTRY IrqPriorityTable[MAX_IRQ_PRIORITY_ENTRIES] = {\r
-  {0x0B,0},\r
-  {0x09,0},\r
-  {0x0A,0},\r
-  {0x05,0},\r
-  {0x07,0},\r
-  {0x00,0},\r
-  {0x00,0}\r
+EFI_LEGACY_IRQ_PRIORITY_TABLE_ENTRY  IrqPriorityTable[MAX_IRQ_PRIORITY_ENTRIES] = {\r
+  { 0x0B, 0 },\r
+  { 0x09, 0 },\r
+  { 0x0A, 0 },\r
+  { 0x05, 0 },\r
+  { 0x07, 0 },\r
+  { 0x00, 0 },\r
+  { 0x00, 0 }\r
 };\r
 \r
 //\r
@@ -54,18 +54,18 @@ EFI_LEGACY_IRQ_PRIORITY_TABLE_ENTRY IrqPriorityTable[MAX_IRQ_PRIORITY_ENTRIES] =
 //   to check to get bus number.  The Slot number - 1 is an index into a decode\r
 //   table to get the bridge information.\r
 //\r
-EFI_LEGACY_PIRQ_TABLE PirqTableHead = {\r
+EFI_LEGACY_PIRQ_TABLE  PirqTableHead = {\r
   {\r
     EFI_LEGACY_PIRQ_TABLE_SIGNATURE, // UINT32  Signature\r
-    0x00,             // UINT8   MinorVersion\r
-    0x01,             // UINT8   MajorVersion\r
-    0x0000,           // UINT16  TableSize\r
-    0x00,             // UINT8   Bus\r
-    0x08,             // UINT8   DevFun\r
-    0x0000,           // UINT16  PciOnlyIrq\r
-    0x8086,           // UINT16  CompatibleVid\r
-    0x122e,           // UINT16  CompatibleDid\r
-    0x00000000,       // UINT32  Miniport\r
+    0x00,                            // UINT8   MinorVersion\r
+    0x01,                            // UINT8   MajorVersion\r
+    0x0000,                          // UINT16  TableSize\r
+    0x00,                            // UINT8   Bus\r
+    0x08,                            // UINT8   DevFun\r
+    0x0000,                          // UINT16  PciOnlyIrq\r
+    0x8086,                          // UINT16  CompatibleVid\r
+    0x122e,                          // UINT16  CompatibleDid\r
+    0x00000000,                      // UINT32  Miniport\r
     {                 // UINT8   Reserved[11]\r
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
       0x00, 0x00, 0x00\r
@@ -76,17 +76,29 @@ EFI_LEGACY_PIRQ_TABLE PirqTableHead = {
     //           -- Pin 1 --   -- Pin 2 --   -- Pin 3 --   -- Pin 4 --\r
     // Bus  Dev   Reg   Map     Reg   Map     Reg   Map     Reg   Map\r
     //\r
-    {0x00,0x08,{{0x60,0xDEB8},{0x61,0xDEB8},{0x62,0xDEB8},{0x63,0xDEB8}},0x00,0x00},\r
-    {0x00,0x10,{{0x61,0xDEB8},{0x62,0xDEB8},{0x63,0xDEB8},{0x60,0xDEB8}},0x01,0x00},\r
-    {0x00,0x18,{{0x62,0xDEB8},{0x63,0xDEB8},{0x60,0xDEB8},{0x61,0xDEB8}},0x02,0x00},\r
-    {0x00,0x20,{{0x63,0xDEB8},{0x60,0xDEB8},{0x61,0xDEB8},{0x62,0xDEB8}},0x03,0x00},\r
-    {0x00,0x28,{{0x60,0xDEB8},{0x61,0xDEB8},{0x62,0xDEB8},{0x63,0xDEB8}},0x04,0x00},\r
-    {0x00,0x30,{{0x61,0xDEB8},{0x62,0xDEB8},{0x63,0xDEB8},{0x60,0xDEB8}},0x05,0x00},\r
+    { 0x00, 0x08, {\r
+            { 0x60, 0xDEB8 }, { 0x61, 0xDEB8 }, { 0x62, 0xDEB8 }, { 0x63, 0xDEB8 }\r
+          }, 0x00, 0x00 },\r
+    { 0x00, 0x10, {\r
+            { 0x61, 0xDEB8 }, { 0x62, 0xDEB8 }, { 0x63, 0xDEB8 }, { 0x60, 0xDEB8 }\r
+          }, 0x01, 0x00 },\r
+    { 0x00, 0x18, {\r
+            { 0x62, 0xDEB8 }, { 0x63, 0xDEB8 }, { 0x60, 0xDEB8 }, { 0x61, 0xDEB8 }\r
+          }, 0x02, 0x00 },\r
+    { 0x00, 0x20, {\r
+            { 0x63, 0xDEB8 }, { 0x60, 0xDEB8 }, { 0x61, 0xDEB8 }, { 0x62, 0xDEB8 }\r
+          }, 0x03, 0x00 },\r
+    { 0x00, 0x28, {\r
+            { 0x60, 0xDEB8 }, { 0x61, 0xDEB8 }, { 0x62, 0xDEB8 }, { 0x63, 0xDEB8 }\r
+          }, 0x04, 0x00 },\r
+    { 0x00, 0x30, {\r
+            { 0x61, 0xDEB8 }, { 0x62, 0xDEB8 }, { 0x63, 0xDEB8 }, { 0x60, 0xDEB8 }\r
+          }, 0x05, 0x00 },\r
   }\r
 };\r
 \r
-LEGACY_BIOS_PLATFORM_INSTANCE       mPrivateData;\r
-EFI_HANDLE                          mImageHandle = NULL;\r
+LEGACY_BIOS_PLATFORM_INSTANCE  mPrivateData;\r
+EFI_HANDLE                     mImageHandle = NULL;\r
 \r
 /**\r
   Return the handles and assorted information for the specified PCI Class code\r
@@ -102,32 +114,32 @@ EFI_HANDLE                          mImageHandle = NULL;
 **/\r
 EFI_STATUS\r
 FindAllDeviceTypes (\r
-  IN       PCI_CLASS_RECORD      *PciClasses,\r
-  IN OUT   DEVICE_STRUCTURE      *DeviceTable,\r
-  IN OUT   UINT16                *DeviceIndex,\r
-  IN       BOOLEAN               DeviceFlags\r
+  IN       PCI_CLASS_RECORD  *PciClasses,\r
+  IN OUT   DEVICE_STRUCTURE  *DeviceTable,\r
+  IN OUT   UINT16            *DeviceIndex,\r
+  IN       BOOLEAN           DeviceFlags\r
   )\r
 {\r
-  UINTN                       HandleCount;\r
-  EFI_HANDLE                  *HandleBuffer;\r
-  UINTN                       Index;\r
-  UINTN                       StartIndex;\r
-  PCI_TYPE00                  PciConfigHeader;\r
-  EFI_PCI_IO_PROTOCOL         *PciIo;\r
-  EFI_LEGACY_BIOS_PROTOCOL    *LegacyBios;\r
-  UINTN                       Flags;\r
-  EFI_STATUS                  Status;\r
-  UINTN                       Index2;\r
+  UINTN                     HandleCount;\r
+  EFI_HANDLE                *HandleBuffer;\r
+  UINTN                     Index;\r
+  UINTN                     StartIndex;\r
+  PCI_TYPE00                PciConfigHeader;\r
+  EFI_PCI_IO_PROTOCOL       *PciIo;\r
+  EFI_LEGACY_BIOS_PROTOCOL  *LegacyBios;\r
+  UINTN                     Flags;\r
+  EFI_STATUS                Status;\r
+  UINTN                     Index2;\r
 \r
   //\r
   // Get legacy BIOS protocol as it is required to deal with Option ROMs.\r
   //\r
   StartIndex = *DeviceIndex;\r
-  Status = gBS->LocateProtocol (\r
-                  &gEfiLegacyBiosProtocolGuid,\r
-                  NULL,\r
-                  (VOID**)&LegacyBios\r
-                  );\r
+  Status     = gBS->LocateProtocol (\r
+                      &gEfiLegacyBiosProtocolGuid,\r
+                      NULL,\r
+                      (VOID **)&LegacyBios\r
+                      );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -144,7 +156,7 @@ FindAllDeviceTypes (
     gBS->HandleProtocol (\r
            HandleBuffer[Index],\r
            &gEfiPciIoProtocolGuid,\r
-           (VOID**)&PciIo\r
+           (VOID **)&PciIo\r
            );\r
     PciIo->Pci.Read (\r
                  PciIo,\r
@@ -154,8 +166,9 @@ FindAllDeviceTypes (
                  &PciConfigHeader\r
                  );\r
     for (Index2 = 0; PciClasses[Index2].Class != 0xff; Index2++) {\r
-        if ((PciConfigHeader.Hdr.ClassCode[2] == PciClasses[Index2].Class) &&\r
-            (PciConfigHeader.Hdr.ClassCode[1] == PciClasses[Index2].SubClass)) {\r
+      if ((PciConfigHeader.Hdr.ClassCode[2] == PciClasses[Index2].Class) &&\r
+          (PciConfigHeader.Hdr.ClassCode[1] == PciClasses[Index2].SubClass))\r
+      {\r
         LegacyBios->CheckPciRom (\r
                       LegacyBios,\r
                       HandleBuffer[Index],\r
@@ -173,13 +186,14 @@ FindAllDeviceTypes (
         if (\r
             ((DeviceFlags != 0) && (Flags == NO_ROM)) ||\r
             ((Flags & (ROM_FOUND | VALID_LEGACY_ROM)) == (ROM_FOUND | VALID_LEGACY_ROM))\r
-           ) {\r
+            )\r
+        {\r
           DeviceTable->Handle = HandleBuffer[Index];\r
           DeviceTable->Vid    = PciConfigHeader.Hdr.VendorId;\r
           DeviceTable->Did    = PciConfigHeader.Hdr.DeviceId;\r
           DeviceTable->SvId   = PciConfigHeader.Device.SubsystemVendorID;\r
           DeviceTable->SysId  = PciConfigHeader.Device.SubsystemID;\r
-          ++ *DeviceIndex;\r
+          ++*DeviceIndex;\r
           DeviceTable++;\r
         }\r
       }\r
@@ -211,8 +225,8 @@ FindAllDeviceTypes (
 EFI_STATUS\r
 EFIAPI\r
 SmmInit (\r
-  IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL           *This,\r
-  IN  VOID                                        *EfiToLegacy16BootTable\r
+  IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL  *This,\r
+  IN  VOID                               *EfiToLegacy16BootTable\r
   )\r
 {\r
   return EFI_SUCCESS;\r
@@ -226,23 +240,23 @@ SmmInit (
 **/\r
 VOID\r
 GetSelectedVgaDeviceInfo (\r
-  OUT EFI_HANDLE                *VgaHandle\r
+  OUT EFI_HANDLE  *VgaHandle\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINTN                     HandleCount;\r
-  EFI_HANDLE                *HandleBuffer;\r
-  UINTN                     Index;\r
-  EFI_PCI_IO_PROTOCOL       *PciIo;\r
-  PCI_TYPE00                Pci;\r
-  UINT8                     MinBus;\r
-  UINT8                     MaxBus;\r
-  UINTN                     Segment;\r
-  UINTN                     Bus;\r
-  UINTN                     Device;\r
-  UINTN                     Function;\r
-  UINTN                     SelectedAddress;\r
-  UINTN                     CurrentAddress;\r
+  EFI_STATUS           Status;\r
+  UINTN                HandleCount;\r
+  EFI_HANDLE           *HandleBuffer;\r
+  UINTN                Index;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
+  UINT8                MinBus;\r
+  UINT8                MaxBus;\r
+  UINTN                Segment;\r
+  UINTN                Bus;\r
+  UINTN                Device;\r
+  UINTN                Function;\r
+  UINTN                SelectedAddress;\r
+  UINTN                CurrentAddress;\r
 \r
   //\r
   // Initialize return to 'not found' state\r
@@ -253,9 +267,9 @@ GetSelectedVgaDeviceInfo (
   // Initialize variable states.  This is important for selecting the VGA\r
   // device if multiple devices exist behind a single bridge.\r
   //\r
-  HandleCount = 0;\r
-  HandleBuffer = NULL;\r
-  SelectedAddress = PCI_LIB_ADDRESS(0xff, 0x1f, 0x7, 0);\r
+  HandleCount     = 0;\r
+  HandleBuffer    = NULL;\r
+  SelectedAddress = PCI_LIB_ADDRESS (0xff, 0x1f, 0x7, 0);\r
 \r
   //\r
   // The bus range to search for a VGA device in.\r
@@ -265,27 +279,27 @@ GetSelectedVgaDeviceInfo (
   //\r
   // Start to check all the pci io to find all possible VGA device\r
   //\r
-  HandleCount = 0;\r
+  HandleCount  = 0;\r
   HandleBuffer = NULL;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  &gEfiPciIoProtocolGuid,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &HandleBuffer\r
-                  );\r
+  Status       = gBS->LocateHandleBuffer (\r
+                        ByProtocol,\r
+                        &gEfiPciIoProtocolGuid,\r
+                        NULL,\r
+                        &HandleCount,\r
+                        &HandleBuffer\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     return;\r
   }\r
 \r
   for (Index = 0; Index < HandleCount; Index++) {\r
-    Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, (VOID**)&PciIo);\r
+    Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, (VOID **)&PciIo);\r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // Determine if this is in the correct bus range.\r
       //\r
       Status = PciIo->GetLocation (PciIo, &Segment, &Bus, &Device, &Function);\r
-      if (EFI_ERROR(Status) || (Bus < MinBus || Bus > MaxBus)) {\r
+      if (EFI_ERROR (Status) || ((Bus < MinBus) || (Bus > MaxBus))) {\r
         continue;\r
       }\r
 \r
@@ -293,12 +307,12 @@ GetSelectedVgaDeviceInfo (
       // Read device information.\r
       //\r
       Status = PciIo->Pci.Read (\r
-                        PciIo,\r
-                        EfiPciIoWidthUint32,\r
-                        0,\r
-                        sizeof (Pci) / sizeof (UINT32),\r
-                        &Pci\r
-                        );\r
+                            PciIo,\r
+                            EfiPciIoWidthUint32,\r
+                            0,\r
+                            sizeof (Pci) / sizeof (UINT32),\r
+                            &Pci\r
+                            );\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r
@@ -309,7 +323,9 @@ GetSelectedVgaDeviceInfo (
       if (!IS_PCI_VGA (&Pci)) {\r
         continue;\r
       }\r
-      DEBUG ((DEBUG_INFO,\r
+\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
         "PCI VGA: 0x%04x:0x%04x\n",\r
         Pci.Hdr.VendorId,\r
         Pci.Hdr.DeviceId\r
@@ -319,10 +335,10 @@ GetSelectedVgaDeviceInfo (
       // Currently we use the lowest numbered bus/device/function if multiple\r
       // devices are found in the target bus range.\r
       //\r
-      CurrentAddress = PCI_LIB_ADDRESS(Bus, Device, Function, 0);\r
+      CurrentAddress = PCI_LIB_ADDRESS (Bus, Device, Function, 0);\r
       if (CurrentAddress < SelectedAddress) {\r
         SelectedAddress = CurrentAddress;\r
-        *VgaHandle = HandleBuffer[Index];\r
+        *VgaHandle      = HandleBuffer[Index];\r
       }\r
     }\r
   }\r
@@ -330,7 +346,6 @@ GetSelectedVgaDeviceInfo (
   FreePool (HandleBuffer);\r
 }\r
 \r
-\r
 /**\r
   Returns a buffer of handles for the requested subfunction.\r
 \r
@@ -349,42 +364,42 @@ GetSelectedVgaDeviceInfo (
 EFI_STATUS\r
 EFIAPI\r
 GetPlatformHandle (\r
-  IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL           *This,\r
-  IN  EFI_GET_PLATFORM_HANDLE_MODE                Mode,\r
-  IN  UINT16                                      Type,\r
-  OUT EFI_HANDLE                                  **HandleBuffer,\r
-  OUT UINTN                                       *HandleCount,\r
-  OUT VOID                                        **AdditionalData OPTIONAL\r
+  IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL  *This,\r
+  IN  EFI_GET_PLATFORM_HANDLE_MODE       Mode,\r
+  IN  UINT16                             Type,\r
+  OUT EFI_HANDLE                         **HandleBuffer,\r
+  OUT UINTN                              *HandleCount,\r
+  OUT VOID                               **AdditionalData OPTIONAL\r
   )\r
 {\r
-  DEVICE_STRUCTURE    LocalDevice[0x40];\r
-  UINT32              LocalIndex;\r
-  UINT32              Index;\r
-  DEVICE_STRUCTURE    TempDevice;\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  UINTN               Segment;\r
-  UINTN               Bus;\r
-  UINTN               Device;\r
-  UINTN               Function;\r
-  HDD_INFO            *HddInfo;\r
-  PCI_TYPE00          PciConfigHeader;\r
-  UINT32              HddIndex;\r
-  EFI_HANDLE          IdeHandle;\r
+  DEVICE_STRUCTURE          LocalDevice[0x40];\r
+  UINT32                    LocalIndex;\r
+  UINT32                    Index;\r
+  DEVICE_STRUCTURE          TempDevice;\r
+  EFI_STATUS                Status;\r
+  EFI_PCI_IO_PROTOCOL       *PciIo;\r
+  UINTN                     Segment;\r
+  UINTN                     Bus;\r
+  UINTN                     Device;\r
+  UINTN                     Function;\r
+  HDD_INFO                  *HddInfo;\r
+  PCI_TYPE00                PciConfigHeader;\r
+  UINT32                    HddIndex;\r
+  EFI_HANDLE                IdeHandle;\r
   EFI_LEGACY_BIOS_PROTOCOL  *LegacyBios;\r
-  PCI_CLASS_RECORD    ClassLists[10];\r
-  UINTN               PriorityIndex;\r
+  PCI_CLASS_RECORD          ClassLists[10];\r
+  UINTN                     PriorityIndex;\r
 \r
-  static BOOLEAN      bConnected = FALSE;\r
+  static BOOLEAN  bConnected = FALSE;\r
 \r
-  LocalIndex  = 0x00;\r
-  HddInfo     = NULL;\r
-  HddIndex    = 0;\r
+  LocalIndex = 0x00;\r
+  HddInfo    = NULL;\r
+  HddIndex   = 0;\r
 \r
   Status = gBS->LocateProtocol (\r
                   &gEfiLegacyBiosProtocolGuid,\r
                   NULL,\r
-                  (VOID**)&LegacyBios\r
+                  (VOID **)&LegacyBios\r
                   );\r
 \r
   //\r
@@ -400,9 +415,9 @@ GetPlatformHandle (
       *HandleCount  = (mVgaHandles[0] != NULL) ? 1 : 0;\r
       return EFI_SUCCESS;\r
     case EfiGetPlatformIdeHandle:\r
-      IdeHandle  = NULL;\r
+      IdeHandle = NULL;\r
       if (AdditionalData != NULL) {\r
-        HddInfo = (HDD_INFO *) *AdditionalData;\r
+        HddInfo = (HDD_INFO *)*AdditionalData;\r
       }\r
 \r
       //\r
@@ -417,7 +432,7 @@ GetPlatformHandle (
       ClassLists[3].Class    = PCI_CLASS_MASS_STORAGE;\r
       ClassLists[3].SubClass = PCI_CLASS_MASS_STORAGE_SATADPA;\r
       ClassLists[4].Class    = 0xff;\r
-      FindAllDeviceTypes (ClassLists, LocalDevice, (UINT16 *) &LocalIndex, TRUE);\r
+      FindAllDeviceTypes (ClassLists, LocalDevice, (UINT16 *)&LocalIndex, TRUE);\r
       if (LocalIndex == 0) {\r
         return EFI_NOT_FOUND;\r
       }\r
@@ -449,10 +464,10 @@ GetPlatformHandle (
       //\r
       PriorityIndex = 0;\r
       for (Index = 0; Index < LocalIndex; Index++) {\r
-        if (LocalDevice[Index].Handle == IdeHandle && PriorityIndex == 0) {\r
-          TempDevice = LocalDevice[PriorityIndex];\r
+        if ((LocalDevice[Index].Handle == IdeHandle) && (PriorityIndex == 0)) {\r
+          TempDevice                 = LocalDevice[PriorityIndex];\r
           LocalDevice[PriorityIndex] = LocalDevice[Index];\r
-          LocalDevice[Index] = TempDevice;\r
+          LocalDevice[Index]         = TempDevice;\r
           PriorityIndex++;\r
           break;\r
         }\r
@@ -464,6 +479,7 @@ GetPlatformHandle (
       for (Index = 0; Index < LocalIndex; Index++) {\r
         mDiskHandles[Index] = LocalDevice[Index].Handle;\r
       }\r
+\r
       *HandleBuffer = &mDiskHandles[0];\r
       *HandleCount  = LocalIndex;\r
 \r
@@ -477,11 +493,12 @@ GetPlatformHandle (
       //\r
       for (Index = 0; (Index < LocalIndex) && (AdditionalData != NULL); Index++) {\r
         if ((LocalDevice[Index].Handle != NULL) &&\r
-            (LocalDevice[Index].Handle == IdeHandle)) {\r
+            (LocalDevice[Index].Handle == IdeHandle))\r
+        {\r
           Status = gBS->HandleProtocol (\r
                           LocalDevice[Index].Handle,\r
                           &gEfiPciIoProtocolGuid,\r
-                          (VOID **) &PciIo\r
+                          (VOID **)&PciIo\r
                           );\r
           PciIo->Pci.Read (\r
                        PciIo,\r
@@ -503,14 +520,14 @@ GetPlatformHandle (
             // Be sure to only fill out correct information based on platform\r
             // configuration.\r
             //\r
-            HddInfo[HddIndex].Status        |= HDD_PRIMARY;\r
-            HddInfo[HddIndex].Bus           = (UINT32)Bus;\r
-            HddInfo[HddIndex].Device        = (UINT32)Device;\r
-            HddInfo[HddIndex].Function      = (UINT32)Function;\r
-            HddInfo[HddIndex + 1].Status    |= HDD_SECONDARY;\r
-            HddInfo[HddIndex + 1].Bus       = (UINT32)Bus;\r
-            HddInfo[HddIndex + 1].Device    = (UINT32)Device;\r
-            HddInfo[HddIndex + 1].Function  = (UINT32)Function;\r
+            HddInfo[HddIndex].Status      |= HDD_PRIMARY;\r
+            HddInfo[HddIndex].Bus          = (UINT32)Bus;\r
+            HddInfo[HddIndex].Device       = (UINT32)Device;\r
+            HddInfo[HddIndex].Function     = (UINT32)Function;\r
+            HddInfo[HddIndex + 1].Status  |= HDD_SECONDARY;\r
+            HddInfo[HddIndex + 1].Bus      = (UINT32)Bus;\r
+            HddInfo[HddIndex + 1].Device   = (UINT32)Device;\r
+            HddInfo[HddIndex + 1].Function = (UINT32)Function;\r
 \r
             //\r
             // Primary controller data\r
@@ -524,11 +541,12 @@ GetPlatformHandle (
                 (UINT16)(PciConfigHeader.Device.Bar[4] & 0xfffc);\r
               HddInfo[HddIndex].HddIrq = PciConfigHeader.Device.InterruptLine;\r
             } else {\r
-              HddInfo[HddIndex].HddIrq = 14;\r
+              HddInfo[HddIndex].HddIrq             = 14;\r
               HddInfo[HddIndex].CommandBaseAddress = 0x1f0;\r
               HddInfo[HddIndex].ControlBaseAddress = 0x3f6;\r
-              HddInfo[HddIndex].BusMasterAddress = 0;\r
+              HddInfo[HddIndex].BusMasterAddress   = 0;\r
             }\r
+\r
             HddIndex++;\r
 \r
             //\r
@@ -543,27 +561,29 @@ GetPlatformHandle (
                 (UINT16)(HddInfo[HddIndex].BusMasterAddress + 8);\r
               HddInfo[HddIndex].HddIrq = PciConfigHeader.Device.InterruptLine;\r
             } else {\r
-              HddInfo[HddIndex].HddIrq = 15;\r
+              HddInfo[HddIndex].HddIrq             = 15;\r
               HddInfo[HddIndex].CommandBaseAddress = 0x170;\r
               HddInfo[HddIndex].ControlBaseAddress = 0x376;\r
-              HddInfo[HddIndex].BusMasterAddress = 0;\r
+              HddInfo[HddIndex].BusMasterAddress   = 0;\r
             }\r
+\r
             HddIndex++;\r
           }\r
         }\r
       }\r
+\r
       return EFI_SUCCESS;\r
     case EfiGetPlatformIsaBusHandle:\r
-      ClassLists[0].Class    = (UINT8) PCI_CLASS_BRIDGE;\r
-      ClassLists[0].SubClass = (UINT8) PCI_CLASS_BRIDGE_ISA_PDECODE;\r
-      ClassLists[1].Class    = (UINT8) PCI_CLASS_BRIDGE;\r
-      ClassLists[1].SubClass = (UINT8) PCI_CLASS_BRIDGE_ISA;\r
+      ClassLists[0].Class    = (UINT8)PCI_CLASS_BRIDGE;\r
+      ClassLists[0].SubClass = (UINT8)PCI_CLASS_BRIDGE_ISA_PDECODE;\r
+      ClassLists[1].Class    = (UINT8)PCI_CLASS_BRIDGE;\r
+      ClassLists[1].SubClass = (UINT8)PCI_CLASS_BRIDGE_ISA;\r
       ClassLists[2].Class    = 0xff;\r
 \r
       //\r
       // Locate all found block io devices\r
       //\r
-      FindAllDeviceTypes (ClassLists, LocalDevice, (UINT16 *) (&LocalIndex), TRUE);\r
+      FindAllDeviceTypes (ClassLists, LocalDevice, (UINT16 *)(&LocalIndex), TRUE);\r
       if (LocalIndex == 0) {\r
         return EFI_NOT_FOUND;\r
       }\r
@@ -573,9 +593,9 @@ GetPlatformHandle (
       //\r
       for (Index = 0; Index < LocalIndex; Index++) {\r
         if (LocalDevice[Index].Vid == V_INTEL_VENDOR_ID) {\r
-          TempDevice          = LocalDevice[0];\r
-          LocalDevice[0]      = LocalDevice[Index];\r
-          LocalDevice[Index]  = TempDevice;\r
+          TempDevice         = LocalDevice[0];\r
+          LocalDevice[0]     = LocalDevice[Index];\r
+          LocalDevice[Index] = TempDevice;\r
         }\r
       }\r
 \r
@@ -585,13 +605,14 @@ GetPlatformHandle (
       for (Index = 0; Index < LocalIndex; Index++) {\r
         mIsaHandles[Index] = LocalDevice[Index].Handle;\r
       }\r
+\r
       *HandleBuffer = &mIsaHandles[0];\r
       *HandleCount  = LocalIndex;\r
       return EFI_SUCCESS;\r
     case EfiGetPlatformUsbHandle:\r
     default:\r
       return EFI_UNSUPPORTED;\r
-  };\r
+  }\r
 }\r
 \r
 /**\r
@@ -613,13 +634,13 @@ GetPlatformHandle (
 EFI_STATUS\r
 EFIAPI\r
 PlatformHooks (\r
-  IN       EFI_LEGACY_BIOS_PLATFORM_PROTOCOL     *This,\r
-  IN       EFI_GET_PLATFORM_HOOK_MODE            Mode,\r
-  IN       UINT16                                Type,\r
-     OUT   EFI_HANDLE                            DeviceHandle  OPTIONAL,\r
-  IN OUT   UINTN                                 *Shadowaddress  OPTIONAL,\r
-  IN       EFI_COMPATIBILITY16_TABLE             *Compatibility16Table  OPTIONAL,\r
-     OUT   VOID                                  **AdditionalData OPTIONAL\r
+  IN       EFI_LEGACY_BIOS_PLATFORM_PROTOCOL  *This,\r
+  IN       EFI_GET_PLATFORM_HOOK_MODE         Mode,\r
+  IN       UINT16                             Type,\r
+  OUT   EFI_HANDLE                            DeviceHandle  OPTIONAL,\r
+  IN OUT   UINTN                              *Shadowaddress  OPTIONAL,\r
+  IN       EFI_COMPATIBILITY16_TABLE          *Compatibility16Table  OPTIONAL,\r
+  OUT   VOID                                  **AdditionalData OPTIONAL\r
   )\r
 {\r
   EFI_IA32_REGISTER_SET     Regs;\r
@@ -631,7 +652,7 @@ PlatformHooks (
       Status = gBS->LocateProtocol (\r
                       &gEfiLegacyBiosProtocolGuid,\r
                       NULL,\r
-                      (VOID**)&LegacyBios\r
+                      (VOID **)&LegacyBios\r
                       );\r
 \r
       //\r
@@ -639,14 +660,14 @@ PlatformHooks (
       //\r
       Regs.H.AH = 0x00;\r
       Regs.H.AL = 0x03;\r
-      Status = LegacyBios->Int86 (LegacyBios, 0x10, &Regs);\r
+      Status    = LegacyBios->Int86 (LegacyBios, 0x10, &Regs);\r
       return Status;\r
     case EfiPlatformHookShadowServiceRoms:\r
       return EFI_SUCCESS;\r
     case EfiPlatformHookAfterRomInit:\r
     default:\r
       return EFI_UNSUPPORTED;\r
-  };\r
+  }\r
 }\r
 \r
 /**\r
@@ -671,24 +692,24 @@ PlatformHooks (
 EFI_STATUS\r
 EFIAPI\r
 GetRoutingTable (\r
-  IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL           *This,\r
-  OUT VOID                                        **RoutingTable,\r
-  OUT UINTN                                       *RoutingTableEntries,\r
-  OUT VOID                                        **LocalPirqTable  OPTIONAL,\r
-  OUT UINTN                                       *PirqTableSize  OPTIONAL,\r
-  OUT VOID                                        **LocalIrqPriorityTable  OPTIONAL,\r
-  OUT UINTN                                       *IrqPriorityTableEntries OPTIONAL\r
+  IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL  *This,\r
+  OUT VOID                               **RoutingTable,\r
+  OUT UINTN                              *RoutingTableEntries,\r
+  OUT VOID                               **LocalPirqTable  OPTIONAL,\r
+  OUT UINTN                              *PirqTableSize  OPTIONAL,\r
+  OUT VOID                               **LocalIrqPriorityTable  OPTIONAL,\r
+  OUT UINTN                              *IrqPriorityTableEntries OPTIONAL\r
   )\r
 {\r
-  UINT16                        PTableSize;\r
-  UINT32                        Index;\r
-  UINT8                         Bus;\r
-  UINT8                         Device;\r
-  UINT8                         Function;\r
-  UINT8                         Checksum;\r
-  UINT8                         *Ptr;\r
-  EFI_STATUS                    Status;\r
-  EFI_LEGACY_INTERRUPT_PROTOCOL *LegacyInterrupt;\r
+  UINT16                         PTableSize;\r
+  UINT32                         Index;\r
+  UINT8                          Bus;\r
+  UINT8                          Device;\r
+  UINT8                          Function;\r
+  UINT8                          Checksum;\r
+  UINT8                          *Ptr;\r
+  EFI_STATUS                     Status;\r
+  EFI_LEGACY_INTERRUPT_PROTOCOL  *LegacyInterrupt;\r
 \r
   Checksum = 0;\r
 \r
@@ -699,7 +720,7 @@ GetRoutingTable (
     Status = gBS->LocateProtocol (\r
                     &gEfiLegacyInterruptProtocolGuid,\r
                     NULL,\r
-                    (VOID**)&LegacyInterrupt\r
+                    (VOID **)&LegacyInterrupt\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
     LegacyInterrupt->GetLocation (\r
@@ -714,34 +735,35 @@ GetRoutingTable (
     //\r
     PirqTableHead.PirqTable.TableSize = PTableSize;\r
     PirqTableHead.PirqTable.Bus       = Bus;\r
-    PirqTableHead.PirqTable.DevFun    = (UINT8) ((Device << 3) + Function);\r
-    Ptr = (UINT8 *) (&PirqTableHead);\r
+    PirqTableHead.PirqTable.DevFun    = (UINT8)((Device << 3) + Function);\r
+    Ptr                               = (UINT8 *)(&PirqTableHead);\r
 \r
     //\r
     // Calculate checksum.\r
     //\r
     for (Index = 0; Index < PTableSize; Index++) {\r
-      Checksum = (UINT8) (Checksum + (UINT8) *Ptr);\r
-      Ptr += 1;\r
+      Checksum = (UINT8)(Checksum + (UINT8)*Ptr);\r
+      Ptr     += 1;\r
     }\r
-    Checksum                          = (UINT8) (0x00 - Checksum);\r
-    PirqTableHead.PirqTable.Checksum  = Checksum;\r
+\r
+    Checksum                         = (UINT8)(0x00 - Checksum);\r
+    PirqTableHead.PirqTable.Checksum = Checksum;\r
 \r
     //\r
     // Update return values.\r
     //\r
-    *LocalPirqTable                   = (VOID *) (&PirqTableHead);\r
-    *PirqTableSize                    = PTableSize;\r
+    *LocalPirqTable = (VOID *)(&PirqTableHead);\r
+    *PirqTableSize  = PTableSize;\r
   }\r
 \r
   //\r
   // More items to return.\r
   //\r
-  *RoutingTable         = PirqTableHead.IrqRoutingEntry;\r
-  *RoutingTableEntries  = MAX_IRQ_ROUTING_ENTRIES;\r
+  *RoutingTable        = PirqTableHead.IrqRoutingEntry;\r
+  *RoutingTableEntries = MAX_IRQ_ROUTING_ENTRIES;\r
   if (LocalIrqPriorityTable != NULL) {\r
-    *LocalIrqPriorityTable    = IrqPriorityTable;\r
-    *IrqPriorityTableEntries  = MAX_IRQ_PRIORITY_ENTRIES;\r
+    *LocalIrqPriorityTable   = IrqPriorityTable;\r
+    *IrqPriorityTableEntries = MAX_IRQ_PRIORITY_ENTRIES;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -767,18 +789,18 @@ GetRoutingTable (
 EFI_STATUS\r
 EFIAPI\r
 GetPlatformInfo (\r
-  IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL           *This,\r
-  IN  EFI_GET_PLATFORM_INFO_MODE                  Mode,\r
-  OUT VOID                                        **Table,\r
-  OUT UINTN                                       *TableSize,\r
-  OUT UINTN                                       *Location,\r
-  OUT UINTN                                       *Alignment,\r
-  IN  UINT16                                      LegacySegment,\r
-  IN  UINT16                                      LegacyOffset\r
+  IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL  *This,\r
+  IN  EFI_GET_PLATFORM_INFO_MODE         Mode,\r
+  OUT VOID                               **Table,\r
+  OUT UINTN                              *TableSize,\r
+  OUT UINTN                              *Location,\r
+  OUT UINTN                              *Alignment,\r
+  IN  UINT16                             LegacySegment,\r
+  IN  UINT16                             LegacyOffset\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  UINTN                         Index;\r
+  EFI_STATUS  Status;\r
+  UINTN       Index;\r
 \r
   switch (Mode) {\r
     case EfiGetPlatformBinarySystemRom:\r
@@ -791,11 +813,12 @@ GetPlatformInfo (
                    EFI_SECTION_RAW,\r
                    0,\r
                    Table,\r
-                   (UINTN *) TableSize\r
+                   (UINTN *)TableSize\r
                    );\r
         if (EFI_ERROR (Status)) {\r
           continue;\r
         }\r
+\r
         return EFI_SUCCESS;\r
       }\r
 \r
@@ -808,7 +831,7 @@ GetPlatformInfo (
     case EfiGetPlatformPciExpressBase:\r
     default:\r
       return EFI_UNSUPPORTED;\r
-  };\r
+  }\r
 }\r
 \r
 /**\r
@@ -830,34 +853,35 @@ GetPlatformInfo (
 EFI_STATUS\r
 EFIAPI\r
 TranslatePirq (\r
-  IN        EFI_LEGACY_BIOS_PLATFORM_PROTOCOL           *This,\r
-  IN        UINTN                                       PciBus,\r
-  IN        UINTN                                       PciDevice,\r
-  IN        UINTN                                       PciFunction,\r
-  IN  OUT   UINT8                                       *Pirq,\r
-      OUT   UINT8                                       *PciIrq\r
+  IN        EFI_LEGACY_BIOS_PLATFORM_PROTOCOL  *This,\r
+  IN        UINTN                              PciBus,\r
+  IN        UINTN                              PciDevice,\r
+  IN        UINTN                              PciFunction,\r
+  IN  OUT   UINT8                              *Pirq,\r
+  OUT   UINT8                                  *PciIrq\r
   )\r
 {\r
-  EFI_LEGACY_INTERRUPT_PROTOCOL      *LegacyInterrupt;\r
-  EFI_STATUS                         Status;\r
-  UINTN                              Index;\r
-  UINTN                              Index1;\r
-  UINT8                              LocalPirq;\r
-  UINT8                              PirqData;\r
-  UINT8                              MatchData;\r
+  EFI_LEGACY_INTERRUPT_PROTOCOL  *LegacyInterrupt;\r
+  EFI_STATUS                     Status;\r
+  UINTN                          Index;\r
+  UINTN                          Index1;\r
+  UINT8                          LocalPirq;\r
+  UINT8                          PirqData;\r
+  UINT8                          MatchData;\r
 \r
   Status = gBS->LocateProtocol (\r
                   &gEfiLegacyInterruptProtocolGuid,\r
                   NULL,\r
-                  (VOID**)&LegacyInterrupt\r
+                  (VOID **)&LegacyInterrupt\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
-  LocalPirq = (UINT8) (*Pirq);\r
+  LocalPirq = (UINT8)(*Pirq);\r
 \r
   for (Index = 0; Index < MAX_IRQ_ROUTING_ENTRIES; Index++) {\r
     if ((PirqTableHead.IrqRoutingEntry[Index].Bus == PciBus) &&\r
-        (PirqTableHead.IrqRoutingEntry[Index].Device == PciDevice)) {\r
-      LocalPirq = (UINT8) (PirqTableHead.IrqRoutingEntry[Index].PirqEntry[LocalPirq].Pirq & 0x0f);\r
+        (PirqTableHead.IrqRoutingEntry[Index].Device == PciDevice))\r
+    {\r
+      LocalPirq = (UINT8)(PirqTableHead.IrqRoutingEntry[Index].PirqEntry[LocalPirq].Pirq & 0x0f);\r
       if (LocalPirq > 4) {\r
         LocalPirq -= 4;\r
       }\r
@@ -867,8 +891,9 @@ TranslatePirq (
       while (PirqData == 0) {\r
         for (Index1 = 0; Index1 < MAX_IRQ_PRIORITY_ENTRIES; Index1++) {\r
           if ((IrqPriorityTable[Index1].Used == MatchData) &&\r
-              (IrqPriorityTable[Index1].Irq != 0)) {\r
-            PirqData = IrqPriorityTable[Index1].Irq;\r
+              (IrqPriorityTable[Index1].Irq != 0))\r
+          {\r
+            PirqData                      = IrqPriorityTable[Index1].Irq;\r
             IrqPriorityTable[Index1].Used = 0xff;\r
             LegacyInterrupt->WritePirq (\r
                                LegacyInterrupt,\r
@@ -880,11 +905,10 @@ TranslatePirq (
         }\r
 \r
         if (PirqData == 0) {\r
-\r
           //\r
           // No unused interrupts, so start reusing them.\r
           //\r
-          MatchData = (UINT8) (~MatchData);\r
+          MatchData = (UINT8)(~MatchData);\r
         }\r
       }\r
 \r
@@ -896,7 +920,6 @@ TranslatePirq (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Attempt to legacy boot the BootOption. If the EFI contexted has been\r
   compromised this function will not return.\r
@@ -914,26 +937,26 @@ TranslatePirq (
 EFI_STATUS\r
 EFIAPI\r
 PrepareToBoot (\r
-  IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL           *This,\r
-  IN  BBS_BBS_DEVICE_PATH                         *BbsDevicePath,\r
-  IN  VOID                                        *BbsTable,\r
-  IN  UINT32                                      LoadOptionsSize,\r
-  IN  VOID                                        *LoadOptions,\r
-  IN  VOID                                        *EfiToLegacy16BootTable\r
+  IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL  *This,\r
+  IN  BBS_BBS_DEVICE_PATH                *BbsDevicePath,\r
+  IN  VOID                               *BbsTable,\r
+  IN  UINT32                             LoadOptionsSize,\r
+  IN  VOID                               *LoadOptions,\r
+  IN  VOID                               *EfiToLegacy16BootTable\r
   )\r
 {\r
-  BBS_TABLE                           *LocalBbsTable;\r
-  EFI_TO_COMPATIBILITY16_BOOT_TABLE   *Legacy16BootTable;\r
-  DEVICE_PRODUCER_DATA_HEADER         *SioPtr;\r
-  UINT16                              DevicePathType;\r
-  UINT16                              Index;\r
-  UINT16                              Priority;\r
+  BBS_TABLE                          *LocalBbsTable;\r
+  EFI_TO_COMPATIBILITY16_BOOT_TABLE  *Legacy16BootTable;\r
+  DEVICE_PRODUCER_DATA_HEADER        *SioPtr;\r
+  UINT16                             DevicePathType;\r
+  UINT16                             Index;\r
+  UINT16                             Priority;\r
 \r
   //\r
   // Initialize values\r
   //\r
-  Priority = 0;\r
-  Legacy16BootTable = (EFI_TO_COMPATIBILITY16_BOOT_TABLE*) EfiToLegacy16BootTable;\r
+  Priority          = 0;\r
+  Legacy16BootTable = (EFI_TO_COMPATIBILITY16_BOOT_TABLE *)EfiToLegacy16BootTable;\r
 \r
   //\r
   // Set how Gate A20 is gated by hardware\r
@@ -943,7 +966,7 @@ PrepareToBoot (
   SioPtr->Flags.A20Port90 = 1;\r
   SioPtr->MousePresent    = 1;\r
 \r
-  LocalBbsTable           = BbsTable;\r
+  LocalBbsTable = BbsTable;\r
 \r
   //\r
   // There are 2 cases that must be covered.\r
@@ -966,8 +989,9 @@ PrepareToBoot (
     if ((LocalBbsTable[Index].BootPriority != BBS_UNPRIORITIZED_ENTRY) &&\r
         (LocalBbsTable[Index].BootPriority != BBS_IGNORE_ENTRY) &&\r
         (LocalBbsTable[Index].BootPriority != BBS_LOWEST_PRIORITY) &&\r
-        (Priority <= LocalBbsTable[Index].BootPriority)) {\r
-      Priority = (UINT16) (LocalBbsTable[Index].BootPriority + 1);\r
+        (Priority <= LocalBbsTable[Index].BootPriority))\r
+    {\r
+      Priority = (UINT16)(LocalBbsTable[Index].BootPriority + 1);\r
     }\r
   }\r
 \r
@@ -978,28 +1002,32 @@ PrepareToBoot (
     case BBS_EMBED_NETWORK:\r
       for (Index = 0; Index < Legacy16BootTable->NumberBbsEntries; Index++) {\r
         if ((LocalBbsTable[Index].BootPriority == BBS_UNPRIORITIZED_ENTRY) &&\r
-            (LocalBbsTable[Index].DeviceType == DevicePathType)) {\r
+            (LocalBbsTable[Index].DeviceType == DevicePathType))\r
+        {\r
           LocalBbsTable[Index].BootPriority = Priority;\r
           ++Priority;\r
         }\r
       }\r
+\r
       break;\r
     case BBS_BEV_DEVICE:\r
       for (Index = 0; Index < Legacy16BootTable->NumberBbsEntries; Index++) {\r
         if ((LocalBbsTable[Index].BootPriority == BBS_UNPRIORITIZED_ENTRY) &&\r
             (LocalBbsTable[Index].Class == 01) &&\r
-            (LocalBbsTable[Index].SubClass == 01)) {\r
+            (LocalBbsTable[Index].SubClass == 01))\r
+        {\r
           LocalBbsTable[Index].BootPriority = Priority;\r
           ++Priority;\r
         }\r
       }\r
+\r
       break;\r
     case BBS_USB:\r
     case BBS_PCMCIA:\r
     case BBS_UNKNOWN:\r
     default:\r
       break;\r
-  };\r
+  }\r
 \r
   //\r
   // Set priority for rest of devices\r
@@ -1014,7 +1042,6 @@ PrepareToBoot (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Initialize Legacy Platform support\r
 \r
@@ -1026,16 +1053,16 @@ LegacyBiosPlatformInstall (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
-  LEGACY_BIOS_PLATFORM_INSTANCE        *Private;\r
+  EFI_STATUS                     Status;\r
+  LEGACY_BIOS_PLATFORM_INSTANCE  *Private;\r
 \r
   mImageHandle = gImageHandle;\r
-  Private = &mPrivateData;\r
+  Private      = &mPrivateData;\r
 \r
   //\r
   // Grab a copy of all the protocols we depend on.\r
   //\r
-  Private->Signature = LEGACY_BIOS_PLATFORM_INSTANCE_SIGNATURE;\r
+  Private->Signature                            = LEGACY_BIOS_PLATFORM_INSTANCE_SIGNATURE;\r
   Private->LegacyBiosPlatform.GetPlatformInfo   = GetPlatformInfo;\r
   Private->LegacyBiosPlatform.GetPlatformHandle = GetPlatformHandle;\r
   Private->LegacyBiosPlatform.SmmInit           = SmmInit;\r
@@ -1043,17 +1070,17 @@ LegacyBiosPlatformInstall (
   Private->LegacyBiosPlatform.GetRoutingTable   = GetRoutingTable;\r
   Private->LegacyBiosPlatform.TranslatePirq     = TranslatePirq;\r
   Private->LegacyBiosPlatform.PrepareToBoot     = PrepareToBoot;\r
-  Private->ImageHandle = gImageHandle;\r
+  Private->ImageHandle                          = gImageHandle;\r
 \r
   //\r
   // Make a new handle and install the protocol\r
   //\r
   Private->Handle = NULL;\r
-  Status = gBS->InstallProtocolInterface (\r
-                  &Private->Handle,\r
-                  &gEfiLegacyBiosPlatformProtocolGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &Private->LegacyBiosPlatform\r
-                  );\r
+  Status          = gBS->InstallProtocolInterface (\r
+                           &Private->Handle,\r
+                           &gEfiLegacyBiosPlatformProtocolGuid,\r
+                           EFI_NATIVE_INTERFACE,\r
+                           &Private->LegacyBiosPlatform\r
+                           );\r
   return Status;\r
 }\r
index 1479efc749d0daf3904d480eec00ce0ba550c0b9..7dddd5200f43223014b1f02002edc192b44fd79e 100644 (file)
 //\r
 // PIRQ information constants.\r
 //\r
-#define MAX_IRQ_ROUTING_ENTRIES     6\r
-#define MAX_IRQ_PRIORITY_ENTRIES    7\r
+#define MAX_IRQ_ROUTING_ENTRIES   6\r
+#define MAX_IRQ_PRIORITY_ENTRIES  7\r
 \r
-#define V_INTEL_VENDOR_ID         0x8086\r
-#define V_PIIX4_IDE_DEVICE_ID     0x7010\r
+#define V_INTEL_VENDOR_ID      0x8086\r
+#define V_PIIX4_IDE_DEVICE_ID  0x7010\r
 \r
 //\r
 // Type declarations\r
 //\r
 typedef struct {\r
-  UINT8   SetupValue;\r
-  UINT16  DeviceType;\r
-  UINT8   Class;\r
-  UINT8   SubClass;\r
+  UINT8     SetupValue;\r
+  UINT16    DeviceType;\r
+  UINT8     Class;\r
+  UINT8     SubClass;\r
 } EFI_SETUP_BBS_MAP;\r
 \r
 typedef struct {\r
-  UINT8          Class;\r
-  UINT8          SubClass;\r
+  UINT8    Class;\r
+  UINT8    SubClass;\r
 } PCI_CLASS_RECORD;\r
 \r
 typedef struct {\r
-  EFI_LEGACY_PIRQ_TABLE_HEADER  PirqTable;\r
-  EFI_LEGACY_IRQ_ROUTING_ENTRY  IrqRoutingEntry[MAX_IRQ_ROUTING_ENTRIES];\r
+  EFI_LEGACY_PIRQ_TABLE_HEADER    PirqTable;\r
+  EFI_LEGACY_IRQ_ROUTING_ENTRY    IrqRoutingEntry[MAX_IRQ_ROUTING_ENTRIES];\r
 } EFI_LEGACY_PIRQ_TABLE;\r
 \r
 typedef struct {\r
-  EFI_HANDLE  Handle;\r
-  UINT16      Vid;\r
-  UINT16      Did;\r
-  UINT16      SvId;\r
-  UINT16      SysId;\r
+  EFI_HANDLE    Handle;\r
+  UINT16        Vid;\r
+  UINT16        Did;\r
+  UINT16        SvId;\r
+  UINT16        SysId;\r
 } DEVICE_STRUCTURE;\r
 \r
 typedef struct {\r
-  EFI_GUID  FileName;\r
-  UINTN     Valid;\r
+  EFI_GUID    FileName;\r
+  UINTN       Valid;\r
 } SYSTEM_ROM_TABLE;\r
 \r
 typedef struct {\r
-  UINT32                            Signature;\r
-  EFI_HANDLE                        Handle;\r
-  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL LegacyBiosPlatform;\r
-  EFI_HANDLE                        ImageHandle;\r
-  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL   *PciRootBridgeIo;\r
+  UINT32                               Signature;\r
+  EFI_HANDLE                           Handle;\r
+  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL    LegacyBiosPlatform;\r
+  EFI_HANDLE                           ImageHandle;\r
+  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL      *PciRootBridgeIo;\r
 } LEGACY_BIOS_PLATFORM_INSTANCE;\r
 \r
-#define LEGACY_BIOS_PLATFORM_INSTANCE_SIGNATURE   SIGNATURE_32('P','B','I','O')\r
+#define LEGACY_BIOS_PLATFORM_INSTANCE_SIGNATURE  SIGNATURE_32('P','B','I','O')\r
 \r
 #define LEGACY_BIOS_PLATFORM_INSTANCE_FROM_THIS(this) \\r
   CR (this, \\r
@@ -95,4 +95,3 @@ typedef struct {
       )\r
 \r
 #endif\r
-\r
index fe9ae27c9d919ce69094a752a27aef6763bda359..4969c88dc33ed66cfa54babb5d6ac7e345aaadd9 100644 (file)
 // 0xEC000-0xEFFFF  0x5f  0x96  5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
 // 0xF0000-0xFFFFF  0x59  0x90  5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
 //\r
-STATIC LEGACY_MEMORY_SECTION_INFO   mSectionArray[] = {\r
-  {0xC0000, SIZE_16KB, FALSE, FALSE},\r
-  {0xC4000, SIZE_16KB, FALSE, FALSE},\r
-  {0xC8000, SIZE_16KB, FALSE, FALSE},\r
-  {0xCC000, SIZE_16KB, FALSE, FALSE},\r
-  {0xD0000, SIZE_16KB, FALSE, FALSE},\r
-  {0xD4000, SIZE_16KB, FALSE, FALSE},\r
-  {0xD8000, SIZE_16KB, FALSE, FALSE},\r
-  {0xDC000, SIZE_16KB, FALSE, FALSE},\r
-  {0xE0000, SIZE_16KB, FALSE, FALSE},\r
-  {0xE4000, SIZE_16KB, FALSE, FALSE},\r
-  {0xE8000, SIZE_16KB, FALSE, FALSE},\r
-  {0xEC000, SIZE_16KB, FALSE, FALSE},\r
-  {0xF0000, SIZE_64KB, FALSE, FALSE}\r
+STATIC LEGACY_MEMORY_SECTION_INFO  mSectionArray[] = {\r
+  { 0xC0000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xC4000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xC8000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xCC000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xD0000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xD4000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xD8000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xDC000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xE0000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xE4000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xE8000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xEC000, SIZE_16KB, FALSE, FALSE },\r
+  { 0xF0000, SIZE_64KB, FALSE, FALSE }\r
 };\r
 \r
 STATIC PAM_REGISTER_VALUE  mRegisterValues440[] = {\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM1), 0x01, 0x02},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM1), 0x10, 0x20},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM2), 0x01, 0x02},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM2), 0x10, 0x20},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM3), 0x01, 0x02},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM3), 0x10, 0x20},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM4), 0x01, 0x02},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM4), 0x10, 0x20},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM5), 0x01, 0x02},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM5), 0x10, 0x20},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM6), 0x01, 0x02},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM6), 0x10, 0x20},\r
-  {PMC_REGISTER_PIIX4 (PIIX4_PAM0), 0x10, 0x20}\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM1), 0x01, 0x02 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM1), 0x10, 0x20 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM2), 0x01, 0x02 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM2), 0x10, 0x20 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM3), 0x01, 0x02 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM3), 0x10, 0x20 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM4), 0x01, 0x02 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM4), 0x10, 0x20 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM5), 0x01, 0x02 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM5), 0x10, 0x20 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM6), 0x01, 0x02 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM6), 0x10, 0x20 },\r
+  { PMC_REGISTER_PIIX4 (PIIX4_PAM0), 0x10, 0x20 }\r
 };\r
 \r
 STATIC PAM_REGISTER_VALUE  mRegisterValuesQ35[] = {\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM1), 0x01, 0x02},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM1), 0x10, 0x20},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM2), 0x01, 0x02},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM2), 0x10, 0x20},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM3), 0x01, 0x02},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM3), 0x10, 0x20},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM4), 0x01, 0x02},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM4), 0x10, 0x20},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM5), 0x01, 0x02},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM5), 0x10, 0x20},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM6), 0x01, 0x02},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM6), 0x10, 0x20},\r
-  {DRAMC_REGISTER_Q35 (MCH_PAM0), 0x10, 0x20}\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM1), 0x01, 0x02 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM1), 0x10, 0x20 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM2), 0x01, 0x02 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM2), 0x10, 0x20 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM3), 0x01, 0x02 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM3), 0x10, 0x20 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM4), 0x01, 0x02 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM4), 0x10, 0x20 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM5), 0x01, 0x02 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM5), 0x10, 0x20 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM6), 0x01, 0x02 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM6), 0x10, 0x20 },\r
+  { DRAMC_REGISTER_Q35 (MCH_PAM0), 0x10, 0x20 }\r
 };\r
 \r
-STATIC PAM_REGISTER_VALUE *mRegisterValues;\r
+STATIC PAM_REGISTER_VALUE  *mRegisterValues;\r
 \r
 //\r
 // Handle used to install the Legacy Region Protocol\r
@@ -98,25 +98,26 @@ STATIC EFI_LEGACY_REGION2_PROTOCOL  mLegacyRegion2 = {
 STATIC\r
 EFI_STATUS\r
 LegacyRegionManipulationInternal (\r
-  IN  UINT32                  Start,\r
-  IN  UINT32                  Length,\r
-  IN  BOOLEAN                 *ReadEnable,\r
-  IN  BOOLEAN                 *WriteEnable,\r
-  OUT UINT32                  *Granularity\r
+  IN  UINT32   Start,\r
+  IN  UINT32   Length,\r
+  IN  BOOLEAN  *ReadEnable,\r
+  IN  BOOLEAN  *WriteEnable,\r
+  OUT UINT32   *Granularity\r
   )\r
 {\r
-  UINT32                        EndAddress;\r
-  UINTN                         Index;\r
-  UINTN                         StartIndex;\r
+  UINT32  EndAddress;\r
+  UINTN   Index;\r
+  UINTN   StartIndex;\r
 \r
   //\r
   // Validate input parameters.\r
   //\r
-  if (Length == 0 || Granularity == NULL) {\r
+  if ((Length == 0) || (Granularity == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   EndAddress = Start + Length - 1;\r
-  if ((Start < PAM_BASE_ADDRESS) || EndAddress > PAM_LIMIT_ADDRESS) {\r
+  if ((Start < PAM_BASE_ADDRESS) || (EndAddress > PAM_LIMIT_ADDRESS)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -130,6 +131,7 @@ LegacyRegionManipulationInternal (
       break;\r
     }\r
   }\r
+\r
   ASSERT (Index < ARRAY_SIZE (mSectionArray));\r
 \r
   //\r
@@ -145,10 +147,11 @@ LegacyRegionManipulationInternal (
       } else {\r
         PciAnd8 (\r
           mRegisterValues[Index].PAMRegPciLibAddress,\r
-          (UINT8) (~mRegisterValues[Index].ReadEnableData)\r
+          (UINT8)(~mRegisterValues[Index].ReadEnableData)\r
           );\r
       }\r
     }\r
+\r
     if (WriteEnable != NULL) {\r
       if (*WriteEnable) {\r
         PciOr8 (\r
@@ -158,7 +161,7 @@ LegacyRegionManipulationInternal (
       } else {\r
         PciAnd8 (\r
           mRegisterValues[Index].PAMRegPciLibAddress,\r
-          (UINT8) (~mRegisterValues[Index].WriteEnableData)\r
+          (UINT8)(~mRegisterValues[Index].WriteEnableData)\r
           );\r
       }\r
     }\r
@@ -171,6 +174,7 @@ LegacyRegionManipulationInternal (
       break;\r
     }\r
   }\r
+\r
   ASSERT (Index < ARRAY_SIZE (mSectionArray));\r
 \r
   return EFI_SUCCESS;\r
@@ -179,30 +183,31 @@ LegacyRegionManipulationInternal (
 STATIC\r
 EFI_STATUS\r
 LegacyRegionGetInfoInternal (\r
-  OUT UINT32                        *DescriptorCount,\r
-  OUT LEGACY_MEMORY_SECTION_INFO    **Descriptor\r
+  OUT UINT32                      *DescriptorCount,\r
+  OUT LEGACY_MEMORY_SECTION_INFO  **Descriptor\r
   )\r
 {\r
-  UINTN    Index;\r
-  UINT8    PamValue;\r
+  UINTN  Index;\r
+  UINT8  PamValue;\r
 \r
   //\r
   // Check input parameters\r
   //\r
-  if (DescriptorCount == NULL || Descriptor == NULL) {\r
+  if ((DescriptorCount == NULL) || (Descriptor == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // Fill in current status of legacy region.\r
   //\r
-  *DescriptorCount = sizeof(mSectionArray) / sizeof (mSectionArray[0]);\r
+  *DescriptorCount = sizeof (mSectionArray) / sizeof (mSectionArray[0]);\r
   for (Index = 0; Index < *DescriptorCount; Index++) {\r
-    PamValue = PciRead8 (mRegisterValues[Index].PAMRegPciLibAddress);\r
+    PamValue                         = PciRead8 (mRegisterValues[Index].PAMRegPciLibAddress);\r
     mSectionArray[Index].ReadEnabled = FALSE;\r
     if ((PamValue & mRegisterValues[Index].ReadEnableData) != 0) {\r
       mSectionArray[Index].ReadEnabled = TRUE;\r
     }\r
+\r
     mSectionArray[Index].WriteEnabled = FALSE;\r
     if ((PamValue & mRegisterValues[Index].WriteEnableData) != 0) {\r
       mSectionArray[Index].WriteEnabled = TRUE;\r
@@ -250,7 +255,6 @@ LegacyRegion2Decode (
   return LegacyRegionManipulationInternal (Start, Length, On, NULL, Granularity);\r
 }\r
 \r
-\r
 /**\r
   Modify the hardware to disallow memory attribute changes in a region.\r
 \r
@@ -279,10 +283,10 @@ LegacyRegion2Decode (
 EFI_STATUS\r
 EFIAPI\r
 LegacyRegion2BootLock (\r
-  IN  EFI_LEGACY_REGION2_PROTOCOL         *This,\r
-  IN  UINT32                              Start,\r
-  IN  UINT32                              Length,\r
-  OUT UINT32                              *Granularity\r
+  IN  EFI_LEGACY_REGION2_PROTOCOL  *This,\r
+  IN  UINT32                       Start,\r
+  IN  UINT32                       Length,\r
+  OUT UINT32                       *Granularity\r
   )\r
 {\r
   if ((Start < 0xC0000) || ((Start + Length - 1) > 0xFFFFF)) {\r
@@ -292,7 +296,6 @@ LegacyRegion2BootLock (
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Modify the hardware to disallow memory writes in a region.\r
 \r
@@ -316,10 +319,10 @@ LegacyRegion2BootLock (
 EFI_STATUS\r
 EFIAPI\r
 LegacyRegion2Lock (\r
-  IN  EFI_LEGACY_REGION2_PROTOCOL *This,\r
-  IN  UINT32                      Start,\r
-  IN  UINT32                      Length,\r
-  OUT UINT32                      *Granularity\r
+  IN  EFI_LEGACY_REGION2_PROTOCOL  *This,\r
+  IN  UINT32                       Start,\r
+  IN  UINT32                       Length,\r
+  OUT UINT32                       *Granularity\r
   )\r
 {\r
   BOOLEAN  WriteEnable;\r
@@ -328,7 +331,6 @@ LegacyRegion2Lock (
   return LegacyRegionManipulationInternal (Start, Length, NULL, &WriteEnable, Granularity);\r
 }\r
 \r
-\r
 /**\r
   Modify the hardware to allow memory writes in a region.\r
 \r
@@ -391,11 +393,11 @@ LegacyRegionGetInfo (
   OUT EFI_LEGACY_REGION_DESCRIPTOR  **Descriptor\r
   )\r
 {\r
-  LEGACY_MEMORY_SECTION_INFO   *SectionInfo;\r
-  UINT32                       SectionCount;\r
-  EFI_LEGACY_REGION_DESCRIPTOR *DescriptorArray;\r
-  UINTN                        Index;\r
-  UINTN                        DescriptorIndex;\r
+  LEGACY_MEMORY_SECTION_INFO    *SectionInfo;\r
+  UINT32                        SectionCount;\r
+  EFI_LEGACY_REGION_DESCRIPTOR  *DescriptorArray;\r
+  UINTN                         Index;\r
+  UINTN                         DescriptorIndex;\r
 \r
   //\r
   // Get section numbers and information\r
@@ -416,10 +418,11 @@ LegacyRegionGetInfo (
     DescriptorArray[DescriptorIndex].Length      = SectionInfo[Index].Length;\r
     DescriptorArray[DescriptorIndex].Granularity = SectionInfo[Index].Length;\r
     if (SectionInfo[Index].ReadEnabled) {\r
-      DescriptorArray[DescriptorIndex].Attribute   = LegacyRegionDecoded;\r
+      DescriptorArray[DescriptorIndex].Attribute = LegacyRegionDecoded;\r
     } else {\r
-      DescriptorArray[DescriptorIndex].Attribute   = LegacyRegionNotDecoded;\r
+      DescriptorArray[DescriptorIndex].Attribute = LegacyRegionNotDecoded;\r
     }\r
+\r
     DescriptorIndex++;\r
 \r
     //\r
@@ -433,6 +436,7 @@ LegacyRegionGetInfo (
     } else {\r
       DescriptorArray[DescriptorIndex].Attribute = LegacyRegionWriteDisabled;\r
     }\r
+\r
     DescriptorIndex++;\r
 \r
     //\r
@@ -445,7 +449,7 @@ LegacyRegionGetInfo (
     DescriptorIndex++;\r
   }\r
 \r
-  *DescriptorCount = (UINT32) DescriptorIndex;\r
+  *DescriptorCount = (UINT32)DescriptorIndex;\r
   *Descriptor      = DescriptorArray;\r
 \r
   return EFI_SUCCESS;\r
@@ -470,17 +474,21 @@ LegacyRegionInit (
   //\r
   HostBridgeDevId = PcdGet16 (PcdOvmfHostBridgePciDevId);\r
   switch (HostBridgeDevId) {\r
-  case INTEL_82441_DEVICE_ID:\r
-    mRegisterValues = mRegisterValues440;\r
-    break;\r
-  case INTEL_Q35_MCH_DEVICE_ID:\r
-    mRegisterValues = mRegisterValuesQ35;\r
-    break;\r
-  default:\r
-    DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-            __FUNCTION__, HostBridgeDevId));\r
-    ASSERT (FALSE);\r
-    return RETURN_UNSUPPORTED;\r
+    case INTEL_82441_DEVICE_ID:\r
+      mRegisterValues = mRegisterValues440;\r
+      break;\r
+    case INTEL_Q35_MCH_DEVICE_ID:\r
+      mRegisterValues = mRegisterValuesQ35;\r
+      break;\r
+    default:\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        HostBridgeDevId\r
+        ));\r
+      ASSERT (FALSE);\r
+      return RETURN_UNSUPPORTED;\r
   }\r
 \r
   //\r
@@ -488,11 +496,11 @@ LegacyRegionInit (
   //\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &mHandle,\r
-                  &gEfiLegacyRegion2ProtocolGuid, &mLegacyRegion2,\r
+                  &gEfiLegacyRegion2ProtocolGuid,\r
+                  &mLegacyRegion2,\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r
 }\r
-\r
index e18cb97949d19ab9465389fae39474695969a2f5..8ffe42a6a5e249d7ff9b5a9eaf97418ddc7f21a6 100644 (file)
 // Describes Legacy Region blocks and status.\r
 //\r
 typedef struct {\r
-  UINT32  Start;\r
-  UINT32  Length;\r
-  BOOLEAN ReadEnabled;\r
-  BOOLEAN WriteEnabled;\r
+  UINT32     Start;\r
+  UINT32     Length;\r
+  BOOLEAN    ReadEnabled;\r
+  BOOLEAN    WriteEnabled;\r
 } LEGACY_MEMORY_SECTION_INFO;\r
 \r
 //\r
 // Provides a map of the PAM registers and bits used to set Read/Write access.\r
 //\r
 typedef struct {\r
-  UINTN   PAMRegPciLibAddress;\r
-  UINT8   ReadEnableData;\r
-  UINT8   WriteEnableData;\r
+  UINTN    PAMRegPciLibAddress;\r
+  UINT8    ReadEnableData;\r
+  UINT8    WriteEnableData;\r
 } PAM_REGISTER_VALUE;\r
 \r
 /**\r
@@ -103,10 +103,10 @@ LegacyRegion2Decode (
 EFI_STATUS\r
 EFIAPI\r
 LegacyRegion2Lock (\r
-  IN  EFI_LEGACY_REGION2_PROTOCOL *This,\r
-  IN  UINT32                      Start,\r
-  IN  UINT32                      Length,\r
-  OUT UINT32                      *Granularity\r
+  IN  EFI_LEGACY_REGION2_PROTOCOL  *This,\r
+  IN  UINT32                       Start,\r
+  IN  UINT32                       Length,\r
+  OUT UINT32                       *Granularity\r
   );\r
 \r
 /**\r
@@ -137,10 +137,10 @@ LegacyRegion2Lock (
 EFI_STATUS\r
 EFIAPI\r
 LegacyRegion2BootLock (\r
-  IN EFI_LEGACY_REGION2_PROTOCOL          *This,\r
-  IN  UINT32                              Start,\r
-  IN  UINT32                              Length,\r
-  OUT UINT32                              *Granularity\r
+  IN EFI_LEGACY_REGION2_PROTOCOL  *This,\r
+  IN  UINT32                      Start,\r
+  IN  UINT32                      Length,\r
+  OUT UINT32                      *Granularity\r
   );\r
 \r
 /**\r
@@ -200,4 +200,3 @@ LegacyRegionGetInfo (
   );\r
 \r
 #endif\r
-\r
index a3518ea837cdce290eb7f7b124762463fa052b71..ea1d03cf479da9d30f335cd63ad33c775717508a 100644 (file)
@@ -17,25 +17,24 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///\r
 /// S3 Boot Script Table identifier.\r
 ///\r
-#define FRAMEWORK_EFI_ACPI_S3_RESUME_SCRIPT_TABLE               0x00\r
+#define FRAMEWORK_EFI_ACPI_S3_RESUME_SCRIPT_TABLE  0x00\r
 ///\r
 /// The opcode is used to add a record for memory reads of the memory location and continues when the\r
 /// exit criteria is satisfied, or after a defined duration.\r
 ///\r
-#define FRAMEWORK_EFI_BOOT_SCRIPT_MEM_POLL_OPCODE               0x09\r
+#define FRAMEWORK_EFI_BOOT_SCRIPT_MEM_POLL_OPCODE  0x09\r
 ///\r
 /// The opcode is used to add a record for dispatching specified arbitrary code into a specified\r
 /// boot script table.\r
 ///\r
-#define FRAMEWORK_EFI_BOOT_SCRIPT_DISPATCH_2_OPCODE             0x0D\r
+#define FRAMEWORK_EFI_BOOT_SCRIPT_DISPATCH_2_OPCODE  0x0D\r
 ///\r
 /// The opcode indicates the start of the boot script table.\r
 ///\r
-#define FRAMEWORK_EFI_BOOT_SCRIPT_TABLE_OPCODE                  0xAA\r
+#define FRAMEWORK_EFI_BOOT_SCRIPT_TABLE_OPCODE  0xAA\r
 ///\r
 /// The opcode indicates the end of the boot script table.\r
 ///\r
-#define FRAMEWORK_EFI_BOOT_SCRIPT_TERMINATE_OPCODE              0xFF\r
-\r
+#define FRAMEWORK_EFI_BOOT_SCRIPT_TERMINATE_OPCODE  0xFF\r
 \r
 #endif\r
index 98a947e420b0c3f288d5d7f74d5bcedb100ca907..d2ee61d681fb75923bf118644e9866eb70ba0765 100644 (file)
@@ -33,35 +33,35 @@ typedef struct {
   //\r
   // Table header for the Framework EFI Runtime Services Table\r
   //\r
-  EFI_TABLE_HEADER                  Hdr;\r
+  EFI_TABLE_HEADER                Hdr;\r
   //\r
   // Time services\r
   //\r
-  EFI_GET_TIME                      GetTime;\r
-  EFI_SET_TIME                      SetTime;\r
-  EFI_GET_WAKEUP_TIME               GetWakeupTime;\r
-  EFI_SET_WAKEUP_TIME               SetWakeupTime;\r
+  EFI_GET_TIME                    GetTime;\r
+  EFI_SET_TIME                    SetTime;\r
+  EFI_GET_WAKEUP_TIME             GetWakeupTime;\r
+  EFI_SET_WAKEUP_TIME             SetWakeupTime;\r
   //\r
   // Virtual memory services\r
   //\r
-  EFI_SET_VIRTUAL_ADDRESS_MAP       SetVirtualAddressMap;\r
-  EFI_CONVERT_POINTER               ConvertPointer;\r
+  EFI_SET_VIRTUAL_ADDRESS_MAP     SetVirtualAddressMap;\r
+  EFI_CONVERT_POINTER             ConvertPointer;\r
   //\r
   // Variable services\r
   //\r
-  EFI_GET_VARIABLE                  GetVariable;\r
-  EFI_GET_NEXT_VARIABLE_NAME        GetNextVariableName;\r
-  EFI_SET_VARIABLE                  SetVariable;\r
+  EFI_GET_VARIABLE                GetVariable;\r
+  EFI_GET_NEXT_VARIABLE_NAME      GetNextVariableName;\r
+  EFI_SET_VARIABLE                SetVariable;\r
   //\r
   // Misc\r
   //\r
-  EFI_GET_NEXT_HIGH_MONO_COUNT      GetNextHighMonotonicCount;\r
-  EFI_RESET_SYSTEM                  ResetSystem;\r
+  EFI_GET_NEXT_HIGH_MONO_COUNT    GetNextHighMonotonicCount;\r
+  EFI_RESET_SYSTEM                ResetSystem;\r
   ///\r
   /// A Framework extension to the EFI 1.10 runtime table.\r
   /// It was moved to a protocol to avoid conflict with UEFI 2.0.\r
   ///\r
-  EFI_REPORT_STATUS_CODE            ReportStatusCode;\r
+  EFI_REPORT_STATUS_CODE          ReportStatusCode;\r
 } FRAMEWORK_EFI_RUNTIME_SERVICES;\r
 \r
 ///\r
@@ -71,94 +71,94 @@ typedef struct {
   ///\r
   /// The table header for the EFI Boot Services Table.\r
   ///\r
-  EFI_TABLE_HEADER                Hdr;\r
+  EFI_TABLE_HEADER                              Hdr;\r
 \r
   //\r
   // Task Priority Services\r
   //\r
-  EFI_RAISE_TPL                   RaiseTPL;\r
-  EFI_RESTORE_TPL                 RestoreTPL;\r
+  EFI_RAISE_TPL                                 RaiseTPL;\r
+  EFI_RESTORE_TPL                               RestoreTPL;\r
 \r
   //\r
   // Memory Services\r
   //\r
-  EFI_ALLOCATE_PAGES              AllocatePages;\r
-  EFI_FREE_PAGES                  FreePages;\r
-  EFI_GET_MEMORY_MAP              GetMemoryMap;\r
-  EFI_ALLOCATE_POOL               AllocatePool;\r
-  EFI_FREE_POOL                   FreePool;\r
+  EFI_ALLOCATE_PAGES                            AllocatePages;\r
+  EFI_FREE_PAGES                                FreePages;\r
+  EFI_GET_MEMORY_MAP                            GetMemoryMap;\r
+  EFI_ALLOCATE_POOL                             AllocatePool;\r
+  EFI_FREE_POOL                                 FreePool;\r
 \r
   //\r
   // Event & Timer Services\r
   //\r
-  EFI_CREATE_EVENT                  CreateEvent;\r
-  EFI_SET_TIMER                     SetTimer;\r
-  EFI_WAIT_FOR_EVENT                WaitForEvent;\r
-  EFI_SIGNAL_EVENT                  SignalEvent;\r
-  EFI_CLOSE_EVENT                   CloseEvent;\r
-  EFI_CHECK_EVENT                   CheckEvent;\r
+  EFI_CREATE_EVENT                              CreateEvent;\r
+  EFI_SET_TIMER                                 SetTimer;\r
+  EFI_WAIT_FOR_EVENT                            WaitForEvent;\r
+  EFI_SIGNAL_EVENT                              SignalEvent;\r
+  EFI_CLOSE_EVENT                               CloseEvent;\r
+  EFI_CHECK_EVENT                               CheckEvent;\r
 \r
   //\r
   // Protocol Handler Services\r
   //\r
-  EFI_INSTALL_PROTOCOL_INTERFACE    InstallProtocolInterface;\r
-  EFI_REINSTALL_PROTOCOL_INTERFACE  ReinstallProtocolInterface;\r
-  EFI_UNINSTALL_PROTOCOL_INTERFACE  UninstallProtocolInterface;\r
-  EFI_HANDLE_PROTOCOL               HandleProtocol;\r
-  EFI_HANDLE_PROTOCOL               PcHandleProtocol;\r
-  EFI_REGISTER_PROTOCOL_NOTIFY      RegisterProtocolNotify;\r
-  EFI_LOCATE_HANDLE                 LocateHandle;\r
-  EFI_LOCATE_DEVICE_PATH            LocateDevicePath;\r
-  EFI_INSTALL_CONFIGURATION_TABLE   InstallConfigurationTable;\r
+  EFI_INSTALL_PROTOCOL_INTERFACE                InstallProtocolInterface;\r
+  EFI_REINSTALL_PROTOCOL_INTERFACE              ReinstallProtocolInterface;\r
+  EFI_UNINSTALL_PROTOCOL_INTERFACE              UninstallProtocolInterface;\r
+  EFI_HANDLE_PROTOCOL                           HandleProtocol;\r
+  EFI_HANDLE_PROTOCOL                           PcHandleProtocol;\r
+  EFI_REGISTER_PROTOCOL_NOTIFY                  RegisterProtocolNotify;\r
+  EFI_LOCATE_HANDLE                             LocateHandle;\r
+  EFI_LOCATE_DEVICE_PATH                        LocateDevicePath;\r
+  EFI_INSTALL_CONFIGURATION_TABLE               InstallConfigurationTable;\r
 \r
   //\r
   // Image Services\r
   //\r
-  EFI_IMAGE_LOAD                    LoadImage;\r
-  EFI_IMAGE_START                   StartImage;\r
-  EFI_EXIT                          Exit;\r
-  EFI_IMAGE_UNLOAD                  UnloadImage;\r
-  EFI_EXIT_BOOT_SERVICES            ExitBootServices;\r
+  EFI_IMAGE_LOAD                                LoadImage;\r
+  EFI_IMAGE_START                               StartImage;\r
+  EFI_EXIT                                      Exit;\r
+  EFI_IMAGE_UNLOAD                              UnloadImage;\r
+  EFI_EXIT_BOOT_SERVICES                        ExitBootServices;\r
 \r
   //\r
   // Miscellaneous Services\r
   //\r
-  EFI_GET_NEXT_MONOTONIC_COUNT      GetNextMonotonicCount;\r
-  EFI_STALL                         Stall;\r
-  EFI_SET_WATCHDOG_TIMER            SetWatchdogTimer;\r
+  EFI_GET_NEXT_MONOTONIC_COUNT                  GetNextMonotonicCount;\r
+  EFI_STALL                                     Stall;\r
+  EFI_SET_WATCHDOG_TIMER                        SetWatchdogTimer;\r
 \r
   //\r
   // DriverSupport Services\r
   //\r
-  EFI_CONNECT_CONTROLLER            ConnectController;\r
-  EFI_DISCONNECT_CONTROLLER         DisconnectController;\r
+  EFI_CONNECT_CONTROLLER                        ConnectController;\r
+  EFI_DISCONNECT_CONTROLLER                     DisconnectController;\r
 \r
   //\r
   // Open and Close Protocol Services\r
   //\r
-  EFI_OPEN_PROTOCOL                 OpenProtocol;\r
-  EFI_CLOSE_PROTOCOL                CloseProtocol;\r
-  EFI_OPEN_PROTOCOL_INFORMATION     OpenProtocolInformation;\r
+  EFI_OPEN_PROTOCOL                             OpenProtocol;\r
+  EFI_CLOSE_PROTOCOL                            CloseProtocol;\r
+  EFI_OPEN_PROTOCOL_INFORMATION                 OpenProtocolInformation;\r
 \r
   //\r
   // Library Services\r
   //\r
-  EFI_PROTOCOLS_PER_HANDLE          ProtocolsPerHandle;\r
-  EFI_LOCATE_HANDLE_BUFFER          LocateHandleBuffer;\r
-  EFI_LOCATE_PROTOCOL               LocateProtocol;\r
-  EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES    InstallMultipleProtocolInterfaces;\r
-  EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES  UninstallMultipleProtocolInterfaces;\r
+  EFI_PROTOCOLS_PER_HANDLE                      ProtocolsPerHandle;\r
+  EFI_LOCATE_HANDLE_BUFFER                      LocateHandleBuffer;\r
+  EFI_LOCATE_PROTOCOL                           LocateProtocol;\r
+  EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES      InstallMultipleProtocolInterfaces;\r
+  EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES    UninstallMultipleProtocolInterfaces;\r
 \r
   //\r
   // 32-bit CRC Services\r
   //\r
-  EFI_CALCULATE_CRC32               CalculateCrc32;\r
+  EFI_CALCULATE_CRC32                           CalculateCrc32;\r
 \r
   //\r
   // Miscellaneous Services\r
   //\r
-  EFI_COPY_MEM                      CopyMem;\r
-  EFI_SET_MEM                       SetMem;\r
+  EFI_COPY_MEM                                  CopyMem;\r
+  EFI_SET_MEM                                   SetMem;\r
 } FRAMEWORK_EFI_BOOT_SERVICES;\r
 \r
 #define EFI_EVENT_RUNTIME_CONTEXT       0x20000000\r
@@ -167,4 +167,3 @@ typedef struct {
 #define EFI_EVENT_SIGNAL_LEGACY_BOOT    0x00000204\r
 \r
 #endif\r
-\r
index e2b5a28b8bcb1b95882f85be68040987234509b8..8da429286a2210e2dab39ed5a7ab8a06b71f010a 100644 (file)
@@ -17,38 +17,38 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///\r
 /// Firmware Volume Block Attributes bit definitions.\r
 ///@{\r
-#define EFI_FVB_READ_DISABLED_CAP   0x00000001\r
-#define EFI_FVB_READ_ENABLED_CAP    0x00000002\r
-#define EFI_FVB_READ_STATUS         0x00000004\r
+#define EFI_FVB_READ_DISABLED_CAP  0x00000001\r
+#define EFI_FVB_READ_ENABLED_CAP   0x00000002\r
+#define EFI_FVB_READ_STATUS        0x00000004\r
 \r
 #define EFI_FVB_WRITE_DISABLED_CAP  0x00000008\r
 #define EFI_FVB_WRITE_ENABLED_CAP   0x00000010\r
 #define EFI_FVB_WRITE_STATUS        0x00000020\r
 \r
-#define EFI_FVB_LOCK_CAP            0x00000040\r
-#define EFI_FVB_LOCK_STATUS         0x00000080\r
+#define EFI_FVB_LOCK_CAP     0x00000040\r
+#define EFI_FVB_LOCK_STATUS  0x00000080\r
 \r
-#define EFI_FVB_STICKY_WRITE        0x00000200\r
-#define EFI_FVB_MEMORY_MAPPED       0x00000400\r
-#define EFI_FVB_ERASE_POLARITY      0x00000800\r
+#define EFI_FVB_STICKY_WRITE    0x00000200\r
+#define EFI_FVB_MEMORY_MAPPED   0x00000400\r
+#define EFI_FVB_ERASE_POLARITY  0x00000800\r
 \r
-#define EFI_FVB_ALIGNMENT_CAP       0x00008000\r
-#define EFI_FVB_ALIGNMENT_2         0x00010000\r
-#define EFI_FVB_ALIGNMENT_4         0x00020000\r
-#define EFI_FVB_ALIGNMENT_8         0x00040000\r
-#define EFI_FVB_ALIGNMENT_16        0x00080000\r
-#define EFI_FVB_ALIGNMENT_32        0x00100000\r
-#define EFI_FVB_ALIGNMENT_64        0x00200000\r
-#define EFI_FVB_ALIGNMENT_128       0x00400000\r
-#define EFI_FVB_ALIGNMENT_256       0x00800000\r
-#define EFI_FVB_ALIGNMENT_512       0x01000000\r
-#define EFI_FVB_ALIGNMENT_1K        0x02000000\r
-#define EFI_FVB_ALIGNMENT_2K        0x04000000\r
-#define EFI_FVB_ALIGNMENT_4K        0x08000000\r
-#define EFI_FVB_ALIGNMENT_8K        0x10000000\r
-#define EFI_FVB_ALIGNMENT_16K       0x20000000\r
-#define EFI_FVB_ALIGNMENT_32K       0x40000000\r
-#define EFI_FVB_ALIGNMENT_64K       0x80000000\r
+#define EFI_FVB_ALIGNMENT_CAP  0x00008000\r
+#define EFI_FVB_ALIGNMENT_2    0x00010000\r
+#define EFI_FVB_ALIGNMENT_4    0x00020000\r
+#define EFI_FVB_ALIGNMENT_8    0x00040000\r
+#define EFI_FVB_ALIGNMENT_16   0x00080000\r
+#define EFI_FVB_ALIGNMENT_32   0x00100000\r
+#define EFI_FVB_ALIGNMENT_64   0x00200000\r
+#define EFI_FVB_ALIGNMENT_128  0x00400000\r
+#define EFI_FVB_ALIGNMENT_256  0x00800000\r
+#define EFI_FVB_ALIGNMENT_512  0x01000000\r
+#define EFI_FVB_ALIGNMENT_1K   0x02000000\r
+#define EFI_FVB_ALIGNMENT_2K   0x04000000\r
+#define EFI_FVB_ALIGNMENT_4K   0x08000000\r
+#define EFI_FVB_ALIGNMENT_8K   0x10000000\r
+#define EFI_FVB_ALIGNMENT_16K  0x20000000\r
+#define EFI_FVB_ALIGNMENT_32K  0x40000000\r
+#define EFI_FVB_ALIGNMENT_64K  0x80000000\r
 ///@}\r
 \r
 /// This is a simple macro defined as the set of all FV Block Attributes signifying capabilities.\r
@@ -68,12 +68,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
   * @param Bit            A value indicating the bit(s) to test.\r
   *                       If multiple bits are set, the logical OR of their tests is the expression's value.\r
 **/\r
-#define EFI_TEST_FFS_ATTRIBUTES_BIT( FvbAttributes, TestAttributes, Bit) \\r
+#define EFI_TEST_FFS_ATTRIBUTES_BIT(FvbAttributes, TestAttributes, Bit) \\r
     ((BOOLEAN) \\r
       ((FvbAttributes & EFI_FVB_ERASE_POLARITY) ? (((~TestAttributes) & Bit) == Bit) : ((TestAttributes & Bit) == Bit)) \\r
     )\r
 \r
 /// A simple macro defined as the set of all FV Block Attribute bits that indicate status.\r
-#define EFI_FVB_STATUS    (EFI_FVB_READ_STATUS | EFI_FVB_WRITE_STATUS | EFI_FVB_LOCK_STATUS)\r
+#define EFI_FVB_STATUS  (EFI_FVB_READ_STATUS | EFI_FVB_WRITE_STATUS | EFI_FVB_LOCK_STATUS)\r
 \r
-#endif  /* __EFI_FIRMWARE_VOLUME_HEADER_H__ */\r
+#endif /* __EFI_FIRMWARE_VOLUME_HEADER_H__ */\r
index c77e39b4c09047c58031f4efcc9654c93b789e71..02fadd13517b7aecb3d410b823c69d5d26781d01 100644 (file)
@@ -17,16 +17,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Bit values for AuthenticationStatus\r
 //\r
-#define EFI_AGGREGATE_AUTH_STATUS_PLATFORM_OVERRIDE 0x000001\r
-#define EFI_AGGREGATE_AUTH_STATUS_IMAGE_SIGNED      0x000002\r
-#define EFI_AGGREGATE_AUTH_STATUS_NOT_TESTED        0x000004\r
-#define EFI_AGGREGATE_AUTH_STATUS_TEST_FAILED       0x000008\r
-#define EFI_AGGREGATE_AUTH_STATUS_ALL               0x00000f\r
+#define EFI_AGGREGATE_AUTH_STATUS_PLATFORM_OVERRIDE  0x000001\r
+#define EFI_AGGREGATE_AUTH_STATUS_IMAGE_SIGNED       0x000002\r
+#define EFI_AGGREGATE_AUTH_STATUS_NOT_TESTED         0x000004\r
+#define EFI_AGGREGATE_AUTH_STATUS_TEST_FAILED        0x000008\r
+#define EFI_AGGREGATE_AUTH_STATUS_ALL                0x00000f\r
 \r
-#define EFI_LOCAL_AUTH_STATUS_PLATFORM_OVERRIDE     0x010000\r
-#define EFI_LOCAL_AUTH_STATUS_IMAGE_SIGNED          0x020000\r
-#define EFI_LOCAL_AUTH_STATUS_NOT_TESTED            0x040000\r
-#define EFI_LOCAL_AUTH_STATUS_TEST_FAILED           0x080000\r
-#define EFI_LOCAL_AUTH_STATUS_ALL                   0x0f0000\r
+#define EFI_LOCAL_AUTH_STATUS_PLATFORM_OVERRIDE  0x010000\r
+#define EFI_LOCAL_AUTH_STATUS_IMAGE_SIGNED       0x020000\r
+#define EFI_LOCAL_AUTH_STATUS_NOT_TESTED         0x040000\r
+#define EFI_LOCAL_AUTH_STATUS_TEST_FAILED        0x080000\r
+#define EFI_LOCAL_AUTH_STATUS_ALL                0x0f0000\r
 \r
 #endif\r
index f10fc5231289057506392163ef8b672b79a6e803..2dcf6380e35a11d166c9f828823e308b16d6f149 100644 (file)
@@ -14,72 +14,72 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __FRAMEWORK_INTERNAL_FORMREPRESENTATION_H__\r
 #define __FRAMEWORK_INTERNAL_FORMREPRESENTATION_H__\r
 \r
-typedef UINT16  STRING_REF;\r
+typedef UINT16 STRING_REF;\r
 \r
 //\r
 // IFR Op codes\r
 //\r
-#define FRAMEWORK_EFI_IFR_FORM_OP                 0x01\r
-#define FRAMEWORK_EFI_IFR_SUBTITLE_OP             0x02\r
-#define FRAMEWORK_EFI_IFR_TEXT_OP                 0x03\r
-#define EFI_IFR_GRAPHIC_OP                        0x04\r
-#define FRAMEWORK_EFI_IFR_ONE_OF_OP               0x05\r
-#define FRAMEWORK_EFI_IFR_CHECKBOX_OP             0x06\r
-#define FRAMEWORK_EFI_IFR_NUMERIC_OP              0x07\r
-#define FRAMEWORK_EFI_IFR_PASSWORD_OP             0x08\r
-#define FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP        0x09  ///< ONEOF OPTION field.\r
-#define FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP          0x0A\r
-#define EFI_IFR_END_FORM_OP                       0x0B\r
-#define EFI_IFR_HIDDEN_OP                         0x0C\r
-#define EFI_IFR_END_FORM_SET_OP                   0x0D\r
-#define FRAMEWORK_EFI_IFR_FORM_SET_OP             0x0E\r
-#define FRAMEWORK_EFI_IFR_REF_OP                  0x0F\r
-#define EFI_IFR_END_ONE_OF_OP                     0x10\r
-#define FRAMEWORK_EFI_IFR_END_OP                  EFI_IFR_END_ONE_OF_OP\r
-#define FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP      0x11\r
-#define FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP            0x12\r
-#define FRAMEWORK_EFI_IFR_EQ_ID_ID_OP             0x13\r
-#define FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP           0x14\r
-#define FRAMEWORK_EFI_IFR_AND_OP                  0x15\r
-#define FRAMEWORK_EFI_IFR_OR_OP                   0x16\r
-#define FRAMEWORK_EFI_IFR_NOT_OP                  0x17\r
-#define EFI_IFR_END_IF_OP                         0x18  ///< For endif of inconsistentif, suppressif, grayoutif.\r
-#define EFI_IFR_GRAYOUT_IF_OP                     0x19\r
-#define FRAMEWORK_EFI_IFR_DATE_OP                 0x1A\r
-#define FRAMEWORK_EFI_IFR_TIME_OP                 0x1B\r
-#define FRAMEWORK_EFI_IFR_STRING_OP               0x1C\r
-#define EFI_IFR_LABEL_OP                          0x1D\r
-#define EFI_IFR_SAVE_DEFAULTS_OP                  0x1E\r
-#define EFI_IFR_RESTORE_DEFAULTS_OP               0x1F\r
-#define EFI_IFR_BANNER_OP                         0x20\r
-#define EFI_IFR_INVENTORY_OP                      0x21\r
-#define EFI_IFR_EQ_VAR_VAL_OP                     0x22\r
-#define FRAMEWORK_EFI_IFR_ORDERED_LIST_OP         0x23\r
-#define FRAMEWORK_EFI_IFR_VARSTORE_OP             0x24\r
-#define EFI_IFR_VARSTORE_SELECT_OP                0x25\r
-#define EFI_IFR_VARSTORE_SELECT_PAIR_OP           0x26\r
-#define EFI_IFR_LAST_OPCODE                       EFI_IFR_VARSTORE_SELECT_PAIR_OP\r
-#define EFI_IFR_OEM_OP                            0xFE\r
-#define EFI_IFR_NV_ACCESS_COMMAND                 0xFF\r
+#define FRAMEWORK_EFI_IFR_FORM_OP             0x01\r
+#define FRAMEWORK_EFI_IFR_SUBTITLE_OP         0x02\r
+#define FRAMEWORK_EFI_IFR_TEXT_OP             0x03\r
+#define EFI_IFR_GRAPHIC_OP                    0x04\r
+#define FRAMEWORK_EFI_IFR_ONE_OF_OP           0x05\r
+#define FRAMEWORK_EFI_IFR_CHECKBOX_OP         0x06\r
+#define FRAMEWORK_EFI_IFR_NUMERIC_OP          0x07\r
+#define FRAMEWORK_EFI_IFR_PASSWORD_OP         0x08\r
+#define FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP    0x09      ///< ONEOF OPTION field.\r
+#define FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP      0x0A\r
+#define EFI_IFR_END_FORM_OP                   0x0B\r
+#define EFI_IFR_HIDDEN_OP                     0x0C\r
+#define EFI_IFR_END_FORM_SET_OP               0x0D\r
+#define FRAMEWORK_EFI_IFR_FORM_SET_OP         0x0E\r
+#define FRAMEWORK_EFI_IFR_REF_OP              0x0F\r
+#define EFI_IFR_END_ONE_OF_OP                 0x10\r
+#define FRAMEWORK_EFI_IFR_END_OP              EFI_IFR_END_ONE_OF_OP\r
+#define FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP  0x11\r
+#define FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP        0x12\r
+#define FRAMEWORK_EFI_IFR_EQ_ID_ID_OP         0x13\r
+#define FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP       0x14\r
+#define FRAMEWORK_EFI_IFR_AND_OP              0x15\r
+#define FRAMEWORK_EFI_IFR_OR_OP               0x16\r
+#define FRAMEWORK_EFI_IFR_NOT_OP              0x17\r
+#define EFI_IFR_END_IF_OP                     0x18      ///< For endif of inconsistentif, suppressif, grayoutif.\r
+#define EFI_IFR_GRAYOUT_IF_OP                 0x19\r
+#define FRAMEWORK_EFI_IFR_DATE_OP             0x1A\r
+#define FRAMEWORK_EFI_IFR_TIME_OP             0x1B\r
+#define FRAMEWORK_EFI_IFR_STRING_OP           0x1C\r
+#define EFI_IFR_LABEL_OP                      0x1D\r
+#define EFI_IFR_SAVE_DEFAULTS_OP              0x1E\r
+#define EFI_IFR_RESTORE_DEFAULTS_OP           0x1F\r
+#define EFI_IFR_BANNER_OP                     0x20\r
+#define EFI_IFR_INVENTORY_OP                  0x21\r
+#define EFI_IFR_EQ_VAR_VAL_OP                 0x22\r
+#define FRAMEWORK_EFI_IFR_ORDERED_LIST_OP     0x23\r
+#define FRAMEWORK_EFI_IFR_VARSTORE_OP         0x24\r
+#define EFI_IFR_VARSTORE_SELECT_OP            0x25\r
+#define EFI_IFR_VARSTORE_SELECT_PAIR_OP       0x26\r
+#define EFI_IFR_LAST_OPCODE                   EFI_IFR_VARSTORE_SELECT_PAIR_OP\r
+#define EFI_IFR_OEM_OP                        0xFE\r
+#define EFI_IFR_NV_ACCESS_COMMAND             0xFF\r
 \r
 //\r
 // Define values for the flags fields in some VFR opcodes. These are\r
 // bitmasks.\r
 //\r
-#define EFI_IFR_FLAG_DEFAULT            0x01\r
-#define EFI_IFR_FLAG_MANUFACTURING      0x02\r
-#define EFI_IFR_FLAG_INTERACTIVE        0x04\r
-#define EFI_IFR_FLAG_NV_ACCESS          0x08\r
-#define EFI_IFR_FLAG_RESET_REQUIRED     0x10\r
-#define EFI_IFR_FLAG_LATE_CHECK         0x20\r
-\r
-#define EFI_NON_DEVICE_CLASS              0x00  ///< Useful when you do not want something in the Device Manager.\r
-#define EFI_DISK_DEVICE_CLASS             0x01\r
-#define EFI_VIDEO_DEVICE_CLASS            0x02\r
-#define EFI_NETWORK_DEVICE_CLASS          0x04\r
-#define EFI_INPUT_DEVICE_CLASS            0x08\r
-#define EFI_ON_BOARD_DEVICE_CLASS         0x10\r
-#define EFI_OTHER_DEVICE_CLASS            0x20\r
+#define EFI_IFR_FLAG_DEFAULT         0x01\r
+#define EFI_IFR_FLAG_MANUFACTURING   0x02\r
+#define EFI_IFR_FLAG_INTERACTIVE     0x04\r
+#define EFI_IFR_FLAG_NV_ACCESS       0x08\r
+#define EFI_IFR_FLAG_RESET_REQUIRED  0x10\r
+#define EFI_IFR_FLAG_LATE_CHECK      0x20\r
+\r
+#define EFI_NON_DEVICE_CLASS       0x00         ///< Useful when you do not want something in the Device Manager.\r
+#define EFI_DISK_DEVICE_CLASS      0x01\r
+#define EFI_VIDEO_DEVICE_CLASS     0x02\r
+#define EFI_NETWORK_DEVICE_CLASS   0x04\r
+#define EFI_INPUT_DEVICE_CLASS     0x08\r
+#define EFI_ON_BOARD_DEVICE_CLASS  0x10\r
+#define EFI_OTHER_DEVICE_CLASS     0x20\r
 \r
 #define EFI_SETUP_APPLICATION_SUBCLASS    0x00\r
 #define EFI_GENERAL_APPLICATION_SUBCLASS  0x01\r
@@ -96,70 +96,69 @@ typedef UINT16  STRING_REF;
 ///\r
 #define EFI_IFR_FLAG_CREATED  128\r
 \r
-\r
 #pragma pack(1)\r
 //\r
 // IFR Structure definitions\r
 //\r
 typedef struct {\r
-  UINT8                             OpCode;\r
-  UINT8                             Length;\r
+  UINT8    OpCode;\r
+  UINT8    Length;\r
 } FRAMEWORK_EFI_IFR_OP_HEADER;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  EFI_GUID                          Guid;\r
-  STRING_REF                        FormSetTitle;\r
-  STRING_REF                        Help;\r
-  EFI_PHYSICAL_ADDRESS              CallbackHandle;\r
-  UINT16                            Class;\r
-  UINT16                            SubClass;\r
-  UINT16                            NvDataSize; ///< Set once; the size of the NV data as defined in the script.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  EFI_GUID                       Guid;\r
+  STRING_REF                     FormSetTitle;\r
+  STRING_REF                     Help;\r
+  EFI_PHYSICAL_ADDRESS           CallbackHandle;\r
+  UINT16                         Class;\r
+  UINT16                         SubClass;\r
+  UINT16                         NvDataSize;    ///< Set once; the size of the NV data as defined in the script.\r
 } FRAMEWORK_EFI_IFR_FORM_SET;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            FormId;\r
-  STRING_REF                        FormTitle;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         FormId;\r
+  STRING_REF                     FormTitle;\r
 } FRAMEWORK_EFI_IFR_FORM;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            LabelId;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         LabelId;\r
 } EFI_IFR_LABEL;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  STRING_REF                        SubTitle;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  STRING_REF                     SubTitle;\r
 } FRAMEWORK_EFI_IFR_SUBTITLE;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  STRING_REF                        Help;\r
-  STRING_REF                        Text;\r
-  STRING_REF                        TextTwo;\r
-  UINT8                             Flags;  ///< This is included solely for purposes of interactive/dynamic support.\r
-  UINT16                            Key;    ///< The value to be passed to the caller to identify this particular op-code.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  STRING_REF                     Help;\r
+  STRING_REF                     Text;\r
+  STRING_REF                     TextTwo;\r
+  UINT8                          Flags;     ///< This is included solely for purposes of interactive/dynamic support.\r
+  UINT16                         Key;       ///< The value to be passed to the caller to identify this particular op-code.\r
 } FRAMEWORK_EFI_IFR_TEXT;\r
 \r
 //\r
 // goto\r
 //\r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            FormId;\r
-  STRING_REF                        Prompt;\r
-  STRING_REF                        Help;   ///< The string Token for the context-help.\r
-  UINT8                             Flags;  ///< This is included solely for purposes of interactive/dynamic support.\r
-  UINT16                            Key;    ///< The value to be passed to the caller to identify this particular op-code.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         FormId;\r
+  STRING_REF                     Prompt;\r
+  STRING_REF                     Help;      ///< The string Token for the context-help.\r
+  UINT8                          Flags;     ///< This is included solely for purposes of interactive/dynamic support.\r
+  UINT16                         Key;       ///< The value to be passed to the caller to identify this particular op-code.\r
 } FRAMEWORK_EFI_IFR_REF;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
 } EFI_IFR_END_FORM;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
 } EFI_IFR_END_FORM_SET;\r
 \r
 //\r
@@ -167,51 +166,51 @@ typedef struct {
 // code assumes this to be true, if this ever changes we need to revisit the InitializeTagStructures code\r
 //\r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            QuestionId; ///< The ID designating what the question is about...\r
-  UINT8                             Width;      ///< The Size of the Data being saved.\r
-  STRING_REF                        Prompt;     ///< The String Token for the Prompt.\r
-  STRING_REF                        Help;       ///< The string Token for the context-help.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         QuestionId;    ///< The ID designating what the question is about...\r
+  UINT8                          Width;         ///< The Size of the Data being saved.\r
+  STRING_REF                     Prompt;        ///< The String Token for the Prompt.\r
+  STRING_REF                     Help;          ///< The string Token for the context-help.\r
 } FRAMEWORK_EFI_IFR_ONE_OF;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            QuestionId; ///< The offset in NV for storage of the data.\r
-  UINT8                             MaxEntries; ///< The maximum number of options in the ordered list (=size of NVStore).\r
-  STRING_REF                        Prompt;     ///< The string token for the prompt.\r
-  STRING_REF                        Help;       ///< The string token for the context-help.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         QuestionId;    ///< The offset in NV for storage of the data.\r
+  UINT8                          MaxEntries;    ///< The maximum number of options in the ordered list (=size of NVStore).\r
+  STRING_REF                     Prompt;        ///< The string token for the prompt.\r
+  STRING_REF                     Help;          ///< The string token for the context-help.\r
 } FRAMEWORK_EFI_IFR_ORDERED_LIST;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            QuestionId; ///< The ID designating what the question is about...\r
-  UINT8                             Width;      ///< The Size of the Data being saved.\r
-  STRING_REF                        Prompt;     ///< The String Token for the Prompt.\r
-  STRING_REF                        Help;       ///< The string Token for the context-help.\r
-  UINT8                             Flags;      ///< If non-zero, it means that it is the default option.\r
-  UINT16                            Key;        ///< Value to be passed to caller to identify this particular op-code.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         QuestionId;    ///< The ID designating what the question is about...\r
+  UINT8                          Width;         ///< The Size of the Data being saved.\r
+  STRING_REF                     Prompt;        ///< The String Token for the Prompt.\r
+  STRING_REF                     Help;          ///< The string Token for the context-help.\r
+  UINT8                          Flags;         ///< If non-zero, it means that it is the default option.\r
+  UINT16                         Key;           ///< Value to be passed to caller to identify this particular op-code.\r
 } FRAMEWORK_EFI_IFR_CHECKBOX, EFI_IFR_CHECK_BOX;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  STRING_REF                        Option;     ///< The string token describing the option.\r
-  UINT16                            Value;      ///< The value associated with this option that is stored in the NVRAM.\r
-  UINT8                             Flags;      ///< If non-zero, it means that it is the default option.\r
-  UINT16                            Key;        ///< Value to be passed to caller to identify this particular op-code.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  STRING_REF                     Option;        ///< The string token describing the option.\r
+  UINT16                         Value;         ///< The value associated with this option that is stored in the NVRAM.\r
+  UINT8                          Flags;         ///< If non-zero, it means that it is the default option.\r
+  UINT16                         Key;           ///< Value to be passed to caller to identify this particular op-code.\r
 } FRAMEWORK_EFI_IFR_ONE_OF_OPTION;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            QuestionId; ///< The ID designating what the question is about...\r
-  UINT8                             Width;      ///< The Size of the Data being saved.\r
-  STRING_REF                        Prompt;     ///< The String Token for the Prompt.\r
-  STRING_REF                        Help;       ///< The string Token for the context-help.\r
-  UINT8                             Flags;      ///< This is included solely for purposes of interactive/dynamic support.\r
-  UINT16                            Key;        ///< The value to be passed to caller to identify this particular op-code.\r
-  UINT16                            Minimum;\r
-  UINT16                            Maximum;\r
-  UINT16                            Step;       ///< Zero means manual input. Otherwise, arrow selection is called for.\r
-  UINT16                            Default;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         QuestionId;    ///< The ID designating what the question is about...\r
+  UINT8                          Width;         ///< The Size of the Data being saved.\r
+  STRING_REF                     Prompt;        ///< The String Token for the Prompt.\r
+  STRING_REF                     Help;          ///< The string Token for the context-help.\r
+  UINT8                          Flags;         ///< This is included solely for purposes of interactive/dynamic support.\r
+  UINT16                         Key;           ///< The value to be passed to caller to identify this particular op-code.\r
+  UINT16                         Minimum;\r
+  UINT16                         Maximum;\r
+  UINT16                         Step;          ///< Zero means manual input. Otherwise, arrow selection is called for.\r
+  UINT16                         Default;\r
 } FRAMEWORK_EFI_IFR_NUMERIC;\r
 \r
 //\r
@@ -223,50 +222,50 @@ typedef struct {
 // gRT->GetXXXX series of calls.\r
 //\r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_NUMERIC         Hour;\r
-  FRAMEWORK_EFI_IFR_NUMERIC         Minute;\r
-  FRAMEWORK_EFI_IFR_NUMERIC         Second;\r
+  FRAMEWORK_EFI_IFR_NUMERIC    Hour;\r
+  FRAMEWORK_EFI_IFR_NUMERIC    Minute;\r
+  FRAMEWORK_EFI_IFR_NUMERIC    Second;\r
 } FRAMEWORK_EFI_IFR_TIME;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_NUMERIC         Year;\r
-  FRAMEWORK_EFI_IFR_NUMERIC         Month;\r
-  FRAMEWORK_EFI_IFR_NUMERIC         Day;\r
+  FRAMEWORK_EFI_IFR_NUMERIC    Year;\r
+  FRAMEWORK_EFI_IFR_NUMERIC    Month;\r
+  FRAMEWORK_EFI_IFR_NUMERIC    Day;\r
 } FRAMEWORK_EFI_IFR_DATE;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            QuestionId;///< The ID designating what the question is about...\r
-  UINT8                             Width;     ///< The Size of the Data being saved.\r
-  STRING_REF                        Prompt;    ///< The String Token for the Prompt.\r
-  STRING_REF                        Help;      ///< The string Token for the context-help.\r
-  UINT8                             Flags;     ///< This is included solely for purposes of interactive/dynamic support.\r
-  UINT16                            Key;       ///< The value to be passed to caller to identify this particular op-code.\r
-  UINT8                             MinSize;   ///< Minimum allowable sized password.\r
-  UINT8                             MaxSize;   ///< Maximum allowable sized password.\r
-  UINT16                            Encoding;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         QuestionId;   ///< The ID designating what the question is about...\r
+  UINT8                          Width;        ///< The Size of the Data being saved.\r
+  STRING_REF                     Prompt;       ///< The String Token for the Prompt.\r
+  STRING_REF                     Help;         ///< The string Token for the context-help.\r
+  UINT8                          Flags;        ///< This is included solely for purposes of interactive/dynamic support.\r
+  UINT16                         Key;          ///< The value to be passed to caller to identify this particular op-code.\r
+  UINT8                          MinSize;      ///< Minimum allowable sized password.\r
+  UINT8                          MaxSize;      ///< Maximum allowable sized password.\r
+  UINT16                         Encoding;\r
 } FRAMEWORK_EFI_IFR_PASSWORD;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            QuestionId; ///< The ID designating what the question is about...\r
-  UINT8                             Width;      ///< The Size of the Data being saved.\r
-  STRING_REF                        Prompt;     ///< The String Token for the Prompt.\r
-  STRING_REF                        Help;       ///< The string Token for the context-help.\r
-  UINT8                             Flags;      ///< This is included solely for purposes of interactive/dynamic support.\r
-  UINT16                            Key;        ///< The value to be passed to caller to identify this particular op-code.\r
-  UINT8                             MinSize;    ///< Minimum allowable sized password.\r
-  UINT8                             MaxSize;    ///< Maximum allowable sized password.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         QuestionId;    ///< The ID designating what the question is about...\r
+  UINT8                          Width;         ///< The Size of the Data being saved.\r
+  STRING_REF                     Prompt;        ///< The String Token for the Prompt.\r
+  STRING_REF                     Help;          ///< The string Token for the context-help.\r
+  UINT8                          Flags;         ///< This is included solely for purposes of interactive/dynamic support.\r
+  UINT16                         Key;           ///< The value to be passed to caller to identify this particular op-code.\r
+  UINT8                          MinSize;       ///< Minimum allowable sized password.\r
+  UINT8                          MaxSize;       ///< Maximum allowable sized password.\r
 } FRAMEWORK_EFI_IFR_STRING;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
 } EFI_IFR_END_ONE_OF;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            Value;\r
-  UINT16                            Key;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         Value;\r
+  UINT16                         Key;\r
 } EFI_IFR_HIDDEN;\r
 \r
 ///\r
@@ -275,92 +274,92 @@ typedef struct {
 /// keep the inconsistant is for implementation needed.\r
 ///@{\r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT8                             Flags;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT8                          Flags;\r
 } EFI_IFR_SUPPRESS;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT8                             Flags;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT8                          Flags;\r
 } EFI_IFR_GRAY_OUT;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  STRING_REF                        Popup;\r
-  UINT8                             Flags;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  STRING_REF                     Popup;\r
+  UINT8                          Flags;\r
 } EFI_IFR_INCONSISTENT;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            QuestionId;   ///< The offset into variable storage.\r
-  UINT8                             Width;        ///< The size of variable storage.\r
-  UINT16                            Value;        ///< The value to compare against.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         QuestionId;      ///< The offset into variable storage.\r
+  UINT8                          Width;           ///< The size of variable storage.\r
+  UINT16                         Value;           ///< The value to compare against.\r
 } FRAMEWORK_EFI_IFR_EQ_ID_VAL;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            QuestionId;   ///< The offset into variable storage.\r
-  UINT8                             Width;        ///< The size of variable storage.\r
-  UINT16                            ListLength;\r
-  UINT16                            ValueList[1];\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         QuestionId;      ///< The offset into variable storage.\r
+  UINT8                          Width;           ///< The size of variable storage.\r
+  UINT16                         ListLength;\r
+  UINT16                         ValueList[1];\r
 } FRAMEWORK_EFI_IFR_EQ_ID_LIST;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            QuestionId1;  ///< The offset into variable storage for first value to compare.\r
-  UINT8                             Width;        ///< The size of variable storage (must be same for both).\r
-  UINT16                            QuestionId2;  ///< The offset into variable storage for second value to compare.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         QuestionId1;     ///< The offset into variable storage for first value to compare.\r
+  UINT8                          Width;           ///< The size of variable storage (must be same for both).\r
+  UINT16                         QuestionId2;     ///< The offset into variable storage for second value to compare.\r
 } FRAMEWORK_EFI_IFR_EQ_ID_ID;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            VariableId;   ///< The offset into variable storage.\r
-  UINT16                            Value;        ///< The value to compare against.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         VariableId;      ///< The offset into variable storage.\r
+  UINT16                         Value;           ///< The value to compare against.\r
 } EFI_IFR_EQ_VAR_VAL;\r
 ///@}\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
 } FRAMEWORK_EFI_IFR_AND;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
 } FRAMEWORK_EFI_IFR_OR;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
 } FRAMEWORK_EFI_IFR_NOT;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
 } EFI_IFR_END_EXPR, EFI_IFR_END_IF;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            FormId;\r
-  STRING_REF                        Prompt;\r
-  STRING_REF                        Help;\r
-  UINT8                             Flags;\r
-  UINT16                            Key;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         FormId;\r
+  STRING_REF                     Prompt;\r
+  STRING_REF                     Help;\r
+  UINT8                          Flags;\r
+  UINT16                         Key;\r
 } EFI_IFR_SAVE_DEFAULTS;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  STRING_REF                        Help;\r
-  STRING_REF                        Text;\r
-  STRING_REF                        TextTwo;    ///< Optional text.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  STRING_REF                     Help;\r
+  STRING_REF                     Text;\r
+  STRING_REF                     TextTwo;       ///< Optional text.\r
 } EFI_IFR_INVENTORY;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  EFI_GUID                          Guid;       ///< GUID for the variable.\r
-  UINT16                            VarId;      ///< The variable store ID, as referenced elsewhere in the form.\r
-  UINT16                            Size;       ///< The size of the variable storage.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  EFI_GUID                       Guid;          ///< GUID for the variable.\r
+  UINT16                         VarId;         ///< The variable store ID, as referenced elsewhere in the form.\r
+  UINT16                         Size;          ///< The size of the variable storage.\r
 } FRAMEWORK_EFI_IFR_VARSTORE;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            VarId;      ///< The variable store ID, as referenced elsewhere in the form.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         VarId;         ///< The variable store ID, as referenced elsewhere in the form.\r
 } EFI_IFR_VARSTORE_SELECT;\r
 \r
 ///\r
@@ -370,9 +369,9 @@ typedef struct {
 /// IFR opcodes use the VarId as defined here.\r
 ///\r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  UINT16                            VarId;          ///< The variable store ID, as referenced elsewhere in the form.\r
-  UINT16                            SecondaryVarId; ///< The variable store ID, as referenced elsewhere in the form.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  UINT16                         VarId;             ///< The variable store ID, as referenced elsewhere in the form.\r
+  UINT16                         SecondaryVarId;    ///< The variable store ID, as referenced elsewhere in the form.\r
 } EFI_IFR_VARSTORE_SELECT_PAIR;\r
 \r
 ///\r
@@ -381,16 +380,16 @@ typedef struct {
 #define EFI_IFR_RESTORE_DEFAULTS  EFI_IFR_SAVE_DEFAULTS\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
-  STRING_REF                        Title;        ///< The string token for the banner title.\r
-  UINT16                            LineNumber;   ///< 1-based line number.\r
-  UINT8                             Alignment;    ///< Left, center, or right-aligned.\r
+  FRAMEWORK_EFI_IFR_OP_HEADER    Header;\r
+  STRING_REF                     Title;           ///< The string token for the banner title.\r
+  UINT16                         LineNumber;      ///< 1-based line number.\r
+  UINT8                          Alignment;       ///< Left, center, or right-aligned.\r
 } EFI_IFR_BANNER;\r
 \r
-#define EFI_IFR_BANNER_ALIGN_LEFT   0\r
-#define EFI_IFR_BANNER_ALIGN_CENTER 1\r
-#define EFI_IFR_BANNER_ALIGN_RIGHT  2\r
-#define EFI_IFR_BANNER_TIMEOUT      0xFF\r
+#define EFI_IFR_BANNER_ALIGN_LEFT    0\r
+#define EFI_IFR_BANNER_ALIGN_CENTER  1\r
+#define EFI_IFR_BANNER_ALIGN_RIGHT   2\r
+#define EFI_IFR_BANNER_TIMEOUT       0xFF\r
 \r
 #pragma pack()\r
 \r
index f6a71fabe4f0fc3eda6cac907c9143d52f23ffdb..592a179bc2e33899f611778b9dfa44589492b639 100644 (file)
@@ -17,12 +17,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// This macro is defined to comply with the hob Framework Spec. And the marco was\r
 /// retired in the PI1.0 specification.\r
 ///\r
-#define EFI_HOB_TYPE_CV           0x0008\r
+#define EFI_HOB_TYPE_CV  0x0008\r
 \r
 typedef struct {\r
-  EFI_HOB_GENERIC_HEADER            Header;\r
-  EFI_PHYSICAL_ADDRESS              BaseAddress;\r
-  UINT64                            Length;\r
+  EFI_HOB_GENERIC_HEADER    Header;\r
+  EFI_PHYSICAL_ADDRESS      BaseAddress;\r
+  UINT64                    Length;\r
 } EFI_HOB_CAPSULE_VOLUME;\r
 \r
 #endif\r
index 753029c13c346dc0fecae14576d46492e7c4dc00..5678127a246fff62fa750fbca434088e1a7842c2 100644 (file)
@@ -26,8 +26,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// The Framework Specification, StatusCodes 0.92, does not define the macros.\r
 ///\r
 ///@{\r
-#define EFI_SW_DXE_BS_PC_BEGIN_CONNECTING_DRIVERS     (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
-#define EFI_SW_DXE_BS_PC_VERIFYING_PASSWORD           (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
+#define EFI_SW_DXE_BS_PC_BEGIN_CONNECTING_DRIVERS  (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
+#define EFI_SW_DXE_BS_PC_VERIFYING_PASSWORD        (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
 ///@}\r
 \r
 ///\r
@@ -37,12 +37,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// The Framework Specification, StatusCodes 0.92, does not define the macros.\r
 ///\r
 ///@{\r
-#define EFI_SW_DXE_RT_PC_S0 (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_DXE_RT_PC_S1 (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_SW_DXE_RT_PC_S2 (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_SW_DXE_RT_PC_S3 (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_SW_DXE_RT_PC_S4 (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-#define EFI_SW_DXE_RT_PC_S5 (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
+#define EFI_SW_DXE_RT_PC_S0  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
+#define EFI_SW_DXE_RT_PC_S1  (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
+#define EFI_SW_DXE_RT_PC_S2  (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
+#define EFI_SW_DXE_RT_PC_S3  (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
+#define EFI_SW_DXE_RT_PC_S4  (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
+#define EFI_SW_DXE_RT_PC_S5  (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
 ///@}\r
 \r
 ///\r
@@ -51,7 +51,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// Inconsistent with specification here:\r
 /// The Framework Specification, StatusCodes 0.92, does not define the macros.\r
 ///\r
-#define EFI_SOFTWARE_X64_EXCEPTION        (EFI_SOFTWARE | 0x00130000)\r
+#define EFI_SOFTWARE_X64_EXCEPTION  (EFI_SOFTWARE | 0x00130000)\r
 \r
 ///\r
 /// Software Class X64 Exception Subclass Error Code definitions.\r
@@ -62,31 +62,31 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// The Framework Specification, StatusCodes 0.92, does not define the macros.\r
 ///\r
 ///@{\r
-#define EFI_SW_EC_X64_DIVIDE_ERROR      EXCEPT_X64_DIVIDE_ERROR\r
-#define EFI_SW_EC_X64_DEBUG             EXCEPT_X64_DEBUG\r
-#define EFI_SW_EC_X64_NMI               EXCEPT_X64_NMI\r
-#define EFI_SW_EC_X64_BREAKPOINT        EXCEPT_X64_BREAKPOINT\r
-#define EFI_SW_EC_X64_OVERFLOW          EXCEPT_X64_OVERFLOW\r
-#define EFI_SW_EC_X64_BOUND             EXCEPT_X64_BOUND\r
-#define EFI_SW_EC_X64_INVALID_OPCODE    EXCEPT_X64_INVALID_OPCODE\r
-#define EFI_SW_EC_X64_DOUBLE_FAULT      EXCEPT_X64_DOUBLE_FAULT\r
-#define EFI_SW_EC_X64_INVALID_TSS       EXCEPT_X64_INVALID_TSS\r
-#define EFI_SW_EC_X64_SEG_NOT_PRESENT   EXCEPT_X64_SEG_NOT_PRESENT\r
-#define EFI_SW_EC_X64_STACK_FAULT       EXCEPT_X64_STACK_FAULT\r
-#define EFI_SW_EC_X64_GP_FAULT          EXCEPT_X64_GP_FAULT\r
-#define EFI_SW_EC_X64_PAGE_FAULT        EXCEPT_X64_PAGE_FAULT\r
-#define EFI_SW_EC_X64_FP_ERROR          EXCEPT_X64_FP_ERROR\r
-#define EFI_SW_EC_X64_ALIGNMENT_CHECK   EXCEPT_X64_ALIGNMENT_CHECK\r
-#define EFI_SW_EC_X64_MACHINE_CHECK     EXCEPT_X64_MACHINE_CHECK\r
-#define EFI_SW_EC_X64_SIMD              EXCEPT_X64_SIMD\r
+#define EFI_SW_EC_X64_DIVIDE_ERROR     EXCEPT_X64_DIVIDE_ERROR\r
+#define EFI_SW_EC_X64_DEBUG            EXCEPT_X64_DEBUG\r
+#define EFI_SW_EC_X64_NMI              EXCEPT_X64_NMI\r
+#define EFI_SW_EC_X64_BREAKPOINT       EXCEPT_X64_BREAKPOINT\r
+#define EFI_SW_EC_X64_OVERFLOW         EXCEPT_X64_OVERFLOW\r
+#define EFI_SW_EC_X64_BOUND            EXCEPT_X64_BOUND\r
+#define EFI_SW_EC_X64_INVALID_OPCODE   EXCEPT_X64_INVALID_OPCODE\r
+#define EFI_SW_EC_X64_DOUBLE_FAULT     EXCEPT_X64_DOUBLE_FAULT\r
+#define EFI_SW_EC_X64_INVALID_TSS      EXCEPT_X64_INVALID_TSS\r
+#define EFI_SW_EC_X64_SEG_NOT_PRESENT  EXCEPT_X64_SEG_NOT_PRESENT\r
+#define EFI_SW_EC_X64_STACK_FAULT      EXCEPT_X64_STACK_FAULT\r
+#define EFI_SW_EC_X64_GP_FAULT         EXCEPT_X64_GP_FAULT\r
+#define EFI_SW_EC_X64_PAGE_FAULT       EXCEPT_X64_PAGE_FAULT\r
+#define EFI_SW_EC_X64_FP_ERROR         EXCEPT_X64_FP_ERROR\r
+#define EFI_SW_EC_X64_ALIGNMENT_CHECK  EXCEPT_X64_ALIGNMENT_CHECK\r
+#define EFI_SW_EC_X64_MACHINE_CHECK    EXCEPT_X64_MACHINE_CHECK\r
+#define EFI_SW_EC_X64_SIMD             EXCEPT_X64_SIMD\r
 ///@}\r
 \r
 ///\r
 /// Software Class EFI After Life Subclass Progress Code definitions.\r
 ///\r
 ///@{\r
-#define EFI_SW_AL_PC_ENTRY_POINT    (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_AL_PC_RETURN_TO_LAST (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
+#define EFI_SW_AL_PC_ENTRY_POINT     (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
+#define EFI_SW_AL_PC_RETURN_TO_LAST  (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
 ///@}\r
 \r
 ///\r
@@ -95,7 +95,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// Inconsistent with specification here:\r
 /// The Framework Specification, StatusCodes 0.92, does not define the macros.\r
 ///\r
-#define EFI_SW_CSM_LEGACY_ROM_INIT                (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
+#define EFI_SW_CSM_LEGACY_ROM_INIT  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
 \r
 ///\r
 /// IO Bus Class ATA/ATAPI Subclass Progress Code definitions.\r
@@ -130,7 +130,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// The Framework Specification, StatusCodes 0.92, does not define the macros.\r
 ///\r
 ///@{\r
-#define EFI_CPU_CAUSE_NOT_DISABLED              0x0000\r
+#define EFI_CPU_CAUSE_NOT_DISABLED  0x0000\r
 ///@}\r
 \r
 ///\r
index e35fbff8d532b83b4cd31410f0427dfdae335b14..b196844d00fcae6177d8bed908eb508426f0b30a 100644 (file)
@@ -24,6 +24,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x2e3044ac, 0x879f, 0x490f, {0x97, 0x60, 0xbb, 0xdf, 0xaf, 0x69, 0x5f, 0x50 } \\r
   }\r
 \r
-extern EFI_GUID gEfiLegacyBiosGuid;\r
+extern EFI_GUID  gEfiLegacyBiosGuid;\r
 \r
 #endif\r
index 8ec3de5e383d5310abba38a41884adf5e755ea48..4446b005cb123005a833deb4fd5737f089789a11 100644 (file)
@@ -23,17 +23,17 @@ typedef UINT8 BBS_TYPE;
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  BBS_TYPE  BbsType;\r
+  BBS_TYPE    BbsType;\r
   ///\r
   /// Length = sizeof (UINT16) + sizeof (Data)\r
   ///\r
-  UINT16    Length;\r
-  UINT16    Data[1];\r
+  UINT16      Length;\r
+  UINT16      Data[1];\r
 } LEGACY_DEV_ORDER_ENTRY;\r
 #pragma pack()\r
 \r
-#define VAR_LEGACY_DEV_ORDER L"LegacyDevOrder"\r
+#define VAR_LEGACY_DEV_ORDER  L"LegacyDevOrder"\r
 \r
-extern EFI_GUID gEfiLegacyDevOrderVariableGuid;\r
+extern EFI_GUID  gEfiLegacyDevOrderVariableGuid;\r
 \r
 #endif\r
index 5e0216c765f2b51fd5684b558b71989481a8124a..bac03c11c4085e68899659afed61923a00eda1e8 100644 (file)
@@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _FIRMWARE_VOLUME_H_\r
 #define _FIRMWARE_VOLUME_H_\r
 \r
-\r
 //\r
 // Firmware Volume Protocol GUID definition\r
 //\r
@@ -28,49 +27,49 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0x389F751F, 0x1838, 0x4388, {0x83, 0x90, 0xCD, 0x81, 0x54, 0xBD, 0x27, 0xF8 } \\r
   }\r
 \r
-#define FV_DEVICE_SIGNATURE SIGNATURE_32 ('_', 'F', 'V', '_')\r
+#define FV_DEVICE_SIGNATURE  SIGNATURE_32 ('_', 'F', 'V', '_')\r
 \r
-typedef struct _EFI_FIRMWARE_VOLUME_PROTOCOL  EFI_FIRMWARE_VOLUME_PROTOCOL;\r
+typedef struct _EFI_FIRMWARE_VOLUME_PROTOCOL EFI_FIRMWARE_VOLUME_PROTOCOL;\r
 \r
 //\r
 // FRAMEWORK_EFI_FV_ATTRIBUTES bit definitions\r
 //\r
-typedef UINT64  FRAMEWORK_EFI_FV_ATTRIBUTES;\r
+typedef UINT64 FRAMEWORK_EFI_FV_ATTRIBUTES;\r
 \r
 //\r
 // ************************************************************\r
 // FRAMEWORK_EFI_FV_ATTRIBUTES bit definitions\r
 // ************************************************************\r
 //\r
-#define EFI_FV_READ_DISABLE_CAP       0x0000000000000001ULL\r
-#define EFI_FV_READ_ENABLE_CAP        0x0000000000000002ULL\r
-#define EFI_FV_READ_STATUS            0x0000000000000004ULL\r
+#define EFI_FV_READ_DISABLE_CAP  0x0000000000000001ULL\r
+#define EFI_FV_READ_ENABLE_CAP   0x0000000000000002ULL\r
+#define EFI_FV_READ_STATUS       0x0000000000000004ULL\r
 \r
-#define EFI_FV_WRITE_DISABLE_CAP      0x0000000000000008ULL\r
-#define EFI_FV_WRITE_ENABLE_CAP       0x0000000000000010ULL\r
-#define EFI_FV_WRITE_STATUS           0x0000000000000020ULL\r
+#define EFI_FV_WRITE_DISABLE_CAP  0x0000000000000008ULL\r
+#define EFI_FV_WRITE_ENABLE_CAP   0x0000000000000010ULL\r
+#define EFI_FV_WRITE_STATUS       0x0000000000000020ULL\r
 \r
 #define EFI_FV_LOCK_CAP               0x0000000000000040ULL\r
 #define EFI_FV_LOCK_STATUS            0x0000000000000080ULL\r
 #define EFI_FV_WRITE_POLICY_RELIABLE  0x0000000000000100ULL\r
 \r
-#define EFI_FV_ALIGNMENT_CAP          0x0000000000008000ULL\r
-#define EFI_FV_ALIGNMENT_2            0x0000000000010000ULL\r
-#define EFI_FV_ALIGNMENT_4            0x0000000000020000ULL\r
-#define EFI_FV_ALIGNMENT_8            0x0000000000040000ULL\r
-#define EFI_FV_ALIGNMENT_16           0x0000000000080000ULL\r
-#define EFI_FV_ALIGNMENT_32           0x0000000000100000ULL\r
-#define EFI_FV_ALIGNMENT_64           0x0000000000200000ULL\r
-#define EFI_FV_ALIGNMENT_128          0x0000000000400000ULL\r
-#define EFI_FV_ALIGNMENT_256          0x0000000000800000ULL\r
-#define EFI_FV_ALIGNMENT_512          0x0000000001000000ULL\r
-#define EFI_FV_ALIGNMENT_1K           0x0000000002000000ULL\r
-#define EFI_FV_ALIGNMENT_2K           0x0000000004000000ULL\r
-#define EFI_FV_ALIGNMENT_4K           0x0000000008000000ULL\r
-#define EFI_FV_ALIGNMENT_8K           0x0000000010000000ULL\r
-#define EFI_FV_ALIGNMENT_16K          0x0000000020000000ULL\r
-#define EFI_FV_ALIGNMENT_32K          0x0000000040000000ULL\r
-#define EFI_FV_ALIGNMENT_64K          0x0000000080000000ULL\r
+#define EFI_FV_ALIGNMENT_CAP  0x0000000000008000ULL\r
+#define EFI_FV_ALIGNMENT_2    0x0000000000010000ULL\r
+#define EFI_FV_ALIGNMENT_4    0x0000000000020000ULL\r
+#define EFI_FV_ALIGNMENT_8    0x0000000000040000ULL\r
+#define EFI_FV_ALIGNMENT_16   0x0000000000080000ULL\r
+#define EFI_FV_ALIGNMENT_32   0x0000000000100000ULL\r
+#define EFI_FV_ALIGNMENT_64   0x0000000000200000ULL\r
+#define EFI_FV_ALIGNMENT_128  0x0000000000400000ULL\r
+#define EFI_FV_ALIGNMENT_256  0x0000000000800000ULL\r
+#define EFI_FV_ALIGNMENT_512  0x0000000001000000ULL\r
+#define EFI_FV_ALIGNMENT_1K   0x0000000002000000ULL\r
+#define EFI_FV_ALIGNMENT_2K   0x0000000004000000ULL\r
+#define EFI_FV_ALIGNMENT_4K   0x0000000008000000ULL\r
+#define EFI_FV_ALIGNMENT_8K   0x0000000010000000ULL\r
+#define EFI_FV_ALIGNMENT_16K  0x0000000020000000ULL\r
+#define EFI_FV_ALIGNMENT_32K  0x0000000040000000ULL\r
+#define EFI_FV_ALIGNMENT_64K  0x0000000080000000ULL\r
 \r
 //\r
 // Protocol API definitions\r
@@ -210,17 +209,17 @@ EFI_STATUS
   OUT UINT32                        *AuthenticationStatus\r
   );\r
 \r
-typedef UINT32  FRAMEWORK_EFI_FV_WRITE_POLICY;\r
+typedef UINT32 FRAMEWORK_EFI_FV_WRITE_POLICY;\r
 \r
-#define FRAMEWORK_EFI_FV_UNRELIABLE_WRITE 0x00000000\r
-#define FRAMEWORK_EFI_FV_RELIABLE_WRITE   0x00000001\r
+#define FRAMEWORK_EFI_FV_UNRELIABLE_WRITE  0x00000000\r
+#define FRAMEWORK_EFI_FV_RELIABLE_WRITE    0x00000001\r
 \r
 typedef struct {\r
-  EFI_GUID                *NameGuid;\r
-  EFI_FV_FILETYPE         Type;\r
-  EFI_FV_FILE_ATTRIBUTES  FileAttributes;\r
-  VOID                    *Buffer;\r
-  UINT32                  BufferSize;\r
+  EFI_GUID                  *NameGuid;\r
+  EFI_FV_FILETYPE           Type;\r
+  EFI_FV_FILE_ATTRIBUTES    FileAttributes;\r
+  VOID                      *Buffer;\r
+  UINT32                    BufferSize;\r
 } FRAMEWORK_EFI_FV_WRITE_FILE_DATA;\r
 \r
 /**\r
@@ -296,45 +295,45 @@ struct _EFI_FIRMWARE_VOLUME_PROTOCOL {
   ///\r
   /// Retrieves volume capabilities and current settings.\r
   ///\r
-  FRAMEWORK_EFI_FV_GET_ATTRIBUTES GetVolumeAttributes;\r
+  FRAMEWORK_EFI_FV_GET_ATTRIBUTES    GetVolumeAttributes;\r
 \r
   ///\r
   /// Modifies the current settings of the firmware volume.\r
   ///\r
-  FRAMEWORK_EFI_FV_SET_ATTRIBUTES SetVolumeAttributes;\r
+  FRAMEWORK_EFI_FV_SET_ATTRIBUTES    SetVolumeAttributes;\r
 \r
   ///\r
   /// Reads an entire file from the firmware volume.\r
   ///\r
-  FRAMEWORK_EFI_FV_READ_FILE      ReadFile;\r
+  FRAMEWORK_EFI_FV_READ_FILE         ReadFile;\r
 \r
   ///\r
   /// Reads a single section from a file into a buffer.\r
   ///\r
-  FRAMEWORK_EFI_FV_READ_SECTION   ReadSection;\r
+  FRAMEWORK_EFI_FV_READ_SECTION      ReadSection;\r
 \r
   ///\r
   /// Writes an entire file into the firmware volume.\r
   ///\r
-  FRAMEWORK_EFI_FV_WRITE_FILE     WriteFile;\r
+  FRAMEWORK_EFI_FV_WRITE_FILE        WriteFile;\r
 \r
   ///\r
   /// Provides service to allow searching the firmware volume.\r
   ///\r
-  FRAMEWORK_EFI_FV_GET_NEXT_FILE  GetNextFile;\r
+  FRAMEWORK_EFI_FV_GET_NEXT_FILE     GetNextFile;\r
 \r
   ///\r
   ///  Data field that indicates the size in bytes of the Key input buffer for\r
   ///  the GetNextFile() API.\r
   ///\r
-  UINT32                KeySize;\r
+  UINT32                             KeySize;\r
 \r
   ///\r
   ///  Handle of the parent firmware volume.\r
   ///\r
-  EFI_HANDLE            ParentHandle;\r
+  EFI_HANDLE                         ParentHandle;\r
 };\r
 \r
-extern EFI_GUID gEfiFirmwareVolumeProtocolGuid;\r
+extern EFI_GUID  gEfiFirmwareVolumeProtocolGuid;\r
 \r
 #endif\r
index 0ff57aa118ca2ff75ca278c890dc5e2c01fe8fb2..afb415a388abb17a008f10aa159f54aaf89ad81e 100644 (file)
@@ -49,20 +49,20 @@ typedef struct _EFI_ISA_ACPI_PROTOCOL EFI_ISA_ACPI_PROTOCOL;
 ///\r
 /// ISA ACPI Protocol MMIO resource attributes\r
 ///\r
-#define EFI_ISA_ACPI_MEMORY_WIDTH_MASK                   0x03   ///< Bit mask of supported ISA memory width attributes.\r
-#define EFI_ISA_ACPI_MEMORY_WIDTH_8_BIT                  0x00   ///< ISA MMIO region only supports 8-bit access.\r
-#define EFI_ISA_ACPI_MEMORY_WIDTH_16_BIT                 0x01   ///< ISA MMIO region only supports 16-bit access.\r
-#define EFI_ISA_ACPI_MEMORY_WIDTH_8_BIT_AND_16_BIT       0x02   ///< ISA MMIO region supports both 8-bit and 16-bit access.\r
-#define EFI_ISA_ACPI_MEMORY_WRITEABLE                    0x04   ///< ISA MMIO region supports write transactions.\r
-#define EFI_ISA_ACPI_MEMORY_CACHEABLE                    0x08   ///< ISA MMIO region supports being cached.\r
-#define EFI_ISA_ACPI_MEMORY_SHADOWABLE                   0x10   ///< ISA MMIO region may be shadowed.\r
-#define EFI_ISA_ACPI_MEMORY_EXPANSION_ROM                0x20   ///< ISA MMIO region is an expansion ROM.\r
+#define EFI_ISA_ACPI_MEMORY_WIDTH_MASK              0x03        ///< Bit mask of supported ISA memory width attributes.\r
+#define EFI_ISA_ACPI_MEMORY_WIDTH_8_BIT             0x00        ///< ISA MMIO region only supports 8-bit access.\r
+#define EFI_ISA_ACPI_MEMORY_WIDTH_16_BIT            0x01        ///< ISA MMIO region only supports 16-bit access.\r
+#define EFI_ISA_ACPI_MEMORY_WIDTH_8_BIT_AND_16_BIT  0x02        ///< ISA MMIO region supports both 8-bit and 16-bit access.\r
+#define EFI_ISA_ACPI_MEMORY_WRITEABLE               0x04        ///< ISA MMIO region supports write transactions.\r
+#define EFI_ISA_ACPI_MEMORY_CACHEABLE               0x08        ///< ISA MMIO region supports being cached.\r
+#define EFI_ISA_ACPI_MEMORY_SHADOWABLE              0x10        ///< ISA MMIO region may be shadowed.\r
+#define EFI_ISA_ACPI_MEMORY_EXPANSION_ROM           0x20        ///< ISA MMIO region is an expansion ROM.\r
 \r
 ///\r
 /// ISA ACPI Protocol I/O resource attributes\r
 ///\r
-#define EFI_ISA_ACPI_IO_DECODE_10_BITS                   0x01    ///< ISA controllers uses a 10-bit address decoder for I/O cycles.\r
-#define EFI_ISA_ACPI_IO_DECODE_16_BITS                   0x02    ///< ISA controllers uses a 16-bit address decoder for I/O cycles.\r
+#define EFI_ISA_ACPI_IO_DECODE_10_BITS  0x01                     ///< ISA controllers uses a 10-bit address decoder for I/O cycles.\r
+#define EFI_ISA_ACPI_IO_DECODE_16_BITS  0x02                     ///< ISA controllers uses a 16-bit address decoder for I/O cycles.\r
 \r
 ///\r
 /// EFI ISA ACPI resource type\r
@@ -79,26 +79,26 @@ typedef enum {
 /// EFI ISA ACPI generic resource structure\r
 ///\r
 typedef struct {\r
-  EFI_ISA_ACPI_RESOURCE_TYPE  Type;         ///< The type of resource (I/O, MMIO, DMA, Interrupt).\r
-  UINT32                      Attribute;    ///< Bit mask of attributes associated with this resource.  See EFI_ISA_ACPI_xxx macros for valid combinations.\r
-  UINT32                      StartRange;   ///< The start of the resource range.\r
-  UINT32                      EndRange;     ///< The end of the resource range.\r
+  EFI_ISA_ACPI_RESOURCE_TYPE    Type;       ///< The type of resource (I/O, MMIO, DMA, Interrupt).\r
+  UINT32                        Attribute;  ///< Bit mask of attributes associated with this resource.  See EFI_ISA_ACPI_xxx macros for valid combinations.\r
+  UINT32                        StartRange; ///< The start of the resource range.\r
+  UINT32                        EndRange;   ///< The end of the resource range.\r
 } EFI_ISA_ACPI_RESOURCE;\r
 \r
 ///\r
 /// EFI ISA ACPI resource device identifier\r
 ///\r
 typedef struct {\r
-  UINT32  HID;   ///< The ACPI Hardware Identifier value associated with an ISA controller.  Matchs ACPI DSDT contents.\r
-  UINT32  UID;   ///< The ACPI Unique Identifier value associated with an ISA controller.  Matches ACPI DSDT contents.\r
+  UINT32    HID; ///< The ACPI Hardware Identifier value associated with an ISA controller.  Matchs ACPI DSDT contents.\r
+  UINT32    UID; ///< The ACPI Unique Identifier value associated with an ISA controller.  Matches ACPI DSDT contents.\r
 } EFI_ISA_ACPI_DEVICE_ID;\r
 \r
 ///\r
 /// EFI ISA ACPI resource list\r
 ///\r
 typedef struct {\r
-  EFI_ISA_ACPI_DEVICE_ID  Device;          ///< The ACPI HID/UID associated with an ISA controller.\r
-  EFI_ISA_ACPI_RESOURCE   *ResourceItem;   ///< A pointer to the list of resources associated with an ISA controller.\r
+  EFI_ISA_ACPI_DEVICE_ID    Device;        ///< The ACPI HID/UID associated with an ISA controller.\r
+  EFI_ISA_ACPI_RESOURCE     *ResourceItem; ///< A pointer to the list of resources associated with an ISA controller.\r
 } EFI_ISA_ACPI_RESOURCE_LIST;\r
 \r
 /**\r
@@ -283,16 +283,16 @@ EFI_STATUS
 /// and assign resources to an ISA controller.\r
 ///\r
 struct _EFI_ISA_ACPI_PROTOCOL {\r
-  EFI_ISA_ACPI_DEVICE_ENUMERATE  DeviceEnumerate;\r
-  EFI_ISA_ACPI_SET_DEVICE_POWER  SetPower;\r
-  EFI_ISA_ACPI_GET_CUR_RESOURCE  GetCurResource;\r
-  EFI_ISA_ACPI_GET_POS_RESOURCE  GetPosResource;\r
-  EFI_ISA_ACPI_SET_RESOURCE      SetResource;\r
-  EFI_ISA_ACPI_ENABLE_DEVICE     EnableDevice;\r
-  EFI_ISA_ACPI_INIT_DEVICE       InitDevice;\r
-  EFI_ISA_ACPI_INTERFACE_INIT    InterfaceInit;\r
+  EFI_ISA_ACPI_DEVICE_ENUMERATE    DeviceEnumerate;\r
+  EFI_ISA_ACPI_SET_DEVICE_POWER    SetPower;\r
+  EFI_ISA_ACPI_GET_CUR_RESOURCE    GetCurResource;\r
+  EFI_ISA_ACPI_GET_POS_RESOURCE    GetPosResource;\r
+  EFI_ISA_ACPI_SET_RESOURCE        SetResource;\r
+  EFI_ISA_ACPI_ENABLE_DEVICE       EnableDevice;\r
+  EFI_ISA_ACPI_INIT_DEVICE         InitDevice;\r
+  EFI_ISA_ACPI_INTERFACE_INIT      InterfaceInit;\r
 };\r
 \r
-extern EFI_GUID gEfiIsaAcpiProtocolGuid;\r
+extern EFI_GUID  gEfiIsaAcpiProtocolGuid;\r
 \r
 #endif\r
index 8807e421feec73209d5a102fefb62a90356fa021..40a8171e95da657980b5c648ba56910802bd09b0 100644 (file)
@@ -128,11 +128,11 @@ typedef struct {
   ///\r
   /// Read from ISA I/O or MMIO space.\r
   ///\r
-  EFI_ISA_IO_PROTOCOL_IO_MEM  Read;\r
+  EFI_ISA_IO_PROTOCOL_IO_MEM    Read;\r
   ///\r
   /// Write to ISA I/O or MMIO space.\r
   ///\r
-  EFI_ISA_IO_PROTOCOL_IO_MEM  Write;\r
+  EFI_ISA_IO_PROTOCOL_IO_MEM    Write;\r
 } EFI_ISA_IO_PROTOCOL_ACCESS;\r
 \r
 /**\r
@@ -326,31 +326,31 @@ EFI_STATUS
 /// ISA_PCI_IO_PROTOCOL instance associated with the ISA controller.\r
 ///\r
 struct _EFI_ISA_IO_PROTOCOL {\r
-  EFI_ISA_IO_PROTOCOL_ACCESS           Mem;\r
-  EFI_ISA_IO_PROTOCOL_ACCESS           Io;\r
-  EFI_ISA_IO_PROTOCOL_COPY_MEM         CopyMem;\r
-  EFI_ISA_IO_PROTOCOL_MAP              Map;\r
-  EFI_ISA_IO_PROTOCOL_UNMAP            Unmap;\r
-  EFI_ISA_IO_PROTOCOL_ALLOCATE_BUFFER  AllocateBuffer;\r
-  EFI_ISA_IO_PROTOCOL_FREE_BUFFER      FreeBuffer;\r
-  EFI_ISA_IO_PROTOCOL_FLUSH            Flush;\r
+  EFI_ISA_IO_PROTOCOL_ACCESS             Mem;\r
+  EFI_ISA_IO_PROTOCOL_ACCESS             Io;\r
+  EFI_ISA_IO_PROTOCOL_COPY_MEM           CopyMem;\r
+  EFI_ISA_IO_PROTOCOL_MAP                Map;\r
+  EFI_ISA_IO_PROTOCOL_UNMAP              Unmap;\r
+  EFI_ISA_IO_PROTOCOL_ALLOCATE_BUFFER    AllocateBuffer;\r
+  EFI_ISA_IO_PROTOCOL_FREE_BUFFER        FreeBuffer;\r
+  EFI_ISA_IO_PROTOCOL_FLUSH              Flush;\r
   ///\r
   /// The list of I/O , MMIO, DMA, and Interrupt resources associated with the\r
   /// ISA controller abstracted by this instance of the EFI_ISA_IO_PROTOCOL.\r
   ///\r
-  EFI_ISA_ACPI_RESOURCE_LIST           *ResourceList;\r
+  EFI_ISA_ACPI_RESOURCE_LIST             *ResourceList;\r
   ///\r
   /// The size, in bytes, of the ROM image.\r
   ///\r
-  UINT32                               RomSize;\r
+  UINT32                                 RomSize;\r
   ///\r
   /// A pointer to the in memory copy of the ROM image. The ISA Bus Driver is responsible\r
   /// for allocating memory for the ROM image, and copying the contents of the ROM to memory\r
   /// during ISA Bus initialization.\r
   ///\r
-  VOID                                 *RomImage;\r
+  VOID                                   *RomImage;\r
 };\r
 \r
-extern EFI_GUID gEfiIsaIoProtocolGuid;\r
+extern EFI_GUID  gEfiIsaIoProtocolGuid;\r
 \r
 #endif\r
index 443f0c11a435c653cb0ce21ad5b9d5a7b7863fc9..b9a225a8748edac362bab05d3214807f32ac1e92 100644 (file)
@@ -26,10 +26,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///\r
 #pragma pack(1)\r
 \r
-typedef UINT8                       SERIAL_MODE;\r
-typedef UINT8                       PARALLEL_MODE;\r
+typedef UINT8  SERIAL_MODE;\r
+typedef UINT8  PARALLEL_MODE;\r
 \r
-#define EFI_COMPATIBILITY16_TABLE_SIGNATURE SIGNATURE_32 ('I', 'F', 'E', '$')\r
+#define EFI_COMPATIBILITY16_TABLE_SIGNATURE  SIGNATURE_32 ('I', 'F', 'E', '$')\r
 \r
 ///\r
 /// There is a table located within the traditional BIOS in either the 0xF000:xxxx or 0xE000:xxxx\r
@@ -44,75 +44,75 @@ typedef struct {
   /// The string "$EFI" denotes the start of the EfiCompatibility table. Byte 0 is "I," byte\r
   /// 1 is "F," byte 2 is "E," and byte 3 is "$" and is normally accessed as a DWORD or UINT32.\r
   ///\r
-  UINT32                            Signature;\r
+  UINT32    Signature;\r
 \r
   ///\r
   /// The value required such that byte checksum of TableLength equals zero.\r
   ///\r
-  UINT8                             TableChecksum;\r
+  UINT8     TableChecksum;\r
 \r
   ///\r
   /// The length of this table.\r
   ///\r
-  UINT8                             TableLength;\r
+  UINT8     TableLength;\r
 \r
   ///\r
   /// The major EFI revision for which this table was generated.\r
   ///\r
-  UINT8                             EfiMajorRevision;\r
+  UINT8     EfiMajorRevision;\r
 \r
   ///\r
   /// The minor EFI revision for which this table was generated.\r
   ///\r
-  UINT8                             EfiMinorRevision;\r
+  UINT8     EfiMinorRevision;\r
 \r
   ///\r
   /// The major revision of this table.\r
   ///\r
-  UINT8                             TableMajorRevision;\r
+  UINT8     TableMajorRevision;\r
 \r
   ///\r
   /// The minor revision of this table.\r
   ///\r
-  UINT8                             TableMinorRevision;\r
+  UINT8     TableMinorRevision;\r
 \r
   ///\r
   /// Reserved for future usage.\r
   ///\r
-  UINT16                            Reserved;\r
+  UINT16    Reserved;\r
 \r
   ///\r
   /// The segment of the entry point within the traditional BIOS for Compatibility16 functions.\r
   ///\r
-  UINT16                            Compatibility16CallSegment;\r
+  UINT16    Compatibility16CallSegment;\r
 \r
   ///\r
   /// The offset of the entry point within the traditional BIOS for Compatibility16 functions.\r
   ///\r
-  UINT16                            Compatibility16CallOffset;\r
+  UINT16    Compatibility16CallOffset;\r
 \r
   ///\r
   /// The segment of the entry point within the traditional BIOS for EfiCompatibility\r
   /// to invoke the PnP installation check.\r
   ///\r
-  UINT16                            PnPInstallationCheckSegment;\r
+  UINT16    PnPInstallationCheckSegment;\r
 \r
   ///\r
   /// The Offset of the entry point within the traditional BIOS for EfiCompatibility\r
   /// to invoke the PnP installation check.\r
   ///\r
-  UINT16                            PnPInstallationCheckOffset;\r
+  UINT16    PnPInstallationCheckOffset;\r
 \r
   ///\r
   /// EFI system resources table. Type EFI_SYSTEM_TABLE is defined in the IntelPlatform\r
-  ///Innovation Framework for EFI Driver Execution Environment Core Interface Specification (DXE CIS).\r
+  /// Innovation Framework for EFI Driver Execution Environment Core Interface Specification (DXE CIS).\r
   ///\r
-  UINT32                            EfiSystemTable;\r
+  UINT32    EfiSystemTable;\r
 \r
   ///\r
   /// The address of an OEM-provided identifier string. The string is null terminated.\r
   ///\r
-  UINT32                            OemIdStringPointer;\r
+  UINT32    OemIdStringPointer;\r
 \r
   ///\r
   /// The 32-bit physical address where ACPI RSD PTR is stored within the traditional\r
@@ -120,93 +120,93 @@ typedef struct {
   /// reserved is the maximum for ACPI 2.0. The EfiCompatibility will fill in the ACPI\r
   /// RSD PTR with either the ACPI 1.0b or 2.0 values.\r
   ///\r
-  UINT32                            AcpiRsdPtrPointer;\r
+  UINT32    AcpiRsdPtrPointer;\r
 \r
   ///\r
   /// The OEM revision number. Usage is undefined but provided for OEM module usage.\r
   ///\r
-  UINT16                            OemRevision;\r
+  UINT16    OemRevision;\r
 \r
   ///\r
   /// The 32-bit physical address where INT15 E820 data is stored within the traditional\r
   /// BIOS. The EfiCompatibility code will fill in the E820Pointer value and copy the\r
   /// data to the indicated area.\r
   ///\r
-  UINT32                            E820Pointer;\r
+  UINT32    E820Pointer;\r
 \r
   ///\r
   /// The length of the E820 data and is filled in by the EfiCompatibility code.\r
   ///\r
-  UINT32                            E820Length;\r
+  UINT32    E820Length;\r
 \r
   ///\r
   /// The 32-bit physical address where the $PIR table is stored in the traditional BIOS.\r
   /// The EfiCompatibility code will fill in the IrqRoutingTablePointer value and\r
   /// copy the data to the indicated area.\r
   ///\r
-  UINT32                            IrqRoutingTablePointer;\r
+  UINT32    IrqRoutingTablePointer;\r
 \r
   ///\r
   /// The length of the $PIR table and is filled in by the EfiCompatibility code.\r
   ///\r
-  UINT32                            IrqRoutingTableLength;\r
+  UINT32    IrqRoutingTableLength;\r
 \r
   ///\r
   /// The 32-bit physical address where the MP table is stored in the traditional BIOS.\r
   /// The EfiCompatibility code will fill in the MpTablePtr value and copy the data\r
   /// to the indicated area.\r
   ///\r
-  UINT32                            MpTablePtr;\r
+  UINT32    MpTablePtr;\r
 \r
   ///\r
   /// The length of the MP table and is filled in by the EfiCompatibility code.\r
   ///\r
-  UINT32                            MpTableLength;\r
+  UINT32    MpTableLength;\r
 \r
   ///\r
   /// The segment of the OEM-specific INT table/code.\r
   ///\r
-  UINT16                            OemIntSegment;\r
+  UINT16    OemIntSegment;\r
 \r
   ///\r
   /// The offset of the OEM-specific INT table/code.\r
   ///\r
-  UINT16                            OemIntOffset;\r
+  UINT16    OemIntOffset;\r
 \r
   ///\r
   /// The segment of the OEM-specific 32-bit table/code.\r
   ///\r
-  UINT16                            Oem32Segment;\r
+  UINT16    Oem32Segment;\r
 \r
   ///\r
   /// The offset of the OEM-specific 32-bit table/code.\r
   ///\r
-  UINT16                            Oem32Offset;\r
+  UINT16    Oem32Offset;\r
 \r
   ///\r
   /// The segment of the OEM-specific 16-bit table/code.\r
   ///\r
-  UINT16                            Oem16Segment;\r
+  UINT16    Oem16Segment;\r
 \r
   ///\r
   /// The offset of the OEM-specific 16-bit table/code.\r
   ///\r
-  UINT16                            Oem16Offset;\r
+  UINT16    Oem16Offset;\r
 \r
   ///\r
   /// The segment of the TPM binary passed to 16-bit CSM.\r
   ///\r
-  UINT16                            TpmSegment;\r
+  UINT16    TpmSegment;\r
 \r
   ///\r
   /// The offset of the TPM binary passed to 16-bit CSM.\r
   ///\r
-  UINT16                            TpmOffset;\r
+  UINT16    TpmOffset;\r
 \r
   ///\r
   /// A pointer to a string identifying the independent BIOS vendor.\r
   ///\r
-  UINT32                            IbvPointer;\r
+  UINT32    IbvPointer;\r
 \r
   ///\r
   /// This field is NULL for all systems not supporting PCI Express. This field is the base\r
@@ -216,37 +216,37 @@ typedef struct {
   /// Compatibility16InitializeYourself() is defined in Compatibility16\r
   /// Functions.\r
   ///\r
-  UINT32                            PciExpressBase;\r
+  UINT32    PciExpressBase;\r
 \r
   ///\r
   /// Maximum PCI bus number assigned.\r
   ///\r
-  UINT8                             LastPciBus;\r
+  UINT8     LastPciBus;\r
 \r
   ///\r
   /// Start Address of Upper Memory Area (UMA) to be set as Read/Write. If\r
   /// UmaAddress is a valid address in the shadow RAM, it also indicates that the region\r
   /// from 0xC0000 to (UmaAddress - 1) can be used for Option ROM.\r
   ///\r
-  UINT32                            UmaAddress;\r
+  UINT32    UmaAddress;\r
 \r
   ///\r
   /// Upper Memory Area size in bytes to be set as Read/Write. If zero, no UMA region\r
   /// will be set as Read/Write (i.e. all Shadow RAM is set as Read-Only).\r
   ///\r
-  UINT32                            UmaSize;\r
+  UINT32    UmaSize;\r
 \r
   ///\r
   /// Start Address of high memory that can be used for permanent allocation. If zero,\r
   /// high memory is not available for permanent allocation.\r
   ///\r
-  UINT32                            HiPermanentMemoryAddress;\r
+  UINT32    HiPermanentMemoryAddress;\r
 \r
   ///\r
   /// Size of high memory that can be used for permanent allocation in bytes. If zero,\r
   /// high memory is not available for permanent allocation.\r
   ///\r
-  UINT32                            HiPermanentMemorySize;\r
+  UINT32    HiPermanentMemorySize;\r
 } EFI_COMPATIBILITY16_TABLE;\r
 \r
 ///\r
@@ -267,7 +267,7 @@ typedef enum {
   /// Return:\r
   ///   AX = Return Status codes\r
   ///\r
-  Legacy16InitializeYourself    = 0x0000,\r
+  Legacy16InitializeYourself = 0x0000,\r
 \r
   ///\r
   /// Causes the Compatibility16 BIOS to perform any drive number translations to match the boot sequence.\r
@@ -277,7 +277,7 @@ typedef enum {
   /// Return:\r
   ///   AX = Returned status codes\r
   ///\r
-  Legacy16UpdateBbs             = 0x0001,\r
+  Legacy16UpdateBbs = 0x0001,\r
 \r
   ///\r
   /// Allows the Compatibility16 code to perform any final actions before booting. The Compatibility16\r
@@ -288,7 +288,7 @@ typedef enum {
   /// Return:\r
   ///   AX = Returned status codes\r
   ///\r
-  Legacy16PrepareToBoot         = 0x0002,\r
+  Legacy16PrepareToBoot = 0x0002,\r
 \r
   ///\r
   /// Causes the Compatibility16 BIOS to boot. The Compatibility16 code is Read/Only.\r
@@ -297,7 +297,7 @@ typedef enum {
   /// Output:\r
   ///   AX = Returned status codes\r
   ///\r
-  Legacy16Boot                  = 0x0003,\r
+  Legacy16Boot = 0x0003,\r
 \r
   ///\r
   /// Allows the Compatibility16 code to get the last device from which a boot was attempted. This is\r
@@ -319,7 +319,7 @@ typedef enum {
   ///   AX = Returned status codes\r
   ///   BX = Number of non-BBS-compliant devices found. Equals 0 if BBS compliant.\r
   ///\r
-  Legacy16DispatchOprom         = 0x0005,\r
+  Legacy16DispatchOprom = 0x0005,\r
 \r
   ///\r
   /// Finds a free area in the 0xFxxxx or 0xExxxx region of the specified length and returns the address\r
@@ -336,7 +336,7 @@ typedef enum {
   ///   AX = Returned status codes\r
   ///   DS:BX = Address of the region\r
   ///\r
-  Legacy16GetTableAddress       = 0x0006,\r
+  Legacy16GetTableAddress = 0x0006,\r
 \r
   ///\r
   /// Enables the EfiCompatibility module to do any nonstandard processing of keyboard LEDs or state.\r
@@ -349,7 +349,7 @@ typedef enum {
   /// Output:\r
   ///     AX = Returned status codes\r
   ///\r
-  Legacy16SetKeyboardLeds       = 0x0007,\r
+  Legacy16SetKeyboardLeds = 0x0007,\r
 \r
   ///\r
   /// Enables the EfiCompatibility module to install an interrupt handler for PCI mass media devices that\r
@@ -360,29 +360,27 @@ typedef enum {
   /// Output:\r
   ///   AX = Returned status codes\r
   ///\r
-  Legacy16InstallPciHandler     = 0x0008\r
+  Legacy16InstallPciHandler = 0x0008\r
 } EFI_COMPATIBILITY_FUNCTIONS;\r
 \r
-\r
 ///\r
 /// EFI_DISPATCH_OPROM_TABLE\r
 ///\r
 typedef struct {\r
-  UINT16  PnPInstallationCheckSegment;  ///< A pointer to the PnpInstallationCheck data structure.\r
-  UINT16  PnPInstallationCheckOffset;   ///< A pointer to the PnpInstallationCheck data structure.\r
-  UINT16  OpromSegment;                 ///< The segment where the OpROM was placed. Offset is assumed to be 3.\r
-  UINT8   PciBus;                       ///< The PCI bus.\r
-  UINT8   PciDeviceFunction;            ///< The PCI device * 0x08 | PCI function.\r
-  UINT8   NumberBbsEntries;             ///< The number of valid BBS table entries upon entry and exit. The IBV code may\r
-                                        ///< increase this number, if BBS-compliant devices also hook INTs in order to force the\r
-                                        ///< OpROM BIOS Setup to be executed.\r
-  UINT32  BbsTablePointer;              ///< A pointer to the BBS table.\r
-  UINT16  RuntimeSegment;               ///< The segment where the OpROM can be relocated to. If this value is 0x0000, this\r
-                                        ///< means that the relocation of this run time code is not supported.\r
-                                        ///< Inconsistent with specification here:\r
-                                        ///< The member's name "OpromDestinationSegment" [defined in Intel Framework Compatibility Support Module Specification / 0.97 version]\r
-                                        ///< has been changed to "RuntimeSegment" since keeping backward compatible.\r
-\r
+  UINT16    PnPInstallationCheckSegment; ///< A pointer to the PnpInstallationCheck data structure.\r
+  UINT16    PnPInstallationCheckOffset;  ///< A pointer to the PnpInstallationCheck data structure.\r
+  UINT16    OpromSegment;                ///< The segment where the OpROM was placed. Offset is assumed to be 3.\r
+  UINT8     PciBus;                      ///< The PCI bus.\r
+  UINT8     PciDeviceFunction;           ///< The PCI device * 0x08 | PCI function.\r
+  UINT8     NumberBbsEntries;            ///< The number of valid BBS table entries upon entry and exit. The IBV code may\r
+                                         ///< increase this number, if BBS-compliant devices also hook INTs in order to force the\r
+                                         ///< OpROM BIOS Setup to be executed.\r
+  UINT32    BbsTablePointer;             ///< A pointer to the BBS table.\r
+  UINT16    RuntimeSegment;              ///< The segment where the OpROM can be relocated to. If this value is 0x0000, this\r
+                                         ///< means that the relocation of this run time code is not supported.\r
+                                         ///< Inconsistent with specification here:\r
+                                         ///< The member's name "OpromDestinationSegment" [defined in Intel Framework Compatibility Support Module Specification / 0.97 version]\r
+                                         ///< has been changed to "RuntimeSegment" since keeping backward compatible.\r
 } EFI_DISPATCH_OPROM_TABLE;\r
 \r
 ///\r
@@ -392,132 +390,132 @@ typedef struct {
   ///\r
   /// Starting address of memory under 1 MB. The ending address is assumed to be 640 KB or 0x9FFFF.\r
   ///\r
-  UINT32                            BiosLessThan1MB;\r
+  UINT32    BiosLessThan1MB;\r
 \r
   ///\r
   /// The starting address of the high memory block.\r
   ///\r
-  UINT32                            HiPmmMemory;\r
+  UINT32    HiPmmMemory;\r
 \r
   ///\r
   /// The length of high memory block.\r
   ///\r
-  UINT32                            HiPmmMemorySizeInBytes;\r
+  UINT32    HiPmmMemorySizeInBytes;\r
 \r
   ///\r
   /// The segment of the reverse thunk call code.\r
   ///\r
-  UINT16                            ReverseThunkCallSegment;\r
+  UINT16    ReverseThunkCallSegment;\r
 \r
   ///\r
   /// The offset of the reverse thunk call code.\r
   ///\r
-  UINT16                            ReverseThunkCallOffset;\r
+  UINT16    ReverseThunkCallOffset;\r
 \r
   ///\r
   /// The number of E820 entries copied to the Compatibility16 BIOS.\r
   ///\r
-  UINT32                            NumberE820Entries;\r
+  UINT32    NumberE820Entries;\r
 \r
   ///\r
   /// The amount of usable memory above 1 MB, e.g., E820 type 1 memory.\r
   ///\r
-  UINT32                            OsMemoryAbove1Mb;\r
+  UINT32    OsMemoryAbove1Mb;\r
 \r
   ///\r
   /// The start of thunk code in main memory. Memory cannot be used by BIOS or PMM.\r
   ///\r
-  UINT32                            ThunkStart;\r
+  UINT32    ThunkStart;\r
 \r
   ///\r
   /// The size of the thunk code.\r
   ///\r
-  UINT32                            ThunkSizeInBytes;\r
+  UINT32    ThunkSizeInBytes;\r
 \r
   ///\r
   /// Starting address of memory under 1 MB.\r
   ///\r
-  UINT32                            LowPmmMemory;\r
+  UINT32    LowPmmMemory;\r
 \r
   ///\r
   /// The length of low Memory block.\r
   ///\r
-  UINT32                            LowPmmMemorySizeInBytes;\r
+  UINT32    LowPmmMemorySizeInBytes;\r
 } EFI_TO_COMPATIBILITY16_INIT_TABLE;\r
 \r
 ///\r
 /// DEVICE_PRODUCER_SERIAL.\r
 ///\r
 typedef struct {\r
-  UINT16                            Address;    ///< I/O address assigned to the serial port.\r
-  UINT8                             Irq;        ///< IRQ assigned to the serial port.\r
-  SERIAL_MODE                       Mode;       ///< Mode of serial port. Values are defined below.\r
+  UINT16         Address;                       ///< I/O address assigned to the serial port.\r
+  UINT8          Irq;                           ///< IRQ assigned to the serial port.\r
+  SERIAL_MODE    Mode;                          ///< Mode of serial port. Values are defined below.\r
 } DEVICE_PRODUCER_SERIAL;\r
 \r
 ///\r
 /// DEVICE_PRODUCER_SERIAL's modes.\r
 ///@{\r
-#define DEVICE_SERIAL_MODE_NORMAL               0x00\r
-#define DEVICE_SERIAL_MODE_IRDA                 0x01\r
-#define DEVICE_SERIAL_MODE_ASK_IR               0x02\r
-#define DEVICE_SERIAL_MODE_DUPLEX_HALF          0x00\r
-#define DEVICE_SERIAL_MODE_DUPLEX_FULL          0x10\r
-///@)\r
+#define DEVICE_SERIAL_MODE_NORMAL       0x00\r
+#define DEVICE_SERIAL_MODE_IRDA         0x01\r
+#define DEVICE_SERIAL_MODE_ASK_IR       0x02\r
+#define DEVICE_SERIAL_MODE_DUPLEX_HALF  0x00\r
+#define DEVICE_SERIAL_MODE_DUPLEX_FULL  0x10\r
+/// @)\r
 \r
 ///\r
 /// DEVICE_PRODUCER_PARALLEL.\r
 ///\r
 typedef struct {\r
-  UINT16                            Address;  ///< I/O address assigned to the parallel port.\r
-  UINT8                             Irq;      ///< IRQ assigned to the parallel port.\r
-  UINT8                             Dma;      ///< DMA assigned to the parallel port.\r
-  PARALLEL_MODE                     Mode;     ///< Mode of the parallel port. Values are defined below.\r
+  UINT16           Address;                   ///< I/O address assigned to the parallel port.\r
+  UINT8            Irq;                       ///< IRQ assigned to the parallel port.\r
+  UINT8            Dma;                       ///< DMA assigned to the parallel port.\r
+  PARALLEL_MODE    Mode;                      ///< Mode of the parallel port. Values are defined below.\r
 } DEVICE_PRODUCER_PARALLEL;\r
 \r
 ///\r
 /// DEVICE_PRODUCER_PARALLEL's modes.\r
 ///@{\r
-#define DEVICE_PARALLEL_MODE_MODE_OUTPUT_ONLY   0x00\r
-#define DEVICE_PARALLEL_MODE_MODE_BIDIRECTIONAL 0x01\r
-#define DEVICE_PARALLEL_MODE_MODE_EPP           0x02\r
-#define DEVICE_PARALLEL_MODE_MODE_ECP           0x03\r
+#define DEVICE_PARALLEL_MODE_MODE_OUTPUT_ONLY    0x00\r
+#define DEVICE_PARALLEL_MODE_MODE_BIDIRECTIONAL  0x01\r
+#define DEVICE_PARALLEL_MODE_MODE_EPP            0x02\r
+#define DEVICE_PARALLEL_MODE_MODE_ECP            0x03\r
 ///@}\r
 \r
 ///\r
 /// DEVICE_PRODUCER_FLOPPY\r
 ///\r
 typedef struct {\r
-  UINT16                            Address;          ///< I/O address assigned to the floppy.\r
-  UINT8                             Irq;              ///< IRQ assigned to the floppy.\r
-  UINT8                             Dma;              ///< DMA assigned to the floppy.\r
-  UINT8                             NumberOfFloppy;   ///< Number of floppies in the system.\r
+  UINT16    Address;                                  ///< I/O address assigned to the floppy.\r
+  UINT8     Irq;                                      ///< IRQ assigned to the floppy.\r
+  UINT8     Dma;                                      ///< DMA assigned to the floppy.\r
+  UINT8     NumberOfFloppy;                           ///< Number of floppies in the system.\r
 } DEVICE_PRODUCER_FLOPPY;\r
 \r
 ///\r
 /// LEGACY_DEVICE_FLAGS\r
 ///\r
 typedef struct {\r
-  UINT32                            A20Kybd : 1;      ///< A20 controller by keyboard controller.\r
-  UINT32                            A20Port90 : 1;    ///< A20 controlled by port 0x92.\r
-  UINT32                            Reserved : 30;    ///< Reserved for future usage.\r
+  UINT32    A20Kybd   : 1;                            ///< A20 controller by keyboard controller.\r
+  UINT32    A20Port90 : 1;                            ///< A20 controlled by port 0x92.\r
+  UINT32    Reserved  : 30;                           ///< Reserved for future usage.\r
 } LEGACY_DEVICE_FLAGS;\r
 \r
 ///\r
 /// DEVICE_PRODUCER_DATA_HEADER\r
 ///\r
 typedef struct {\r
-  DEVICE_PRODUCER_SERIAL            Serial[4];      ///< Data for serial port x. Type DEVICE_PRODUCER_SERIAL is defined below.\r
-  DEVICE_PRODUCER_PARALLEL          Parallel[3];    ///< Data for parallel port x. Type DEVICE_PRODUCER_PARALLEL is defined below.\r
-  DEVICE_PRODUCER_FLOPPY            Floppy;         ///< Data for floppy. Type DEVICE_PRODUCER_FLOPPY is defined below.\r
-  UINT8                             MousePresent;   ///< Flag to indicate if mouse is present.\r
-  LEGACY_DEVICE_FLAGS               Flags;          ///< Miscellaneous Boolean state information passed to CSM.\r
+  DEVICE_PRODUCER_SERIAL      Serial[4];            ///< Data for serial port x. Type DEVICE_PRODUCER_SERIAL is defined below.\r
+  DEVICE_PRODUCER_PARALLEL    Parallel[3];          ///< Data for parallel port x. Type DEVICE_PRODUCER_PARALLEL is defined below.\r
+  DEVICE_PRODUCER_FLOPPY      Floppy;               ///< Data for floppy. Type DEVICE_PRODUCER_FLOPPY is defined below.\r
+  UINT8                       MousePresent;         ///< Flag to indicate if mouse is present.\r
+  LEGACY_DEVICE_FLAGS         Flags;                ///< Miscellaneous Boolean state information passed to CSM.\r
 } DEVICE_PRODUCER_DATA_HEADER;\r
 \r
 ///\r
 /// ATAPI_IDENTIFY\r
 ///\r
 typedef struct {\r
-  UINT16                            Raw[256];     ///< Raw data from the IDE IdentifyDrive command.\r
+  UINT16    Raw[256];                             ///< Raw data from the IDE IdentifyDrive command.\r
 } ATAPI_IDENTIFY;\r
 \r
 ///\r
@@ -529,44 +527,44 @@ typedef struct {
   /// per IDE controller. The IdentifyDrive is per drive. Index 0 is master and index\r
   /// 1 is slave.\r
   ///\r
-  UINT16                            Status;\r
+  UINT16            Status;\r
 \r
   ///\r
   /// PCI bus of IDE controller.\r
   ///\r
-  UINT32                            Bus;\r
+  UINT32            Bus;\r
 \r
   ///\r
   /// PCI device of IDE controller.\r
   ///\r
-  UINT32                            Device;\r
+  UINT32            Device;\r
 \r
   ///\r
   /// PCI function of IDE controller.\r
   ///\r
-  UINT32                            Function;\r
+  UINT32            Function;\r
 \r
   ///\r
   /// Command ports base address.\r
   ///\r
-  UINT16                            CommandBaseAddress;\r
+  UINT16            CommandBaseAddress;\r
 \r
   ///\r
   /// Control ports base address.\r
   ///\r
-  UINT16                            ControlBaseAddress;\r
+  UINT16            ControlBaseAddress;\r
 \r
   ///\r
   /// Bus master address.\r
   ///\r
-  UINT16                            BusMasterAddress;\r
+  UINT16            BusMasterAddress;\r
 \r
-  UINT8                             HddIrq;\r
+  UINT8             HddIrq;\r
 \r
   ///\r
   /// Data that identifies the drive data; one per possible attached drive.\r
   ///\r
-  ATAPI_IDENTIFY                    IdentifyDrive[2];\r
+  ATAPI_IDENTIFY    IdentifyDrive[2];\r
 } HDD_INFO;\r
 \r
 ///\r
@@ -585,10 +583,10 @@ typedef struct {
 /// BBS_STATUS_FLAGS;\.\r
 ///\r
 typedef struct {\r
-  UINT16                            OldPosition : 4;    ///< Prior priority.\r
-  UINT16                            Reserved1 : 4;      ///< Reserved for future use.\r
-  UINT16                            Enabled : 1;        ///< If 0, ignore this entry.\r
-  UINT16                            Failed : 1;         ///< 0 = Not known if boot failure occurred.\r
+  UINT16    OldPosition : 4;                            ///< Prior priority.\r
+  UINT16    Reserved1   : 4;                            ///< Reserved for future use.\r
+  UINT16    Enabled     : 1;                            ///< If 0, ignore this entry.\r
+  UINT16    Failed      : 1;                            ///< 0 = Not known if boot failure occurred.\r
                                                         ///< 1 = Boot attempted failed.\r
 \r
   ///\r
@@ -598,8 +596,8 @@ typedef struct {
   ///   10 = Media is present and appears bootable.\r
   ///   11 = Reserved.\r
   ///\r
-  UINT16                            MediaPresent : 2;\r
-  UINT16                            Reserved2 : 4;      ///< Reserved for future use.\r
+  UINT16    MediaPresent : 2;\r
+  UINT16    Reserved2    : 4;                           ///< Reserved for future use.\r
 } BBS_STATUS_FLAGS;\r
 \r
 ///\r
@@ -609,134 +607,134 @@ typedef struct {
   ///\r
   /// The boot priority for this boot device. Values are defined below.\r
   ///\r
-  UINT16                            BootPriority;\r
+  UINT16              BootPriority;\r
 \r
   ///\r
   /// The PCI bus for this boot device.\r
   ///\r
-  UINT32                            Bus;\r
+  UINT32              Bus;\r
 \r
   ///\r
   /// The PCI device for this boot device.\r
   ///\r
-  UINT32                            Device;\r
+  UINT32              Device;\r
 \r
   ///\r
   /// The PCI function for the boot device.\r
   ///\r
-  UINT32                            Function;\r
+  UINT32              Function;\r
 \r
   ///\r
   /// The PCI class for this boot device.\r
   ///\r
-  UINT8                             Class;\r
+  UINT8               Class;\r
 \r
   ///\r
   /// The PCI Subclass for this boot device.\r
   ///\r
-  UINT8                             SubClass;\r
+  UINT8               SubClass;\r
 \r
   ///\r
   /// Segment:offset address of an ASCIIZ description string describing the manufacturer.\r
   ///\r
-  UINT16                            MfgStringOffset;\r
+  UINT16              MfgStringOffset;\r
 \r
   ///\r
   /// Segment:offset address of an ASCIIZ description string describing the manufacturer.\r
   ///\r
-  UINT16                            MfgStringSegment;\r
+  UINT16              MfgStringSegment;\r
 \r
   ///\r
   /// BBS device type. BBS device types are defined below.\r
   ///\r
-  UINT16                            DeviceType;\r
+  UINT16              DeviceType;\r
 \r
   ///\r
   /// Status of this boot device. Type BBS_STATUS_FLAGS is defined below.\r
   ///\r
-  BBS_STATUS_FLAGS                  StatusFlags;\r
+  BBS_STATUS_FLAGS    StatusFlags;\r
 \r
   ///\r
   /// Segment:Offset address of boot loader for IPL devices or install INT13 handler for\r
   /// BCV devices.\r
   ///\r
-  UINT16                            BootHandlerOffset;\r
+  UINT16              BootHandlerOffset;\r
 \r
   ///\r
   /// Segment:Offset address of boot loader for IPL devices or install INT13 handler for\r
   /// BCV devices.\r
   ///\r
-  UINT16                            BootHandlerSegment;\r
+  UINT16              BootHandlerSegment;\r
 \r
   ///\r
   /// Segment:offset address of an ASCIIZ description string describing this device.\r
   ///\r
-  UINT16                            DescStringOffset;\r
+  UINT16              DescStringOffset;\r
 \r
   ///\r
   /// Segment:offset address of an ASCIIZ description string describing this device.\r
   ///\r
-  UINT16                            DescStringSegment;\r
+  UINT16              DescStringSegment;\r
 \r
   ///\r
   /// Reserved.\r
   ///\r
-  UINT32                            InitPerReserved;\r
+  UINT32              InitPerReserved;\r
 \r
   ///\r
   /// The use of these fields is IBV dependent. They can be used to flag that an OpROM\r
   /// has hooked the specified IRQ. The OpROM may be BBS compliant as some SCSI\r
   /// BBS-compliant OpROMs also hook IRQ vectors in order to run their BIOS Setup\r
   ///\r
-  UINT32                            AdditionalIrq13Handler;\r
+  UINT32              AdditionalIrq13Handler;\r
 \r
   ///\r
   /// The use of these fields is IBV dependent. They can be used to flag that an OpROM\r
   /// has hooked the specified IRQ. The OpROM may be BBS compliant as some SCSI\r
   /// BBS-compliant OpROMs also hook IRQ vectors in order to run their BIOS Setup\r
   ///\r
-  UINT32                            AdditionalIrq18Handler;\r
+  UINT32              AdditionalIrq18Handler;\r
 \r
   ///\r
   /// The use of these fields is IBV dependent. They can be used to flag that an OpROM\r
   /// has hooked the specified IRQ. The OpROM may be BBS compliant as some SCSI\r
   /// BBS-compliant OpROMs also hook IRQ vectors in order to run their BIOS Setup\r
   ///\r
-  UINT32                            AdditionalIrq19Handler;\r
+  UINT32              AdditionalIrq19Handler;\r
 \r
   ///\r
   /// The use of these fields is IBV dependent. They can be used to flag that an OpROM\r
   /// has hooked the specified IRQ. The OpROM may be BBS compliant as some SCSI\r
   /// BBS-compliant OpROMs also hook IRQ vectors in order to run their BIOS Setup\r
   ///\r
-  UINT32                            AdditionalIrq40Handler;\r
-  UINT8                             AssignedDriveNumber;\r
-  UINT32                            AdditionalIrq41Handler;\r
-  UINT32                            AdditionalIrq46Handler;\r
-  UINT32                            IBV1;\r
-  UINT32                            IBV2;\r
+  UINT32              AdditionalIrq40Handler;\r
+  UINT8               AssignedDriveNumber;\r
+  UINT32              AdditionalIrq41Handler;\r
+  UINT32              AdditionalIrq46Handler;\r
+  UINT32              IBV1;\r
+  UINT32              IBV2;\r
 } BBS_TABLE;\r
 \r
 ///\r
 /// BBS device type values\r
 ///@{\r
-#define BBS_FLOPPY              0x01\r
-#define BBS_HARDDISK            0x02\r
-#define BBS_CDROM               0x03\r
-#define BBS_PCMCIA              0x04\r
-#define BBS_USB                 0x05\r
-#define BBS_EMBED_NETWORK       0x06\r
-#define BBS_BEV_DEVICE          0x80\r
-#define BBS_UNKNOWN             0xff\r
+#define BBS_FLOPPY         0x01\r
+#define BBS_HARDDISK       0x02\r
+#define BBS_CDROM          0x03\r
+#define BBS_PCMCIA         0x04\r
+#define BBS_USB            0x05\r
+#define BBS_EMBED_NETWORK  0x06\r
+#define BBS_BEV_DEVICE     0x80\r
+#define BBS_UNKNOWN        0xff\r
 ///@}\r
 \r
 ///\r
 /// BBS boot priority values\r
 ///@{\r
-#define BBS_DO_NOT_BOOT_FROM    0xFFFC\r
-#define BBS_LOWEST_PRIORITY     0xFFFD\r
-#define BBS_UNPRIORITIZED_ENTRY 0xFFFE\r
-#define BBS_IGNORE_ENTRY        0xFFFF\r
+#define BBS_DO_NOT_BOOT_FROM     0xFFFC\r
+#define BBS_LOWEST_PRIORITY      0xFFFD\r
+#define BBS_UNPRIORITIZED_ENTRY  0xFFFE\r
+#define BBS_IGNORE_ENTRY         0xFFFF\r
 ///@}\r
 \r
 ///\r
@@ -747,70 +745,70 @@ typedef struct {
   /// Access mechanism used to generate the soft SMI. Defined types are below. The other\r
   /// values are reserved for future usage.\r
   ///\r
-  UINT16                            Type : 3;\r
+  UINT16    Type            : 3;\r
 \r
   ///\r
   /// The size of "port" in bits. Defined values are below.\r
   ///\r
-  UINT16                            PortGranularity : 3;\r
+  UINT16    PortGranularity : 3;\r
 \r
   ///\r
   /// The size of data in bits. Defined values are below.\r
   ///\r
-  UINT16                            DataGranularity : 3;\r
+  UINT16    DataGranularity : 3;\r
 \r
   ///\r
   /// Reserved for future use.\r
   ///\r
-  UINT16                            Reserved : 7;\r
+  UINT16    Reserved        : 7;\r
 } SMM_ATTRIBUTES;\r
 \r
 ///\r
 /// SMM_ATTRIBUTES type values.\r
 ///@{\r
-#define STANDARD_IO       0x00\r
-#define STANDARD_MEMORY   0x01\r
+#define STANDARD_IO      0x00\r
+#define STANDARD_MEMORY  0x01\r
 ///@}\r
 \r
 ///\r
 /// SMM_ATTRIBUTES port size constants.\r
 ///@{\r
-#define PORT_SIZE_8       0x00\r
-#define PORT_SIZE_16      0x01\r
-#define PORT_SIZE_32      0x02\r
-#define PORT_SIZE_64      0x03\r
+#define PORT_SIZE_8   0x00\r
+#define PORT_SIZE_16  0x01\r
+#define PORT_SIZE_32  0x02\r
+#define PORT_SIZE_64  0x03\r
 ///@}\r
 \r
 ///\r
 /// SMM_ATTRIBUTES data size constants.\r
 ///@{\r
-#define DATA_SIZE_8       0x00\r
-#define DATA_SIZE_16      0x01\r
-#define DATA_SIZE_32      0x02\r
-#define DATA_SIZE_64      0x03\r
+#define DATA_SIZE_8   0x00\r
+#define DATA_SIZE_16  0x01\r
+#define DATA_SIZE_32  0x02\r
+#define DATA_SIZE_64  0x03\r
 ///@}\r
 \r
 ///\r
 /// SMM_FUNCTION & relating constants.\r
 ///\r
 typedef struct {\r
-  UINT16                            Function : 15;\r
-  UINT16                            Owner : 1;\r
+  UINT16    Function : 15;\r
+  UINT16    Owner    : 1;\r
 } SMM_FUNCTION;\r
 \r
 ///\r
 /// SMM_FUNCTION Function constants.\r
 ///@{\r
-#define INT15_D042        0x0000\r
-#define GET_USB_BOOT_INFO 0x0001\r
-#define DMI_PNP_50_57     0x0002\r
+#define INT15_D042         0x0000\r
+#define GET_USB_BOOT_INFO  0x0001\r
+#define DMI_PNP_50_57      0x0002\r
 ///@}\r
 \r
 ///\r
 /// SMM_FUNCTION Owner constants.\r
 ///@{\r
-#define STANDARD_OWNER    0x0\r
-#define OEM_OWNER         0x1\r
+#define STANDARD_OWNER  0x0\r
+#define OEM_OWNER       0x1\r
 ///@}\r
 \r
 ///\r
@@ -822,30 +820,30 @@ typedef struct {
   /// Describes the access mechanism, SmmPort, and SmmData sizes. Type\r
   /// SMM_ATTRIBUTES is defined below.\r
   ///\r
-  SMM_ATTRIBUTES                    SmmAttributes;\r
+  SMM_ATTRIBUTES    SmmAttributes;\r
 \r
   ///\r
   /// Function Soft SMI is to perform. Type SMM_FUNCTION is defined below.\r
   ///\r
-  SMM_FUNCTION                      SmmFunction;\r
+  SMM_FUNCTION      SmmFunction;\r
 \r
   ///\r
   /// SmmPort size depends upon SmmAttributes and ranges from2 bytes to 16 bytes.\r
   ///\r
-  UINT8                             SmmPort;\r
+  UINT8             SmmPort;\r
 \r
   ///\r
   /// SmmData size depends upon SmmAttributes and ranges from2 bytes to 16 bytes.\r
   ///\r
-  UINT8                             SmmData;\r
+  UINT8             SmmData;\r
 } SMM_ENTRY;\r
 \r
 ///\r
 /// SMM_TABLE\r
 ///\r
 typedef struct {\r
-  UINT16                            NumSmmEntries;    ///< Number of entries represented by SmmEntry.\r
-  SMM_ENTRY                         SmmEntry;         ///< One entry per function. Type SMM_ENTRY is defined below.\r
+  UINT16       NumSmmEntries;                         ///< Number of entries represented by SmmEntry.\r
+  SMM_ENTRY    SmmEntry;                              ///< One entry per function. Type SMM_ENTRY is defined below.\r
 } SMM_TABLE;\r
 \r
 ///\r
@@ -855,23 +853,23 @@ typedef struct {
   ///\r
   /// This bit set indicates that the ServiceAreaData is valid.\r
   ///\r
-  UINT8                             DirectoryServiceValidity : 1;\r
+  UINT8    DirectoryServiceValidity  : 1;\r
 \r
   ///\r
   /// This bit set indicates to use the Reserve Area Boot Code Address (RACBA) only if\r
   /// DirectoryServiceValidity is 0.\r
   ///\r
-  UINT8                             RabcaUsedFlag : 1;\r
+  UINT8    RabcaUsedFlag             : 1;\r
 \r
   ///\r
   /// This bit set indicates to execute hard disk diagnostics.\r
   ///\r
-  UINT8                             ExecuteHddDiagnosticsFlag : 1;\r
+  UINT8    ExecuteHddDiagnosticsFlag : 1;\r
 \r
   ///\r
   /// Reserved for future use. Set to 0.\r
   ///\r
-  UINT8                             Reserved : 5;\r
+  UINT8    Reserved                  : 5;\r
 } UDC_ATTRIBUTES;\r
 \r
 ///\r
@@ -882,74 +880,74 @@ typedef struct {
   /// This field contains the bit-mapped attributes of the PARTIES information. Type\r
   /// UDC_ATTRIBUTES is defined below.\r
   ///\r
-  UDC_ATTRIBUTES                    Attributes;\r
+  UDC_ATTRIBUTES    Attributes;\r
 \r
   ///\r
   /// This field contains the zero-based device on which the selected\r
   /// ServiceDataArea is present. It is 0 for master and 1 for the slave device.\r
   ///\r
-  UINT8                             DeviceNumber;\r
+  UINT8             DeviceNumber;\r
 \r
   ///\r
   /// This field contains the zero-based index into the BbsTable for the parent device.\r
   /// This index allows the user to reference the parent device information such as PCI\r
   /// bus, device function.\r
   ///\r
-  UINT8                             BbsTableEntryNumberForParentDevice;\r
+  UINT8             BbsTableEntryNumberForParentDevice;\r
 \r
   ///\r
   /// This field contains the zero-based index into the BbsTable for the boot entry.\r
   ///\r
-  UINT8                             BbsTableEntryNumberForBoot;\r
+  UINT8             BbsTableEntryNumberForBoot;\r
 \r
   ///\r
   /// This field contains the zero-based index into the BbsTable for the HDD diagnostics entry.\r
   ///\r
-  UINT8                             BbsTableEntryNumberForHddDiag;\r
+  UINT8             BbsTableEntryNumberForHddDiag;\r
 \r
   ///\r
   /// The raw Beer data.\r
   ///\r
-  UINT8                             BeerData[128];\r
+  UINT8             BeerData[128];\r
 \r
   ///\r
   /// The raw data of selected service area.\r
   ///\r
-  UINT8                             ServiceAreaData[64];\r
+  UINT8             ServiceAreaData[64];\r
 } UD_TABLE;\r
 \r
-#define EFI_TO_LEGACY_MAJOR_VERSION 0x02\r
-#define EFI_TO_LEGACY_MINOR_VERSION 0x00\r
-#define MAX_IDE_CONTROLLER          8\r
+#define EFI_TO_LEGACY_MAJOR_VERSION  0x02\r
+#define EFI_TO_LEGACY_MINOR_VERSION  0x00\r
+#define MAX_IDE_CONTROLLER           8\r
 \r
 ///\r
 /// EFI_TO_COMPATIBILITY16_BOOT_TABLE\r
 ///\r
 typedef struct {\r
-  UINT16                            MajorVersion;                 ///< The EfiCompatibility major version number.\r
-  UINT16                            MinorVersion;                 ///< The EfiCompatibility minor version number.\r
-  UINT32                            AcpiTable;                    ///< The location of the RSDT ACPI table. < 4G range.\r
-  UINT32                            SmbiosTable;                  ///< The location of the SMBIOS table in EFI memory. < 4G range.\r
-  UINT32                            SmbiosTableLength;\r
+  UINT16                         MajorVersion;                    ///< The EfiCompatibility major version number.\r
+  UINT16                         MinorVersion;                    ///< The EfiCompatibility minor version number.\r
+  UINT32                         AcpiTable;                       ///< The location of the RSDT ACPI table. < 4G range.\r
+  UINT32                         SmbiosTable;                     ///< The location of the SMBIOS table in EFI memory. < 4G range.\r
+  UINT32                         SmbiosTableLength;\r
   //\r
   // Legacy SIO state\r
   //\r
-  DEVICE_PRODUCER_DATA_HEADER       SioData;                      ///< Standard traditional device information.\r
-  UINT16                            DevicePathType;               ///< The default boot type.\r
-  UINT16                            PciIrqMask;                   ///< Mask of which IRQs have been assigned to PCI.\r
-  UINT32                            NumberE820Entries;            ///< Number of E820 entries. The number can change from the\r
+  DEVICE_PRODUCER_DATA_HEADER    SioData;                         ///< Standard traditional device information.\r
+  UINT16                         DevicePathType;                  ///< The default boot type.\r
+  UINT16                         PciIrqMask;                      ///< Mask of which IRQs have been assigned to PCI.\r
+  UINT32                         NumberE820Entries;               ///< Number of E820 entries. The number can change from the\r
                                                                   ///< Compatibility16InitializeYourself() function.\r
   //\r
   // Controller & Drive Identify[2] per controller information\r
   //\r
-  HDD_INFO                          HddInfo[MAX_IDE_CONTROLLER];  ///< Hard disk drive information, including raw Identify Drive data.\r
-  UINT32                            NumberBbsEntries;             ///< Number of entries in the BBS table\r
-  UINT32                            BbsTable;                     ///< A pointer to the BBS table. Type BBS_TABLE is defined below.\r
-  UINT32                            SmmTable;                     ///< A pointer to the SMM table. Type SMM_TABLE is defined below.\r
-  UINT32                            OsMemoryAbove1Mb;             ///< The amount of usable memory above 1 MB, i.e. E820 type 1 memory. This value can\r
+  HDD_INFO                       HddInfo[MAX_IDE_CONTROLLER];     ///< Hard disk drive information, including raw Identify Drive data.\r
+  UINT32                         NumberBbsEntries;                ///< Number of entries in the BBS table\r
+  UINT32                         BbsTable;                        ///< A pointer to the BBS table. Type BBS_TABLE is defined below.\r
+  UINT32                         SmmTable;                        ///< A pointer to the SMM table. Type SMM_TABLE is defined below.\r
+  UINT32                         OsMemoryAbove1Mb;                ///< The amount of usable memory above 1 MB, i.e. E820 type 1 memory. This value can\r
                                                                   ///< differ from the value in EFI_TO_COMPATIBILITY16_INIT_TABLE as more\r
                                                                   ///< memory may have been discovered.\r
-  UINT32                            UnconventionalDeviceTable;    ///< Information to boot off an unconventional device like a PARTIES partition. Type\r
+  UINT32                         UnconventionalDeviceTable;       ///< Information to boot off an unconventional device like a PARTIES partition. Type\r
                                                                   ///< UD_TABLE is defined below.\r
 } EFI_TO_COMPATIBILITY16_BOOT_TABLE;\r
 \r
@@ -957,28 +955,28 @@ typedef struct {
 /// EFI_LEGACY_INSTALL_PCI_HANDLER\r
 ///\r
 typedef struct {\r
-  UINT8                             PciBus;             ///< The PCI bus of the device.\r
-  UINT8                             PciDeviceFun;       ///< The PCI device in bits 7:3 and function in bits 2:0.\r
-  UINT8                             PciSegment;         ///< The PCI segment of the device.\r
-  UINT8                             PciClass;           ///< The PCI class code of the device.\r
-  UINT8                             PciSubclass;        ///< The PCI subclass code of the device.\r
-  UINT8                             PciInterface;       ///< The PCI interface code of the device.\r
+  UINT8     PciBus;                                     ///< The PCI bus of the device.\r
+  UINT8     PciDeviceFun;                               ///< The PCI device in bits 7:3 and function in bits 2:0.\r
+  UINT8     PciSegment;                                 ///< The PCI segment of the device.\r
+  UINT8     PciClass;                                   ///< The PCI class code of the device.\r
+  UINT8     PciSubclass;                                ///< The PCI subclass code of the device.\r
+  UINT8     PciInterface;                               ///< The PCI interface code of the device.\r
   //\r
   // Primary section\r
   //\r
-  UINT8                             PrimaryIrq;         ///< The primary device IRQ.\r
-  UINT8                             PrimaryReserved;    ///< Reserved.\r
-  UINT16                            PrimaryControl;     ///< The primary device control I/O base.\r
-  UINT16                            PrimaryBase;        ///< The primary device I/O base.\r
-  UINT16                            PrimaryBusMaster;   ///< The primary device bus master I/O base.\r
+  UINT8     PrimaryIrq;                                 ///< The primary device IRQ.\r
+  UINT8     PrimaryReserved;                            ///< Reserved.\r
+  UINT16    PrimaryControl;                             ///< The primary device control I/O base.\r
+  UINT16    PrimaryBase;                                ///< The primary device I/O base.\r
+  UINT16    PrimaryBusMaster;                           ///< The primary device bus master I/O base.\r
   //\r
   // Secondary Section\r
   //\r
-  UINT8                             SecondaryIrq;       ///< The secondary device IRQ.\r
-  UINT8                             SecondaryReserved;  ///< Reserved.\r
-  UINT16                            SecondaryControl;   ///< The secondary device control I/O base.\r
-  UINT16                            SecondaryBase;      ///< The secondary device I/O base.\r
-  UINT16                            SecondaryBusMaster; ///< The secondary device bus master I/O base.\r
+  UINT8     SecondaryIrq;                               ///< The secondary device IRQ.\r
+  UINT8     SecondaryReserved;                          ///< Reserved.\r
+  UINT16    SecondaryControl;                           ///< The secondary device control I/O base.\r
+  UINT16    SecondaryBase;                              ///< The secondary device I/O base.\r
+  UINT16    SecondaryBusMaster;                         ///< The secondary device bus master I/O base.\r
 } EFI_LEGACY_INSTALL_PCI_HANDLER;\r
 \r
 //\r
@@ -1007,128 +1005,128 @@ typedef struct _EFI_LEGACY_BIOS_PROTOCOL EFI_LEGACY_BIOS_PROTOCOL;
 /// to Segment:Offset 16-bit form.\r
 ///\r
 ///@{\r
-#define EFI_SEGMENT(_Adr)     (UINT16) ((UINT16) (((UINTN) (_Adr)) >> 4) & 0xf000)\r
-#define EFI_OFFSET(_Adr)      (UINT16) (((UINT16) ((UINTN) (_Adr))) & 0xffff)\r
+#define EFI_SEGMENT(_Adr)  (UINT16) ((UINT16) (((UINTN) (_Adr)) >> 4) & 0xf000)\r
+#define EFI_OFFSET(_Adr)   (UINT16) (((UINT16) ((UINTN) (_Adr))) & 0xffff)\r
 ///@}\r
 \r
-#define CARRY_FLAG            0x01\r
+#define CARRY_FLAG  0x01\r
 \r
 ///\r
 /// EFI_EFLAGS_REG\r
 ///\r
 typedef struct {\r
-  UINT32 CF:1;\r
-  UINT32 Reserved1:1;\r
-  UINT32 PF:1;\r
-  UINT32 Reserved2:1;\r
-  UINT32 AF:1;\r
-  UINT32 Reserved3:1;\r
-  UINT32 ZF:1;\r
-  UINT32 SF:1;\r
-  UINT32 TF:1;\r
-  UINT32 IF:1;\r
-  UINT32 DF:1;\r
-  UINT32 OF:1;\r
-  UINT32 IOPL:2;\r
-  UINT32 NT:1;\r
-  UINT32 Reserved4:2;\r
-  UINT32 VM:1;\r
-  UINT32 Reserved5:14;\r
+  UINT32    CF        : 1;\r
+  UINT32    Reserved1 : 1;\r
+  UINT32    PF        : 1;\r
+  UINT32    Reserved2 : 1;\r
+  UINT32    AF        : 1;\r
+  UINT32    Reserved3 : 1;\r
+  UINT32    ZF        : 1;\r
+  UINT32    SF        : 1;\r
+  UINT32    TF        : 1;\r
+  UINT32    IF        : 1;\r
+  UINT32    DF        : 1;\r
+  UINT32    OF        : 1;\r
+  UINT32    IOPL      : 2;\r
+  UINT32    NT        : 1;\r
+  UINT32    Reserved4 : 2;\r
+  UINT32    VM        : 1;\r
+  UINT32    Reserved5 : 14;\r
 } EFI_EFLAGS_REG;\r
 \r
 ///\r
 /// EFI_DWORD_REGS\r
 ///\r
 typedef struct {\r
-    UINT32           EAX;\r
-    UINT32           EBX;\r
-    UINT32           ECX;\r
-    UINT32           EDX;\r
-    UINT32           ESI;\r
-    UINT32           EDI;\r
-    EFI_EFLAGS_REG   EFlags;\r
-    UINT16           ES;\r
-    UINT16           CS;\r
-    UINT16           SS;\r
-    UINT16           DS;\r
-    UINT16           FS;\r
-    UINT16           GS;\r
-    UINT32           EBP;\r
-    UINT32           ESP;\r
+  UINT32            EAX;\r
+  UINT32            EBX;\r
+  UINT32            ECX;\r
+  UINT32            EDX;\r
+  UINT32            ESI;\r
+  UINT32            EDI;\r
+  EFI_EFLAGS_REG    EFlags;\r
+  UINT16            ES;\r
+  UINT16            CS;\r
+  UINT16            SS;\r
+  UINT16            DS;\r
+  UINT16            FS;\r
+  UINT16            GS;\r
+  UINT32            EBP;\r
+  UINT32            ESP;\r
 } EFI_DWORD_REGS;\r
 \r
 ///\r
 /// EFI_FLAGS_REG\r
 ///\r
 typedef struct {\r
-  UINT16     CF:1;\r
-  UINT16     Reserved1:1;\r
-  UINT16     PF:1;\r
-  UINT16     Reserved2:1;\r
-  UINT16     AF:1;\r
-  UINT16     Reserved3:1;\r
-  UINT16     ZF:1;\r
-  UINT16     SF:1;\r
-  UINT16     TF:1;\r
-  UINT16     IF:1;\r
-  UINT16     DF:1;\r
-  UINT16     OF:1;\r
-  UINT16     IOPL:2;\r
-  UINT16     NT:1;\r
-  UINT16     Reserved4:1;\r
+  UINT16    CF        : 1;\r
+  UINT16    Reserved1 : 1;\r
+  UINT16    PF        : 1;\r
+  UINT16    Reserved2 : 1;\r
+  UINT16    AF        : 1;\r
+  UINT16    Reserved3 : 1;\r
+  UINT16    ZF        : 1;\r
+  UINT16    SF        : 1;\r
+  UINT16    TF        : 1;\r
+  UINT16    IF        : 1;\r
+  UINT16    DF        : 1;\r
+  UINT16    OF        : 1;\r
+  UINT16    IOPL      : 2;\r
+  UINT16    NT        : 1;\r
+  UINT16    Reserved4 : 1;\r
 } EFI_FLAGS_REG;\r
 \r
 ///\r
 /// EFI_WORD_REGS\r
 ///\r
 typedef struct {\r
-    UINT16           AX;\r
-    UINT16           ReservedAX;\r
-    UINT16           BX;\r
-    UINT16           ReservedBX;\r
-    UINT16           CX;\r
-    UINT16           ReservedCX;\r
-    UINT16           DX;\r
-    UINT16           ReservedDX;\r
-    UINT16           SI;\r
-    UINT16           ReservedSI;\r
-    UINT16           DI;\r
-    UINT16           ReservedDI;\r
-    EFI_FLAGS_REG    Flags;\r
-    UINT16           ReservedFlags;\r
-    UINT16           ES;\r
-    UINT16           CS;\r
-    UINT16           SS;\r
-    UINT16           DS;\r
-    UINT16           FS;\r
-    UINT16           GS;\r
-    UINT16           BP;\r
-    UINT16           ReservedBP;\r
-    UINT16           SP;\r
-    UINT16           ReservedSP;\r
+  UINT16           AX;\r
+  UINT16           ReservedAX;\r
+  UINT16           BX;\r
+  UINT16           ReservedBX;\r
+  UINT16           CX;\r
+  UINT16           ReservedCX;\r
+  UINT16           DX;\r
+  UINT16           ReservedDX;\r
+  UINT16           SI;\r
+  UINT16           ReservedSI;\r
+  UINT16           DI;\r
+  UINT16           ReservedDI;\r
+  EFI_FLAGS_REG    Flags;\r
+  UINT16           ReservedFlags;\r
+  UINT16           ES;\r
+  UINT16           CS;\r
+  UINT16           SS;\r
+  UINT16           DS;\r
+  UINT16           FS;\r
+  UINT16           GS;\r
+  UINT16           BP;\r
+  UINT16           ReservedBP;\r
+  UINT16           SP;\r
+  UINT16           ReservedSP;\r
 } EFI_WORD_REGS;\r
 \r
 ///\r
 /// EFI_BYTE_REGS\r
 ///\r
 typedef struct {\r
-    UINT8   AL, AH;\r
-    UINT16  ReservedAX;\r
-    UINT8   BL, BH;\r
-    UINT16  ReservedBX;\r
-    UINT8   CL, CH;\r
-    UINT16  ReservedCX;\r
-    UINT8   DL, DH;\r
-    UINT16  ReservedDX;\r
+  UINT8     AL, AH;\r
+  UINT16    ReservedAX;\r
+  UINT8     BL, BH;\r
+  UINT16    ReservedBX;\r
+  UINT8     CL, CH;\r
+  UINT16    ReservedCX;\r
+  UINT8     DL, DH;\r
+  UINT16    ReservedDX;\r
 } EFI_BYTE_REGS;\r
 \r
 ///\r
 /// EFI_IA32_REGISTER_SET\r
 ///\r
 typedef union {\r
-  EFI_DWORD_REGS  E;\r
-  EFI_WORD_REGS   X;\r
-  EFI_BYTE_REGS   H;\r
+  EFI_DWORD_REGS    E;\r
+  EFI_WORD_REGS     X;\r
+  EFI_BYTE_REGS     H;\r
 } EFI_IA32_REGISTER_SET;\r
 \r
 /**\r
@@ -1453,63 +1451,63 @@ struct _EFI_LEGACY_BIOS_PROTOCOL {
   ///\r
   /// Performs traditional software INT. See the Int86() function description.\r
   ///\r
-  EFI_LEGACY_BIOS_INT86                       Int86;\r
+  EFI_LEGACY_BIOS_INT86                         Int86;\r
 \r
   ///\r
   /// Performs a far call into Compatibility16 or traditional OpROM code.\r
   ///\r
-  EFI_LEGACY_BIOS_FARCALL86                   FarCall86;\r
+  EFI_LEGACY_BIOS_FARCALL86                     FarCall86;\r
 \r
   ///\r
   /// Checks if a traditional OpROM exists for this device.\r
   ///\r
-  EFI_LEGACY_BIOS_CHECK_ROM                   CheckPciRom;\r
+  EFI_LEGACY_BIOS_CHECK_ROM                     CheckPciRom;\r
 \r
   ///\r
   /// Loads a traditional OpROM in traditional OpROM address space.\r
   ///\r
-  EFI_LEGACY_BIOS_INSTALL_ROM                 InstallPciRom;\r
+  EFI_LEGACY_BIOS_INSTALL_ROM                   InstallPciRom;\r
 \r
   ///\r
   /// Boots a traditional OS.\r
   ///\r
-  EFI_LEGACY_BIOS_BOOT                        LegacyBoot;\r
+  EFI_LEGACY_BIOS_BOOT                          LegacyBoot;\r
 \r
   ///\r
   /// Updates BDA to reflect the current EFI keyboard LED status.\r
   ///\r
-  EFI_LEGACY_BIOS_UPDATE_KEYBOARD_LED_STATUS  UpdateKeyboardLedStatus;\r
+  EFI_LEGACY_BIOS_UPDATE_KEYBOARD_LED_STATUS    UpdateKeyboardLedStatus;\r
 \r
   ///\r
   /// Allows an external agent, such as BIOS Setup, to get the BBS data.\r
   ///\r
-  EFI_LEGACY_BIOS_GET_BBS_INFO                GetBbsInfo;\r
+  EFI_LEGACY_BIOS_GET_BBS_INFO                  GetBbsInfo;\r
 \r
   ///\r
   /// Causes all legacy OpROMs to be shadowed.\r
   ///\r
-  EFI_LEGACY_BIOS_SHADOW_ALL_LEGACY_OPROMS    ShadowAllLegacyOproms;\r
+  EFI_LEGACY_BIOS_SHADOW_ALL_LEGACY_OPROMS      ShadowAllLegacyOproms;\r
 \r
   ///\r
   /// Performs all actions prior to boot. Used when booting an EFI-aware OS\r
   /// rather than a legacy OS.\r
   ///\r
-  EFI_LEGACY_BIOS_PREPARE_TO_BOOT_EFI         PrepareToBootEfi;\r
+  EFI_LEGACY_BIOS_PREPARE_TO_BOOT_EFI           PrepareToBootEfi;\r
 \r
   ///\r
   /// Allows EFI to reserve an area in the 0xE0000 or 0xF0000 block.\r
   ///\r
-  EFI_LEGACY_BIOS_GET_LEGACY_REGION           GetLegacyRegion;\r
+  EFI_LEGACY_BIOS_GET_LEGACY_REGION             GetLegacyRegion;\r
 \r
   ///\r
   /// Allows EFI to copy data to the area specified by GetLegacyRegion.\r
   ///\r
-  EFI_LEGACY_BIOS_COPY_LEGACY_REGION          CopyLegacyRegion;\r
+  EFI_LEGACY_BIOS_COPY_LEGACY_REGION            CopyLegacyRegion;\r
 \r
   ///\r
   /// Allows the user to boot off an unconventional device such as a PARTIES partition.\r
   ///\r
-  EFI_LEGACY_BIOS_BOOT_UNCONVENTIONAL_DEVICE  BootUnconventionalDevice;\r
+  EFI_LEGACY_BIOS_BOOT_UNCONVENTIONAL_DEVICE    BootUnconventionalDevice;\r
 };\r
 \r
 //\r
@@ -1548,6 +1546,6 @@ struct _EFI_LEGACY_BIOS_PROTOCOL {
     }                                                           \\r
   } while (FALSE)\r
 \r
-extern EFI_GUID gEfiLegacyBiosProtocolGuid;\r
+extern EFI_GUID  gEfiLegacyBiosProtocolGuid;\r
 \r
 #endif\r
index 37f5d9178bce64c4c5f717341550186d5a6bee69..941b1c8331595cc8481fe4e8b6fb42a46ca783ee 100644 (file)
@@ -66,7 +66,7 @@ typedef enum {
   ///\r
   ///   EFI_UNSUPPORTED The MP table is not supported on this platform.\r
   ///\r
-  EfiGetPlatformBinaryMpTable      = 0,\r
+  EfiGetPlatformBinaryMpTable = 0,\r
   ///\r
   /// This mode returns a block of data. The content and usage is IBV or OEM defined.\r
   /// OEMs or IBVs normally use this function for nonstandard Compatibility16 runtime soft\r
@@ -104,7 +104,7 @@ typedef enum {
   ///\r
   ///   EFI_UNSUPPORTED Oem INT is not supported on this platform.\r
   ///\r
-  EfiGetPlatformBinaryOemIntData   = 1,\r
+  EfiGetPlatformBinaryOemIntData = 1,\r
   ///\r
   /// This mode returns a block of data. The content and usage is IBV defined. OEMs or\r
   /// IBVs normally use this mode for nonstandard Compatibility16 runtime 16 bit routines. It\r
@@ -146,57 +146,57 @@ typedef enum {
   ///\r
   ///   EFI_UNSUPPORTED Oem16 is not supported on this platform.\r
   ///\r
-  EfiGetPlatformBinaryOem16Data    = 2,\r
-///\r
-/// This mode returns a block of data. The content and usage are IBV defined. OEMs or\r
-/// IBVs normally use this mode for nonstandard Compatibility16 runtime 32 bit routines. It\r
-/// is the responsibility of this routine to coalesce multiple OEM 32 bit functions, if they\r
-/// exist, into one coherent package that is understandable by the Compatibility16 code.\r
-///\r
-/// Example usage: A legacy mobile BIOS that has a pre existing runtime\r
-/// interface to return the battery status to calling applications.\r
-///\r
-/// This mode is invoked twice. The first invocation has LegacySegment and\r
-/// LegacyOffset set to 0. The mode returns the table address in EFI memory and its size.\r
-///\r
-/// The second invocation has LegacySegment and LegacyOffset set to the location\r
-/// in the 0xF0000 or 0xE0000 block to which the table is to be copied. The second\r
-/// invocation allows any table address fix ups to occur in the EFI memory copy of the table.\r
-/// The caller, not EfiGetPlatformBinaryOem32Data, copies the modified table to\r
-/// the allocated region in 0xF0000 or 0xE0000 block after the second invocation..\r
-///\r
-/// Note: There are two generic mechanisms by which this mode can be used.\r
-/// Mechanism 1: This mode returns the data and the Legacy BIOS Protocol copies\r
-/// the data into the F0000 or E0000 block in the Compatibility16 code. The\r
-/// EFI_COMPATIBILITY16_TABLE entries Oem32Segment and Oem32Offset can\r
-/// be viewed as two UINT16 entries.\r
-/// Mechanism 2: This mode directly fills in the EFI_COMPATIBILITY16_TABLE with\r
-/// a pointer to the INT15 E820 region containing the 32 bit code. It returns\r
-/// EFI_UNSUPPORTED. The EFI_COMPATIBILITY16_TABLE entries,\r
-/// Oem32Segment and Oem32Offset, can be viewed as two UINT16 entries or\r
-/// as a single UINT32 entry as determined by the IBV.\r
-///\r
-/// The function parameters associated with this mode are:\r
-///\r
-///   TableSize Size of data.\r
-///\r
-///   Location Location to place the table. 0x00 or 0xE0000 or 0xF0000 64 KB blocks.\r
-///       Bit 0 = 1 0xF0000 64 KB block.\r
-///       Bit 1 = 1 0xE0000 64 KB block.\r
-///       Multiple bits can be set.\r
-///\r
-///   Alignment Bit mapped address alignment granularity.\r
-///       The first nonzero bit from the right is the address granularity.\r
-///\r
-///   LegacySegment Segment in which EfiCompatibility code will place the table or data.\r
-///\r
-///   LegacyOffset Offset in which EfiCompatibility code will place the table or data.\r
-///\r
-/// The return values associated with this mode are:\r
-///   EFI_SUCCESS The data was returned successfully.\r
-///   EFI_UNSUPPORTED Oem32 is not supported on this platform.\r
-///\r
-EfiGetPlatformBinaryOem32Data    = 3,\r
+  EfiGetPlatformBinaryOem16Data = 2,\r
+  ///\r
+  /// This mode returns a block of data. The content and usage are IBV defined. OEMs or\r
+  /// IBVs normally use this mode for nonstandard Compatibility16 runtime 32 bit routines. It\r
+  /// is the responsibility of this routine to coalesce multiple OEM 32 bit functions, if they\r
+  /// exist, into one coherent package that is understandable by the Compatibility16 code.\r
+  ///\r
+  /// Example usage: A legacy mobile BIOS that has a pre existing runtime\r
+  /// interface to return the battery status to calling applications.\r
+  ///\r
+  /// This mode is invoked twice. The first invocation has LegacySegment and\r
+  /// LegacyOffset set to 0. The mode returns the table address in EFI memory and its size.\r
+  ///\r
+  /// The second invocation has LegacySegment and LegacyOffset set to the location\r
+  /// in the 0xF0000 or 0xE0000 block to which the table is to be copied. The second\r
+  /// invocation allows any table address fix ups to occur in the EFI memory copy of the table.\r
+  /// The caller, not EfiGetPlatformBinaryOem32Data, copies the modified table to\r
+  /// the allocated region in 0xF0000 or 0xE0000 block after the second invocation..\r
+  ///\r
+  /// Note: There are two generic mechanisms by which this mode can be used.\r
+  /// Mechanism 1: This mode returns the data and the Legacy BIOS Protocol copies\r
+  /// the data into the F0000 or E0000 block in the Compatibility16 code. The\r
+  /// EFI_COMPATIBILITY16_TABLE entries Oem32Segment and Oem32Offset can\r
+  /// be viewed as two UINT16 entries.\r
+  /// Mechanism 2: This mode directly fills in the EFI_COMPATIBILITY16_TABLE with\r
+  /// a pointer to the INT15 E820 region containing the 32 bit code. It returns\r
+  /// EFI_UNSUPPORTED. The EFI_COMPATIBILITY16_TABLE entries,\r
+  /// Oem32Segment and Oem32Offset, can be viewed as two UINT16 entries or\r
+  /// as a single UINT32 entry as determined by the IBV.\r
+  ///\r
+  /// The function parameters associated with this mode are:\r
+  ///\r
+  ///   TableSize Size of data.\r
+  ///\r
+  ///   Location Location to place the table. 0x00 or 0xE0000 or 0xF0000 64 KB blocks.\r
+  ///       Bit 0 = 1 0xF0000 64 KB block.\r
+  ///       Bit 1 = 1 0xE0000 64 KB block.\r
+  ///       Multiple bits can be set.\r
+  ///\r
+  ///   Alignment Bit mapped address alignment granularity.\r
+  ///       The first nonzero bit from the right is the address granularity.\r
+  ///\r
+  ///   LegacySegment Segment in which EfiCompatibility code will place the table or data.\r
+  ///\r
+  ///   LegacyOffset Offset in which EfiCompatibility code will place the table or data.\r
+  ///\r
+  /// The return values associated with this mode are:\r
+  ///   EFI_SUCCESS The data was returned successfully.\r
+  ///   EFI_UNSUPPORTED Oem32 is not supported on this platform.\r
+  ///\r
+  EfiGetPlatformBinaryOem32Data = 3,\r
   ///\r
   /// This mode returns a TPM binary image for the onboard TPM device.\r
   ///\r
@@ -226,7 +226,7 @@ EfiGetPlatformBinaryOem32Data    = 3,
   ///\r
   ///   EFI_NOT_FOUND No BinaryImage was found.\r
   ///\r
-  EfiGetPlatformBinaryTpmBinary    = 4,\r
+  EfiGetPlatformBinaryTpmBinary = 4,\r
   ///\r
   /// The mode finds the Compatibility16 Rom Image.\r
   ///\r
@@ -250,7 +250,7 @@ EfiGetPlatformBinaryOem32Data    = 3,
   ///\r
   ///    EFI_NOT_FOUND ROM not found.\r
   ///\r
-  EfiGetPlatformBinarySystemRom    = 5,\r
+  EfiGetPlatformBinarySystemRom = 5,\r
   ///\r
   /// This mode returns the Base address of PciExpress memory mapped configuration\r
   /// address space.\r
@@ -275,9 +275,9 @@ EfiGetPlatformBinaryOem32Data    = 3,
   ///\r
   ///   EFI_UNSUPPORTED System does not PciExpress.\r
   ///\r
-  EfiGetPlatformPciExpressBase     = 6,\r
+  EfiGetPlatformPciExpressBase = 6,\r
   ///\r
-  EfiGetPlatformPmmSize            = 7,\r
+  EfiGetPlatformPmmSize = 7,\r
   ///\r
   EfiGetPlatformEndOpromShadowAddr = 8,\r
   ///\r
@@ -301,7 +301,7 @@ typedef enum {
   ///\r
   ///   AdditionalData NULL.\r
   ///\r
-  EfiGetPlatformVgaHandle       = 0,\r
+  EfiGetPlatformVgaHandle = 0,\r
   ///\r
   /// This mode returns the Compatibility16 policy for the device that should be the IDE\r
   /// controller used during a Compatibility16 boot.\r
@@ -317,7 +317,7 @@ typedef enum {
   ///   AdditionalData Pointer to HddInfo.\r
   ///     Information about all onboard IDE controllers.\r
   ///\r
-  EfiGetPlatformIdeHandle       = 1,\r
+  EfiGetPlatformIdeHandle = 1,\r
   ///\r
   /// This mode returns the Compatibility16 policy for the device that should be the ISA bus\r
   /// controller used during a Compatibility16 boot.\r
@@ -332,7 +332,7 @@ typedef enum {
   ///\r
   ///   AdditionalData NULL.\r
   ///\r
-  EfiGetPlatformIsaBusHandle    = 2,\r
+  EfiGetPlatformIsaBusHandle = 2,\r
   ///\r
   /// This mode returns the Compatibility16 policy for the device that should be the USB\r
   /// device used during a Compatibility16 boot.\r
@@ -347,7 +347,7 @@ typedef enum {
   ///\r
   ///   AdditionalData NULL.\r
   ///\r
-  EfiGetPlatformUsbHandle       = 3\r
+  EfiGetPlatformUsbHandle = 3\r
 } EFI_GET_PLATFORM_HANDLE_MODE;\r
 \r
 /**\r
@@ -387,7 +387,7 @@ typedef enum {
   ///\r
   ///       AdditionalData NULL.\r
   ///\r
-  EfiPlatformHookShadowServiceRoms= 1,\r
+  EfiPlatformHookShadowServiceRoms = 1,\r
   ///\r
   /// This mode allows platform to perform any required operation after an OpROM has\r
   /// completed its initialization.\r
@@ -404,21 +404,21 @@ typedef enum {
   ///\r
   ///       AdditionalData NULL.\r
   ///\r
-  EfiPlatformHookAfterRomInit     = 2\r
+  EfiPlatformHookAfterRomInit = 2\r
 } EFI_GET_PLATFORM_HOOK_MODE;\r
 \r
 ///\r
 /// This IRQ has not been assigned to PCI.\r
 ///\r
-#define PCI_UNUSED        0x00\r
+#define PCI_UNUSED  0x00\r
 ///\r
 /// This IRQ has been assigned to PCI.\r
 ///\r
-#define PCI_USED          0xFF\r
+#define PCI_USED  0xFF\r
 ///\r
 /// This IRQ has been used by an SIO legacy device and cannot be used by PCI.\r
 ///\r
-#define LEGACY_USED       0xFE\r
+#define LEGACY_USED  0xFE\r
 \r
 #pragma pack(1)\r
 \r
@@ -426,7 +426,7 @@ typedef struct {
   ///\r
   /// IRQ for this entry.\r
   ///\r
-  UINT8 Irq;\r
+  UINT8    Irq;\r
   ///\r
   /// Status of this IRQ.\r
   ///\r
@@ -437,103 +437,101 @@ typedef struct {
   /// LEGACY_USED 0xFE. This IRQ has been used by an SIO legacy\r
   /// device and cannot be used by PCI.\r
   ///\r
-  UINT8 Used;\r
+  UINT8    Used;\r
 } EFI_LEGACY_IRQ_PRIORITY_TABLE_ENTRY;\r
 \r
 //\r
 // Define PIR table structures\r
 //\r
-#define EFI_LEGACY_PIRQ_TABLE_SIGNATURE SIGNATURE_32 ('$', 'P', 'I', 'R')\r
+#define EFI_LEGACY_PIRQ_TABLE_SIGNATURE  SIGNATURE_32 ('$', 'P', 'I', 'R')\r
 \r
 typedef struct {\r
   ///\r
   /// $PIR.\r
   ///\r
-  UINT32  Signature;\r
+  UINT32    Signature;\r
   ///\r
   /// 0x00.\r
   ///\r
-  UINT8   MinorVersion;\r
+  UINT8     MinorVersion;\r
   ///\r
   /// 0x01 for table version 1.0.\r
   ///\r
-  UINT8   MajorVersion;\r
+  UINT8     MajorVersion;\r
   ///\r
   /// 0x20 + RoutingTableEntries * 0x10.\r
   ///\r
-  UINT16  TableSize;\r
+  UINT16    TableSize;\r
   ///\r
   /// PCI interrupt router bus.\r
   ///\r
-  UINT8   Bus;\r
+  UINT8     Bus;\r
   ///\r
   /// PCI interrupt router device/function.\r
   ///\r
-  UINT8   DevFun;\r
+  UINT8     DevFun;\r
   ///\r
   /// If nonzero, bit map of IRQs reserved for PCI.\r
   ///\r
-  UINT16  PciOnlyIrq;\r
+  UINT16    PciOnlyIrq;\r
   ///\r
   /// Vendor ID of a compatible PCI interrupt router.\r
   ///\r
-  UINT16  CompatibleVid;\r
+  UINT16    CompatibleVid;\r
   ///\r
   /// Device ID of a compatible PCI interrupt router.\r
   ///\r
-  UINT16  CompatibleDid;\r
+  UINT16    CompatibleDid;\r
   ///\r
   /// If nonzero, a value passed directly to the IRQ miniport's Initialize function.\r
   ///\r
-  UINT32  Miniport;\r
+  UINT32    Miniport;\r
   ///\r
   /// Reserved for future usage.\r
   ///\r
-  UINT8   Reserved[11];\r
+  UINT8     Reserved[11];\r
   ///\r
   /// This byte plus the sum of all other bytes in the LocalPirqTable equal 0x00.\r
   ///\r
-  UINT8   Checksum;\r
+  UINT8     Checksum;\r
 } EFI_LEGACY_PIRQ_TABLE_HEADER;\r
 \r
-\r
 typedef struct {\r
   ///\r
   /// If nonzero, a value assigned by the IBV.\r
   ///\r
-  UINT8   Pirq;\r
+  UINT8     Pirq;\r
   ///\r
   /// If nonzero, the IRQs that can be assigned to this device.\r
   ///\r
-  UINT16  IrqMask;\r
+  UINT16    IrqMask;\r
 } EFI_LEGACY_PIRQ_ENTRY;\r
 \r
 typedef struct {\r
   ///\r
   /// PCI bus of the entry.\r
   ///\r
-  UINT8                 Bus;\r
+  UINT8                    Bus;\r
   ///\r
   /// PCI device of this entry.\r
   ///\r
-  UINT8                 Device;\r
+  UINT8                    Device;\r
   ///\r
   /// An IBV value and IRQ mask for PIRQ pins A through D.\r
   ///\r
-  EFI_LEGACY_PIRQ_ENTRY PirqEntry[4];\r
+  EFI_LEGACY_PIRQ_ENTRY    PirqEntry[4];\r
   ///\r
   /// If nonzero, the slot number assigned by the board manufacturer.\r
   ///\r
-  UINT8                 Slot;\r
+  UINT8                    Slot;\r
   ///\r
   /// Reserved for future use.\r
   ///\r
-  UINT8                 Reserved;\r
+  UINT8                    Reserved;\r
 } EFI_LEGACY_IRQ_ROUTING_ENTRY;\r
 \r
 #pragma pack()\r
 \r
-\r
 /**\r
   Finds the binary data or other platform information.\r
 \r
@@ -725,31 +723,31 @@ struct _EFI_LEGACY_BIOS_PLATFORM_PROTOCOL {
   ///\r
   ///  Gets binary data or other platform information.\r
   ///\r
-  EFI_LEGACY_BIOS_PLATFORM_GET_PLATFORM_INFO    GetPlatformInfo;\r
+  EFI_LEGACY_BIOS_PLATFORM_GET_PLATFORM_INFO      GetPlatformInfo;\r
   ///\r
   ///  Returns a buffer of all handles matching the requested subfunction.\r
   ///\r
-  EFI_LEGACY_BIOS_PLATFORM_GET_PLATFORM_HANDLE  GetPlatformHandle;\r
+  EFI_LEGACY_BIOS_PLATFORM_GET_PLATFORM_HANDLE    GetPlatformHandle;\r
   ///\r
   ///  Loads and initializes the traditional BIOS SMM handler.\r
-  EFI_LEGACY_BIOS_PLATFORM_SMM_INIT             SmmInit;\r
+  EFI_LEGACY_BIOS_PLATFORM_SMM_INIT               SmmInit;\r
   ///\r
   ///  Allows platform to perform any required actions after a LegacyBios operation.\r
   ///\r
-  EFI_LEGACY_BIOS_PLATFORM_HOOKS                PlatformHooks;\r
+  EFI_LEGACY_BIOS_PLATFORM_HOOKS                  PlatformHooks;\r
   ///\r
   ///  Gets $PIR table.\r
-  EFI_LEGACY_BIOS_PLATFORM_GET_ROUTING_TABLE    GetRoutingTable;\r
+  EFI_LEGACY_BIOS_PLATFORM_GET_ROUTING_TABLE      GetRoutingTable;\r
   ///\r
   ///  Translates the given PIRQ to the final value after traversing any PCI bridges.\r
   ///\r
-  EFI_LEGACY_BIOS_PLATFORM_TRANSLATE_PIRQ       TranslatePirq;\r
+  EFI_LEGACY_BIOS_PLATFORM_TRANSLATE_PIRQ         TranslatePirq;\r
   ///\r
   ///  Final platform function before the system attempts to boot to a traditional OS.\r
   ///\r
-  EFI_LEGACY_BIOS_PLATFORM_PREPARE_TO_BOOT      PrepareToBoot;\r
+  EFI_LEGACY_BIOS_PLATFORM_PREPARE_TO_BOOT        PrepareToBoot;\r
 };\r
 \r
-extern EFI_GUID gEfiLegacyBiosPlatformProtocolGuid;\r
+extern EFI_GUID  gEfiLegacyBiosPlatformProtocolGuid;\r
 \r
 #endif\r
index b3ad2ffb3c91e30c9813c9c677185fc7f59e3603..8287ad5b5c1c1c9f585c071148bc8000db18b684 100644 (file)
@@ -13,7 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _EFI_LEGACY_INTERRUPT_H_\r
 #define _EFI_LEGACY_INTERRUPT_H_\r
 \r
-\r
 #define EFI_LEGACY_INTERRUPT_PROTOCOL_GUID \\r
   { \\r
     0x31ce593d, 0x108a, 0x485d, {0xad, 0xb2, 0x78, 0xf2, 0x1f, 0x29, 0x66, 0xbe } \\r
@@ -99,24 +98,24 @@ struct _EFI_LEGACY_INTERRUPT_PROTOCOL {
   ///\r
   ///   Gets the number of PIRQs supported.\r
   ///\r
-  EFI_LEGACY_INTERRUPT_GET_NUMBER_PIRQS GetNumberPirqs;\r
+  EFI_LEGACY_INTERRUPT_GET_NUMBER_PIRQS    GetNumberPirqs;\r
 \r
   ///\r
   /// Gets the PCI bus, device, and function that is associated with this protocol.\r
   ///\r
-  EFI_LEGACY_INTERRUPT_GET_LOCATION     GetLocation;\r
+  EFI_LEGACY_INTERRUPT_GET_LOCATION        GetLocation;\r
 \r
   ///\r
   /// Reads the indicated PIRQ register.\r
   ///\r
-  EFI_LEGACY_INTERRUPT_READ_PIRQ        ReadPirq;\r
+  EFI_LEGACY_INTERRUPT_READ_PIRQ           ReadPirq;\r
 \r
   ///\r
   /// Writes to the indicated PIRQ register.\r
   ///\r
-  EFI_LEGACY_INTERRUPT_WRITE_PIRQ       WritePirq;\r
+  EFI_LEGACY_INTERRUPT_WRITE_PIRQ          WritePirq;\r
 };\r
 \r
-extern EFI_GUID gEfiLegacyInterruptProtocolGuid;\r
+extern EFI_GUID  gEfiLegacyInterruptProtocolGuid;\r
 \r
 #endif\r
index 5071c712ff9cf5b58f3bc15b2396ac4c62a0fe9e..fa023a2dfae42ac24df44fbdec8a630543daec85 100644 (file)
@@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 ///\r
 /// Forward declaration for the EFI_VGA_MINI_PORT_PROTOCOL.\r
 ///\r
-typedef struct _EFI_VGA_MINI_PORT_PROTOCOL  EFI_VGA_MINI_PORT_PROTOCOL;\r
+typedef struct _EFI_VGA_MINI_PORT_PROTOCOL EFI_VGA_MINI_PORT_PROTOCOL;\r
 \r
 /**\r
   Sets the text display mode of a VGA controller.\r
@@ -49,40 +49,40 @@ EFI_STATUS
   );\r
 \r
 struct _EFI_VGA_MINI_PORT_PROTOCOL {\r
-  EFI_VGA_MINI_PORT_SET_MODE  SetMode;\r
+  EFI_VGA_MINI_PORT_SET_MODE    SetMode;\r
   ///\r
   /// MMIO base address of the VGA text mode framebuffer.  Typically set to 0xB8000.\r
   ///\r
-  UINT64                      VgaMemoryOffset;\r
+  UINT64                        VgaMemoryOffset;\r
   ///\r
   /// I/O Port address for the VGA CRTC address register. Typically set to 0x3D4.\r
   ///\r
-  UINT64                      CrtcAddressRegisterOffset;\r
+  UINT64                        CrtcAddressRegisterOffset;\r
   ///\r
   /// I/O Port address for the VGA CRTC data register.  Typically set to 0x3D5.\r
   ///\r
-  UINT64                      CrtcDataRegisterOffset;\r
+  UINT64                        CrtcDataRegisterOffset;\r
   ///\r
   /// PCI Controller MMIO BAR index of the VGA text mode frame buffer.  Typically\r
   /// set to EFI_PCI_IO_PASS_THROUGH_BAR\r
   ///\r
-  UINT8                       VgaMemoryBar;\r
+  UINT8                         VgaMemoryBar;\r
   ///\r
   /// PCI Controller I/O BAR index of the VGA CRTC address register.  Typically\r
   /// set to EFI_PCI_IO_PASS_THROUGH_BAR\r
   ///\r
-  UINT8                       CrtcAddressRegisterBar;\r
+  UINT8                         CrtcAddressRegisterBar;\r
   ///\r
   /// PCI Controller I/O BAR index of the VGA CRTC data register.  Typically set\r
   /// to EFI_PCI_IO_PASS_THROUGH_BAR\r
   ///\r
-  UINT8                       CrtcDataRegisterBar;\r
+  UINT8                         CrtcDataRegisterBar;\r
   ///\r
   /// The maximum number of text modes that this VGA controller supports.\r
   ///\r
-  UINT8                       MaxMode;\r
+  UINT8                         MaxMode;\r
 };\r
 \r
-extern EFI_GUID gEfiVgaMiniPortProtocolGuid;\r
+extern EFI_GUID  gEfiVgaMiniPortProtocolGuid;\r
 \r
 #endif\r
index 5e4c7a249ef15fb07234fa9413ba6b859235b1ee..cd80720a1d0847c5342d3069d705b5ae3a30ccc3 100644 (file)
@@ -14,13 +14,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // FLOPPY_NOT_PRESENT = No floppy controller present\r
 // FLOPPY_PRESENT_NO_MEDIA = Floppy controller present but no media inserted\r
 //\r
-#define FLOPPY_NOT_PRESENT           0\r
-#define FLOPPY_PRESENT_WITH_MEDIA    1\r
-#define FLOPPY_PRESENT_NO_MEDIA      2\r
+#define FLOPPY_NOT_PRESENT         0\r
+#define FLOPPY_PRESENT_WITH_MEDIA  1\r
+#define FLOPPY_PRESENT_NO_MEDIA    2\r
 \r
-BBS_TABLE           *mBbsTable;\r
-BOOLEAN             mBbsTableDoneFlag   = FALSE;\r
-BOOLEAN             IsHaveMediaInFloppy = TRUE;\r
+BBS_TABLE  *mBbsTable;\r
+BOOLEAN    mBbsTableDoneFlag   = FALSE;\r
+BOOLEAN    IsHaveMediaInFloppy = TRUE;\r
 \r
 /**\r
   Checks the state of the floppy and if media is inserted.\r
@@ -44,23 +44,23 @@ HasMediaInFloppy (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                            Status;\r
-  UINTN                                 HandleCount;\r
-  EFI_HANDLE                            *HandleBuffer;\r
-  UINTN                                 Index;\r
-  EFI_ISA_IO_PROTOCOL                   *IsaIo;\r
-  EFI_BLOCK_IO_PROTOCOL                 *BlkIo;\r
+  EFI_STATUS             Status;\r
+  UINTN                  HandleCount;\r
+  EFI_HANDLE             *HandleBuffer;\r
+  UINTN                  Index;\r
+  EFI_ISA_IO_PROTOCOL    *IsaIo;\r
+  EFI_BLOCK_IO_PROTOCOL  *BlkIo;\r
 \r
-  HandleBuffer  = NULL;\r
-  HandleCount   = 0;\r
+  HandleBuffer = NULL;\r
+  HandleCount  = 0;\r
 \r
   gBS->LocateHandleBuffer (\r
-        ByProtocol,\r
-        &gEfiIsaIoProtocolGuid,\r
-        NULL,\r
-        &HandleCount,\r
-        &HandleBuffer\r
-        );\r
+         ByProtocol,\r
+         &gEfiIsaIoProtocolGuid,\r
+         NULL,\r
+         &HandleCount,\r
+         &HandleBuffer\r
+         );\r
 \r
   //\r
   // If don't find any ISA/IO protocol assume no floppy. Need for floppy\r
@@ -76,7 +76,7 @@ HasMediaInFloppy (
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiIsaIoProtocolGuid,\r
-                    (VOID **) &IsaIo\r
+                    (VOID **)&IsaIo\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       continue;\r
@@ -85,6 +85,7 @@ HasMediaInFloppy (
     if (IsaIo->ResourceList->Device.HID != EISA_PNP_ID (0x604)) {\r
       continue;\r
     }\r
+\r
     //\r
     // Update blockio in case the floppy is inserted in during BdsTimeout\r
     //\r
@@ -103,7 +104,7 @@ HasMediaInFloppy (
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiBlockIoProtocolGuid,\r
-                    (VOID **) &BlkIo\r
+                    (VOID **)&BlkIo\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       continue;\r
@@ -121,10 +122,8 @@ HasMediaInFloppy (
   FreePool (HandleBuffer);\r
 \r
   return FLOPPY_NOT_PRESENT;\r
-\r
 }\r
 \r
-\r
 /**\r
   Complete build of BBS TABLE.\r
 \r
@@ -136,8 +135,8 @@ HasMediaInFloppy (
 **/\r
 EFI_STATUS\r
 LegacyBiosBuildBbs (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private,\r
-  IN  BBS_TABLE                 *BbsTable\r
+  IN  LEGACY_BIOS_INSTANCE  *Private,\r
+  IN  BBS_TABLE             *BbsTable\r
   )\r
 {\r
   UINTN       BbsIndex;\r
@@ -172,18 +171,18 @@ LegacyBiosBuildBbs (
     }\r
   }\r
 \r
-  BbsTable[0].Bus                       = 0xff;\r
-  BbsTable[0].Device                    = 0xff;\r
-  BbsTable[0].Function                  = 0xff;\r
-  BbsTable[0].DeviceType                = BBS_FLOPPY;\r
-  BbsTable[0].Class                     = 01;\r
-  BbsTable[0].SubClass                  = 02;\r
-  BbsTable[0].StatusFlags.OldPosition   = 0;\r
-  BbsTable[0].StatusFlags.Reserved1     = 0;\r
-  BbsTable[0].StatusFlags.Enabled       = 0;\r
-  BbsTable[0].StatusFlags.Failed        = 0;\r
-  BbsTable[0].StatusFlags.MediaPresent  = 0;\r
-  BbsTable[0].StatusFlags.Reserved2     = 0;\r
+  BbsTable[0].Bus                      = 0xff;\r
+  BbsTable[0].Device                   = 0xff;\r
+  BbsTable[0].Function                 = 0xff;\r
+  BbsTable[0].DeviceType               = BBS_FLOPPY;\r
+  BbsTable[0].Class                    = 01;\r
+  BbsTable[0].SubClass                 = 02;\r
+  BbsTable[0].StatusFlags.OldPosition  = 0;\r
+  BbsTable[0].StatusFlags.Reserved1    = 0;\r
+  BbsTable[0].StatusFlags.Enabled      = 0;\r
+  BbsTable[0].StatusFlags.Failed       = 0;\r
+  BbsTable[0].StatusFlags.MediaPresent = 0;\r
+  BbsTable[0].StatusFlags.Reserved2    = 0;\r
 \r
   //\r
   // Onboard HDD - Note Each HDD controller controls 2 drives\r
@@ -196,10 +195,8 @@ LegacyBiosBuildBbs (
   LegacyBiosBuildIdeData (Private, &HddInfo, 0);\r
 \r
   for (HddIndex = 0; HddIndex < MAX_IDE_CONTROLLER; HddIndex++) {\r
-\r
     BbsIndex = HddIndex * 2 + 1;\r
     for (Index = 0; Index < 2; ++Index) {\r
-\r
       BbsTable[BbsIndex + Index].Bus                      = HddInfo[HddIndex].Bus;\r
       BbsTable[BbsIndex + Index].Device                   = HddInfo[HddIndex].Device;\r
       BbsTable[BbsIndex + Index].Function                 = HddInfo[HddIndex].Function;\r
@@ -286,7 +283,7 @@ LegacyBiosBuildBbs (
         Status = gBS->HandleProtocol (\r
                         BlockIoHandles[BlockIndex],\r
                         &gEfiBlockIoProtocolGuid,\r
-                        (VOID **) &BlkIo\r
+                        (VOID **)&BlkIo\r
                         );\r
 \r
         if (EFI_ERROR (Status)) {\r
@@ -313,7 +310,7 @@ LegacyBiosBuildBbs (
         Status = gBS->HandleProtocol (\r
                         BlockIoHandles[BlockIndex],\r
                         &gEfiDevicePathProtocolGuid,\r
-                        (VOID **) &DevicePath\r
+                        (VOID **)&DevicePath\r
                         );\r
         if (EFI_ERROR (Status)) {\r
           continue;\r
@@ -324,14 +321,17 @@ LegacyBiosBuildBbs (
         //\r
         DevicePathNode = DevicePath;\r
         while (!IsDevicePathEnd (DevicePathNode)) {\r
-          if (DevicePathType (DevicePathNode) == MESSAGING_DEVICE_PATH &&\r
-              DevicePathSubType (DevicePathNode) == MSG_ATAPI_DP) {\r
+          if ((DevicePathType (DevicePathNode) == MESSAGING_DEVICE_PATH) &&\r
+              (DevicePathSubType (DevicePathNode) == MSG_ATAPI_DP))\r
+          {\r
             break;\r
           }\r
+\r
           DevicePathNode = NextDevicePathNode (DevicePathNode);\r
         }\r
+\r
         if (!IsDevicePathEnd (DevicePathNode)) {\r
-            continue;\r
+          continue;\r
         }\r
 \r
         //\r
@@ -349,7 +349,7 @@ LegacyBiosBuildBbs (
         Status = gBS->HandleProtocol (\r
                         PciHandle,\r
                         &gEfiPciIoProtocolGuid,\r
-                        (VOID **) &PciIo\r
+                        (VOID **)&PciIo\r
                         );\r
         if (EFI_ERROR (Status)) {\r
           continue;\r
@@ -367,13 +367,21 @@ LegacyBiosBuildBbs (
         }\r
 \r
         if (SegNum != 0) {\r
-          DEBUG ((DEBUG_WARN, "CSM cannot use PCI devices in segment %Lu\n",\r
-            (UINT64) SegNum));\r
+          DEBUG ((\r
+            DEBUG_WARN,\r
+            "CSM cannot use PCI devices in segment %Lu\n",\r
+            (UINT64)SegNum\r
+            ));\r
           continue;\r
         }\r
 \r
-        DEBUG ((DEBUG_INFO, "Add Legacy Bbs entry for PCI %d/%d/%d\n",\r
-          BusNum, DevNum, FuncNum));\r
+        DEBUG ((\r
+          DEBUG_INFO,\r
+          "Add Legacy Bbs entry for PCI %d/%d/%d\n",\r
+          BusNum,\r
+          DevNum,\r
+          FuncNum\r
+          ));\r
 \r
         BbsTable[BbsIndex].Bus                      = BusNum;\r
         BbsTable[BbsIndex].Device                   = DevNum;\r
@@ -403,7 +411,6 @@ LegacyBiosBuildBbs (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Get all BBS info\r
 \r
@@ -421,30 +428,30 @@ LegacyBiosBuildBbs (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosGetBbsInfo (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL         *This,\r
-  OUT UINT16                          *HddCount,\r
-  OUT HDD_INFO                        **HddInfo,\r
-  OUT UINT16                          *BbsCount,\r
-  OUT BBS_TABLE                       **BbsTable\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  OUT UINT16                   *HddCount,\r
+  OUT HDD_INFO                 **HddInfo,\r
+  OUT UINT16                   *BbsCount,\r
+  OUT BBS_TABLE                **BbsTable\r
   )\r
 {\r
-  LEGACY_BIOS_INSTANCE              *Private;\r
-  EFI_IA32_REGISTER_SET             Regs;\r
-  EFI_TO_COMPATIBILITY16_BOOT_TABLE *EfiToLegacy16BootTable;\r
-//  HDD_INFO                          *LocalHddInfo;\r
-//  IN BBS_TABLE                      *LocalBbsTable;\r
-  UINTN                             NumHandles;\r
-  EFI_HANDLE                        *HandleBuffer;\r
-  UINTN                             Index;\r
-  UINTN                             TempData;\r
-  UINT32                            Granularity;\r
-\r
-  HandleBuffer            = NULL;\r
-\r
-  Private                 = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
-  EfiToLegacy16BootTable  = &Private->IntThunk->EfiToLegacy16BootTable;\r
-//  LocalHddInfo            = EfiToLegacy16BootTable->HddInfo;\r
-//  LocalBbsTable           = (BBS_TABLE*)(UINTN)EfiToLegacy16BootTable->BbsTable;\r
+  LEGACY_BIOS_INSTANCE               *Private;\r
+  EFI_IA32_REGISTER_SET              Regs;\r
+  EFI_TO_COMPATIBILITY16_BOOT_TABLE  *EfiToLegacy16BootTable;\r
+  //  HDD_INFO                          *LocalHddInfo;\r
+  //  IN BBS_TABLE                      *LocalBbsTable;\r
+  UINTN       NumHandles;\r
+  EFI_HANDLE  *HandleBuffer;\r
+  UINTN       Index;\r
+  UINTN       TempData;\r
+  UINT32      Granularity;\r
+\r
+  HandleBuffer = NULL;\r
+\r
+  Private                = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
+  EfiToLegacy16BootTable = &Private->IntThunk->EfiToLegacy16BootTable;\r
+  //  LocalHddInfo            = EfiToLegacy16BootTable->HddInfo;\r
+  //  LocalBbsTable           = (BBS_TABLE*)(UINTN)EfiToLegacy16BootTable->BbsTable;\r
 \r
   if (!mBbsTableDoneFlag) {\r
     mBbsTable = Private->BbsTablePtr;\r
@@ -457,12 +464,12 @@ LegacyBiosGetBbsInfo (
     // Get PciRootBridgeIO protocol\r
     //\r
     gBS->LocateHandleBuffer (\r
-          ByProtocol,\r
-          &gEfiPciRootBridgeIoProtocolGuid,\r
-          NULL,\r
-          &NumHandles,\r
-          &HandleBuffer\r
-          );\r
+           ByProtocol,\r
+           &gEfiPciRootBridgeIoProtocolGuid,\r
+           NULL,\r
+           &NumHandles,\r
+           &HandleBuffer\r
+           );\r
 \r
     if (NumHandles == 0) {\r
       return EFI_NOT_FOUND;\r
@@ -475,7 +482,6 @@ LegacyBiosGetBbsInfo (
       // PCI bus driver enumerate all subsequent handles\r
       //\r
       gBS->ConnectController (HandleBuffer[Index], NULL, NULL, FALSE);\r
-\r
     }\r
 \r
     LegacyBiosBuildBbs (Private, mBbsTable);\r
@@ -491,18 +497,18 @@ LegacyBiosGetBbsInfo (
     //\r
     // Pass in handoff data\r
     //\r
-    TempData  = (UINTN) EfiToLegacy16BootTable;\r
-    Regs.X.ES = NORMALIZE_EFI_SEGMENT ((UINT32) TempData);\r
-    Regs.X.BX = NORMALIZE_EFI_OFFSET ((UINT32) TempData);\r
+    TempData  = (UINTN)EfiToLegacy16BootTable;\r
+    Regs.X.ES = NORMALIZE_EFI_SEGMENT ((UINT32)TempData);\r
+    Regs.X.BX = NORMALIZE_EFI_OFFSET ((UINT32)TempData);\r
 \r
     Private->LegacyBios.FarCall86 (\r
-      This,\r
-      Private->Legacy16CallSegment,\r
-      Private->Legacy16CallOffset,\r
-      &Regs,\r
-      NULL,\r
-      0\r
-      );\r
+                          This,\r
+                          Private->Legacy16CallSegment,\r
+                          Private->Legacy16CallOffset,\r
+                          &Regs,\r
+                          NULL,\r
+                          0\r
+                          );\r
 \r
     Private->Cpu->FlushDataCache (Private->Cpu, 0xE0000, 0x20000, EfiCpuFlushTypeWriteBackInvalidate);\r
     Private->LegacyRegion->Lock (Private->LegacyRegion, 0xe0000, 0x20000, &Granularity);\r
@@ -518,7 +524,7 @@ LegacyBiosGetBbsInfo (
 \r
   *HddCount = MAX_IDE_CONTROLLER;\r
   *HddInfo  = EfiToLegacy16BootTable->HddInfo;\r
-  *BbsTable = (BBS_TABLE*)(UINTN)EfiToLegacy16BootTable->BbsTable;\r
-  *BbsCount = (UINT16) (sizeof (Private->IntThunk->BbsTable) / sizeof (BBS_TABLE));\r
+  *BbsTable = (BBS_TABLE *)(UINTN)EfiToLegacy16BootTable->BbsTable;\r
+  *BbsCount = (UINT16)(sizeof (Private->IntThunk->BbsTable) / sizeof (BBS_TABLE));\r
   return EFI_SUCCESS;\r
 }\r
index aa6e07ab91665b4d70b8d7d5172cf37515a882d4..a873015d06970bbd8f49d951444fac502aaf572d 100644 (file)
@@ -21,25 +21,25 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 LegacyBiosInitBda (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  BDA_STRUC *Bda;\r
-  UINT8     *Ebda;\r
+  BDA_STRUC  *Bda;\r
+  UINT8      *Ebda;\r
 \r
-  Bda   = (BDA_STRUC *) ((UINTN) 0x400);\r
-  Ebda  = (UINT8 *) ((UINTN) 0x9fc00);\r
+  Bda  = (BDA_STRUC *)((UINTN)0x400);\r
+  Ebda = (UINT8 *)((UINTN)0x9fc00);\r
 \r
   ACCESS_PAGE0_CODE (\r
     ZeroMem (Bda, 0x100);\r
     //\r
     // 640k-1k for EBDA\r
     //\r
-    Bda->MemSize        = 0x27f;\r
-    Bda->KeyHead        = 0x1e;\r
-    Bda->KeyTail        = 0x1e;\r
-    Bda->FloppyData     = 0x00;\r
-    Bda->FloppyTimeout  = 0xff;\r
+    Bda->MemSize       = 0x27f;\r
+    Bda->KeyHead       = 0x1e;\r
+    Bda->KeyTail       = 0x1e;\r
+    Bda->FloppyData    = 0x00;\r
+    Bda->FloppyTimeout = 0xff;\r
 \r
     Bda->KeyStart       = 0x001E;\r
     Bda->KeyEnd         = 0x003E;\r
@@ -50,10 +50,10 @@ LegacyBiosInitBda (
     // Move LPT time out here and zero out LPT4 since some SCSI OPROMS\r
     // use this as scratch pad (LPT4 is Reserved)\r
     //\r
-    Bda->Lpt1_2Timeout  = 0x1414;\r
-    Bda->Lpt3_4Timeout  = 0x1400;\r
+    Bda->Lpt1_2Timeout = 0x1414;\r
+    Bda->Lpt3_4Timeout = 0x1400;\r
 \r
-  );\r
+    );\r
 \r
   ZeroMem (Ebda, 0x400);\r
   *Ebda = 0x01;\r
index 3ce19496b07d208973f97f0a9dacb1d58a1f7625..d587b55e3b7e63a0213027f17658e7e99e7c0392 100644 (file)
@@ -13,7 +13,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // define maximum number of HDD system supports\r
 //\r
-#define MAX_HDD_ENTRIES 0x30\r
+#define MAX_HDD_ENTRIES  0x30\r
 \r
 //\r
 // Module Global:\r
@@ -25,7 +25,7 @@ LEGACY_BIOS_INSTANCE  mPrivateData;
 //\r
 // The SMBIOS table in EfiRuntimeServicesData memory\r
 //\r
-VOID                  *mRuntimeSmbiosEntryPoint = NULL;\r
+VOID  *mRuntimeSmbiosEntryPoint = NULL;\r
 \r
 //\r
 // The SMBIOS table in EfiReservedMemoryType memory\r
@@ -50,27 +50,27 @@ BOOLEAN               mEndOfDxe                = FALSE;
 **/\r
 EFI_STATUS\r
 AllocateLegacyMemory (\r
-  IN  EFI_ALLOCATE_TYPE         AllocateType,\r
-  IN  EFI_MEMORY_TYPE           MemoryType,\r
-  IN  EFI_PHYSICAL_ADDRESS      StartPageAddress,\r
-  IN  UINTN                     Pages,\r
-  OUT EFI_PHYSICAL_ADDRESS      *Result\r
+  IN  EFI_ALLOCATE_TYPE     AllocateType,\r
+  IN  EFI_MEMORY_TYPE       MemoryType,\r
+  IN  EFI_PHYSICAL_ADDRESS  StartPageAddress,\r
+  IN  UINTN                 Pages,\r
+  OUT EFI_PHYSICAL_ADDRESS  *Result\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_PHYSICAL_ADDRESS            MemPage;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR MemDesc;\r
+  EFI_STATUS                       Status;\r
+  EFI_PHYSICAL_ADDRESS             MemPage;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  MemDesc;\r
 \r
   //\r
   // Allocate Pages of memory less <= StartPageAddress\r
   //\r
-  MemPage = (EFI_PHYSICAL_ADDRESS) (UINTN) StartPageAddress;\r
-  Status = gBS->AllocatePages (\r
-                  AllocateType,\r
-                  MemoryType,\r
-                  Pages,\r
-                  &MemPage\r
-                  );\r
+  MemPage = (EFI_PHYSICAL_ADDRESS)(UINTN)StartPageAddress;\r
+  Status  = gBS->AllocatePages (\r
+                   AllocateType,\r
+                   MemoryType,\r
+                   Pages,\r
+                   &MemPage\r
+                   );\r
   //\r
   // Do not ASSERT on Status error but let caller decide since some cases\r
   // memory is already taken but that is ok.\r
@@ -81,13 +81,14 @@ AllocateLegacyMemory (
       // Make sure that the buffer can be used to store code.\r
       //\r
       Status = gDS->GetMemorySpaceDescriptor (MemPage, &MemDesc);\r
-      if (!EFI_ERROR (Status) && (MemDesc.Attributes & EFI_MEMORY_XP) != 0) {\r
+      if (!EFI_ERROR (Status) && ((MemDesc.Attributes & EFI_MEMORY_XP) != 0)) {\r
         Status = gDS->SetMemorySpaceAttributes (\r
                         MemPage,\r
                         EFI_PAGES_TO_SIZE (Pages),\r
                         MemDesc.Attributes & (~EFI_MEMORY_XP)\r
                         );\r
       }\r
+\r
       if (EFI_ERROR (Status)) {\r
         gBS->FreePages (MemPage, Pages);\r
       }\r
@@ -95,13 +96,12 @@ AllocateLegacyMemory (
   }\r
 \r
   if (!EFI_ERROR (Status)) {\r
-    *Result = (EFI_PHYSICAL_ADDRESS) (UINTN) MemPage;\r
+    *Result = (EFI_PHYSICAL_ADDRESS)(UINTN)MemPage;\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is called when EFI needs to reserve an area in the 0xE0000 or 0xF0000\r
   64 KB blocks.\r
@@ -126,39 +126,38 @@ AllocateLegacyMemory (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosGetLegacyRegion (\r
-  IN    EFI_LEGACY_BIOS_PROTOCOL *This,\r
-  IN    UINTN                    LegacyMemorySize,\r
-  IN    UINTN                    Region,\r
-  IN    UINTN                    Alignment,\r
-  OUT   VOID                     **LegacyMemoryAddress\r
+  IN    EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN    UINTN                     LegacyMemorySize,\r
+  IN    UINTN                     Region,\r
+  IN    UINTN                     Alignment,\r
+  OUT   VOID                      **LegacyMemoryAddress\r
   )\r
 {\r
-\r
-  LEGACY_BIOS_INSTANCE  *Private;\r
-  EFI_IA32_REGISTER_SET Regs;\r
-  EFI_STATUS            Status;\r
-  UINT32                Granularity;\r
+  LEGACY_BIOS_INSTANCE   *Private;\r
+  EFI_IA32_REGISTER_SET  Regs;\r
+  EFI_STATUS             Status;\r
+  UINT32                 Granularity;\r
 \r
   Private = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
   Private->LegacyRegion->UnLock (Private->LegacyRegion, 0xE0000, 0x20000, &Granularity);\r
 \r
   ZeroMem (&Regs, sizeof (EFI_IA32_REGISTER_SET));\r
   Regs.X.AX = Legacy16GetTableAddress;\r
-  Regs.X.BX = (UINT16) Region;\r
-  Regs.X.CX = (UINT16) LegacyMemorySize;\r
-  Regs.X.DX = (UINT16) Alignment;\r
+  Regs.X.BX = (UINT16)Region;\r
+  Regs.X.CX = (UINT16)LegacyMemorySize;\r
+  Regs.X.DX = (UINT16)Alignment;\r
   Private->LegacyBios.FarCall86 (\r
-     &Private->LegacyBios,\r
-     Private->Legacy16CallSegment,\r
-     Private->Legacy16CallOffset,\r
-     &Regs,\r
-     NULL,\r
-     0\r
-     );\r
+                        &Private->LegacyBios,\r
+                        Private->Legacy16CallSegment,\r
+                        Private->Legacy16CallOffset,\r
+                        &Regs,\r
+                        NULL,\r
+                        0\r
+                        );\r
 \r
   if (Regs.X.AX == 0) {\r
-    *LegacyMemoryAddress  = (VOID *) (((UINTN) Regs.X.DS << 4) + Regs.X.BX);\r
-    Status = EFI_SUCCESS;\r
+    *LegacyMemoryAddress = (VOID *)(((UINTN)Regs.X.DS << 4) + Regs.X.BX);\r
+    Status               = EFI_SUCCESS;\r
   } else {\r
     Status = EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -169,7 +168,6 @@ LegacyBiosGetLegacyRegion (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is called when copying data to the region assigned by\r
   EFI_LEGACY_BIOS_PROTOCOL.GetLegacyRegion().\r
@@ -187,21 +185,22 @@ LegacyBiosGetLegacyRegion (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosCopyLegacyRegion (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL *This,\r
-  IN    UINTN                 LegacyMemorySize,\r
-  IN    VOID                  *LegacyMemoryAddress,\r
-  IN    VOID                  *LegacyMemorySourceAddress\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN    UINTN                  LegacyMemorySize,\r
+  IN    VOID                   *LegacyMemoryAddress,\r
+  IN    VOID                   *LegacyMemorySourceAddress\r
   )\r
 {\r
-\r
   LEGACY_BIOS_INSTANCE  *Private;\r
   UINT32                Granularity;\r
 \r
-  if ((LegacyMemoryAddress < (VOID *)(UINTN)0xE0000 ) ||\r
-      ((UINTN) LegacyMemoryAddress + LegacyMemorySize > (UINTN) 0x100000)\r
-        ) {\r
+  if ((LegacyMemoryAddress < (VOID *)(UINTN)0xE0000) ||\r
+      ((UINTN)LegacyMemoryAddress + LegacyMemorySize > (UINTN)0x100000)\r
+      )\r
+  {\r
     return EFI_ACCESS_DENIED;\r
   }\r
+\r
   //\r
   // There is no protection from writes over lapping if this function is\r
   // called multiple times.\r
@@ -216,7 +215,6 @@ LegacyBiosCopyLegacyRegion (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Find Legacy16 BIOS image in the FLASH device and shadow it into memory. Find\r
   the $EFI table in the shadow area. Thunk into the Legacy16 code after it had\r
@@ -233,33 +231,33 @@ ShadowAndStartLegacy16 (
   IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  UINT8                             *Ptr;\r
-  UINT8                             *PtrEnd;\r
-  BOOLEAN                           Done;\r
-  EFI_COMPATIBILITY16_TABLE         *Table;\r
-  UINT8                             CheckSum;\r
-  EFI_IA32_REGISTER_SET             Regs;\r
-  EFI_TO_COMPATIBILITY16_INIT_TABLE *EfiToLegacy16InitTable;\r
-  EFI_TO_COMPATIBILITY16_BOOT_TABLE *EfiToLegacy16BootTable;\r
-  VOID                              *LegacyBiosImage;\r
-  UINTN                             LegacyBiosImageSize;\r
-  UINTN                             E820Size;\r
-  UINT32                            *ClearPtr;\r
-  BBS_TABLE                         *BbsTable;\r
-  LEGACY_EFI_HDD_TABLE              *LegacyEfiHddTable;\r
-  UINTN                             Index;\r
-  UINT32                            TpmPointer;\r
-  VOID                              *TpmBinaryImage;\r
-  UINTN                             TpmBinaryImageSize;\r
-  UINTN                             Location;\r
-  UINTN                             Alignment;\r
-  UINTN                             TempData;\r
-  EFI_PHYSICAL_ADDRESS              Address;\r
-  UINT16                            OldMask;\r
-  UINT16                            NewMask;\r
-  UINT32                            Granularity;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR   Descriptor;\r
+  EFI_STATUS                         Status;\r
+  UINT8                              *Ptr;\r
+  UINT8                              *PtrEnd;\r
+  BOOLEAN                            Done;\r
+  EFI_COMPATIBILITY16_TABLE          *Table;\r
+  UINT8                              CheckSum;\r
+  EFI_IA32_REGISTER_SET              Regs;\r
+  EFI_TO_COMPATIBILITY16_INIT_TABLE  *EfiToLegacy16InitTable;\r
+  EFI_TO_COMPATIBILITY16_BOOT_TABLE  *EfiToLegacy16BootTable;\r
+  VOID                               *LegacyBiosImage;\r
+  UINTN                              LegacyBiosImageSize;\r
+  UINTN                              E820Size;\r
+  UINT32                             *ClearPtr;\r
+  BBS_TABLE                          *BbsTable;\r
+  LEGACY_EFI_HDD_TABLE               *LegacyEfiHddTable;\r
+  UINTN                              Index;\r
+  UINT32                             TpmPointer;\r
+  VOID                               *TpmBinaryImage;\r
+  UINTN                              TpmBinaryImageSize;\r
+  UINTN                              Location;\r
+  UINTN                              Alignment;\r
+  UINTN                              TempData;\r
+  EFI_PHYSICAL_ADDRESS               Address;\r
+  UINT16                             OldMask;\r
+  UINT16                             NewMask;\r
+  UINT32                             Granularity;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR    Descriptor;\r
 \r
   Location  = 0;\r
   Alignment = 0;\r
@@ -300,23 +298,23 @@ ShadowAndStartLegacy16 (
   // end testtest\r
   //\r
   EfiToLegacy16BootTable = &Private->IntThunk->EfiToLegacy16BootTable;\r
-  Status = Private->LegacyBiosPlatform->GetPlatformInfo (\r
-                                          Private->LegacyBiosPlatform,\r
-                                          EfiGetPlatformBinarySystemRom,\r
-                                          &LegacyBiosImage,\r
-                                          &LegacyBiosImageSize,\r
-                                          &Location,\r
-                                          &Alignment,\r
-                                          0,\r
-                                          0\r
-                                          );\r
+  Status                 = Private->LegacyBiosPlatform->GetPlatformInfo (\r
+                                                          Private->LegacyBiosPlatform,\r
+                                                          EfiGetPlatformBinarySystemRom,\r
+                                                          &LegacyBiosImage,\r
+                                                          &LegacyBiosImageSize,\r
+                                                          &Location,\r
+                                                          &Alignment,\r
+                                                          0,\r
+                                                          0\r
+                                                          );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Private->BiosStart            = (UINT32) (0x100000 - LegacyBiosImageSize);\r
-  Private->OptionRom            = 0xc0000;\r
-  Private->LegacyBiosImageSize  = (UINT32) LegacyBiosImageSize;\r
+  Private->BiosStart           = (UINT32)(0x100000 - LegacyBiosImageSize);\r
+  Private->OptionRom           = 0xc0000;\r
+  Private->LegacyBiosImageSize = (UINT32)LegacyBiosImageSize;\r
 \r
   //\r
   // Can only shadow into memory allocated for legacy usage.\r
@@ -328,20 +326,20 @@ ShadowAndStartLegacy16 (
   //\r
   Private->LegacyRegion->UnLock (Private->LegacyRegion, 0xc0000, 0x40000, &Granularity);\r
 \r
-  ClearPtr = (VOID *) ((UINTN) 0xc0000);\r
+  ClearPtr = (VOID *)((UINTN)0xc0000);\r
 \r
   //\r
   // Initialize region from 0xc0000 to start of BIOS to all ffs. This allows unused\r
   // regions to be used by EMM386 etc.\r
   //\r
-  SetMem ((VOID *) ClearPtr, (UINTN) (0x40000 - LegacyBiosImageSize), 0xff);\r
+  SetMem ((VOID *)ClearPtr, (UINTN)(0x40000 - LegacyBiosImageSize), 0xff);\r
 \r
   TempData = Private->BiosStart;\r
 \r
   CopyMem (\r
-    (VOID *) TempData,\r
+    (VOID *)TempData,\r
     LegacyBiosImage,\r
-    (UINTN) LegacyBiosImageSize\r
+    (UINTN)LegacyBiosImageSize\r
     );\r
 \r
   Private->Cpu->FlushDataCache (Private->Cpu, 0xc0000, 0x40000, EfiCpuFlushTypeWriteBackInvalidate);\r
@@ -351,12 +349,12 @@ ShadowAndStartLegacy16 (
   //\r
   Done  = FALSE;\r
   Table = NULL;\r
-  for (Ptr = (UINT8 *) TempData; Ptr < (UINT8 *) ((UINTN) 0x100000) && !Done; Ptr += 0x10) {\r
-    if (*(UINT32 *) Ptr == SIGNATURE_32 ('I', 'F', 'E', '$')) {\r
-      Table   = (EFI_COMPATIBILITY16_TABLE *) Ptr;\r
-      PtrEnd  = Ptr + Table->TableLength;\r
+  for (Ptr = (UINT8 *)TempData; Ptr < (UINT8 *)((UINTN)0x100000) && !Done; Ptr += 0x10) {\r
+    if (*(UINT32 *)Ptr == SIGNATURE_32 ('I', 'F', 'E', '$')) {\r
+      Table  = (EFI_COMPATIBILITY16_TABLE *)Ptr;\r
+      PtrEnd = Ptr + Table->TableLength;\r
       for (CheckSum = 0; Ptr < PtrEnd; Ptr++) {\r
-        CheckSum = (UINT8) (CheckSum +*Ptr);\r
+        CheckSum = (UINT8)(CheckSum +*Ptr);\r
       }\r
 \r
       Done = TRUE;\r
@@ -378,24 +376,24 @@ ShadowAndStartLegacy16 (
   //\r
   // Remember location of the Legacy16 table\r
   //\r
-  Private->Legacy16Table            = Table;\r
-  Private->Legacy16CallSegment      = Table->Compatibility16CallSegment;\r
-  Private->Legacy16CallOffset       = Table->Compatibility16CallOffset;\r
-  EfiToLegacy16InitTable            = &Private->IntThunk->EfiToLegacy16InitTable;\r
-  Private->Legacy16InitPtr          = EfiToLegacy16InitTable;\r
-  Private->Legacy16BootPtr          = &Private->IntThunk->EfiToLegacy16BootTable;\r
-  Private->InternalIrqRoutingTable  = NULL;\r
-  Private->NumberIrqRoutingEntries  = 0;\r
-  Private->BbsTablePtr              = NULL;\r
-  Private->LegacyEfiHddTable        = NULL;\r
-  Private->DiskEnd                  = 0;\r
-  Private->Disk4075                 = 0;\r
-  Private->HddTablePtr              = &Private->IntThunk->EfiToLegacy16BootTable.HddInfo;\r
-  Private->NumberHddControllers     = MAX_IDE_CONTROLLER;\r
-  Private->Dump[0]                  = 'D';\r
-  Private->Dump[1]                  = 'U';\r
-  Private->Dump[2]                  = 'M';\r
-  Private->Dump[3]                  = 'P';\r
+  Private->Legacy16Table           = Table;\r
+  Private->Legacy16CallSegment     = Table->Compatibility16CallSegment;\r
+  Private->Legacy16CallOffset      = Table->Compatibility16CallOffset;\r
+  EfiToLegacy16InitTable           = &Private->IntThunk->EfiToLegacy16InitTable;\r
+  Private->Legacy16InitPtr         = EfiToLegacy16InitTable;\r
+  Private->Legacy16BootPtr         = &Private->IntThunk->EfiToLegacy16BootTable;\r
+  Private->InternalIrqRoutingTable = NULL;\r
+  Private->NumberIrqRoutingEntries = 0;\r
+  Private->BbsTablePtr             = NULL;\r
+  Private->LegacyEfiHddTable       = NULL;\r
+  Private->DiskEnd                 = 0;\r
+  Private->Disk4075                = 0;\r
+  Private->HddTablePtr             = &Private->IntThunk->EfiToLegacy16BootTable.HddInfo;\r
+  Private->NumberHddControllers    = MAX_IDE_CONTROLLER;\r
+  Private->Dump[0]                 = 'D';\r
+  Private->Dump[1]                 = 'U';\r
+  Private->Dump[2]                 = 'M';\r
+  Private->Dump[3]                 = 'P';\r
 \r
   ZeroMem (\r
     Private->Legacy16BootPtr,\r
@@ -405,7 +403,7 @@ ShadowAndStartLegacy16 (
   //\r
   // Store away a copy of the EFI System Table\r
   //\r
-  Table->EfiSystemTable = (UINT32) (UINTN) gST;\r
+  Table->EfiSystemTable = (UINT32)(UINTN)gST;\r
 \r
   //\r
   // IPF CSM integration -Bug\r
@@ -423,31 +421,31 @@ ShadowAndStartLegacy16 (
   //\r
   // All legacy interrupt should be masked when do initialization work from legacy 16 code.\r
   //\r
-  Private->Legacy8259->GetMask(Private->Legacy8259, &OldMask, NULL, NULL, NULL);\r
+  Private->Legacy8259->GetMask (Private->Legacy8259, &OldMask, NULL, NULL, NULL);\r
   NewMask = 0xFFFF;\r
-  Private->Legacy8259->SetMask(Private->Legacy8259, &NewMask, NULL, NULL, NULL);\r
+  Private->Legacy8259->SetMask (Private->Legacy8259, &NewMask, NULL, NULL, NULL);\r
 \r
   //\r
   // Call into Legacy16 code to do an INIT\r
   //\r
   ZeroMem (&Regs, sizeof (EFI_IA32_REGISTER_SET));\r
   Regs.X.AX = Legacy16InitializeYourself;\r
-  Regs.X.ES = EFI_SEGMENT (*((UINT32 *) &EfiToLegacy16InitTable));\r
-  Regs.X.BX = EFI_OFFSET (*((UINT32 *) &EfiToLegacy16InitTable));\r
+  Regs.X.ES = EFI_SEGMENT (*((UINT32 *)&EfiToLegacy16InitTable));\r
+  Regs.X.BX = EFI_OFFSET (*((UINT32 *)&EfiToLegacy16InitTable));\r
 \r
   Private->LegacyBios.FarCall86 (\r
-    &Private->LegacyBios,\r
-    Table->Compatibility16CallSegment,\r
-    Table->Compatibility16CallOffset,\r
-    &Regs,\r
-    NULL,\r
-    0\r
-    );\r
+                        &Private->LegacyBios,\r
+                        Table->Compatibility16CallSegment,\r
+                        Table->Compatibility16CallOffset,\r
+                        &Regs,\r
+                        NULL,\r
+                        0\r
+                        );\r
 \r
   //\r
   // Restore original legacy interrupt mask value\r
   //\r
-  Private->Legacy8259->SetMask(Private->Legacy8259, &OldMask, NULL, NULL, NULL);\r
+  Private->Legacy8259->SetMask (Private->Legacy8259, &OldMask, NULL, NULL, NULL);\r
 \r
   if (Regs.X.AX != 0) {\r
     return EFI_DEVICE_ERROR;\r
@@ -469,30 +467,31 @@ ShadowAndStartLegacy16 (
   //\r
   ZeroMem (&Regs, sizeof (EFI_IA32_REGISTER_SET));\r
   Regs.X.AX = Legacy16GetTableAddress;\r
-  Regs.X.CX = (UINT16) E820Size;\r
+  Regs.X.CX = (UINT16)E820Size;\r
   Regs.X.DX = 1;\r
   Private->LegacyBios.FarCall86 (\r
-    &Private->LegacyBios,\r
-    Table->Compatibility16CallSegment,\r
-    Table->Compatibility16CallOffset,\r
-    &Regs,\r
-    NULL,\r
-    0\r
-    );\r
+                        &Private->LegacyBios,\r
+                        Table->Compatibility16CallSegment,\r
+                        Table->Compatibility16CallOffset,\r
+                        &Regs,\r
+                        NULL,\r
+                        0\r
+                        );\r
 \r
-  Table->E820Pointer  = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);\r
-  Table->E820Length   = (UINT32) E820Size;\r
+  Table->E820Pointer = (UINT32)(Regs.X.DS * 16 + Regs.X.BX);\r
+  Table->E820Length  = (UINT32)E820Size;\r
   if (Regs.X.AX != 0) {\r
     DEBUG ((DEBUG_ERROR, "Legacy16 E820 length insufficient\n"));\r
   } else {\r
     TempData = Table->E820Pointer;\r
-    CopyMem ((VOID *) TempData, Private->E820Table, E820Size);\r
+    CopyMem ((VOID *)TempData, Private->E820Table, E820Size);\r
   }\r
+\r
   //\r
   // Get PnPInstallationCheck Info.\r
   //\r
-  Private->PnPInstallationCheckSegment  = Table->PnPInstallationCheckSegment;\r
-  Private->PnPInstallationCheckOffset   = Table->PnPInstallationCheckOffset;\r
+  Private->PnPInstallationCheckSegment = Table->PnPInstallationCheckSegment;\r
+  Private->PnPInstallationCheckOffset  = Table->PnPInstallationCheckOffset;\r
 \r
   //\r
   // Check if PCI Express is supported. If yes, Save base address.\r
@@ -508,9 +507,10 @@ ShadowAndStartLegacy16 (
                                           0\r
                                           );\r
   if (!EFI_ERROR (Status)) {\r
-    Private->Legacy16Table->PciExpressBase  = (UINT32)Location;\r
-    Location = 0;\r
+    Private->Legacy16Table->PciExpressBase = (UINT32)Location;\r
+    Location                               = 0;\r
   }\r
+\r
   //\r
   // Check if TPM is supported. If yes get a region in E0000,F0000 to copy it\r
   // into, copy it and update pointer to binary image. This needs to be\r
@@ -527,35 +527,34 @@ ShadowAndStartLegacy16 (
                                           0\r
                                           );\r
   if (!EFI_ERROR (Status)) {\r
-\r
     ZeroMem (&Regs, sizeof (EFI_IA32_REGISTER_SET));\r
     Regs.X.AX = Legacy16GetTableAddress;\r
-    Regs.X.CX = (UINT16) TpmBinaryImageSize;\r
+    Regs.X.CX = (UINT16)TpmBinaryImageSize;\r
     Regs.X.DX = 1;\r
     Private->LegacyBios.FarCall86 (\r
-      &Private->LegacyBios,\r
-      Table->Compatibility16CallSegment,\r
-      Table->Compatibility16CallOffset,\r
-      &Regs,\r
-      NULL,\r
-      0\r
-      );\r
-\r
-    TpmPointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);\r
+                          &Private->LegacyBios,\r
+                          Table->Compatibility16CallSegment,\r
+                          Table->Compatibility16CallOffset,\r
+                          &Regs,\r
+                          NULL,\r
+                          0\r
+                          );\r
+\r
+    TpmPointer = (UINT32)(Regs.X.DS * 16 + Regs.X.BX);\r
     if (Regs.X.AX != 0) {\r
       DEBUG ((DEBUG_ERROR, "TPM cannot be loaded\n"));\r
     } else {\r
-      CopyMem ((VOID *) (UINTN)TpmPointer, TpmBinaryImage, TpmBinaryImageSize);\r
+      CopyMem ((VOID *)(UINTN)TpmPointer, TpmBinaryImage, TpmBinaryImageSize);\r
       Table->TpmSegment = Regs.X.DS;\r
       Table->TpmOffset  = Regs.X.BX;\r
-\r
     }\r
   }\r
+\r
   //\r
   // Lock the Legacy BIOS region\r
   //\r
-  Private->Cpu->FlushDataCache (Private->Cpu, Private->BiosStart, (UINT32) LegacyBiosImageSize, EfiCpuFlushTypeWriteBackInvalidate);\r
-  Private->LegacyRegion->Lock (Private->LegacyRegion, Private->BiosStart, (UINT32) LegacyBiosImageSize, &Granularity);\r
+  Private->Cpu->FlushDataCache (Private->Cpu, Private->BiosStart, (UINT32)LegacyBiosImageSize, EfiCpuFlushTypeWriteBackInvalidate);\r
+  Private->LegacyRegion->Lock (Private->LegacyRegion, Private->BiosStart, (UINT32)LegacyBiosImageSize, &Granularity);\r
 \r
   //\r
   // Get the BbsTable from LOW_MEMORY_THUNK\r
@@ -563,8 +562,8 @@ ShadowAndStartLegacy16 (
   BbsTable = (BBS_TABLE *)(UINTN)Private->IntThunk->BbsTable;\r
   ZeroMem ((VOID *)BbsTable, sizeof (Private->IntThunk->BbsTable));\r
 \r
-  EfiToLegacy16BootTable->BbsTable  = (UINT32)(UINTN)BbsTable;\r
-  Private->BbsTablePtr              = (VOID *) BbsTable;\r
+  EfiToLegacy16BootTable->BbsTable = (UINT32)(UINTN)BbsTable;\r
+  Private->BbsTablePtr             = (VOID *)BbsTable;\r
 \r
   //\r
   // Populate entire table with BBS_IGNORE_ENTRY\r
@@ -574,10 +573,11 @@ ShadowAndStartLegacy16 (
   for (Index = 0; Index < MAX_BBS_ENTRIES; Index++) {\r
     BbsTable[Index].BootPriority = BBS_IGNORE_ENTRY;\r
   }\r
+\r
   //\r
   // Allocate space for Legacy HDD table\r
   //\r
-  LegacyEfiHddTable = (LEGACY_EFI_HDD_TABLE *) AllocateZeroPool ((UINTN) MAX_HDD_ENTRIES * sizeof (LEGACY_EFI_HDD_TABLE));\r
+  LegacyEfiHddTable = (LEGACY_EFI_HDD_TABLE *)AllocateZeroPool ((UINTN)MAX_HDD_ENTRIES * sizeof (LEGACY_EFI_HDD_TABLE));\r
   ASSERT (LegacyEfiHddTable);\r
 \r
   Private->LegacyEfiHddTable      = LegacyEfiHddTable;\r
@@ -612,7 +612,7 @@ ShadowAndStartLegacy16 (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosShadowAllLegacyOproms (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL *This\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This\r
   )\r
 {\r
   LEGACY_BIOS_INSTANCE  *Private;\r
@@ -657,16 +657,16 @@ LegacyBiosShadowAllLegacyOproms (
 **/\r
 UINT16\r
 GetPciInterfaceVersion (\r
-  IN LEGACY_BIOS_INSTANCE *Private\r
+  IN LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  EFI_IA32_REGISTER_SET Reg;\r
-  BOOLEAN               ThunkFailed;\r
-  UINT16                PciInterfaceVersion;\r
+  EFI_IA32_REGISTER_SET  Reg;\r
+  BOOLEAN                ThunkFailed;\r
+  UINT16                 PciInterfaceVersion;\r
 \r
   PciInterfaceVersion = 0;\r
 \r
-  Reg.X.AX = 0xB101;\r
+  Reg.X.AX  = 0xB101;\r
   Reg.E.EDI = 0;\r
 \r
   ThunkFailed = Private->LegacyBios.Int86 (&Private->LegacyBios, 0x1A, &Reg);\r
@@ -684,6 +684,7 @@ GetPciInterfaceVersion (
       PciInterfaceVersion = Reg.X.BX;\r
     }\r
   }\r
+\r
   return PciInterfaceVersion;\r
 }\r
 \r
@@ -699,25 +700,25 @@ GetPciInterfaceVersion (
 VOID\r
 EFIAPI\r
 InstallSmbiosEventCallback (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  SMBIOS_TABLE_ENTRY_POINT    *EntryPointStructure;\r
+  EFI_STATUS                Status;\r
+  SMBIOS_TABLE_ENTRY_POINT  *EntryPointStructure;\r
 \r
   //\r
   // Get SMBIOS table from EFI configuration table\r
   //\r
   Status = EfiGetSystemConfigurationTable (\r
-            &gEfiSmbiosTableGuid,\r
-            &mRuntimeSmbiosEntryPoint\r
-            );\r
+             &gEfiSmbiosTableGuid,\r
+             &mRuntimeSmbiosEntryPoint\r
+             );\r
   if ((EFI_ERROR (Status)) || (mRuntimeSmbiosEntryPoint == NULL)) {\r
     return;\r
   }\r
 \r
-  EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) mRuntimeSmbiosEntryPoint;\r
+  EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *)mRuntimeSmbiosEntryPoint;\r
 \r
   //\r
   // Allocate memory for SMBIOS Entry Point Structure.\r
@@ -728,21 +729,23 @@ InstallSmbiosEventCallback (
     // Entrypoint structure with fixed size is allocated only once.\r
     //\r
     mReserveSmbiosEntryPoint = SIZE_4GB - 1;\r
-    Status = gBS->AllocatePages (\r
-                    AllocateMaxAddress,\r
-                    EfiReservedMemoryType,\r
-                    EFI_SIZE_TO_PAGES ((UINTN) (EntryPointStructure->EntryPointLength)),\r
-                    &mReserveSmbiosEntryPoint\r
-                    );\r
+    Status                   = gBS->AllocatePages (\r
+                                      AllocateMaxAddress,\r
+                                      EfiReservedMemoryType,\r
+                                      EFI_SIZE_TO_PAGES ((UINTN)(EntryPointStructure->EntryPointLength)),\r
+                                      &mReserveSmbiosEntryPoint\r
+                                      );\r
     if (EFI_ERROR (Status)) {\r
       mReserveSmbiosEntryPoint = 0;\r
       return;\r
     }\r
+\r
     DEBUG ((DEBUG_INFO, "Allocate memory for Smbios Entry Point Structure\n"));\r
   }\r
 \r
   if ((mStructureTableAddress != 0) &&\r
-      (mStructureTablePages < EFI_SIZE_TO_PAGES ((UINT32)EntryPointStructure->TableLength))) {\r
+      (mStructureTablePages < EFI_SIZE_TO_PAGES ((UINT32)EntryPointStructure->TableLength)))\r
+  {\r
     //\r
     // If original buffer is not enough for the new SMBIOS table, free original buffer and re-allocate\r
     //\r
@@ -759,22 +762,23 @@ InstallSmbiosEventCallback (
     //\r
     mStructureTableAddress = SIZE_4GB - 1;\r
     mStructureTablePages   = EFI_SIZE_TO_PAGES (EntryPointStructure->TableLength);\r
-    Status = gBS->AllocatePages (\r
-                    AllocateMaxAddress,\r
-                    EfiReservedMemoryType,\r
-                    mStructureTablePages,\r
-                    &mStructureTableAddress\r
-                    );\r
+    Status                 = gBS->AllocatePages (\r
+                                    AllocateMaxAddress,\r
+                                    EfiReservedMemoryType,\r
+                                    mStructureTablePages,\r
+                                    &mStructureTableAddress\r
+                                    );\r
     if (EFI_ERROR (Status)) {\r
       gBS->FreePages (\r
-        mReserveSmbiosEntryPoint,\r
-        EFI_SIZE_TO_PAGES ((UINTN) (EntryPointStructure->EntryPointLength))\r
-        );\r
+             mReserveSmbiosEntryPoint,\r
+             EFI_SIZE_TO_PAGES ((UINTN)(EntryPointStructure->EntryPointLength))\r
+             );\r
       mReserveSmbiosEntryPoint = 0;\r
       mStructureTableAddress   = 0;\r
       mStructureTablePages     = 0;\r
       return;\r
     }\r
+\r
     DEBUG ((DEBUG_INFO, "Allocate memory for Smbios Structure Table\n"));\r
   }\r
 }\r
@@ -791,8 +795,8 @@ InstallSmbiosEventCallback (
 VOID\r
 EFIAPI\r
 ToggleEndOfDxeStatus (\r
-  IN EFI_EVENT                Event,\r
-  IN VOID                     *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   mEndOfDxe = TRUE;\r
@@ -812,8 +816,8 @@ ToggleEndOfDxeStatus (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosInstall (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_STATUS                         Status;\r
@@ -850,7 +854,7 @@ LegacyBiosInstall (
   // When UEFI Secure Boot is enabled, CSM module will not start any more.\r
   //\r
   SecureBoot = NULL;\r
-  GetEfiGlobalVariable2 (EFI_SECURE_BOOT_MODE_NAME, (VOID**)&SecureBoot, NULL);\r
+  GetEfiGlobalVariable2 (EFI_SECURE_BOOT_MODE_NAME, (VOID **)&SecureBoot, NULL);\r
   if ((SecureBoot != NULL) && (*SecureBoot == SECURE_BOOT_MODE_ENABLE)) {\r
     FreePool (SecureBoot);\r
     return EFI_SECURITY_VIOLATION;\r
@@ -867,22 +871,22 @@ LegacyBiosInstall (
   // Grab a copy of all the protocols we depend on. Any error would\r
   // be a dispatcher bug!.\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **) &Private->Cpu);\r
+  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&Private->Cpu);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiTimerArchProtocolGuid, NULL, (VOID **) &Private->Timer);\r
+  Status = gBS->LocateProtocol (&gEfiTimerArchProtocolGuid, NULL, (VOID **)&Private->Timer);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiLegacyRegion2ProtocolGuid, NULL, (VOID **) &Private->LegacyRegion);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyRegion2ProtocolGuid, NULL, (VOID **)&Private->LegacyRegion);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiLegacyBiosPlatformProtocolGuid, NULL, (VOID **) &Private->LegacyBiosPlatform);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosPlatformProtocolGuid, NULL, (VOID **)&Private->LegacyBiosPlatform);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiLegacy8259ProtocolGuid, NULL, (VOID **) &Private->Legacy8259);\r
+  Status = gBS->LocateProtocol (&gEfiLegacy8259ProtocolGuid, NULL, (VOID **)&Private->Legacy8259);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiLegacyInterruptProtocolGuid, NULL, (VOID **) &Private->LegacyInterrupt);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyInterruptProtocolGuid, NULL, (VOID **)&Private->LegacyInterrupt);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -891,7 +895,7 @@ LegacyBiosInstall (
   Status = gBS->LocateProtocol (\r
                   &gEfiGenericMemTestProtocolGuid,\r
                   NULL,\r
-                  (VOID **) &Private->GenericMemoryTest\r
+                  (VOID **)&Private->GenericMemoryTest\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -904,6 +908,7 @@ LegacyBiosInstall (
       StartAddress = Descriptor.BaseAddress + Descriptor.Length;\r
       continue;\r
     }\r
+\r
     Length = MIN (Descriptor.Length, 0xa0000 - StartAddress);\r
     Private->GenericMemoryTest->CompatibleRangeTest (\r
                                   Private->GenericMemoryTest,\r
@@ -912,6 +917,7 @@ LegacyBiosInstall (
                                   );\r
     StartAddress = StartAddress + Length;\r
   }\r
+\r
   //\r
   // Make sure all memory from 1MB to 16MB is tested and added to memory map\r
   //\r
@@ -921,6 +927,7 @@ LegacyBiosInstall (
       StartAddress = Descriptor.BaseAddress + Descriptor.Length;\r
       continue;\r
     }\r
+\r
     Length = MIN (Descriptor.Length, BASE_16MB - StartAddress);\r
     Private->GenericMemoryTest->CompatibleRangeTest (\r
                                   Private->GenericMemoryTest,\r
@@ -932,17 +939,17 @@ LegacyBiosInstall (
 \r
   Private->Signature = LEGACY_BIOS_INSTANCE_SIGNATURE;\r
 \r
-  Private->LegacyBios.Int86 = LegacyBiosInt86;\r
-  Private->LegacyBios.FarCall86 = LegacyBiosFarCall86;\r
-  Private->LegacyBios.CheckPciRom = LegacyBiosCheckPciRom;\r
-  Private->LegacyBios.InstallPciRom = LegacyBiosInstallPciRom;\r
-  Private->LegacyBios.LegacyBoot = LegacyBiosLegacyBoot;\r
-  Private->LegacyBios.UpdateKeyboardLedStatus = LegacyBiosUpdateKeyboardLedStatus;\r
-  Private->LegacyBios.GetBbsInfo = LegacyBiosGetBbsInfo;\r
-  Private->LegacyBios.ShadowAllLegacyOproms = LegacyBiosShadowAllLegacyOproms;\r
-  Private->LegacyBios.PrepareToBootEfi = LegacyBiosPrepareToBootEfi;\r
-  Private->LegacyBios.GetLegacyRegion = LegacyBiosGetLegacyRegion;\r
-  Private->LegacyBios.CopyLegacyRegion = LegacyBiosCopyLegacyRegion;\r
+  Private->LegacyBios.Int86                    = LegacyBiosInt86;\r
+  Private->LegacyBios.FarCall86                = LegacyBiosFarCall86;\r
+  Private->LegacyBios.CheckPciRom              = LegacyBiosCheckPciRom;\r
+  Private->LegacyBios.InstallPciRom            = LegacyBiosInstallPciRom;\r
+  Private->LegacyBios.LegacyBoot               = LegacyBiosLegacyBoot;\r
+  Private->LegacyBios.UpdateKeyboardLedStatus  = LegacyBiosUpdateKeyboardLedStatus;\r
+  Private->LegacyBios.GetBbsInfo               = LegacyBiosGetBbsInfo;\r
+  Private->LegacyBios.ShadowAllLegacyOproms    = LegacyBiosShadowAllLegacyOproms;\r
+  Private->LegacyBios.PrepareToBootEfi         = LegacyBiosPrepareToBootEfi;\r
+  Private->LegacyBios.GetLegacyRegion          = LegacyBiosGetLegacyRegion;\r
+  Private->LegacyBios.CopyLegacyRegion         = LegacyBiosCopyLegacyRegion;\r
   Private->LegacyBios.BootUnconventionalDevice = LegacyBiosBootUnconventionalDevice;\r
 \r
   Private->ImageHandle = ImageHandle;\r
@@ -994,16 +1001,16 @@ LegacyBiosInstall (
     );\r
   ASSERT (MemoryAddress == 0x000000000);\r
 \r
-  ClearPtr = (VOID *) ((UINTN) 0x0000);\r
+  ClearPtr = (VOID *)((UINTN)0x0000);\r
 \r
   //\r
   // Initialize region from 0x0000 to 4k. This initializes interrupt vector\r
   // range.\r
   //\r
   ACCESS_PAGE0_CODE (\r
-    gBS->SetMem ((VOID *) ClearPtr, 0x400, INITIAL_VALUE_BELOW_1K);\r
-    ZeroMem ((VOID *) ((UINTN)ClearPtr + 0x400), 0xC00);\r
-  );\r
+    gBS->SetMem ((VOID *)ClearPtr, 0x400, INITIAL_VALUE_BELOW_1K);\r
+    ZeroMem ((VOID *)((UINTN)ClearPtr + 0x400), 0xC00);\r
+    );\r
 \r
   //\r
   // Allocate pages for OPROM usage\r
@@ -1020,7 +1027,7 @@ LegacyBiosInstall (
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  ZeroMem ((VOID *) ((UINTN) MemoryAddress), MemorySize);\r
+  ZeroMem ((VOID *)((UINTN)MemoryAddress), MemorySize);\r
 \r
   //\r
   // Allocate all 32k chunks from 0x60000 ~ 0x88000 for Legacy OPROMs that\r
@@ -1028,8 +1035,8 @@ LegacyBiosInstall (
   // OpROMs expect different areas to be free\r
   //\r
   EbdaReservedBaseAddress = MemoryAddress;\r
-  MemoryAddress = PcdGet32 (PcdOpromReservedMemoryBase);\r
-  MemorySize    = PcdGet32 (PcdOpromReservedMemorySize);\r
+  MemoryAddress           = PcdGet32 (PcdOpromReservedMemoryBase);\r
+  MemorySize              = PcdGet32 (PcdOpromReservedMemorySize);\r
   //\r
   // Check if base address and size for reserved memory are 4KB aligned.\r
   //\r
@@ -1048,7 +1055,7 @@ LegacyBiosInstall (
                &StartAddress\r
                );\r
     if (!EFI_ERROR (Status)) {\r
-      MemoryPtr = (VOID *) ((UINTN) StartAddress);\r
+      MemoryPtr = (VOID *)((UINTN)StartAddress);\r
       ZeroMem (MemoryPtr, 0x1000);\r
     } else {\r
       DEBUG ((DEBUG_ERROR, "WARNING: Allocate legacy memory fail for SCSI card - %x\n", MemStart));\r
@@ -1069,7 +1076,7 @@ LegacyBiosInstall (
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  ZeroMem ((VOID *) ((UINTN) MemoryAddressUnder1MB), MemorySize);\r
+  ZeroMem ((VOID *)((UINTN)MemoryAddressUnder1MB), MemorySize);\r
 \r
   //\r
   // Allocate space for thunker and Init Thunker\r
@@ -1082,10 +1089,10 @@ LegacyBiosInstall (
              &MemoryAddress\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
-  Private->IntThunk                   = (LOW_MEMORY_THUNK *) (UINTN) MemoryAddress;\r
+  Private->IntThunk                        = (LOW_MEMORY_THUNK *)(UINTN)MemoryAddress;\r
   EfiToLegacy16InitTable                   = &Private->IntThunk->EfiToLegacy16InitTable;\r
-  EfiToLegacy16InitTable->ThunkStart       = (UINT32) (EFI_PHYSICAL_ADDRESS) (UINTN) MemoryAddress;\r
-  EfiToLegacy16InitTable->ThunkSizeInBytes = (UINT32) (sizeof (LOW_MEMORY_THUNK));\r
+  EfiToLegacy16InitTable->ThunkStart       = (UINT32)(EFI_PHYSICAL_ADDRESS)(UINTN)MemoryAddress;\r
+  EfiToLegacy16InitTable->ThunkSizeInBytes = (UINT32)(sizeof (LOW_MEMORY_THUNK));\r
 \r
   Status = LegacyBiosInitializeThunk (Private);\r
   ASSERT_EFI_ERROR (Status);\r
@@ -1093,8 +1100,8 @@ LegacyBiosInstall (
   //\r
   // Init the legacy memory map in memory < 1 MB.\r
   //\r
-  EfiToLegacy16InitTable->BiosLessThan1MB         = (UINT32) MemoryAddressUnder1MB;\r
-  EfiToLegacy16InitTable->LowPmmMemory            = (UINT32) MemoryAddressUnder1MB;\r
+  EfiToLegacy16InitTable->BiosLessThan1MB         = (UINT32)MemoryAddressUnder1MB;\r
+  EfiToLegacy16InitTable->LowPmmMemory            = (UINT32)MemoryAddressUnder1MB;\r
   EfiToLegacy16InitTable->LowPmmMemorySizeInBytes = MemorySize;\r
 \r
   MemorySize = PcdGet32 (PcdHighPmmMemorySize);\r
@@ -1121,8 +1128,9 @@ LegacyBiosInstall (
                &MemoryAddress\r
                );\r
   }\r
+\r
   if (!EFI_ERROR (Status)) {\r
-    EfiToLegacy16InitTable->HiPmmMemory            = (UINT32) (EFI_PHYSICAL_ADDRESS) (UINTN) MemoryAddress;\r
+    EfiToLegacy16InitTable->HiPmmMemory            = (UINT32)(EFI_PHYSICAL_ADDRESS)(UINTN)MemoryAddress;\r
     EfiToLegacy16InitTable->HiPmmMemorySizeInBytes = MemorySize;\r
   }\r
 \r
@@ -1135,32 +1143,34 @@ LegacyBiosInstall (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Initialize interrupt redirection code and entries;\r
   // IDT Vectors 0x68-0x6f must be redirected to IDT Vectors 0x08-0x0f.\r
   //\r
   CopyMem (\r
-         Private->IntThunk->InterruptRedirectionCode,\r
-         (VOID *) (UINTN) InterruptRedirectionTemplate,\r
-         sizeof (Private->IntThunk->InterruptRedirectionCode)\r
-         );\r
+    Private->IntThunk->InterruptRedirectionCode,\r
+    (VOID *)(UINTN)InterruptRedirectionTemplate,\r
+    sizeof (Private->IntThunk->InterruptRedirectionCode)\r
+    );\r
 \r
   //\r
   // Save Unexpected interrupt vector so can restore it just prior to boot\r
   //\r
   ACCESS_PAGE0_CODE (\r
-    BaseVectorMaster = (UINT32 *) (sizeof (UINT32) * PROTECTED_MODE_BASE_VECTOR_MASTER);\r
+    BaseVectorMaster           = (UINT32 *)(sizeof (UINT32) * PROTECTED_MODE_BASE_VECTOR_MASTER);\r
     Private->BiosUnexpectedInt = BaseVectorMaster[0];\r
-    IntRedirCode = (UINT32) (UINTN) Private->IntThunk->InterruptRedirectionCode;\r
+    IntRedirCode               = (UINT32)(UINTN)Private->IntThunk->InterruptRedirectionCode;\r
     for (Index = 0; Index < 8; Index++) {\r
-      BaseVectorMaster[Index] = (EFI_SEGMENT (IntRedirCode + Index * 4) << 16) | EFI_OFFSET (IntRedirCode + Index * 4);\r
-    }\r
-  );\r
+    BaseVectorMaster[Index] = (EFI_SEGMENT (IntRedirCode + Index * 4) << 16) | EFI_OFFSET (IntRedirCode + Index * 4);\r
+  }\r
+\r
+    );\r
 \r
   //\r
   // Save EFI value\r
   //\r
-  Private->ThunkSeg = (UINT16) (EFI_SEGMENT (IntRedirCode));\r
+  Private->ThunkSeg = (UINT16)(EFI_SEGMENT (IntRedirCode));\r
 \r
   //\r
   // Allocate reserved memory for SMBIOS table used in legacy boot if SMBIOS table exists\r
@@ -1198,18 +1208,20 @@ LegacyBiosInstall (
   // Make a new handle and install the protocol\r
   //\r
   Private->Handle = NULL;\r
-  Status = gBS->InstallProtocolInterface (\r
-                  &Private->Handle,\r
-                  &gEfiLegacyBiosProtocolGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &Private->LegacyBios\r
-                  );\r
+  Status          = gBS->InstallProtocolInterface (\r
+                           &Private->Handle,\r
+                           &gEfiLegacyBiosProtocolGuid,\r
+                           EFI_NATIVE_INTERFACE,\r
+                           &Private->LegacyBios\r
+                           );\r
   Private->Csm16PciInterfaceVersion = GetPciInterfaceVersion (Private);\r
 \r
-  DEBUG ((DEBUG_INFO, "CSM16 PCI BIOS Interface Version: %02x.%02x\n",\r
-          (UINT8) (Private->Csm16PciInterfaceVersion >> 8),\r
-          (UINT8) Private->Csm16PciInterfaceVersion\r
-        ));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "CSM16 PCI BIOS Interface Version: %02x.%02x\n",\r
+    (UINT8)(Private->Csm16PciInterfaceVersion >> 8),\r
+    (UINT8)Private->Csm16PciInterfaceVersion\r
+    ));\r
   ASSERT (Private->Csm16PciInterfaceVersion != 0);\r
   return Status;\r
 }\r
index f437d0cc424607ce7f5b451c025bde23ea36e673..5a706d9ea6819f5fbb984330820351e69bc07022 100644 (file)
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _LEGACY_BIOS_INTERFACE_\r
 #define _LEGACY_BIOS_INTERFACE_\r
 \r
-\r
 #include <FrameworkDxe.h>\r
 #include <IndustryStandard/Pci.h>\r
 #include <IndustryStandard/SmBios.h>\r
@@ -62,7 +61,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // BUGBUG: This entry maybe changed to PCD in future and wait for\r
 //         redesign of BDS library\r
 //\r
-#define MAX_BBS_ENTRIES 0x100\r
+#define MAX_BBS_ENTRIES  0x100\r
 \r
 //\r
 // Thunk Status Codes\r
@@ -79,8 +78,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // 8259 Hardware definitions\r
 //\r
-#define LEGACY_MODE_BASE_VECTOR_MASTER     0x08\r
-#define LEGACY_MODE_BASE_VECTOR_SLAVE      0x70\r
+#define LEGACY_MODE_BASE_VECTOR_MASTER  0x08\r
+#define LEGACY_MODE_BASE_VECTOR_SLAVE   0x70\r
 \r
 //\r
 // The original PC used INT8-F for master PIC. Since these mapped over\r
@@ -96,53 +95,53 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // offset + 0xabcd could overflow which exceeds 0xFFFF which is invalid in real mode.\r
 // So this will keep offset as small as possible to avoid offset overflow in real mode.\r
 //\r
-#define NORMALIZE_EFI_SEGMENT(_Adr)      (UINT16) (((UINTN) (_Adr)) >> 4)\r
-#define NORMALIZE_EFI_OFFSET(_Adr)       (UINT16) (((UINT16) ((UINTN) (_Adr))) & 0xf)\r
+#define NORMALIZE_EFI_SEGMENT(_Adr)  (UINT16) (((UINTN) (_Adr)) >> 4)\r
+#define NORMALIZE_EFI_OFFSET(_Adr)   (UINT16) (((UINT16) ((UINTN) (_Adr))) & 0xf)\r
 \r
 //\r
 // Trace defines\r
 //\r
 //\r
-#define LEGACY_BDA_TRACE    0x000\r
-#define LEGACY_BIOS_TRACE   0x040\r
-#define LEGACY_BOOT_TRACE   0x080\r
-#define LEGACY_CMOS_TRACE   0x0C0\r
-#define LEGACY_IDE_TRACE    0x100\r
-#define LEGACY_MP_TRACE     0x140\r
-#define LEGACY_PCI_TRACE    0x180\r
-#define LEGACY_SIO_TRACE    0x1C0\r
-\r
-#define LEGACY_PCI_TRACE_000 LEGACY_PCI_TRACE + 0x00\r
-#define LEGACY_PCI_TRACE_001 LEGACY_PCI_TRACE + 0x01\r
-#define LEGACY_PCI_TRACE_002 LEGACY_PCI_TRACE + 0x02\r
-#define LEGACY_PCI_TRACE_003 LEGACY_PCI_TRACE + 0x03\r
-#define LEGACY_PCI_TRACE_004 LEGACY_PCI_TRACE + 0x04\r
-#define LEGACY_PCI_TRACE_005 LEGACY_PCI_TRACE + 0x05\r
-#define LEGACY_PCI_TRACE_006 LEGACY_PCI_TRACE + 0x06\r
-#define LEGACY_PCI_TRACE_007 LEGACY_PCI_TRACE + 0x07\r
-#define LEGACY_PCI_TRACE_008 LEGACY_PCI_TRACE + 0x08\r
-#define LEGACY_PCI_TRACE_009 LEGACY_PCI_TRACE + 0x09\r
-#define LEGACY_PCI_TRACE_00A LEGACY_PCI_TRACE + 0x0A\r
-#define LEGACY_PCI_TRACE_00B LEGACY_PCI_TRACE + 0x0B\r
-#define LEGACY_PCI_TRACE_00C LEGACY_PCI_TRACE + 0x0C\r
-#define LEGACY_PCI_TRACE_00D LEGACY_PCI_TRACE + 0x0D\r
-#define LEGACY_PCI_TRACE_00E LEGACY_PCI_TRACE + 0x0E\r
-#define LEGACY_PCI_TRACE_00F LEGACY_PCI_TRACE + 0x0F\r
-\r
-#define BDA_VIDEO_MODE      0x49\r
-\r
-#define IDE_PI_REGISTER_PNE     BIT0\r
-#define IDE_PI_REGISTER_SNE     BIT2\r
+#define LEGACY_BDA_TRACE   0x000\r
+#define LEGACY_BIOS_TRACE  0x040\r
+#define LEGACY_BOOT_TRACE  0x080\r
+#define LEGACY_CMOS_TRACE  0x0C0\r
+#define LEGACY_IDE_TRACE   0x100\r
+#define LEGACY_MP_TRACE    0x140\r
+#define LEGACY_PCI_TRACE   0x180\r
+#define LEGACY_SIO_TRACE   0x1C0\r
+\r
+#define LEGACY_PCI_TRACE_000  LEGACY_PCI_TRACE + 0x00\r
+#define LEGACY_PCI_TRACE_001  LEGACY_PCI_TRACE + 0x01\r
+#define LEGACY_PCI_TRACE_002  LEGACY_PCI_TRACE + 0x02\r
+#define LEGACY_PCI_TRACE_003  LEGACY_PCI_TRACE + 0x03\r
+#define LEGACY_PCI_TRACE_004  LEGACY_PCI_TRACE + 0x04\r
+#define LEGACY_PCI_TRACE_005  LEGACY_PCI_TRACE + 0x05\r
+#define LEGACY_PCI_TRACE_006  LEGACY_PCI_TRACE + 0x06\r
+#define LEGACY_PCI_TRACE_007  LEGACY_PCI_TRACE + 0x07\r
+#define LEGACY_PCI_TRACE_008  LEGACY_PCI_TRACE + 0x08\r
+#define LEGACY_PCI_TRACE_009  LEGACY_PCI_TRACE + 0x09\r
+#define LEGACY_PCI_TRACE_00A  LEGACY_PCI_TRACE + 0x0A\r
+#define LEGACY_PCI_TRACE_00B  LEGACY_PCI_TRACE + 0x0B\r
+#define LEGACY_PCI_TRACE_00C  LEGACY_PCI_TRACE + 0x0C\r
+#define LEGACY_PCI_TRACE_00D  LEGACY_PCI_TRACE + 0x0D\r
+#define LEGACY_PCI_TRACE_00E  LEGACY_PCI_TRACE + 0x0E\r
+#define LEGACY_PCI_TRACE_00F  LEGACY_PCI_TRACE + 0x0F\r
+\r
+#define BDA_VIDEO_MODE  0x49\r
+\r
+#define IDE_PI_REGISTER_PNE  BIT0\r
+#define IDE_PI_REGISTER_SNE  BIT2\r
 \r
 typedef struct {\r
-  UINTN   PciSegment;\r
-  UINTN   PciBus;\r
-  UINTN   PciDevice;\r
-  UINTN   PciFunction;\r
-  UINT32  ShadowAddress;\r
-  UINT32  ShadowedSize;\r
-  UINT8   DiskStart;\r
-  UINT8   DiskEnd;\r
+  UINTN     PciSegment;\r
+  UINTN     PciBus;\r
+  UINTN     PciDevice;\r
+  UINTN     PciFunction;\r
+  UINT32    ShadowAddress;\r
+  UINT32    ShadowedSize;\r
+  UINT8     DiskStart;\r
+  UINT8     DiskEnd;\r
 } ROM_INSTANCE_ENTRY;\r
 \r
 //\r
@@ -150,15 +149,15 @@ typedef struct {
 //\r
 #if defined (MDE_CPU_IA32)\r
 \r
-#define NUM_REAL_GDT_ENTRIES  3\r
-#define CONVENTIONAL_MEMORY_TOP 0xA0000   // 640 KB\r
-#define INITIAL_VALUE_BELOW_1K  0x0\r
+#define NUM_REAL_GDT_ENTRIES     3\r
+#define CONVENTIONAL_MEMORY_TOP  0xA0000  // 640 KB\r
+#define INITIAL_VALUE_BELOW_1K   0x0\r
 \r
 #elif defined (MDE_CPU_X64)\r
 \r
-#define NUM_REAL_GDT_ENTRIES  8\r
-#define CONVENTIONAL_MEMORY_TOP 0xA0000   // 640 KB\r
-#define INITIAL_VALUE_BELOW_1K  0x0\r
+#define NUM_REAL_GDT_ENTRIES     8\r
+#define CONVENTIONAL_MEMORY_TOP  0xA0000  // 640 KB\r
+#define INITIAL_VALUE_BELOW_1K   0x0\r
 \r
 #endif\r
 \r
@@ -168,28 +167,28 @@ typedef struct {
 // Define what a processor GDT looks like\r
 //\r
 typedef struct {\r
-  UINT32  LimitLo : 16;\r
-  UINT32  BaseLo : 16;\r
-  UINT32  BaseMid : 8;\r
-  UINT32  Type : 4;\r
-  UINT32  System : 1;\r
-  UINT32  Dpl : 2;\r
-  UINT32  Present : 1;\r
-  UINT32  LimitHi : 4;\r
-  UINT32  Software : 1;\r
-  UINT32  Reserved : 1;\r
-  UINT32  DefaultSize : 1;\r
-  UINT32  Granularity : 1;\r
-  UINT32  BaseHi : 8;\r
+  UINT32    LimitLo     : 16;\r
+  UINT32    BaseLo      : 16;\r
+  UINT32    BaseMid     : 8;\r
+  UINT32    Type        : 4;\r
+  UINT32    System      : 1;\r
+  UINT32    Dpl         : 2;\r
+  UINT32    Present     : 1;\r
+  UINT32    LimitHi     : 4;\r
+  UINT32    Software    : 1;\r
+  UINT32    Reserved    : 1;\r
+  UINT32    DefaultSize : 1;\r
+  UINT32    Granularity : 1;\r
+  UINT32    BaseHi      : 8;\r
 } GDT32;\r
 \r
 typedef struct {\r
-  UINT16  LimitLow;\r
-  UINT16  BaseLow;\r
-  UINT8   BaseMid;\r
-  UINT8   Attribute;\r
-  UINT8   LimitHi;\r
-  UINT8   BaseHi;\r
+  UINT16    LimitLow;\r
+  UINT16    BaseLow;\r
+  UINT8     BaseMid;\r
+  UINT8     Attribute;\r
+  UINT8     LimitHi;\r
+  UINT8     BaseHi;\r
 } GDT64;\r
 \r
 //\r
@@ -197,13 +196,13 @@ typedef struct {
 // This data structure must be kept in sync with ASM STRUCT in Thunk.inc\r
 //\r
 typedef struct {\r
-  UINT16  Limit;\r
-  UINT64  Base;\r
+  UINT16    Limit;\r
+  UINT64    Base;\r
 } DESCRIPTOR64;\r
 \r
 typedef struct {\r
-  UINT16  Limit;\r
-  UINT32  Base;\r
+  UINT16    Limit;\r
+  UINT32    Base;\r
 } DESCRIPTOR32;\r
 \r
 //\r
@@ -220,33 +219,33 @@ typedef struct {
   // Space for the code\r
   //  The address of Code is also the beginning of the relocated Thunk code\r
   //\r
-  CHAR8                             Code[4096]; // ?\r
+  CHAR8                                Code[4096]; // ?\r
   //\r
   // The address of the Reverse Thunk code\r
   //  Note that this member CONTAINS the address of the relocated reverse thunk\r
   //  code unlike the member variable 'Code', which IS the address of the Thunk\r
   //  code.\r
   //\r
-  UINT32                            LowReverseThunkStart;\r
+  UINT32                               LowReverseThunkStart;\r
 \r
   //\r
   // Data for the code (cs releative)\r
   //\r
-  DESCRIPTOR32                      GdtDesc;          // Protected mode GDT\r
-  DESCRIPTOR32                      IdtDesc;          // Protected mode IDT\r
-  UINT32                            FlatSs;\r
-  UINT32                            FlatEsp;\r
+  DESCRIPTOR32                         GdtDesc;       // Protected mode GDT\r
+  DESCRIPTOR32                         IdtDesc;       // Protected mode IDT\r
+  UINT32                               FlatSs;\r
+  UINT32                               FlatEsp;\r
 \r
-  UINT32                            LowCodeSelector;  // Low code selector in GDT\r
-  UINT32                            LowDataSelector;  // Low data selector in GDT\r
-  UINT32                            LowStack;\r
-  DESCRIPTOR32                      RealModeIdtDesc;\r
+  UINT32                               LowCodeSelector; // Low code selector in GDT\r
+  UINT32                               LowDataSelector; // Low data selector in GDT\r
+  UINT32                               LowStack;\r
+  DESCRIPTOR32                         RealModeIdtDesc;\r
 \r
   //\r
   // real-mode GDT (temporary GDT with two real mode segment descriptors)\r
   //\r
-  GDT32                             RealModeGdt[NUM_REAL_GDT_ENTRIES];\r
-  DESCRIPTOR32                      RealModeGdtDesc;\r
+  GDT32                                RealModeGdt[NUM_REAL_GDT_ENTRIES];\r
+  DESCRIPTOR32                         RealModeGdtDesc;\r
 \r
   //\r
   // Members specifically for the reverse thunk\r
@@ -254,36 +253,36 @@ typedef struct {
   //  before performing the reverse thunk.  The RevFlat* members must be set\r
   //  before calling the reverse thunk assembly code.\r
   //\r
-  UINT16                            RevRealDs;\r
-  UINT16                            RevRealSs;\r
-  UINT32                            RevRealEsp;\r
-  DESCRIPTOR32                      RevRealIdtDesc;\r
-  UINT16                            RevFlatDataSelector;  // Flat data selector in GDT\r
-  UINT32                            RevFlatStack;\r
+  UINT16                               RevRealDs;\r
+  UINT16                               RevRealSs;\r
+  UINT32                               RevRealEsp;\r
+  DESCRIPTOR32                         RevRealIdtDesc;\r
+  UINT16                               RevFlatDataSelector; // Flat data selector in GDT\r
+  UINT32                               RevFlatStack;\r
 \r
   //\r
   // A low memory stack\r
   //\r
-  CHAR8                             Stack[LOW_STACK_SIZE];\r
+  CHAR8                                Stack[LOW_STACK_SIZE];\r
 \r
   //\r
   // Stack for flat mode after reverse thunk\r
   // @bug    - This may no longer be necessary if the reverse thunk interface\r
   //           is changed to have the flat stack in a different location.\r
   //\r
-  CHAR8                             RevThunkStack[LOW_STACK_SIZE];\r
+  CHAR8                                RevThunkStack[LOW_STACK_SIZE];\r
 \r
   //\r
   // Legacy16 Init memory map info\r
   //\r
-  EFI_TO_COMPATIBILITY16_INIT_TABLE EfiToLegacy16InitTable;\r
+  EFI_TO_COMPATIBILITY16_INIT_TABLE    EfiToLegacy16InitTable;\r
 \r
-  EFI_TO_COMPATIBILITY16_BOOT_TABLE EfiToLegacy16BootTable;\r
+  EFI_TO_COMPATIBILITY16_BOOT_TABLE    EfiToLegacy16BootTable;\r
 \r
-  CHAR8                             InterruptRedirectionCode[32];\r
-  EFI_LEGACY_INSTALL_PCI_HANDLER    PciHandler;\r
-  EFI_DISPATCH_OPROM_TABLE          DispatchOpromTable;\r
-  BBS_TABLE                         BbsTable[MAX_BBS_ENTRIES];\r
+  CHAR8                                InterruptRedirectionCode[32];\r
+  EFI_LEGACY_INSTALL_PCI_HANDLER       PciHandler;\r
+  EFI_DISPATCH_OPROM_TABLE             DispatchOpromTable;\r
+  BBS_TABLE                            BbsTable[MAX_BBS_ENTRIES];\r
 } LOW_MEMORY_THUNK;\r
 \r
 #elif defined (MDE_CPU_X64)\r
@@ -293,42 +292,42 @@ typedef struct {
   // Space for the code\r
   //  The address of Code is also the beginning of the relocated Thunk code\r
   //\r
-  CHAR8                             Code[4096]; // ?\r
+  CHAR8                                Code[4096]; // ?\r
 \r
   //\r
   // Data for the code (cs releative)\r
   //\r
-  DESCRIPTOR64                      X64GdtDesc;          // Protected mode GDT\r
-  DESCRIPTOR64                      X64IdtDesc;          // Protected mode IDT\r
-  UINTN                             X64Ss;\r
-  UINTN                             X64Esp;\r
+  DESCRIPTOR64                         X64GdtDesc;       // Protected mode GDT\r
+  DESCRIPTOR64                         X64IdtDesc;       // Protected mode IDT\r
+  UINTN                                X64Ss;\r
+  UINTN                                X64Esp;\r
 \r
-  UINTN                             RealStack;\r
-  DESCRIPTOR32                      RealModeIdtDesc;\r
-  DESCRIPTOR32                      RealModeGdtDesc;\r
+  UINTN                                RealStack;\r
+  DESCRIPTOR32                         RealModeIdtDesc;\r
+  DESCRIPTOR32                         RealModeGdtDesc;\r
 \r
   //\r
   // real-mode GDT (temporary GDT with two real mode segment descriptors)\r
   //\r
-  GDT64                             RealModeGdt[NUM_REAL_GDT_ENTRIES];\r
-  UINT64                            PageMapLevel4;\r
+  GDT64                                RealModeGdt[NUM_REAL_GDT_ENTRIES];\r
+  UINT64                               PageMapLevel4;\r
 \r
   //\r
   // A low memory stack\r
   //\r
-  CHAR8                             Stack[LOW_STACK_SIZE];\r
+  CHAR8                                Stack[LOW_STACK_SIZE];\r
 \r
   //\r
   // Legacy16 Init memory map info\r
   //\r
-  EFI_TO_COMPATIBILITY16_INIT_TABLE EfiToLegacy16InitTable;\r
+  EFI_TO_COMPATIBILITY16_INIT_TABLE    EfiToLegacy16InitTable;\r
 \r
-  EFI_TO_COMPATIBILITY16_BOOT_TABLE EfiToLegacy16BootTable;\r
+  EFI_TO_COMPATIBILITY16_BOOT_TABLE    EfiToLegacy16BootTable;\r
 \r
-  CHAR8                             InterruptRedirectionCode[32];\r
-  EFI_LEGACY_INSTALL_PCI_HANDLER    PciHandler;\r
-  EFI_DISPATCH_OPROM_TABLE          DispatchOpromTable;\r
-  BBS_TABLE                         BbsTable[MAX_BBS_ENTRIES];\r
+  CHAR8                                InterruptRedirectionCode[32];\r
+  EFI_LEGACY_INSTALL_PCI_HANDLER       PciHandler;\r
+  EFI_DISPATCH_OPROM_TABLE             DispatchOpromTable;\r
+  BBS_TABLE                            BbsTable[MAX_BBS_ENTRIES];\r
 } LOW_MEMORY_THUNK;\r
 \r
 #endif\r
@@ -337,42 +336,42 @@ typedef struct {
 // PnP Expansion Header\r
 //\r
 typedef struct {\r
-  UINT32  PnpSignature;\r
-  UINT8   Revision;\r
-  UINT8   Length;\r
-  UINT16  NextHeader;\r
-  UINT8   Reserved1;\r
-  UINT8   Checksum;\r
-  UINT32  DeviceId;\r
-  UINT16  MfgPointer;\r
-  UINT16  ProductNamePointer;\r
-  UINT8   Class;\r
-  UINT8   SubClass;\r
-  UINT8   Interface;\r
-  UINT8   DeviceIndicators;\r
-  UINT16  Bcv;\r
-  UINT16  DisconnectVector;\r
-  UINT16  Bev;\r
-  UINT16  Reserved2;\r
-  UINT16  StaticResourceVector;\r
+  UINT32    PnpSignature;\r
+  UINT8     Revision;\r
+  UINT8     Length;\r
+  UINT16    NextHeader;\r
+  UINT8     Reserved1;\r
+  UINT8     Checksum;\r
+  UINT32    DeviceId;\r
+  UINT16    MfgPointer;\r
+  UINT16    ProductNamePointer;\r
+  UINT8     Class;\r
+  UINT8     SubClass;\r
+  UINT8     Interface;\r
+  UINT8     DeviceIndicators;\r
+  UINT16    Bcv;\r
+  UINT16    DisconnectVector;\r
+  UINT16    Bev;\r
+  UINT16    Reserved2;\r
+  UINT16    StaticResourceVector;\r
 } LEGACY_PNP_EXPANSION_HEADER;\r
 \r
 typedef struct {\r
-  UINT8   PciSegment;\r
-  UINT8   PciBus;\r
-  UINT8   PciDevice;\r
-  UINT8   PciFunction;\r
-  UINT16  Vid;\r
-  UINT16  Did;\r
-  UINT16  SysSid;\r
-  UINT16  SVid;\r
-  UINT8   Class;\r
-  UINT8   SubClass;\r
-  UINT8   Interface;\r
-  UINT8   Reserved;\r
-  UINTN   RomStart;\r
-  UINTN   ManufacturerString;\r
-  UINTN   ProductNameString;\r
+  UINT8     PciSegment;\r
+  UINT8     PciBus;\r
+  UINT8     PciDevice;\r
+  UINT8     PciFunction;\r
+  UINT16    Vid;\r
+  UINT16    Did;\r
+  UINT16    SysSid;\r
+  UINT16    SVid;\r
+  UINT8     Class;\r
+  UINT8     SubClass;\r
+  UINT8     Interface;\r
+  UINT8     Reserved;\r
+  UINTN     RomStart;\r
+  UINTN     ManufacturerString;\r
+  UINTN     ProductNameString;\r
 } LEGACY_ROM_AND_BBS_TABLE;\r
 \r
 //\r
@@ -382,219 +381,217 @@ typedef struct {
 // This mapping is ignored booting to a legacy OS.\r
 //\r
 typedef struct {\r
-  UINT8 PciSegment;\r
-  UINT8 PciBus;\r
-  UINT8 PciDevice;\r
-  UINT8 PciFunction;\r
-  UINT8 StartDriveNumber;\r
-  UINT8 EndDriveNumber;\r
+  UINT8    PciSegment;\r
+  UINT8    PciBus;\r
+  UINT8    PciDevice;\r
+  UINT8    PciFunction;\r
+  UINT8    StartDriveNumber;\r
+  UINT8    EndDriveNumber;\r
 } LEGACY_EFI_HDD_TABLE;\r
 \r
 //\r
 // This data is passed to Leacy16Boot\r
 //\r
 typedef enum {\r
-  EfiAcpiAddressRangeMemory   = 1,\r
-  EfiAcpiAddressRangeReserved = 2,\r
-  EfiAcpiAddressRangeACPI     = 3,\r
-  EfiAcpiAddressRangeNVS      = 4,\r
+  EfiAcpiAddressRangeMemory       = 1,\r
+  EfiAcpiAddressRangeReserved     = 2,\r
+  EfiAcpiAddressRangeACPI         = 3,\r
+  EfiAcpiAddressRangeNVS          = 4,\r
   EfiAddressRangePersistentMemory = 7\r
 } EFI_ACPI_MEMORY_TYPE;\r
 \r
 typedef struct {\r
-  UINT64                BaseAddr;\r
-  UINT64                Length;\r
-  EFI_ACPI_MEMORY_TYPE  Type;\r
+  UINT64                  BaseAddr;\r
+  UINT64                  Length;\r
+  EFI_ACPI_MEMORY_TYPE    Type;\r
 } EFI_E820_ENTRY64;\r
 \r
 typedef struct {\r
-  UINT32                BassAddrLow;\r
-  UINT32                BaseAddrHigh;\r
-  UINT32                LengthLow;\r
-  UINT32                LengthHigh;\r
-  EFI_ACPI_MEMORY_TYPE  Type;\r
+  UINT32                  BassAddrLow;\r
+  UINT32                  BaseAddrHigh;\r
+  UINT32                  LengthLow;\r
+  UINT32                  LengthHigh;\r
+  EFI_ACPI_MEMORY_TYPE    Type;\r
 } EFI_E820_ENTRY;\r
 \r
 #pragma pack()\r
 \r
-extern BBS_TABLE           *mBbsTable;\r
-\r
-extern EFI_GENERIC_MEMORY_TEST_PROTOCOL *gGenMemoryTest;\r
-\r
-extern BOOLEAN mEndOfDxe;\r
-\r
-#define PORT_70 0x70\r
-#define PORT_71 0x71\r
-\r
-#define CMOS_0A     0x0a  ///< Status register A\r
-#define CMOS_0D     0x0d  ///< Status register D\r
-#define CMOS_0E     0x0e  ///< Diagnostic Status\r
-#define CMOS_0F     0x0f  ///< Shutdown status\r
-#define CMOS_10     0x10  ///< Floppy type\r
-#define CMOS_12     0x12  ///< IDE type\r
-#define CMOS_14     0x14  ///< Same as BDA 40:10\r
-#define CMOS_15     0x15  ///< Low byte of base memory in 1k increments\r
-#define CMOS_16     0x16  ///< High byte of base memory in 1k increments\r
-#define CMOS_17     0x17  ///< Low byte of 1MB+ memory in 1k increments - max 15 MB\r
-#define CMOS_18     0x18  ///< High byte of 1MB+ memory in 1k increments - max 15 MB\r
-#define CMOS_19     0x19  ///< C: extended drive type\r
-#define CMOS_1A     0x1a  ///< D: extended drive type\r
-#define CMOS_2E     0x2e  ///< Most significient byte of standard checksum\r
-#define CMOS_2F     0x2f  ///< Least significient byte of standard checksum\r
-#define CMOS_30     0x30  ///< CMOS 0x17\r
-#define CMOS_31     0x31  ///< CMOS 0x18\r
-#define CMOS_32     0x32  ///< Century byte\r
+extern BBS_TABLE  *mBbsTable;\r
+\r
+extern EFI_GENERIC_MEMORY_TEST_PROTOCOL  *gGenMemoryTest;\r
+\r
+extern BOOLEAN  mEndOfDxe;\r
+\r
+#define PORT_70  0x70\r
+#define PORT_71  0x71\r
+\r
+#define CMOS_0A  0x0a     ///< Status register A\r
+#define CMOS_0D  0x0d     ///< Status register D\r
+#define CMOS_0E  0x0e     ///< Diagnostic Status\r
+#define CMOS_0F  0x0f     ///< Shutdown status\r
+#define CMOS_10  0x10     ///< Floppy type\r
+#define CMOS_12  0x12     ///< IDE type\r
+#define CMOS_14  0x14     ///< Same as BDA 40:10\r
+#define CMOS_15  0x15     ///< Low byte of base memory in 1k increments\r
+#define CMOS_16  0x16     ///< High byte of base memory in 1k increments\r
+#define CMOS_17  0x17     ///< Low byte of 1MB+ memory in 1k increments - max 15 MB\r
+#define CMOS_18  0x18     ///< High byte of 1MB+ memory in 1k increments - max 15 MB\r
+#define CMOS_19  0x19     ///< C: extended drive type\r
+#define CMOS_1A  0x1a     ///< D: extended drive type\r
+#define CMOS_2E  0x2e     ///< Most significient byte of standard checksum\r
+#define CMOS_2F  0x2f     ///< Least significient byte of standard checksum\r
+#define CMOS_30  0x30     ///< CMOS 0x17\r
+#define CMOS_31  0x31     ///< CMOS 0x18\r
+#define CMOS_32  0x32     ///< Century byte\r
 \r
 //\r
 // 8254 Timer registers\r
 //\r
-#define TIMER0_COUNT_PORT                         0x40\r
-#define TIMER1_COUNT_PORT                         0x41\r
-#define TIMER2_COUNT_PORT                         0x42\r
-#define TIMER_CONTROL_PORT                        0x43\r
+#define TIMER0_COUNT_PORT   0x40\r
+#define TIMER1_COUNT_PORT   0x41\r
+#define TIMER2_COUNT_PORT   0x42\r
+#define TIMER_CONTROL_PORT  0x43\r
 \r
 //\r
 // Timer 0, Read/Write LSB then MSB, Square wave output, binary count use.\r
 //\r
-#define TIMER0_CONTROL_WORD         0x36\r
+#define TIMER0_CONTROL_WORD  0x36\r
 \r
 #define LEGACY_BIOS_INSTANCE_SIGNATURE  SIGNATURE_32 ('L', 'B', 'I', 'T')\r
 typedef struct {\r
-  UINTN                             Signature;\r
+  UINTN                                Signature;\r
 \r
-  EFI_HANDLE                        Handle;\r
-  EFI_LEGACY_BIOS_PROTOCOL          LegacyBios;\r
+  EFI_HANDLE                           Handle;\r
+  EFI_LEGACY_BIOS_PROTOCOL             LegacyBios;\r
 \r
-  EFI_HANDLE                        ImageHandle;\r
+  EFI_HANDLE                           ImageHandle;\r
 \r
   //\r
   // CPU Architectural Protocol\r
   //\r
-  EFI_CPU_ARCH_PROTOCOL             *Cpu;\r
+  EFI_CPU_ARCH_PROTOCOL                *Cpu;\r
 \r
   //\r
   // Timer Architectural Protocol\r
   //\r
-  EFI_TIMER_ARCH_PROTOCOL           *Timer;\r
-  BOOLEAN                           TimerUses8254;\r
+  EFI_TIMER_ARCH_PROTOCOL              *Timer;\r
+  BOOLEAN                              TimerUses8254;\r
 \r
   //\r
   // Protocol to Lock and Unlock 0xc0000 - 0xfffff\r
   //\r
-  EFI_LEGACY_REGION2_PROTOCOL       *LegacyRegion;\r
+  EFI_LEGACY_REGION2_PROTOCOL          *LegacyRegion;\r
 \r
-  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL *LegacyBiosPlatform;\r
+  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL    *LegacyBiosPlatform;\r
 \r
   //\r
   // Interrupt control for thunk and PCI IRQ\r
   //\r
-  EFI_LEGACY_8259_PROTOCOL          *Legacy8259;\r
+  EFI_LEGACY_8259_PROTOCOL             *Legacy8259;\r
 \r
   //\r
   // PCI Interrupt PIRQ control\r
   //\r
-  EFI_LEGACY_INTERRUPT_PROTOCOL     *LegacyInterrupt;\r
+  EFI_LEGACY_INTERRUPT_PROTOCOL        *LegacyInterrupt;\r
 \r
   //\r
   // Generic Memory Test\r
   //\r
-  EFI_GENERIC_MEMORY_TEST_PROTOCOL  *GenericMemoryTest;\r
+  EFI_GENERIC_MEMORY_TEST_PROTOCOL     *GenericMemoryTest;\r
 \r
   //\r
   // TRUE if PCI Interrupt Line registers have been programmed.\r
   //\r
-  BOOLEAN                           PciInterruptLine;\r
+  BOOLEAN                              PciInterruptLine;\r
 \r
   //\r
   // Code space below 1MB needed by thunker to transition to real mode.\r
   // Contains stack and real mode code fragments\r
   //\r
-  LOW_MEMORY_THUNK                  *IntThunk;\r
+  LOW_MEMORY_THUNK                     *IntThunk;\r
 \r
   //\r
   // Starting shadow address of the Legacy BIOS\r
   //\r
-  UINT32                            BiosStart;\r
-  UINT32                            LegacyBiosImageSize;\r
+  UINT32                               BiosStart;\r
+  UINT32                               LegacyBiosImageSize;\r
 \r
   //\r
   // Start of variables used by CsmItp.mac ITP macro file and/os LegacyBios\r
   //\r
-  UINT8                             Dump[4];\r
+  UINT8                                Dump[4];\r
 \r
   //\r
   // $EFI Legacy16 code entry info in memory < 1 MB;\r
   //\r
-  EFI_COMPATIBILITY16_TABLE         *Legacy16Table;\r
-  VOID                              *Legacy16InitPtr;\r
-  VOID                              *Legacy16BootPtr;\r
-  VOID                              *InternalIrqRoutingTable;\r
-  UINT32                            NumberIrqRoutingEntries;\r
-  VOID                              *BbsTablePtr;\r
-  VOID                              *HddTablePtr;\r
-  UINT32                            NumberHddControllers;\r
+  EFI_COMPATIBILITY16_TABLE            *Legacy16Table;\r
+  VOID                                 *Legacy16InitPtr;\r
+  VOID                                 *Legacy16BootPtr;\r
+  VOID                                 *InternalIrqRoutingTable;\r
+  UINT32                               NumberIrqRoutingEntries;\r
+  VOID                                 *BbsTablePtr;\r
+  VOID                                 *HddTablePtr;\r
+  UINT32                               NumberHddControllers;\r
 \r
   //\r
   // Cached copy of Legacy16 entry point\r
   //\r
-  UINT16                            Legacy16CallSegment;\r
-  UINT16                            Legacy16CallOffset;\r
+  UINT16                               Legacy16CallSegment;\r
+  UINT16                               Legacy16CallOffset;\r
 \r
   //\r
   // Returned from $EFI and passed in to OPROMS\r
   //\r
-  UINT16                            PnPInstallationCheckSegment;\r
-  UINT16                            PnPInstallationCheckOffset;\r
+  UINT16                               PnPInstallationCheckSegment;\r
+  UINT16                               PnPInstallationCheckOffset;\r
 \r
   //\r
   // E820 table\r
   //\r
-  EFI_E820_ENTRY                    E820Table[EFI_MAX_E820_ENTRY];\r
-  UINT32                            NumberE820Entries;\r
+  EFI_E820_ENTRY                       E820Table[EFI_MAX_E820_ENTRY];\r
+  UINT32                               NumberE820Entries;\r
 \r
   //\r
   // True if legacy VGA INT 10h handler installed\r
   //\r
-  BOOLEAN                           VgaInstalled;\r
+  BOOLEAN                              VgaInstalled;\r
 \r
   //\r
   // Number of IDE drives\r
   //\r
-  UINT8                             IdeDriveCount;\r
+  UINT8                                IdeDriveCount;\r
 \r
   //\r
   // Current Free Option ROM space. An option ROM must NOT go past\r
   // BiosStart.\r
   //\r
-  UINT32                            OptionRom;\r
+  UINT32                               OptionRom;\r
 \r
   //\r
   // Save Legacy16 unexpected interrupt vector. Reprogram INT 68-6F from\r
   // EFI values to legacy value just before boot.\r
   //\r
-  UINT32                            BiosUnexpectedInt;\r
-  UINT32                            ThunkSavedInt[8];\r
-  UINT16                            ThunkSeg;\r
-  LEGACY_EFI_HDD_TABLE              *LegacyEfiHddTable;\r
-  UINT16                            LegacyEfiHddTableIndex;\r
-  UINT8                             DiskEnd;\r
-  UINT8                             Disk4075;\r
-  UINT16                            TraceIndex;\r
-  UINT16                            Trace[0x200];\r
+  UINT32                               BiosUnexpectedInt;\r
+  UINT32                               ThunkSavedInt[8];\r
+  UINT16                               ThunkSeg;\r
+  LEGACY_EFI_HDD_TABLE                 *LegacyEfiHddTable;\r
+  UINT16                               LegacyEfiHddTableIndex;\r
+  UINT8                                DiskEnd;\r
+  UINT8                                Disk4075;\r
+  UINT16                               TraceIndex;\r
+  UINT16                               Trace[0x200];\r
 \r
   //\r
   // Indicate that whether GenericLegacyBoot is entered or not\r
   //\r
-  BOOLEAN                           LegacyBootEntered;\r
+  BOOLEAN                              LegacyBootEntered;\r
 \r
   //\r
   // CSM16 PCI Interface Version\r
   //\r
-  UINT16                            Csm16PciInterfaceVersion;\r
-\r
+  UINT16                               Csm16PciInterfaceVersion;\r
 } LEGACY_BIOS_INSTANCE;\r
 \r
-\r
 #pragma pack(1)\r
 \r
 /*\r
@@ -636,41 +633,41 @@ typedef struct {
   40:98-101 skip\r
 */\r
 typedef struct {\r
-  UINT16  Com1;\r
-  UINT16  Com2;\r
-  UINT16  Com3;\r
-  UINT16  Com4;\r
-  UINT16  Lpt1;\r
-  UINT16  Lpt2;\r
-  UINT16  Lpt3;\r
-  UINT16  Ebda;\r
-  UINT16  MachineConfig;\r
-  UINT8   Bda12;\r
-  UINT16  MemSize;\r
-  UINT8   Bda15_16[0x02];\r
-  UINT8   ShiftStatus;\r
-  UINT8   Bda18_19[0x02];\r
-  UINT16  KeyHead;\r
-  UINT16  KeyTail;\r
-  UINT16  Bda1E_3D[0x10];\r
-  UINT16  FloppyData;\r
-  UINT8   FloppyTimeout;\r
-  UINT8   Bda41_74[0x34];\r
-  UINT8   NumberOfDrives;\r
-  UINT8   Bda76_77[0x02];\r
-  UINT16  Lpt1_2Timeout;\r
-  UINT16  Lpt3_4Timeout;\r
-  UINT16  Com1_2Timeout;\r
-  UINT16  Com3_4Timeout;\r
-  UINT16  KeyStart;\r
-  UINT16  KeyEnd;\r
-  UINT8   Bda84_87[0x4];\r
-  UINT8   DataXmit;\r
-  UINT8   Bda89_8F[0x07];\r
-  UINT8   FloppyXRate;\r
-  UINT8   Bda91_95[0x05];\r
-  UINT8   KeyboardStatus;\r
-  UINT8   LedStatus;\r
+  UINT16    Com1;\r
+  UINT16    Com2;\r
+  UINT16    Com3;\r
+  UINT16    Com4;\r
+  UINT16    Lpt1;\r
+  UINT16    Lpt2;\r
+  UINT16    Lpt3;\r
+  UINT16    Ebda;\r
+  UINT16    MachineConfig;\r
+  UINT8     Bda12;\r
+  UINT16    MemSize;\r
+  UINT8     Bda15_16[0x02];\r
+  UINT8     ShiftStatus;\r
+  UINT8     Bda18_19[0x02];\r
+  UINT16    KeyHead;\r
+  UINT16    KeyTail;\r
+  UINT16    Bda1E_3D[0x10];\r
+  UINT16    FloppyData;\r
+  UINT8     FloppyTimeout;\r
+  UINT8     Bda41_74[0x34];\r
+  UINT8     NumberOfDrives;\r
+  UINT8     Bda76_77[0x02];\r
+  UINT16    Lpt1_2Timeout;\r
+  UINT16    Lpt3_4Timeout;\r
+  UINT16    Com1_2Timeout;\r
+  UINT16    Com3_4Timeout;\r
+  UINT16    KeyStart;\r
+  UINT16    KeyEnd;\r
+  UINT8     Bda84_87[0x4];\r
+  UINT8     DataXmit;\r
+  UINT8     Bda89_8F[0x07];\r
+  UINT8     FloppyXRate;\r
+  UINT8     Bda91_95[0x05];\r
+  UINT8     KeyboardStatus;\r
+  UINT8     LedStatus;\r
 } BDA_STRUC;\r
 #pragma pack()\r
 \r
@@ -694,12 +691,11 @@ typedef struct {
 BOOLEAN\r
 EFIAPI\r
 LegacyBiosInt86 (\r
-  IN  EFI_LEGACY_BIOS_PROTOCOL          *This,\r
-  IN  UINT8                             BiosInt,\r
-  IN  EFI_IA32_REGISTER_SET             *Regs\r
+  IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  UINT8                     BiosInt,\r
+  IN  EFI_IA32_REGISTER_SET     *Regs\r
   );\r
 \r
-\r
 /**\r
   Thunk to 16-bit real mode and call Segment:Offset. Regs will contain the\r
   16-bit register context on entry and exit. Arguments can be passed on\r
@@ -721,15 +717,14 @@ LegacyBiosInt86 (
 BOOLEAN\r
 EFIAPI\r
 LegacyBiosFarCall86 (\r
-  IN  EFI_LEGACY_BIOS_PROTOCOL          *This,\r
-  IN  UINT16                            Segment,\r
-  IN  UINT16                            Offset,\r
-  IN  EFI_IA32_REGISTER_SET             *Regs,\r
-  IN  VOID                              *Stack,\r
-  IN  UINTN                             StackSize\r
+  IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  UINT16                    Segment,\r
+  IN  UINT16                    Offset,\r
+  IN  EFI_IA32_REGISTER_SET     *Regs,\r
+  IN  VOID                      *Stack,\r
+  IN  UINTN                     StackSize\r
   );\r
 \r
-\r
 /**\r
   Test to see if a legacy PCI ROM exists for this device. Optionally return\r
   the Legacy ROM instance for this PCI device.\r
@@ -748,14 +743,13 @@ LegacyBiosFarCall86 (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosCheckPciRom (\r
-  IN  EFI_LEGACY_BIOS_PROTOCOL          *This,\r
-  IN  EFI_HANDLE                        PciHandle,\r
-  OUT VOID                              **RomImage  OPTIONAL,\r
-  OUT UINTN                             *RomSize  OPTIONAL,\r
-  OUT UINTN                             *Flags\r
+  IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                PciHandle,\r
+  OUT VOID                      **RomImage  OPTIONAL,\r
+  OUT UINTN                     *RomSize  OPTIONAL,\r
+  OUT UINTN                     *Flags\r
   );\r
 \r
-\r
 /**\r
   Assign drive number to legacy HDD drives prior to booting an EFI\r
   aware OS so the OS can access drives without an EFI driver.\r
@@ -772,12 +766,11 @@ LegacyBiosCheckPciRom (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosPrepareToBootEfi (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL         *This,\r
-  OUT UINT16                          *BbsCount,\r
-  OUT BBS_TABLE                       **BbsTable\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  OUT UINT16                   *BbsCount,\r
+  OUT BBS_TABLE                **BbsTable\r
   );\r
 \r
-\r
 /**\r
   To boot from an unconventional device like parties and/or execute\r
   HDD diagnostics.\r
@@ -796,14 +789,13 @@ LegacyBiosPrepareToBootEfi (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosBootUnconventionalDevice (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL         *This,\r
-  IN UDC_ATTRIBUTES                   Attributes,\r
-  IN UINTN                            BbsEntry,\r
-  IN VOID                             *BeerData,\r
-  IN VOID                             *ServiceAreaData\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN UDC_ATTRIBUTES            Attributes,\r
+  IN UINTN                     BbsEntry,\r
+  IN VOID                      *BeerData,\r
+  IN VOID                      *ServiceAreaData\r
   );\r
 \r
-\r
 /**\r
   Load a legacy PC-AT OPROM on the PciHandle device. Return information\r
   about how many disks were added by the OPROM and the shadow address and\r
@@ -834,17 +826,16 @@ LegacyBiosBootUnconventionalDevice (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosInstallPciRom (\r
-  IN  EFI_LEGACY_BIOS_PROTOCOL          * This,\r
-  IN  EFI_HANDLE                        PciHandle,\r
-  IN  VOID                              **RomImage,\r
-  OUT UINTN                             *Flags,\r
-  OUT UINT8                             *DiskStart  OPTIONAL,\r
-  OUT UINT8                             *DiskEnd  OPTIONAL,\r
-  OUT VOID                              **RomShadowAddress  OPTIONAL,\r
-  OUT UINT32                            *RomShadowedSize OPTIONAL\r
+  IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                PciHandle,\r
+  IN  VOID                      **RomImage,\r
+  OUT UINTN                     *Flags,\r
+  OUT UINT8                     *DiskStart  OPTIONAL,\r
+  OUT UINT8                     *DiskEnd  OPTIONAL,\r
+  OUT VOID                      **RomShadowAddress  OPTIONAL,\r
+  OUT UINT32                    *RomShadowedSize OPTIONAL\r
   );\r
 \r
-\r
 /**\r
   Fill in the standard BDA for Keyboard LEDs\r
 \r
@@ -857,11 +848,10 @@ LegacyBiosInstallPciRom (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosUpdateKeyboardLedStatus (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL           *This,\r
-  IN UINT8                              Leds\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN UINT8                     Leds\r
   );\r
 \r
-\r
 /**\r
   Get all BBS info\r
 \r
@@ -879,14 +869,13 @@ LegacyBiosUpdateKeyboardLedStatus (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosGetBbsInfo (\r
-  IN  EFI_LEGACY_BIOS_PROTOCOL          *This,\r
-  OUT UINT16                            *HddCount,\r
-  OUT HDD_INFO                          **HddInfo,\r
-  OUT UINT16                            *BbsCount,\r
-  OUT BBS_TABLE                         **BbsTable\r
+  IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  OUT UINT16                    *HddCount,\r
+  OUT HDD_INFO                  **HddInfo,\r
+  OUT UINT16                    *BbsCount,\r
+  OUT BBS_TABLE                 **BbsTable\r
   );\r
 \r
-\r
 /**\r
   Shadow all legacy16 OPROMs that haven't been shadowed.\r
   Warning: Use this with caution. This routine disconnects all EFI\r
@@ -901,10 +890,9 @@ LegacyBiosGetBbsInfo (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosShadowAllLegacyOproms (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL   *This\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This\r
   );\r
 \r
-\r
 /**\r
   Attempt to legacy boot the BootOption. If the EFI contexted has been\r
   compromised this function will not return.\r
@@ -920,13 +908,12 @@ LegacyBiosShadowAllLegacyOproms (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosLegacyBoot (\r
-  IN  EFI_LEGACY_BIOS_PROTOCOL          *This,\r
-  IN  BBS_BBS_DEVICE_PATH               *BbsDevicePath,\r
-  IN  UINT32                            LoadOptionsSize,\r
-  IN  VOID                              *LoadOptions\r
+  IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  BBS_BBS_DEVICE_PATH       *BbsDevicePath,\r
+  IN  UINT32                    LoadOptionsSize,\r
+  IN  VOID                      *LoadOptions\r
   );\r
 \r
-\r
 /**\r
   Allocate memory < 1 MB and copy the thunker code into low memory. Se up\r
   all the descriptors.\r
@@ -938,10 +925,9 @@ LegacyBiosLegacyBoot (
 **/\r
 EFI_STATUS\r
 LegacyBiosInitializeThunk (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
-\r
 /**\r
   Fill in the standard BDA and EBDA stuff before Legacy16 load\r
 \r
@@ -952,10 +938,9 @@ LegacyBiosInitializeThunk (
 **/\r
 EFI_STATUS\r
 LegacyBiosInitBda (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
-\r
 /**\r
   Collect IDE Inquiry data from the IDE disks\r
 \r
@@ -968,12 +953,11 @@ LegacyBiosInitBda (
 **/\r
 EFI_STATUS\r
 LegacyBiosBuildIdeData (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private,\r
-  IN  HDD_INFO                  **HddInfo,\r
-  IN  UINT16                    Flag\r
+  IN  LEGACY_BIOS_INSTANCE  *Private,\r
+  IN  HDD_INFO              **HddInfo,\r
+  IN  UINT16                Flag\r
   );\r
 \r
-\r
 /**\r
   Enable ide controller.  This gets disabled when LegacyBoot.c is about\r
   to run the Option ROMs.\r
@@ -984,10 +968,9 @@ LegacyBiosBuildIdeData (
 **/\r
 VOID\r
 EnableIdeController (\r
-  IN LEGACY_BIOS_INSTANCE       *Private\r
+  IN LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
-\r
 /**\r
   If the IDE channel is in compatibility (legacy) mode, remove all\r
   PCI I/O BAR addresses from the controller.\r
@@ -998,10 +981,9 @@ EnableIdeController (
 **/\r
 VOID\r
 InitLegacyIdeController (\r
-  IN EFI_HANDLE                 IdeController\r
+  IN EFI_HANDLE  IdeController\r
   );\r
 \r
-\r
 /**\r
   Program the interrupt routing register in all the PCI devices. On a PC AT system\r
   this register contains the 8259 IRQ vector that matches its PCI interrupt.\r
@@ -1014,10 +996,9 @@ InitLegacyIdeController (
 **/\r
 EFI_STATUS\r
 PciProgramAllInterruptLineRegisters (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
-\r
 /**\r
   Collect EFI Info about legacy devices.\r
 \r
@@ -1028,10 +1009,9 @@ PciProgramAllInterruptLineRegisters (
 **/\r
 EFI_STATUS\r
 LegacyBiosBuildSioData (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
-\r
 /**\r
   Shadow all the PCI legacy ROMs. Use data from the Legacy BIOS Protocol\r
   to chose the order. Skip any devices that have already have legacy\r
@@ -1045,10 +1025,9 @@ LegacyBiosBuildSioData (
 **/\r
 EFI_STATUS\r
 PciShadowRoms (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
-\r
 /**\r
   Fill in the standard BDA and EBDA stuff prior to legacy Boot\r
 \r
@@ -1059,10 +1038,9 @@ PciShadowRoms (
 **/\r
 EFI_STATUS\r
 LegacyBiosCompleteBdaBeforeBoot (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
-\r
 /**\r
   Fill in the standard CMOS stuff before Legacy16 load\r
 \r
@@ -1073,10 +1051,9 @@ LegacyBiosCompleteBdaBeforeBoot (
 **/\r
 EFI_STATUS\r
 LegacyBiosInitCmos (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
-\r
 /**\r
   Fill in the standard CMOS stuff prior to legacy Boot\r
 \r
@@ -1087,10 +1064,9 @@ LegacyBiosInitCmos (
 **/\r
 EFI_STATUS\r
 LegacyBiosCompleteStandardCmosBeforeBoot (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
-\r
 /**\r
   Contains the code that is copied into low memory (below 640K).\r
   This code reflects interrupts 0x68-0x6f to interrupts 0x08-0x0f.\r
@@ -1105,7 +1081,6 @@ InterruptRedirectionTemplate (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Build the E820 table.\r
 \r
@@ -1117,8 +1092,8 @@ InterruptRedirectionTemplate (
 **/\r
 EFI_STATUS\r
 LegacyBiosBuildE820 (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private,\r
-  OUT UINTN                   *Size\r
+  IN  LEGACY_BIOS_INSTANCE  *Private,\r
+  OUT UINTN                 *Size\r
   );\r
 \r
 /**\r
@@ -1129,7 +1104,7 @@ LegacyBiosBuildE820 (
 **/\r
 VOID\r
 ShutdownAPs (\r
-  IN LEGACY_BIOS_INSTANCE              *Private\r
+  IN LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
 /**\r
@@ -1141,7 +1116,7 @@ ShutdownAPs (
 **/\r
 VOID\r
 GetRegisters (\r
-  LOW_MEMORY_THUNK    *IntThunk\r
+  LOW_MEMORY_THUNK  *IntThunk\r
   );\r
 \r
 /**\r
@@ -1156,9 +1131,9 @@ GetRegisters (
 **/\r
 UINTN\r
 CallRealThunkCode (\r
-  UINT8               *RealCode,\r
-  UINT8               BiosInt,\r
-  UINT32              CallAddress\r
+  UINT8   *RealCode,\r
+  UINT8   BiosInt,\r
+  UINT32  CallAddress\r
   );\r
 \r
 /**\r
@@ -1169,7 +1144,7 @@ CallRealThunkCode (
 **/\r
 VOID\r
 GenerateSoftInit (\r
-  UINT8               Vector\r
+  UINT8  Vector\r
   );\r
 \r
 /**\r
@@ -1187,11 +1162,11 @@ GenerateSoftInit (
 **/\r
 EFI_STATUS\r
 AllocateLegacyMemory (\r
-  IN  EFI_ALLOCATE_TYPE         AllocateType,\r
-  IN  EFI_MEMORY_TYPE           MemoryType,\r
-  IN  EFI_PHYSICAL_ADDRESS      StartPageAddress,\r
-  IN  UINTN                     Pages,\r
-  OUT EFI_PHYSICAL_ADDRESS      *Result\r
+  IN  EFI_ALLOCATE_TYPE     AllocateType,\r
+  IN  EFI_MEMORY_TYPE       MemoryType,\r
+  IN  EFI_PHYSICAL_ADDRESS  StartPageAddress,\r
+  IN  UINTN                 Pages,\r
+  OUT EFI_PHYSICAL_ADDRESS  *Result\r
   );\r
 \r
 /**\r
@@ -1214,11 +1189,11 @@ AllocateLegacyMemory (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosGetLegacyRegion (\r
-  IN    EFI_LEGACY_BIOS_PROTOCOL *This,\r
-  IN    UINTN                    LegacyMemorySize,\r
-  IN    UINTN                    Region,\r
-  IN    UINTN                    Alignment,\r
-  OUT   VOID                     **LegacyMemoryAddress\r
+  IN    EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN    UINTN                     LegacyMemorySize,\r
+  IN    UINTN                     Region,\r
+  IN    UINTN                     Alignment,\r
+  OUT   VOID                      **LegacyMemoryAddress\r
   );\r
 \r
 /**\r
@@ -1238,10 +1213,10 @@ LegacyBiosGetLegacyRegion (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosCopyLegacyRegion (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL *This,\r
-  IN    UINTN                 LegacyMemorySize,\r
-  IN    VOID                  *LegacyMemoryAddress,\r
-  IN    VOID                  *LegacyMemorySourceAddress\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN    UINTN                  LegacyMemorySize,\r
+  IN    VOID                   *LegacyMemoryAddress,\r
+  IN    VOID                   *LegacyMemorySourceAddress\r
   );\r
 \r
 /**\r
@@ -1295,8 +1270,8 @@ HasMediaInFloppy (
 **/\r
 EFI_STATUS\r
 CalculateIdentifyDriveChecksum (\r
-  IN  UINT8     *IdentifyDriveData,\r
-  OUT UINT8     *Checksum\r
+  IN  UINT8  *IdentifyDriveData,\r
+  OUT UINT8  *Checksum\r
   );\r
 \r
 /**\r
@@ -1307,7 +1282,7 @@ CalculateIdentifyDriveChecksum (
 **/\r
 VOID\r
 UpdateIdentifyDriveData (\r
-  IN  UINT8     *IdentifyDriveData\r
+  IN  UINT8  *IdentifyDriveData\r
   );\r
 \r
 /**\r
@@ -1321,8 +1296,8 @@ UpdateIdentifyDriveData (
 **/\r
 EFI_STATUS\r
 LegacyBiosBuildBbs (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private,\r
-  IN  BBS_TABLE                 *BbsTable\r
+  IN  LEGACY_BIOS_INSTANCE  *Private,\r
+  IN  BBS_TABLE             *BbsTable\r
   );\r
 \r
 /**\r
@@ -1386,14 +1361,14 @@ LegacyCalculateWriteStandardCmosChecksum (
 **/\r
 EFI_STATUS\r
 LegacyBiosCheckPciRomEx (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL           *This,\r
-  IN  EFI_HANDLE                        PciHandle,\r
-  OUT VOID                              **RomImage  OPTIONAL,\r
-  OUT UINTN                             *RomSize  OPTIONAL,\r
-  OUT UINTN                             *RuntimeImageLength  OPTIONAL,\r
-  OUT UINTN                             *Flags  OPTIONAL,\r
-  OUT UINT8                             *OpromRevision  OPTIONAL,\r
-  OUT VOID                              **ConfigUtilityCodeHeader OPTIONAL\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  EFI_HANDLE               PciHandle,\r
+  OUT VOID                     **RomImage  OPTIONAL,\r
+  OUT UINTN                    *RomSize  OPTIONAL,\r
+  OUT UINTN                    *RuntimeImageLength  OPTIONAL,\r
+  OUT UINTN                    *Flags  OPTIONAL,\r
+  OUT UINT8                    *OpromRevision  OPTIONAL,\r
+  OUT VOID                     **ConfigUtilityCodeHeader OPTIONAL\r
   );\r
 \r
 /**\r
@@ -1408,8 +1383,8 @@ LegacyBiosCheckPciRomEx (
 **/\r
 EFI_STATUS\r
 RelocateImageUnder4GIfNeeded (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   );\r
 \r
 /**\r
@@ -1433,12 +1408,12 @@ RelocateImageUnder4GIfNeeded (
 BOOLEAN\r
 EFIAPI\r
 InternalLegacyBiosFarCall (\r
-  IN  EFI_LEGACY_BIOS_PROTOCOL        *This,\r
-  IN  UINT16                          Segment,\r
-  IN  UINT16                          Offset,\r
-  IN  EFI_IA32_REGISTER_SET           *Regs,\r
-  IN  VOID                            *Stack,\r
-  IN  UINTN                           StackSize\r
+  IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  UINT16                    Segment,\r
+  IN  UINT16                    Offset,\r
+  IN  EFI_IA32_REGISTER_SET     *Regs,\r
+  IN  VOID                      *Stack,\r
+  IN  UINTN                     StackSize\r
   );\r
 \r
 /**\r
@@ -1454,7 +1429,7 @@ InternalLegacyBiosFarCall (
 **/\r
 EFI_STATUS\r
 LegacyBiosInstallVgaRom (\r
-  IN  LEGACY_BIOS_INSTANCE            *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   );\r
 \r
 #endif\r
index 9a09d7230777be36f9c873c48d736375216a0514..83d94cf2892b865aaae4e7e351577c3236417214 100644 (file)
@@ -13,18 +13,18 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define BOOT_EFI_OS                 1\r
 #define BOOT_UNCONVENTIONAL_DEVICE  2\r
 \r
-UINT32              mLoadOptionsSize    = 0;\r
-UINTN               mBootMode           = BOOT_LEGACY_OS;\r
-VOID                *mLoadOptions       = NULL;\r
-BBS_BBS_DEVICE_PATH *mBbsDevicePathPtr  = NULL;\r
-BBS_BBS_DEVICE_PATH mBbsDevicePathNode;\r
-UDC_ATTRIBUTES      mAttributes         = { 0, 0, 0, 0 };\r
-UINTN               mBbsEntry           = 0;\r
-VOID                *mBeerData          = NULL;\r
-VOID                *mServiceAreaData   = NULL;\r
-UINT64              mLowWater           = 0xffffffffffffffffULL;\r
-\r
-extern BBS_TABLE           *mBbsTable;\r
+UINT32               mLoadOptionsSize   = 0;\r
+UINTN                mBootMode          = BOOT_LEGACY_OS;\r
+VOID                 *mLoadOptions      = NULL;\r
+BBS_BBS_DEVICE_PATH  *mBbsDevicePathPtr = NULL;\r
+BBS_BBS_DEVICE_PATH  mBbsDevicePathNode;\r
+UDC_ATTRIBUTES       mAttributes       = { 0, 0, 0, 0 };\r
+UINTN                mBbsEntry         = 0;\r
+VOID                 *mBeerData        = NULL;\r
+VOID                 *mServiceAreaData = NULL;\r
+UINT64               mLowWater         = 0xffffffffffffffffULL;\r
+\r
+extern BBS_TABLE  *mBbsTable;\r
 \r
 extern VOID                  *mRuntimeSmbiosEntryPoint;\r
 extern EFI_PHYSICAL_ADDRESS  mReserveSmbiosEntryPoint;\r
@@ -39,12 +39,12 @@ extern EFI_PHYSICAL_ADDRESS  mStructureTableAddress;
 **/\r
 VOID\r
 PrintBbsTable (\r
-  IN BBS_TABLE *BbsTable\r
+  IN BBS_TABLE  *BbsTable\r
   )\r
 {\r
-  UINT16 Index;\r
-  UINT16 SubIndex;\r
-  CHAR8  *String;\r
+  UINT16  Index;\r
+  UINT16  SubIndex;\r
+  CHAR8   *String;\r
 \r
   DEBUG ((DEBUG_INFO, "\n"));\r
   DEBUG ((DEBUG_INFO, " NO  Prio bb/dd/ff cl/sc Type Stat segm:offs mfgs:mfgo dess:deso\n"));\r
@@ -60,25 +60,25 @@ PrintBbsTable (
     DEBUG ((\r
       DEBUG_INFO,\r
       " %02x: %04x %02x/%02x/%02x %02x/%02x %04x %04x",\r
-      (UINTN) Index,\r
-      (UINTN) BbsTable[Index].BootPriority,\r
-      (UINTN) BbsTable[Index].Bus,\r
-      (UINTN) BbsTable[Index].Device,\r
-      (UINTN) BbsTable[Index].Function,\r
-      (UINTN) BbsTable[Index].Class,\r
-      (UINTN) BbsTable[Index].SubClass,\r
-      (UINTN) BbsTable[Index].DeviceType,\r
-      (UINTN) * (UINT16 *) &BbsTable[Index].StatusFlags\r
+      (UINTN)Index,\r
+      (UINTN)BbsTable[Index].BootPriority,\r
+      (UINTN)BbsTable[Index].Bus,\r
+      (UINTN)BbsTable[Index].Device,\r
+      (UINTN)BbsTable[Index].Function,\r
+      (UINTN)BbsTable[Index].Class,\r
+      (UINTN)BbsTable[Index].SubClass,\r
+      (UINTN)BbsTable[Index].DeviceType,\r
+      (UINTN)*(UINT16 *)&BbsTable[Index].StatusFlags\r
       ));\r
     DEBUG ((\r
       DEBUG_INFO,\r
       " %04x:%04x %04x:%04x %04x:%04x",\r
-      (UINTN) BbsTable[Index].BootHandlerSegment,\r
-      (UINTN) BbsTable[Index].BootHandlerOffset,\r
-      (UINTN) BbsTable[Index].MfgStringSegment,\r
-      (UINTN) BbsTable[Index].MfgStringOffset,\r
-      (UINTN) BbsTable[Index].DescStringSegment,\r
-      (UINTN) BbsTable[Index].DescStringOffset\r
+      (UINTN)BbsTable[Index].BootHandlerSegment,\r
+      (UINTN)BbsTable[Index].BootHandlerOffset,\r
+      (UINTN)BbsTable[Index].MfgStringSegment,\r
+      (UINTN)BbsTable[Index].MfgStringOffset,\r
+      (UINTN)BbsTable[Index].DescStringSegment,\r
+      (UINTN)BbsTable[Index].DescStringOffset\r
       ));\r
 \r
     //\r
@@ -86,18 +86,20 @@ PrintBbsTable (
     //\r
     String = (CHAR8 *)(((UINTN)BbsTable[Index].DescStringSegment << 4) + BbsTable[Index].DescStringOffset);\r
     if (String != NULL) {\r
-      DEBUG ((DEBUG_INFO," ("));\r
+      DEBUG ((DEBUG_INFO, " ("));\r
       for (SubIndex = 0; String[SubIndex] != 0; SubIndex++) {\r
         DEBUG ((DEBUG_INFO, "%c", String[SubIndex]));\r
       }\r
-      DEBUG ((DEBUG_INFO,")"));\r
+\r
+      DEBUG ((DEBUG_INFO, ")"));\r
     }\r
-    DEBUG ((DEBUG_INFO,"\n"));\r
+\r
+    DEBUG ((DEBUG_INFO, "\n"));\r
   }\r
 \r
   DEBUG ((DEBUG_INFO, "\n"));\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
 /**\r
@@ -109,10 +111,10 @@ PrintBbsTable (
 **/\r
 VOID\r
 PrintHddInfo (\r
-  IN HDD_INFO *HddInfo\r
+  IN HDD_INFO  *HddInfo\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
 \r
   DEBUG ((DEBUG_INFO, "\n"));\r
   for (Index = 0; Index < MAX_IDE_CONTROLLER; Index++) {\r
@@ -129,7 +131,7 @@ PrintHddInfo (
 \r
   DEBUG ((DEBUG_INFO, "\n"));\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
 /**\r
@@ -140,16 +142,16 @@ PrintPciInterruptRegister (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINTN                       Index;\r
-  EFI_HANDLE                  *Handles;\r
-  UINTN                       HandleNum;\r
-  EFI_PCI_IO_PROTOCOL         *PciIo;\r
-  UINT8                       Interrupt[2];\r
-  UINTN                       Segment;\r
-  UINTN                       Bus;\r
-  UINTN                       Device;\r
-  UINTN                       Function;\r
+  EFI_STATUS           Status;\r
+  UINTN                Index;\r
+  EFI_HANDLE           *Handles;\r
+  UINTN                HandleNum;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  UINT8                Interrupt[2];\r
+  UINTN                Segment;\r
+  UINTN                Bus;\r
+  UINTN                Device;\r
+  UINTN                Function;\r
 \r
   gBS->LocateHandleBuffer (\r
          ByProtocol,\r
@@ -167,7 +169,7 @@ PrintPciInterruptRegister (
   DEBUG ((DEBUG_INFO, " bb/dd/ff interrupt line interrupt pin\n"));\r
   DEBUG ((DEBUG_INFO, "======================================\n"));\r
   for (Index = 0; Index < HandleNum; Index++) {\r
-    Status = gBS->HandleProtocol (Handles[Index], &gEfiPciIoProtocolGuid, (VOID **) &PciIo);\r
+    Status = gBS->HandleProtocol (Handles[Index], &gEfiPciIoProtocolGuid, (VOID **)&PciIo);\r
     if (!EFI_ERROR (Status)) {\r
       Status = PciIo->Pci.Read (\r
                             PciIo,\r
@@ -177,6 +179,7 @@ PrintPciInterruptRegister (
                             Interrupt\r
                             );\r
     }\r
+\r
     if (!EFI_ERROR (Status)) {\r
       Status = PciIo->GetLocation (\r
                         PciIo,\r
@@ -186,11 +189,20 @@ PrintPciInterruptRegister (
                         &Function\r
                         );\r
     }\r
+\r
     if (!EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_INFO, " %02x/%02x/%02x 0x%02x           0x%02x\n",\r
-              Bus, Device, Function, Interrupt[0], Interrupt[1]));\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        " %02x/%02x/%02x 0x%02x           0x%02x\n",\r
+        Bus,\r
+        Device,\r
+        Function,\r
+        Interrupt[0],\r
+        Interrupt[1]\r
+        ));\r
     }\r
   }\r
+\r
   DEBUG ((DEBUG_INFO, "\n"));\r
 \r
   if (Handles != NULL) {\r
@@ -206,7 +218,7 @@ PrintPciInterruptRegister (
 **/\r
 VOID\r
 UpdateIdentifyDriveData (\r
-  IN  UINT8     *IdentifyDriveData\r
+  IN  UINT8  *IdentifyDriveData\r
   );\r
 \r
 /**\r
@@ -219,30 +231,30 @@ UpdateIdentifyDriveData (
 **/\r
 EFI_STATUS\r
 UpdateSioData (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  UINTN                               Index;\r
-  UINTN                               Index1;\r
-  UINT8                               LegacyInterrupts[16];\r
-  EFI_LEGACY_IRQ_ROUTING_ENTRY        *RoutingTable;\r
-  UINTN                               RoutingTableEntries;\r
-  EFI_LEGACY_IRQ_PRIORITY_TABLE_ENTRY *IrqPriorityTable;\r
-  UINTN                               NumberPriorityEntries;\r
-  EFI_TO_COMPATIBILITY16_BOOT_TABLE   *EfiToLegacy16BootTable;\r
-  UINT8                               HddIrq;\r
-  UINT16                              LegacyInt;\r
-  UINT16                              LegMask;\r
-  UINT32                              Register;\r
-  UINTN                               HandleCount;\r
-  EFI_HANDLE                          *HandleBuffer;\r
-  EFI_ISA_IO_PROTOCOL                 *IsaIo;\r
-\r
-  LegacyInt               = 0;\r
-  HandleBuffer            = NULL;\r
-\r
-  EfiToLegacy16BootTable  = &Private->IntThunk->EfiToLegacy16BootTable;\r
+  EFI_STATUS                           Status;\r
+  UINTN                                Index;\r
+  UINTN                                Index1;\r
+  UINT8                                LegacyInterrupts[16];\r
+  EFI_LEGACY_IRQ_ROUTING_ENTRY         *RoutingTable;\r
+  UINTN                                RoutingTableEntries;\r
+  EFI_LEGACY_IRQ_PRIORITY_TABLE_ENTRY  *IrqPriorityTable;\r
+  UINTN                                NumberPriorityEntries;\r
+  EFI_TO_COMPATIBILITY16_BOOT_TABLE    *EfiToLegacy16BootTable;\r
+  UINT8                                HddIrq;\r
+  UINT16                               LegacyInt;\r
+  UINT16                               LegMask;\r
+  UINT32                               Register;\r
+  UINTN                                HandleCount;\r
+  EFI_HANDLE                           *HandleBuffer;\r
+  EFI_ISA_IO_PROTOCOL                  *IsaIo;\r
+\r
+  LegacyInt    = 0;\r
+  HandleBuffer = NULL;\r
+\r
+  EfiToLegacy16BootTable = &Private->IntThunk->EfiToLegacy16BootTable;\r
   LegacyBiosBuildSioData (Private);\r
   SetMem (LegacyInterrupts, sizeof (LegacyInterrupts), 0);\r
 \r
@@ -270,21 +282,21 @@ UpdateSioData (
   }\r
 \r
   Private->LegacyBiosPlatform->GetRoutingTable (\r
-                                Private->LegacyBiosPlatform,\r
-                                (VOID *) &RoutingTable,\r
-                                &RoutingTableEntries,\r
-                                NULL,\r
-                                NULL,\r
-                                (VOID **) &IrqPriorityTable,\r
-                                &NumberPriorityEntries\r
-                                );\r
+                                 Private->LegacyBiosPlatform,\r
+                                 (VOID *)&RoutingTable,\r
+                                 &RoutingTableEntries,\r
+                                 NULL,\r
+                                 NULL,\r
+                                 (VOID **)&IrqPriorityTable,\r
+                                 &NumberPriorityEntries\r
+                                 );\r
   //\r
   // Remove legacy interrupts from the list of PCI interrupts available.\r
   //\r
   for (Index = 0; Index <= 0x0b; Index++) {\r
     for (Index1 = 0; Index1 <= NumberPriorityEntries; Index1++) {\r
       if (LegacyInterrupts[Index] != 0) {\r
-        LegacyInt = (UINT16) (LegacyInt | (1 << LegacyInterrupts[Index]));\r
+        LegacyInt = (UINT16)(LegacyInt | (1 << LegacyInterrupts[Index]));\r
         if (LegacyInterrupts[Index] == IrqPriorityTable[Index1].Irq) {\r
           IrqPriorityTable[Index1].Used = LEGACY_USED;\r
         }\r
@@ -293,37 +305,37 @@ UpdateSioData (
   }\r
 \r
   Private->Legacy8259->GetMask (\r
-                        Private->Legacy8259,\r
-                        &LegMask,\r
-                        NULL,\r
-                        NULL,\r
-                        NULL\r
-                        );\r
+                         Private->Legacy8259,\r
+                         &LegMask,\r
+                         NULL,\r
+                         NULL,\r
+                         NULL\r
+                         );\r
 \r
   //\r
   // Set SIO interrupts and disable mouse. Let mouse driver\r
   // re-enable it.\r
   //\r
-  LegMask = (UINT16) ((LegMask &~LegacyInt) | 0x1000);\r
+  LegMask = (UINT16)((LegMask &~LegacyInt) | 0x1000);\r
   Private->Legacy8259->SetMask (\r
-                        Private->Legacy8259,\r
-                        &LegMask,\r
-                        NULL,\r
-                        NULL,\r
-                        NULL\r
-                        );\r
+                         Private->Legacy8259,\r
+                         &LegMask,\r
+                         NULL,\r
+                         NULL,\r
+                         NULL\r
+                         );\r
 \r
   //\r
   // Disable mouse in keyboard controller\r
   //\r
   Register = 0xA7;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  &gEfiIsaIoProtocolGuid,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &HandleBuffer\r
-                  );\r
+  Status   = gBS->LocateHandleBuffer (\r
+                    ByProtocol,\r
+                    &gEfiIsaIoProtocolGuid,\r
+                    NULL,\r
+                    &HandleCount,\r
+                    &HandleBuffer\r
+                    );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -332,11 +344,10 @@ UpdateSioData (
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiIsaIoProtocolGuid,\r
-                    (VOID **) &IsaIo\r
+                    (VOID **)&IsaIo\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
     IsaIo->Io.Write (IsaIo, EfiIsaIoWidthUint8, 0x64, 1, &Register);\r
-\r
   }\r
 \r
   if (HandleBuffer != NULL) {\r
@@ -344,7 +355,6 @@ UpdateSioData (
   }\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -360,12 +370,13 @@ UpdateSioData (
 **/\r
 EFI_STATUS\r
 CalculateIdentifyDriveChecksum (\r
-  IN  UINT8     *IdentifyDriveData,\r
-  OUT UINT8     *Checksum\r
+  IN  UINT8  *IdentifyDriveData,\r
+  OUT UINT8  *Checksum\r
   )\r
 {\r
-  UINTN Index;\r
-  UINT8 LocalChecksum;\r
+  UINTN  Index;\r
+  UINT8  LocalChecksum;\r
+\r
   LocalChecksum = 0;\r
   *Checksum     = 0;\r
   if (IdentifyDriveData[510] != 0xA5) {\r
@@ -373,14 +384,13 @@ CalculateIdentifyDriveChecksum (
   }\r
 \r
   for (Index = 0; Index < 512; Index++) {\r
-    LocalChecksum = (UINT8) (LocalChecksum + IdentifyDriveData[Index]);\r
+    LocalChecksum = (UINT8)(LocalChecksum + IdentifyDriveData[Index]);\r
   }\r
 \r
   *Checksum = LocalChecksum;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Identify drive data must be updated to actual parameters before boot.\r
 \r
@@ -390,7 +400,7 @@ CalculateIdentifyDriveChecksum (
 **/\r
 VOID\r
 UpdateIdentifyDriveData (\r
-  IN  UINT8     *IdentifyDriveData\r
+  IN  UINT8  *IdentifyDriveData\r
   )\r
 {\r
   UINT16          NumberCylinders;\r
@@ -406,31 +416,32 @@ UpdateIdentifyDriveData (
   // Status indicates if Integrity byte is correct. Checksum should be\r
   // 0 if valid.\r
   //\r
-  ReadInfo  = (ATAPI_IDENTIFY *) IdentifyDriveData;\r
-  Status    = CalculateIdentifyDriveChecksum (IdentifyDriveData, &OriginalChecksum);\r
+  ReadInfo = (ATAPI_IDENTIFY *)IdentifyDriveData;\r
+  Status   = CalculateIdentifyDriveChecksum (IdentifyDriveData, &OriginalChecksum);\r
   if (OriginalChecksum != 0) {\r
     Status = EFI_SECURITY_VIOLATION;\r
   }\r
+\r
   //\r
   // If NumberCylinders = 0 then do data(Controller present but don drive attached).\r
   //\r
   NumberCylinders = ReadInfo->Raw[1];\r
   if (NumberCylinders != 0) {\r
-    ReadInfo->Raw[54]   = NumberCylinders;\r
+    ReadInfo->Raw[54] = NumberCylinders;\r
 \r
-    NumberHeads         = ReadInfo->Raw[3];\r
-    ReadInfo->Raw[55]   = NumberHeads;\r
+    NumberHeads       = ReadInfo->Raw[3];\r
+    ReadInfo->Raw[55] = NumberHeads;\r
 \r
-    NumberSectorsTrack  = ReadInfo->Raw[6];\r
-    ReadInfo->Raw[56]   = NumberSectorsTrack;\r
+    NumberSectorsTrack = ReadInfo->Raw[6];\r
+    ReadInfo->Raw[56]  = NumberSectorsTrack;\r
 \r
     //\r
     // Copy Multisector info and set valid bit.\r
     //\r
-    ReadInfo->Raw[59] = (UINT16) (ReadInfo->Raw[47] + 0x100);\r
-    CapacityInSectors = (UINT32) ((UINT32) (NumberCylinders) * (UINT32) (NumberHeads) * (UINT32) (NumberSectorsTrack));\r
-    ReadInfo->Raw[57] = (UINT16) (CapacityInSectors >> 16);\r
-    ReadInfo->Raw[58] = (UINT16) (CapacityInSectors & 0xffff);\r
+    ReadInfo->Raw[59] = (UINT16)(ReadInfo->Raw[47] + 0x100);\r
+    CapacityInSectors = (UINT32)((UINT32)(NumberCylinders) * (UINT32)(NumberHeads) * (UINT32)(NumberSectorsTrack));\r
+    ReadInfo->Raw[57] = (UINT16)(CapacityInSectors >> 16);\r
+    ReadInfo->Raw[58] = (UINT16)(CapacityInSectors & 0xffff);\r
     if (Status == EFI_SUCCESS) {\r
       //\r
       // Forece checksum byte to 0 and get new checksum.\r
@@ -441,8 +452,8 @@ UpdateIdentifyDriveData (
       //\r
       // Force new checksum such that sum is 0.\r
       //\r
-      FinalChecksum = (UINT8) ((UINT8)0 - FinalChecksum);\r
-      ReadInfo->Raw[255] = (UINT16) (ReadInfo->Raw[255] | (FinalChecksum << 8));\r
+      FinalChecksum      = (UINT8)((UINT8)0 - FinalChecksum);\r
+      ReadInfo->Raw[255] = (UINT16)(ReadInfo->Raw[255] | (FinalChecksum << 8));\r
     }\r
   }\r
 }\r
@@ -457,7 +468,7 @@ UpdateIdentifyDriveData (
 **/\r
 VOID\r
 UpdateAllIdentifyDriveData (\r
-  IN LEGACY_BIOS_INSTANCE                 *Private\r
+  IN LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
   UINTN     Index;\r
@@ -470,11 +481,11 @@ UpdateAllIdentifyDriveData (
     // Each controller can have 2 devices. Update for each device\r
     //\r
     if ((HddInfo[Index].Status & HDD_MASTER_IDE) != 0) {\r
-      UpdateIdentifyDriveData ((UINT8 *) (&HddInfo[Index].IdentifyDrive[0].Raw[0]));\r
+      UpdateIdentifyDriveData ((UINT8 *)(&HddInfo[Index].IdentifyDrive[0].Raw[0]));\r
     }\r
 \r
     if ((HddInfo[Index].Status & HDD_SLAVE_IDE) != 0) {\r
-      UpdateIdentifyDriveData ((UINT8 *) (&HddInfo[Index].IdentifyDrive[1].Raw[0]));\r
+      UpdateIdentifyDriveData ((UINT8 *)(&HddInfo[Index].IdentifyDrive[1].Raw[0]));\r
     }\r
   }\r
 }\r
@@ -489,15 +500,15 @@ UpdateAllIdentifyDriveData (
 **/\r
 VOID\r
 EnableIdeController (\r
-  IN LEGACY_BIOS_INSTANCE              *Private\r
+  IN LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  EFI_STATUS          Status;\r
-  EFI_HANDLE          IdeController;\r
-  UINT8               ByteBuffer;\r
-  UINTN               HandleCount;\r
-  EFI_HANDLE          *HandleBuffer;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  EFI_STATUS           Status;\r
+  EFI_HANDLE           IdeController;\r
+  UINT8                ByteBuffer;\r
+  UINTN                HandleCount;\r
+  EFI_HANDLE           *HandleBuffer;\r
 \r
   Status = Private->LegacyBiosPlatform->GetPlatformHandle (\r
                                           Private->LegacyBiosPlatform,\r
@@ -509,11 +520,11 @@ EnableIdeController (
                                           );\r
   if (!EFI_ERROR (Status)) {\r
     IdeController = HandleBuffer[0];\r
-    Status = gBS->HandleProtocol (\r
-                    IdeController,\r
-                    &gEfiPciIoProtocolGuid,\r
-                    (VOID **) &PciIo\r
-                    );\r
+    Status        = gBS->HandleProtocol (\r
+                           IdeController,\r
+                           &gEfiPciIoProtocolGuid,\r
+                           (VOID **)&PciIo\r
+                           );\r
     ByteBuffer = 0x1f;\r
     if (!EFI_ERROR (Status)) {\r
       PciIo->Pci.Write (PciIo, EfiPciIoWidthUint8, 0x04, 1, &ByteBuffer);\r
@@ -521,7 +532,6 @@ EnableIdeController (
   }\r
 }\r
 \r
-\r
 /**\r
   Enable ide controller.  This gets disabled when LegacyBoot.c is about\r
   to run the Option ROMs.\r
@@ -532,15 +542,15 @@ EnableIdeController (
 **/\r
 VOID\r
 EnableAllControllers (\r
-  IN LEGACY_BIOS_INSTANCE              *Private\r
+  IN LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  UINTN               HandleCount;\r
-  EFI_HANDLE          *HandleBuffer;\r
-  UINTN               Index;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE01          PciConfigHeader;\r
-  EFI_STATUS          Status;\r
+  UINTN                HandleCount;\r
+  EFI_HANDLE           *HandleBuffer;\r
+  UINTN                Index;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE01           PciConfigHeader;\r
+  EFI_STATUS           Status;\r
 \r
   //\r
   //\r
@@ -563,17 +573,17 @@ EnableAllControllers (
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiPciIoProtocolGuid,\r
-                    (VOID **) &PciIo\r
+                    (VOID **)&PciIo\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     PciIo->Pci.Read (\r
-                PciIo,\r
-                EfiPciIoWidthUint32,\r
-                0,\r
-                sizeof (PciConfigHeader) / sizeof (UINT32),\r
-                &PciConfigHeader\r
-                );\r
+                 PciIo,\r
+                 EfiPciIoWidthUint32,\r
+                 0,\r
+                 sizeof (PciConfigHeader) / sizeof (UINT32),\r
+                 &PciConfigHeader\r
+                 );\r
 \r
     //\r
     // We do not enable PPB here. This is for HotPlug Consideration.\r
@@ -600,8 +610,8 @@ EnableAllControllers (
           IS_PCI_IDE (&PciConfigHeader)     ||\r
           IS_PCI_P2P (&PciConfigHeader)     ||\r
           IS_PCI_P2P_SUB (&PciConfigHeader) ||\r
-          IS_PCI_LPC (&PciConfigHeader)     )) {\r
-\r
+          IS_PCI_LPC (&PciConfigHeader)))\r
+    {\r
       PciConfigHeader.Hdr.Command |= 0x1f;\r
 \r
       PciIo->Pci.Write (PciIo, EfiPciIoWidthUint32, 4, 1, &PciConfigHeader.Hdr.Command);\r
@@ -627,52 +637,52 @@ EnableAllControllers (
 **/\r
 EFI_STATUS\r
 LegacyGetDataOrTable (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL         *This,\r
-  IN EFI_GET_PLATFORM_INFO_MODE       Id\r
+  IN EFI_LEGACY_BIOS_PROTOCOL    *This,\r
+  IN EFI_GET_PLATFORM_INFO_MODE  Id\r
   )\r
 {\r
-  VOID                              *Table;\r
-  UINT32                            TablePtr;\r
-  UINTN                             TableSize;\r
-  UINTN                             Alignment;\r
-  UINTN                             Location;\r
-  EFI_STATUS                        Status;\r
-  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL *LegacyBiosPlatform;\r
-  EFI_COMPATIBILITY16_TABLE         *Legacy16Table;\r
-  EFI_IA32_REGISTER_SET             Regs;\r
-  LEGACY_BIOS_INSTANCE              *Private;\r
+  VOID                               *Table;\r
+  UINT32                             TablePtr;\r
+  UINTN                              TableSize;\r
+  UINTN                              Alignment;\r
+  UINTN                              Location;\r
+  EFI_STATUS                         Status;\r
+  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL  *LegacyBiosPlatform;\r
+  EFI_COMPATIBILITY16_TABLE          *Legacy16Table;\r
+  EFI_IA32_REGISTER_SET              Regs;\r
+  LEGACY_BIOS_INSTANCE               *Private;\r
 \r
-  Private             = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
+  Private = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
 \r
-  LegacyBiosPlatform  = Private->LegacyBiosPlatform;\r
-  Legacy16Table       = Private->Legacy16Table;\r
+  LegacyBiosPlatform = Private->LegacyBiosPlatform;\r
+  Legacy16Table      = Private->Legacy16Table;\r
 \r
   //\r
   // Phase 1 - get an address allocated in 16-bit code\r
   //\r
   while (TRUE) {\r
     switch (Id) {\r
-    case EfiGetPlatformBinaryMpTable:\r
-    case EfiGetPlatformBinaryOemIntData:\r
-    case EfiGetPlatformBinaryOem32Data:\r
-    case EfiGetPlatformBinaryOem16Data:\r
+      case EfiGetPlatformBinaryMpTable:\r
+      case EfiGetPlatformBinaryOemIntData:\r
+      case EfiGetPlatformBinaryOem32Data:\r
+      case EfiGetPlatformBinaryOem16Data:\r
       {\r
         Status = LegacyBiosPlatform->GetPlatformInfo (\r
-                                      LegacyBiosPlatform,\r
-                                      Id,\r
-                                      (VOID *) &Table,\r
-                                      &TableSize,\r
-                                      &Location,\r
-                                      &Alignment,\r
-                                      0,\r
-                                      0\r
-                                      );\r
+                                       LegacyBiosPlatform,\r
+                                       Id,\r
+                                       (VOID *)&Table,\r
+                                       &TableSize,\r
+                                       &Location,\r
+                                       &Alignment,\r
+                                       0,\r
+                                       0\r
+                                       );\r
         DEBUG ((DEBUG_INFO, "LegacyGetDataOrTable - ID: %x, %r\n", (UINTN)Id, Status));\r
         DEBUG ((DEBUG_INFO, "  Table - %x, Size - %x, Location - %x, Alignment - %x\n", (UINTN)Table, (UINTN)TableSize, (UINTN)Location, (UINTN)Alignment));\r
         break;\r
       }\r
 \r
-    default:\r
+      default:\r
       {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
@@ -684,17 +694,17 @@ LegacyGetDataOrTable (
 \r
     ZeroMem (&Regs, sizeof (EFI_IA32_REGISTER_SET));\r
     Regs.X.AX = Legacy16GetTableAddress;\r
-    Regs.X.CX = (UINT16) TableSize;\r
-    Regs.X.BX = (UINT16) Location;\r
-    Regs.X.DX = (UINT16) Alignment;\r
+    Regs.X.CX = (UINT16)TableSize;\r
+    Regs.X.BX = (UINT16)Location;\r
+    Regs.X.DX = (UINT16)Alignment;\r
     Private->LegacyBios.FarCall86 (\r
-      This,\r
-      Private->Legacy16CallSegment,\r
-      Private->Legacy16CallOffset,\r
-      &Regs,\r
-      NULL,\r
-      0\r
-      );\r
+                          This,\r
+                          Private->Legacy16CallSegment,\r
+                          Private->Legacy16CallOffset,\r
+                          &Regs,\r
+                          NULL,\r
+                          0\r
+                          );\r
 \r
     if (Regs.X.AX != 0) {\r
       DEBUG ((DEBUG_ERROR, "Table ID %x length insufficient\n", Id));\r
@@ -703,38 +713,38 @@ LegacyGetDataOrTable (
       break;\r
     }\r
   }\r
+\r
   //\r
   // Phase 2 Call routine second time with address to allow address adjustment\r
   //\r
   Status = LegacyBiosPlatform->GetPlatformInfo (\r
-                                LegacyBiosPlatform,\r
-                                Id,\r
-                                (VOID *) &Table,\r
-                                &TableSize,\r
-                                &Location,\r
-                                &Alignment,\r
-                                Regs.X.DS,\r
-                                Regs.X.BX\r
-                                );\r
+                                 LegacyBiosPlatform,\r
+                                 Id,\r
+                                 (VOID *)&Table,\r
+                                 &TableSize,\r
+                                 &Location,\r
+                                 &Alignment,\r
+                                 Regs.X.DS,\r
+                                 Regs.X.BX\r
+                                 );\r
   switch (Id) {\r
-  case EfiGetPlatformBinaryMpTable:\r
+    case EfiGetPlatformBinaryMpTable:\r
     {\r
-      Legacy16Table->MpTablePtr     = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);\r
-      Legacy16Table->MpTableLength  = (UINT32)TableSize;\r
+      Legacy16Table->MpTablePtr    = (UINT32)(Regs.X.DS * 16 + Regs.X.BX);\r
+      Legacy16Table->MpTableLength = (UINT32)TableSize;\r
       DEBUG ((DEBUG_INFO, "MP table in legacy region - %x\n", (UINTN)Legacy16Table->MpTablePtr));\r
       break;\r
     }\r
 \r
-  case EfiGetPlatformBinaryOemIntData:\r
+    case EfiGetPlatformBinaryOemIntData:\r
     {\r
-\r
-      Legacy16Table->OemIntSegment  = Regs.X.DS;\r
-      Legacy16Table->OemIntOffset   = Regs.X.BX;\r
+      Legacy16Table->OemIntSegment = Regs.X.DS;\r
+      Legacy16Table->OemIntOffset  = Regs.X.BX;\r
       DEBUG ((DEBUG_INFO, "OemInt table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->OemIntSegment, (UINTN)Legacy16Table->OemIntOffset));\r
       break;\r
     }\r
 \r
-  case EfiGetPlatformBinaryOem32Data:\r
+    case EfiGetPlatformBinaryOem32Data:\r
     {\r
       Legacy16Table->Oem32Segment = Regs.X.DS;\r
       Legacy16Table->Oem32Offset  = Regs.X.BX;\r
@@ -742,7 +752,7 @@ LegacyGetDataOrTable (
       break;\r
     }\r
 \r
-  case EfiGetPlatformBinaryOem16Data:\r
+    case EfiGetPlatformBinaryOem16Data:\r
     {\r
       //\r
       //          Legacy16Table->Oem16Segment = Regs.X.DS;\r
@@ -751,7 +761,7 @@ LegacyGetDataOrTable (
       break;\r
     }\r
 \r
-  default:\r
+    default:\r
     {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
@@ -760,13 +770,14 @@ LegacyGetDataOrTable (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Phase 3 Copy table to final location\r
   //\r
-  TablePtr = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);\r
+  TablePtr = (UINT32)(Regs.X.DS * 16 + Regs.X.BX);\r
 \r
   CopyMem (\r
-    (VOID *) (UINTN)TablePtr,\r
+    (VOID *)(UINTN)TablePtr,\r
     Table,\r
     TableSize\r
     );\r
@@ -783,53 +794,54 @@ CreateSmbiosTableInReservedMemory (
   VOID\r
   )\r
 {\r
-  SMBIOS_TABLE_ENTRY_POINT    *EntryPointStructure;\r
+  SMBIOS_TABLE_ENTRY_POINT  *EntryPointStructure;\r
 \r
   if ((mRuntimeSmbiosEntryPoint == NULL) ||\r
       (mReserveSmbiosEntryPoint == 0) ||\r
-      (mStructureTableAddress == 0)) {\r
+      (mStructureTableAddress == 0))\r
+  {\r
     return;\r
   }\r
 \r
-  EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) mRuntimeSmbiosEntryPoint;\r
+  EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *)mRuntimeSmbiosEntryPoint;\r
 \r
   //\r
   // Copy SMBIOS Entry Point Structure\r
   //\r
   CopyMem (\r
-    (VOID *)(UINTN) mReserveSmbiosEntryPoint,\r
+    (VOID *)(UINTN)mReserveSmbiosEntryPoint,\r
     EntryPointStructure,\r
     EntryPointStructure->EntryPointLength\r
-  );\r
+    );\r
 \r
   //\r
   // Copy SMBIOS Structure Table into EfiReservedMemoryType memory\r
   //\r
   CopyMem (\r
-    (VOID *)(UINTN) mStructureTableAddress,\r
-    (VOID *)(UINTN) EntryPointStructure->TableAddress,\r
+    (VOID *)(UINTN)mStructureTableAddress,\r
+    (VOID *)(UINTN)EntryPointStructure->TableAddress,\r
     EntryPointStructure->TableLength\r
-  );\r
+    );\r
 \r
   //\r
   // Update TableAddress in Entry Point Structure\r
   //\r
-  EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *)(UINTN) mReserveSmbiosEntryPoint;\r
-  EntryPointStructure->TableAddress = (UINT32)(UINTN) mStructureTableAddress;\r
+  EntryPointStructure               = (SMBIOS_TABLE_ENTRY_POINT *)(UINTN)mReserveSmbiosEntryPoint;\r
+  EntryPointStructure->TableAddress = (UINT32)(UINTN)mStructureTableAddress;\r
 \r
   //\r
   // Fixup checksums in the Entry Point Structure\r
   //\r
-  EntryPointStructure->IntermediateChecksum = 0;\r
+  EntryPointStructure->IntermediateChecksum        = 0;\r
   EntryPointStructure->EntryPointStructureChecksum = 0;\r
 \r
   EntryPointStructure->IntermediateChecksum =\r
     CalculateCheckSum8 (\r
-      (UINT8 *) EntryPointStructure + OFFSET_OF (SMBIOS_TABLE_ENTRY_POINT, IntermediateAnchorString),\r
+      (UINT8 *)EntryPointStructure + OFFSET_OF (SMBIOS_TABLE_ENTRY_POINT, IntermediateAnchorString),\r
       EntryPointStructure->EntryPointLength - OFFSET_OF (SMBIOS_TABLE_ENTRY_POINT, IntermediateAnchorString)\r
       );\r
   EntryPointStructure->EntryPointStructureChecksum =\r
-    CalculateCheckSum8 ((UINT8 *) EntryPointStructure, EntryPointStructure->EntryPointLength);\r
+    CalculateCheckSum8 ((UINT8 *)EntryPointStructure, EntryPointStructure->EntryPointLength);\r
 }\r
 \r
 /**\r
@@ -845,47 +857,47 @@ CreateSmbiosTableInReservedMemory (
 **/\r
 EFI_STATUS\r
 GenericLegacyBoot (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL           *This\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  LEGACY_BIOS_INSTANCE              *Private;\r
-  EFI_IA32_REGISTER_SET             Regs;\r
-  EFI_TO_COMPATIBILITY16_BOOT_TABLE *EfiToLegacy16BootTable;\r
-  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL *LegacyBiosPlatform;\r
-  UINTN                             CopySize;\r
-  VOID                              *AcpiPtr;\r
-  HDD_INFO                          *HddInfo;\r
-  HDD_INFO                          *LocalHddInfo;\r
-  UINTN                             Index;\r
-  EFI_COMPATIBILITY16_TABLE         *Legacy16Table;\r
-  UINT32                            *BdaPtr;\r
-  UINT16                            HddCount;\r
-  UINT16                            BbsCount;\r
-  BBS_TABLE                         *LocalBbsTable;\r
-  UINT32                            *BaseVectorMaster;\r
-  EFI_TIME                          BootTime;\r
-  UINT32                            LocalTime;\r
-  EFI_HANDLE                        IdeController;\r
-  UINTN                             HandleCount;\r
-  EFI_HANDLE                        *HandleBuffer;\r
-  VOID                              *AcpiTable;\r
-  UINTN                             ShadowAddress;\r
-  UINT32                            Granularity;\r
+  EFI_STATUS                         Status;\r
+  LEGACY_BIOS_INSTANCE               *Private;\r
+  EFI_IA32_REGISTER_SET              Regs;\r
+  EFI_TO_COMPATIBILITY16_BOOT_TABLE  *EfiToLegacy16BootTable;\r
+  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL  *LegacyBiosPlatform;\r
+  UINTN                              CopySize;\r
+  VOID                               *AcpiPtr;\r
+  HDD_INFO                           *HddInfo;\r
+  HDD_INFO                           *LocalHddInfo;\r
+  UINTN                              Index;\r
+  EFI_COMPATIBILITY16_TABLE          *Legacy16Table;\r
+  UINT32                             *BdaPtr;\r
+  UINT16                             HddCount;\r
+  UINT16                             BbsCount;\r
+  BBS_TABLE                          *LocalBbsTable;\r
+  UINT32                             *BaseVectorMaster;\r
+  EFI_TIME                           BootTime;\r
+  UINT32                             LocalTime;\r
+  EFI_HANDLE                         IdeController;\r
+  UINTN                              HandleCount;\r
+  EFI_HANDLE                         *HandleBuffer;\r
+  VOID                               *AcpiTable;\r
+  UINTN                              ShadowAddress;\r
+  UINT32                             Granularity;\r
 \r
   LocalHddInfo  = NULL;\r
   HddCount      = 0;\r
   BbsCount      = 0;\r
   LocalBbsTable = NULL;\r
 \r
-  Private       = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
+  Private = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
   DEBUG_CODE (\r
     DEBUG ((DEBUG_ERROR, "Start of legacy boot\n"));\r
-  );\r
+    );\r
 \r
-  Legacy16Table                         = Private->Legacy16Table;\r
-  EfiToLegacy16BootTable                = &Private->IntThunk->EfiToLegacy16BootTable;\r
-  HddInfo = &EfiToLegacy16BootTable->HddInfo[0];\r
+  Legacy16Table          = Private->Legacy16Table;\r
+  EfiToLegacy16BootTable = &Private->IntThunk->EfiToLegacy16BootTable;\r
+  HddInfo                = &EfiToLegacy16BootTable->HddInfo[0];\r
 \r
   LegacyBiosPlatform = Private->LegacyBiosPlatform;\r
 \r
@@ -900,17 +912,18 @@ GenericLegacyBoot (
   IdeController = NULL;\r
   if ((mBootMode == BOOT_LEGACY_OS) || (mBootMode == BOOT_UNCONVENTIONAL_DEVICE)) {\r
     Status = LegacyBiosPlatform->GetPlatformHandle (\r
-                                  Private->LegacyBiosPlatform,\r
-                                  EfiGetPlatformIdeHandle,\r
-                                  0,\r
-                                  &HandleBuffer,\r
-                                  &HandleCount,\r
-                                  NULL\r
-                                  );\r
+                                   Private->LegacyBiosPlatform,\r
+                                   EfiGetPlatformIdeHandle,\r
+                                   0,\r
+                                   &HandleBuffer,\r
+                                   &HandleCount,\r
+                                   NULL\r
+                                   );\r
     if (!EFI_ERROR (Status)) {\r
       IdeController = HandleBuffer[0];\r
     }\r
   }\r
+\r
   //\r
   // Unlock the Legacy BIOS region\r
   //\r
@@ -928,37 +941,37 @@ GenericLegacyBoot (
   if (CopySize > Private->Legacy16Table->E820Length) {\r
     ZeroMem (&Regs, sizeof (EFI_IA32_REGISTER_SET));\r
     Regs.X.AX = Legacy16GetTableAddress;\r
-    Regs.X.BX = (UINT16) 0x0; // Any region\r
-    Regs.X.CX = (UINT16) CopySize;\r
-    Regs.X.DX = (UINT16) 0x4; // Alignment\r
+    Regs.X.BX = (UINT16)0x0;  // Any region\r
+    Regs.X.CX = (UINT16)CopySize;\r
+    Regs.X.DX = (UINT16)0x4;  // Alignment\r
     Private->LegacyBios.FarCall86 (\r
-      &Private->LegacyBios,\r
-      Private->Legacy16Table->Compatibility16CallSegment,\r
-      Private->Legacy16Table->Compatibility16CallOffset,\r
-      &Regs,\r
-      NULL,\r
-      0\r
-      );\r
-\r
-    Private->Legacy16Table->E820Pointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);\r
-    Private->Legacy16Table->E820Length  = (UINT32) CopySize;\r
+                          &Private->LegacyBios,\r
+                          Private->Legacy16Table->Compatibility16CallSegment,\r
+                          Private->Legacy16Table->Compatibility16CallOffset,\r
+                          &Regs,\r
+                          NULL,\r
+                          0\r
+                          );\r
+\r
+    Private->Legacy16Table->E820Pointer = (UINT32)(Regs.X.DS * 16 + Regs.X.BX);\r
+    Private->Legacy16Table->E820Length  = (UINT32)CopySize;\r
     if (Regs.X.AX != 0) {\r
       DEBUG ((DEBUG_ERROR, "Legacy16 E820 length insufficient\n"));\r
       return EFI_OUT_OF_RESOURCES;\r
     } else {\r
       CopyMem (\r
-        (VOID *)(UINTN) Private->Legacy16Table->E820Pointer,\r
+        (VOID *)(UINTN)Private->Legacy16Table->E820Pointer,\r
         Private->E820Table,\r
         CopySize\r
         );\r
     }\r
   } else {\r
     CopyMem (\r
-      (VOID *)(UINTN) Private->Legacy16Table->E820Pointer,\r
+      (VOID *)(UINTN)Private->Legacy16Table->E820Pointer,\r
       Private->E820Table,\r
       CopySize\r
       );\r
-    Private->Legacy16Table->E820Length = (UINT32) CopySize;\r
+    Private->Legacy16Table->E820Length = (UINT32)CopySize;\r
   }\r
 \r
   //\r
@@ -967,26 +980,29 @@ GenericLegacyBoot (
   if (mReserveSmbiosEntryPoint == 0) {\r
     DEBUG ((DEBUG_INFO, "Smbios table is not found!\n"));\r
   }\r
+\r
   CreateSmbiosTableInReservedMemory ();\r
   EfiToLegacy16BootTable->SmbiosTable = (UINT32)(UINTN)mReserveSmbiosEntryPoint;\r
 \r
   AcpiTable = NULL;\r
-  Status = EfiGetSystemConfigurationTable (\r
-             &gEfiAcpi20TableGuid,\r
-             &AcpiTable\r
-             );\r
+  Status    = EfiGetSystemConfigurationTable (\r
+                &gEfiAcpi20TableGuid,\r
+                &AcpiTable\r
+                );\r
   if (EFI_ERROR (Status)) {\r
     Status = EfiGetSystemConfigurationTable (\r
                &gEfiAcpi10TableGuid,\r
                &AcpiTable\r
                );\r
   }\r
+\r
   //\r
   // We do not ASSERT if AcpiTable not found. It is possible that a platform does not produce AcpiTable.\r
   //\r
   if (AcpiTable == NULL) {\r
     DEBUG ((DEBUG_INFO, "ACPI table is not found!\n"));\r
   }\r
+\r
   EfiToLegacy16BootTable->AcpiTable = (UINT32)(UINTN)AcpiTable;\r
 \r
   //\r
@@ -995,21 +1011,21 @@ GenericLegacyBoot (
   // Rev != 0 Length is UINT32 at offset 20 decimal\r
   //\r
   if (AcpiTable != NULL) {\r
-\r
     AcpiPtr = AcpiTable;\r
-    if (*((UINT8 *) AcpiPtr + 15) == 0) {\r
+    if (*((UINT8 *)AcpiPtr + 15) == 0) {\r
       CopySize = 20;\r
     } else {\r
-      AcpiPtr   = ((UINT8 *) AcpiPtr + 20);\r
-      CopySize  = (*(UINT32 *) AcpiPtr);\r
+      AcpiPtr  = ((UINT8 *)AcpiPtr + 20);\r
+      CopySize = (*(UINT32 *)AcpiPtr);\r
     }\r
 \r
     CopyMem (\r
-      (VOID *)(UINTN) Private->Legacy16Table->AcpiRsdPtrPointer,\r
+      (VOID *)(UINTN)Private->Legacy16Table->AcpiRsdPtrPointer,\r
       AcpiTable,\r
       CopySize\r
       );\r
   }\r
+\r
   //\r
   // Make sure all PCI Interrupt Line register are programmed to match 8259\r
   //\r
@@ -1034,12 +1050,13 @@ GenericLegacyBoot (
   if ((mBootMode == BOOT_LEGACY_OS) || (mBootMode == BOOT_UNCONVENTIONAL_DEVICE)) {\r
     UpdateSioData (Private);\r
   }\r
+\r
   //\r
   // Setup BDA and EBDA standard areas before Legacy Boot\r
   //\r
   ACCESS_PAGE0_CODE (\r
     LegacyBiosCompleteBdaBeforeBoot (Private);\r
-  );\r
+    );\r
   LegacyBiosCompleteStandardCmosBeforeBoot (Private);\r
 \r
   //\r
@@ -1063,7 +1080,7 @@ GenericLegacyBoot (
   // Adjust value by 1 second.\r
   //\r
   gRT->GetTime (&BootTime, NULL);\r
-  LocalTime = BootTime.Hour * 3600 + BootTime.Minute * 60 + BootTime.Second;\r
+  LocalTime  = BootTime.Hour * 3600 + BootTime.Minute * 60 + BootTime.Second;\r
   LocalTime += 1;\r
 \r
   //\r
@@ -1072,9 +1089,9 @@ GenericLegacyBoot (
   //\r
   LocalTime = (LocalTime * 182) / 10;\r
   ACCESS_PAGE0_CODE (\r
-    BdaPtr    = (UINT32 *) (UINTN)0x46C;\r
-    *BdaPtr   = LocalTime;\r
-  );\r
+    BdaPtr  = (UINT32 *)(UINTN)0x46C;\r
+    *BdaPtr = LocalTime;\r
+    );\r
 \r
   //\r
   // Shadow PCI ROMs. We must do this near the end since this will kick\r
@@ -1130,13 +1147,15 @@ GenericLegacyBoot (
   for (Index = 0; Index < MAX_IDE_CONTROLLER; Index++) {\r
     if ((LocalHddInfo[Index].IdentifyDrive[0].Raw[0] != 0) &&\r
         (LocalBbsTable[2 * Index + 1].BootPriority == BBS_IGNORE_ENTRY)\r
-        ) {\r
+        )\r
+    {\r
       LocalBbsTable[2 * Index + 1].BootPriority = BBS_UNPRIORITIZED_ENTRY;\r
     }\r
 \r
     if ((LocalHddInfo[Index].IdentifyDrive[1].Raw[0] != 0) &&\r
         (LocalBbsTable[2 * Index + 2].BootPriority == BBS_IGNORE_ENTRY)\r
-        ) {\r
+        )\r
+    {\r
       LocalBbsTable[2 * Index + 2].BootPriority = BBS_UNPRIORITIZED_ENTRY;\r
     }\r
   }\r
@@ -1154,24 +1173,27 @@ GenericLegacyBoot (
                         mBbsTable,\r
                         mLoadOptionsSize,\r
                         mLoadOptions,\r
-                        (VOID *) &Private->IntThunk->EfiToLegacy16BootTable\r
+                        (VOID *)&Private->IntThunk->EfiToLegacy16BootTable\r
                         );\r
 \r
   //\r
   // If no boot device return to BDS\r
   //\r
   if ((mBootMode == BOOT_LEGACY_OS) || (mBootMode == BOOT_UNCONVENTIONAL_DEVICE)) {\r
-    for (Index = 0; Index < BbsCount; Index++){\r
+    for (Index = 0; Index < BbsCount; Index++) {\r
       if ((LocalBbsTable[Index].BootPriority != BBS_DO_NOT_BOOT_FROM) &&\r
           (LocalBbsTable[Index].BootPriority != BBS_UNPRIORITIZED_ENTRY) &&\r
-          (LocalBbsTable[Index].BootPriority != BBS_IGNORE_ENTRY)) {\r
+          (LocalBbsTable[Index].BootPriority != BBS_IGNORE_ENTRY))\r
+      {\r
         break;\r
       }\r
     }\r
+\r
     if (Index == BbsCount) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
   }\r
+\r
   //\r
   // Let the Legacy16 code know the device path type for legacy boot\r
   //\r
@@ -1218,17 +1240,18 @@ GenericLegacyBoot (
   Regs.X.BX = NORMALIZE_EFI_OFFSET ((UINTN)EfiToLegacy16BootTable);\r
 \r
   Private->LegacyBios.FarCall86 (\r
-    This,\r
-    Private->Legacy16CallSegment,\r
-    Private->Legacy16CallOffset,\r
-    &Regs,\r
-    NULL,\r
-    0\r
-    );\r
+                        This,\r
+                        Private->Legacy16CallSegment,\r
+                        Private->Legacy16CallOffset,\r
+                        &Regs,\r
+                        NULL,\r
+                        0\r
+                        );\r
 \r
   if (Regs.X.AX != 0) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   //\r
   // Lock the Legacy BIOS region\r
   //\r
@@ -1240,13 +1263,18 @@ GenericLegacyBoot (
                            );\r
 \r
   if ((Private->Legacy16Table->TableLength >= OFFSET_OF (EFI_COMPATIBILITY16_TABLE, HiPermanentMemoryAddress)) &&\r
-      ((Private->Legacy16Table->UmaAddress != 0) && (Private->Legacy16Table->UmaSize != 0))) {\r
+      ((Private->Legacy16Table->UmaAddress != 0) && (Private->Legacy16Table->UmaSize != 0)))\r
+  {\r
     //\r
     // Here we could reduce UmaAddress down as far as Private->OptionRom, taking into\r
     // account the granularity of the access control.\r
     //\r
-    DEBUG((DEBUG_INFO, "Unlocking UMB RAM region 0x%x-0x%x\n", Private->Legacy16Table->UmaAddress,\r
-                        Private->Legacy16Table->UmaAddress + Private->Legacy16Table->UmaSize));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "Unlocking UMB RAM region 0x%x-0x%x\n",\r
+      Private->Legacy16Table->UmaAddress,\r
+      Private->Legacy16Table->UmaAddress + Private->Legacy16Table->UmaSize\r
+      ));\r
 \r
     Private->LegacyRegion->UnLock (\r
                              Private->LegacyRegion,\r
@@ -1271,7 +1299,6 @@ GenericLegacyBoot (
   //\r
   EnableAllControllers (Private);\r
   if ((mBootMode == BOOT_LEGACY_OS) || (mBootMode == BOOT_UNCONVENTIONAL_DEVICE)) {\r
-\r
     //\r
     // Signal all the events that are waiting on EVT_SIGNAL_LEGACY_BOOT\r
     //\r
@@ -1297,7 +1324,6 @@ GenericLegacyBoot (
     //\r
     SaveAndSetDebugTimerInterrupt (FALSE);\r
 \r
-\r
     //\r
     // Put the 8259 into its legacy mode by reprogramming the vector bases\r
     //\r
@@ -1321,34 +1347,37 @@ GenericLegacyBoot (
     //\r
     //\r
     ACCESS_PAGE0_CODE (\r
-      BaseVectorMaster = (UINT32 *) (sizeof (UINT32) * PROTECTED_MODE_BASE_VECTOR_MASTER);\r
+      BaseVectorMaster = (UINT32 *)(sizeof (UINT32) * PROTECTED_MODE_BASE_VECTOR_MASTER);\r
       for (Index = 0; Index < 8; Index++) {\r
-        Private->ThunkSavedInt[Index] = BaseVectorMaster[Index];\r
-        if (Private->ThunkSeg == (UINT16) (BaseVectorMaster[Index] >> 16)) {\r
-          BaseVectorMaster[Index] = (UINT32) (Private->BiosUnexpectedInt);\r
-        }\r
+      Private->ThunkSavedInt[Index] = BaseVectorMaster[Index];\r
+      if (Private->ThunkSeg == (UINT16)(BaseVectorMaster[Index] >> 16)) {\r
+        BaseVectorMaster[Index] = (UINT32)(Private->BiosUnexpectedInt);\r
       }\r
-    );\r
+    }\r
+\r
+      );\r
 \r
     ZeroMem (&Regs, sizeof (EFI_IA32_REGISTER_SET));\r
     Regs.X.AX = Legacy16Boot;\r
 \r
     Private->LegacyBios.FarCall86 (\r
-      This,\r
-      Private->Legacy16CallSegment,\r
-      Private->Legacy16CallOffset,\r
-      &Regs,\r
-      NULL,\r
-      0\r
-      );\r
+                          This,\r
+                          Private->Legacy16CallSegment,\r
+                          Private->Legacy16CallOffset,\r
+                          &Regs,\r
+                          NULL,\r
+                          0\r
+                          );\r
 \r
     ACCESS_PAGE0_CODE (\r
-      BaseVectorMaster = (UINT32 *) (sizeof (UINT32) * PROTECTED_MODE_BASE_VECTOR_MASTER);\r
+      BaseVectorMaster = (UINT32 *)(sizeof (UINT32) * PROTECTED_MODE_BASE_VECTOR_MASTER);\r
       for (Index = 0; Index < 8; Index++) {\r
-        BaseVectorMaster[Index] = Private->ThunkSavedInt[Index];\r
-      }\r
-    );\r
+      BaseVectorMaster[Index] = Private->ThunkSavedInt[Index];\r
+    }\r
+\r
+      );\r
   }\r
+\r
   Private->LegacyBootEntered = TRUE;\r
   if ((mBootMode == BOOT_LEGACY_OS) || (mBootMode == BOOT_UNCONVENTIONAL_DEVICE)) {\r
     //\r
@@ -1364,7 +1393,6 @@ GenericLegacyBoot (
   }\r
 }\r
 \r
-\r
 /**\r
   Assign drive number to legacy HDD drives prior to booting an EFI\r
   aware OS so the OS can access drives without an EFI driver.\r
@@ -1381,22 +1409,22 @@ GenericLegacyBoot (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosPrepareToBootEfi (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL         *This,\r
-  OUT UINT16                          *BbsCount,\r
-  OUT BBS_TABLE                       **BbsTable\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  OUT UINT16                   *BbsCount,\r
+  OUT BBS_TABLE                **BbsTable\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_TO_COMPATIBILITY16_BOOT_TABLE *EfiToLegacy16BootTable;\r
-  LEGACY_BIOS_INSTANCE              *Private;\r
-\r
-  Private                 = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
-  EfiToLegacy16BootTable  = &Private->IntThunk->EfiToLegacy16BootTable;\r
-  mBootMode               = BOOT_EFI_OS;\r
-  mBbsDevicePathPtr       = NULL;\r
-  Status                  = GenericLegacyBoot (This);\r
-  *BbsTable               = (BBS_TABLE*)(UINTN)EfiToLegacy16BootTable->BbsTable;\r
-  *BbsCount               = (UINT16) (sizeof (Private->IntThunk->BbsTable) / sizeof (BBS_TABLE));\r
+  EFI_STATUS                         Status;\r
+  EFI_TO_COMPATIBILITY16_BOOT_TABLE  *EfiToLegacy16BootTable;\r
+  LEGACY_BIOS_INSTANCE               *Private;\r
+\r
+  Private                = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
+  EfiToLegacy16BootTable = &Private->IntThunk->EfiToLegacy16BootTable;\r
+  mBootMode              = BOOT_EFI_OS;\r
+  mBbsDevicePathPtr      = NULL;\r
+  Status                 = GenericLegacyBoot (This);\r
+  *BbsTable              = (BBS_TABLE *)(UINTN)EfiToLegacy16BootTable->BbsTable;\r
+  *BbsCount              = (UINT16)(sizeof (Private->IntThunk->BbsTable) / sizeof (BBS_TABLE));\r
   return Status;\r
 }\r
 \r
@@ -1418,28 +1446,28 @@ LegacyBiosPrepareToBootEfi (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosBootUnconventionalDevice (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL         *This,\r
-  IN UDC_ATTRIBUTES                   Attributes,\r
-  IN UINTN                            BbsEntry,\r
-  IN VOID                             *BeerData,\r
-  IN VOID                             *ServiceAreaData\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN UDC_ATTRIBUTES            Attributes,\r
+  IN UINTN                     BbsEntry,\r
+  IN VOID                      *BeerData,\r
+  IN VOID                      *ServiceAreaData\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_TO_COMPATIBILITY16_BOOT_TABLE *EfiToLegacy16BootTable;\r
-  LEGACY_BIOS_INSTANCE              *Private;\r
-  UD_TABLE                          *UcdTable;\r
-  UINTN                             Index;\r
-  UINT16                            BootPriority;\r
-  BBS_TABLE                         *BbsTable;\r
-\r
-  BootPriority = 0;\r
-  Private = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
-  mBootMode = BOOT_UNCONVENTIONAL_DEVICE;\r
+  EFI_STATUS                         Status;\r
+  EFI_TO_COMPATIBILITY16_BOOT_TABLE  *EfiToLegacy16BootTable;\r
+  LEGACY_BIOS_INSTANCE               *Private;\r
+  UD_TABLE                           *UcdTable;\r
+  UINTN                              Index;\r
+  UINT16                             BootPriority;\r
+  BBS_TABLE                          *BbsTable;\r
+\r
+  BootPriority      = 0;\r
+  Private           = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
+  mBootMode         = BOOT_UNCONVENTIONAL_DEVICE;\r
   mBbsDevicePathPtr = &mBbsDevicePathNode;\r
-  mAttributes = Attributes;\r
-  mBbsEntry = BbsEntry;\r
-  mBeerData = BeerData, mServiceAreaData = ServiceAreaData;\r
+  mAttributes       = Attributes;\r
+  mBbsEntry         = BbsEntry;\r
+  mBeerData         = BeerData, mServiceAreaData = ServiceAreaData;\r
 \r
   EfiToLegacy16BootTable = &Private->IntThunk->EfiToLegacy16BootTable;\r
 \r
@@ -1449,58 +1477,62 @@ LegacyBiosBootUnconventionalDevice (
   if ((Attributes.DirectoryServiceValidity == 0) &&\r
       (Attributes.RabcaUsedFlag == 0) &&\r
       (Attributes.ExecuteHddDiagnosticsFlag == 0)\r
-      ) {\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (((Attributes.DirectoryServiceValidity != 0) && (ServiceAreaData == NULL)) ||\r
       (((Attributes.DirectoryServiceValidity | Attributes.RabcaUsedFlag) != 0) && (BeerData == NULL))\r
-      ) {\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  UcdTable = (UD_TABLE *) AllocatePool (\r
-                            sizeof (UD_TABLE)\r
-                            );\r
+  UcdTable = (UD_TABLE *)AllocatePool (\r
+                           sizeof (UD_TABLE)\r
+                           );\r
   if (NULL == UcdTable) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   EfiToLegacy16BootTable->UnconventionalDeviceTable = (UINT32)(UINTN)UcdTable;\r
-  UcdTable->Attributes = Attributes;\r
-  UcdTable->BbsTableEntryNumberForParentDevice = (UINT8) BbsEntry;\r
+  UcdTable->Attributes                              = Attributes;\r
+  UcdTable->BbsTableEntryNumberForParentDevice      = (UINT8)BbsEntry;\r
   //\r
   // Force all existing BBS entries to DoNotBoot. This allows 16-bit CSM\r
   // to assign drive numbers but bot boot from. Only newly created entries\r
   // will be valid.\r
   //\r
-  BbsTable = (BBS_TABLE*)(UINTN)EfiToLegacy16BootTable->BbsTable;\r
+  BbsTable = (BBS_TABLE *)(UINTN)EfiToLegacy16BootTable->BbsTable;\r
   for (Index = 0; Index < EfiToLegacy16BootTable->NumberBbsEntries; Index++) {\r
     BbsTable[Index].BootPriority = BBS_DO_NOT_BOOT_FROM;\r
   }\r
+\r
   //\r
   // If parent is onboard IDE then assign controller & device number\r
   // else they are 0.\r
   //\r
   if (BbsEntry < MAX_IDE_CONTROLLER * 2) {\r
-    UcdTable->DeviceNumber = (UINT8) ((BbsEntry - 1) % 2);\r
+    UcdTable->DeviceNumber = (UINT8)((BbsEntry - 1) % 2);\r
   }\r
 \r
   if (BeerData != NULL) {\r
     CopyMem (\r
-      (VOID *) UcdTable->BeerData,\r
+      (VOID *)UcdTable->BeerData,\r
       BeerData,\r
-      (UINTN) 128\r
+      (UINTN)128\r
       );\r
   }\r
 \r
   if (ServiceAreaData != NULL) {\r
     CopyMem (\r
-      (VOID *) UcdTable->ServiceAreaData,\r
+      (VOID *)UcdTable->ServiceAreaData,\r
       ServiceAreaData,\r
-      (UINTN) 64\r
+      (UINTN)64\r
       );\r
   }\r
+\r
   //\r
   // For each new entry do the following:\r
   //   1. Increment current number of BBS entries\r
@@ -1514,8 +1546,8 @@ LegacyBiosBootUnconventionalDevice (
     EfiToLegacy16BootTable->NumberBbsEntries += 1;\r
 \r
     CopyMem (\r
-      (VOID *) &BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].BootPriority,\r
-      (VOID *) &BbsTable[BbsEntry].BootPriority,\r
+      (VOID *)&BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].BootPriority,\r
+      (VOID *)&BbsTable[BbsEntry].BootPriority,\r
       sizeof (BBS_TABLE)\r
       );\r
 \r
@@ -1523,10 +1555,10 @@ LegacyBiosBootUnconventionalDevice (
     BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].BootHandlerSegment = 0;\r
     BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].DeviceType         = 0x80;\r
 \r
-    UcdTable->BbsTableEntryNumberForHddDiag = (UINT8) (EfiToLegacy16BootTable->NumberBbsEntries - 1);\r
+    UcdTable->BbsTableEntryNumberForHddDiag = (UINT8)(EfiToLegacy16BootTable->NumberBbsEntries - 1);\r
 \r
     BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].BootPriority = BootPriority;\r
-    BootPriority += 1;\r
+    BootPriority                                                   += 1;\r
 \r
     //\r
     // Set device type as BBS_TYPE_DEV for PARTIES diagnostic\r
@@ -1537,22 +1569,23 @@ LegacyBiosBootUnconventionalDevice (
   if (((Attributes.DirectoryServiceValidity | Attributes.RabcaUsedFlag)) != 0) {\r
     EfiToLegacy16BootTable->NumberBbsEntries += 1;\r
     CopyMem (\r
-      (VOID *) &BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].BootPriority,\r
-      (VOID *) &BbsTable[BbsEntry].BootPriority,\r
+      (VOID *)&BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].BootPriority,\r
+      (VOID *)&BbsTable[BbsEntry].BootPriority,\r
       sizeof (BBS_TABLE)\r
       );\r
 \r
     BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].BootHandlerOffset  = 0;\r
     BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].BootHandlerSegment = 0;\r
     BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].DeviceType         = 0x01;\r
-    UcdTable->BbsTableEntryNumberForBoot = (UINT8) (EfiToLegacy16BootTable->NumberBbsEntries - 1);\r
-    BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].BootPriority = BootPriority;\r
+    UcdTable->BbsTableEntryNumberForBoot                                  = (UINT8)(EfiToLegacy16BootTable->NumberBbsEntries - 1);\r
+    BbsTable[EfiToLegacy16BootTable->NumberBbsEntries].BootPriority       = BootPriority;\r
 \r
     //\r
     // Set device type as BBS_TYPE_FLOPPY for PARTIES boot as floppy\r
     //\r
     mBbsDevicePathNode.DeviceType = BBS_TYPE_FLOPPY;\r
   }\r
+\r
   //\r
   // Build the BBS Device Path for this boot selection\r
   //\r
@@ -1562,7 +1595,7 @@ LegacyBiosBootUnconventionalDevice (
   mBbsDevicePathNode.StatusFlag = 0;\r
   mBbsDevicePathNode.String[0]  = 0;\r
 \r
-  Status                        = GenericLegacyBoot (This);\r
+  Status = GenericLegacyBoot (This);\r
   return Status;\r
 }\r
 \r
@@ -1581,10 +1614,10 @@ LegacyBiosBootUnconventionalDevice (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosLegacyBoot (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL           *This,\r
-  IN  BBS_BBS_DEVICE_PATH               *BbsDevicePath,\r
-  IN  UINT32                            LoadOptionsSize,\r
-  IN  VOID                              *LoadOptions\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  BBS_BBS_DEVICE_PATH      *BbsDevicePath,\r
+  IN  UINT32                   LoadOptionsSize,\r
+  IN  VOID                     *LoadOptions\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -1608,46 +1641,46 @@ LegacyBiosLegacyBoot (
 **/\r
 EFI_ACPI_MEMORY_TYPE\r
 EfiMemoryTypeToE820Type (\r
-  IN  UINT32    Type\r
+  IN  UINT32  Type\r
   )\r
 {\r
   switch (Type) {\r
-  case EfiLoaderCode:\r
-  case EfiLoaderData:\r
-  case EfiBootServicesCode:\r
-  case EfiBootServicesData:\r
-  case EfiConventionalMemory:\r
-  //\r
-  // The memory of EfiRuntimeServicesCode and EfiRuntimeServicesData are\r
-  // usable memory for legacy OS, because legacy OS is not aware of EFI runtime concept.\r
-  // In ACPI specification, EfiRuntimeServiceCode and EfiRuntimeServiceData\r
-  // should be mapped to AddressRangeReserved. This statement is for UEFI OS, not for legacy OS.\r
-  //\r
-  case EfiRuntimeServicesCode:\r
-  case EfiRuntimeServicesData:\r
-    return EfiAcpiAddressRangeMemory;\r
+    case EfiLoaderCode:\r
+    case EfiLoaderData:\r
+    case EfiBootServicesCode:\r
+    case EfiBootServicesData:\r
+    case EfiConventionalMemory:\r
+    //\r
+    // The memory of EfiRuntimeServicesCode and EfiRuntimeServicesData are\r
+    // usable memory for legacy OS, because legacy OS is not aware of EFI runtime concept.\r
+    // In ACPI specification, EfiRuntimeServiceCode and EfiRuntimeServiceData\r
+    // should be mapped to AddressRangeReserved. This statement is for UEFI OS, not for legacy OS.\r
+    //\r
+    case EfiRuntimeServicesCode:\r
+    case EfiRuntimeServicesData:\r
+      return EfiAcpiAddressRangeMemory;\r
 \r
-  case EfiPersistentMemory:\r
-    return EfiAddressRangePersistentMemory;\r
+    case EfiPersistentMemory:\r
+      return EfiAddressRangePersistentMemory;\r
 \r
-  case EfiACPIReclaimMemory:\r
-    return EfiAcpiAddressRangeACPI;\r
+    case EfiACPIReclaimMemory:\r
+      return EfiAcpiAddressRangeACPI;\r
 \r
-  case EfiACPIMemoryNVS:\r
-    return EfiAcpiAddressRangeNVS;\r
+    case EfiACPIMemoryNVS:\r
+      return EfiAcpiAddressRangeNVS;\r
 \r
-  //\r
-  // All other types map to reserved.\r
-  // Adding the code just waists FLASH space.\r
-  //\r
-  //  case  EfiReservedMemoryType:\r
-  //  case  EfiUnusableMemory:\r
-  //  case  EfiMemoryMappedIO:\r
-  //  case  EfiMemoryMappedIOPortSpace:\r
-  //  case  EfiPalCode:\r
-  //\r
-  default:\r
-    return EfiAcpiAddressRangeReserved;\r
+    //\r
+    // All other types map to reserved.\r
+    // Adding the code just waists FLASH space.\r
+    //\r
+    //  case  EfiReservedMemoryType:\r
+    //  case  EfiUnusableMemory:\r
+    //  case  EfiMemoryMappedIO:\r
+    //  case  EfiMemoryMappedIOPortSpace:\r
+    //  case  EfiPalCode:\r
+    //\r
+    default:\r
+      return EfiAcpiAddressRangeReserved;\r
   }\r
 }\r
 \r
@@ -1662,47 +1695,47 @@ EfiMemoryTypeToE820Type (
 **/\r
 EFI_STATUS\r
 LegacyBiosBuildE820 (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private,\r
-  OUT UINTN                   *Size\r
+  IN  LEGACY_BIOS_INSTANCE  *Private,\r
+  OUT UINTN                 *Size\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_E820_ENTRY64            *E820Table;\r
-  EFI_MEMORY_DESCRIPTOR       *EfiMemoryMap;\r
-  EFI_MEMORY_DESCRIPTOR       *EfiMemoryMapEnd;\r
-  EFI_MEMORY_DESCRIPTOR       *EfiEntry;\r
-  EFI_MEMORY_DESCRIPTOR       *NextEfiEntry;\r
-  EFI_MEMORY_DESCRIPTOR       TempEfiEntry;\r
-  UINTN                       EfiMemoryMapSize;\r
-  UINTN                       EfiMapKey;\r
-  UINTN                       EfiDescriptorSize;\r
-  UINT32                      EfiDescriptorVersion;\r
-  UINTN                       Index;\r
-  EFI_PEI_HOB_POINTERS        Hob;\r
-  EFI_HOB_RESOURCE_DESCRIPTOR *ResourceHob;\r
-  UINTN                       TempIndex;\r
-  UINTN                       IndexSort;\r
-  UINTN                       TempNextIndex;\r
-  EFI_E820_ENTRY64            TempE820;\r
-  EFI_ACPI_MEMORY_TYPE        TempType;\r
-  BOOLEAN                     ChangedFlag;\r
-  UINTN                       Above1MIndex;\r
-  UINT64                      MemoryBlockLength;\r
-\r
-  E820Table = (EFI_E820_ENTRY64 *) Private->E820Table;\r
+  EFI_STATUS                   Status;\r
+  EFI_E820_ENTRY64             *E820Table;\r
+  EFI_MEMORY_DESCRIPTOR        *EfiMemoryMap;\r
+  EFI_MEMORY_DESCRIPTOR        *EfiMemoryMapEnd;\r
+  EFI_MEMORY_DESCRIPTOR        *EfiEntry;\r
+  EFI_MEMORY_DESCRIPTOR        *NextEfiEntry;\r
+  EFI_MEMORY_DESCRIPTOR        TempEfiEntry;\r
+  UINTN                        EfiMemoryMapSize;\r
+  UINTN                        EfiMapKey;\r
+  UINTN                        EfiDescriptorSize;\r
+  UINT32                       EfiDescriptorVersion;\r
+  UINTN                        Index;\r
+  EFI_PEI_HOB_POINTERS         Hob;\r
+  EFI_HOB_RESOURCE_DESCRIPTOR  *ResourceHob;\r
+  UINTN                        TempIndex;\r
+  UINTN                        IndexSort;\r
+  UINTN                        TempNextIndex;\r
+  EFI_E820_ENTRY64             TempE820;\r
+  EFI_ACPI_MEMORY_TYPE         TempType;\r
+  BOOLEAN                      ChangedFlag;\r
+  UINTN                        Above1MIndex;\r
+  UINT64                       MemoryBlockLength;\r
+\r
+  E820Table = (EFI_E820_ENTRY64 *)Private->E820Table;\r
 \r
   //\r
   // Get the EFI memory map.\r
   //\r
-  EfiMemoryMapSize  = 0;\r
-  EfiMemoryMap      = NULL;\r
-  Status = gBS->GetMemoryMap (\r
-                  &EfiMemoryMapSize,\r
-                  EfiMemoryMap,\r
-                  &EfiMapKey,\r
-                  &EfiDescriptorSize,\r
-                  &EfiDescriptorVersion\r
-                  );\r
+  EfiMemoryMapSize = 0;\r
+  EfiMemoryMap     = NULL;\r
+  Status           = gBS->GetMemoryMap (\r
+                            &EfiMemoryMapSize,\r
+                            EfiMemoryMap,\r
+                            &EfiMapKey,\r
+                            &EfiDescriptorSize,\r
+                            &EfiDescriptorVersion\r
+                            );\r
   ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
 \r
   do {\r
@@ -1712,7 +1745,7 @@ LegacyBiosBuildE820 (
     // EfiMemoryMapEnd which is dependent upon EfiMemoryMapSize. Otherwise\r
     // we process bogus entries and create bogus E820 entries.\r
     //\r
-    EfiMemoryMap = (EFI_MEMORY_DESCRIPTOR *) AllocatePool (EfiMemoryMapSize);\r
+    EfiMemoryMap = (EFI_MEMORY_DESCRIPTOR *)AllocatePool (EfiMemoryMapSize);\r
     ASSERT (EfiMemoryMap != NULL);\r
     Status = gBS->GetMemoryMap (\r
                     &EfiMemoryMapSize,\r
@@ -1736,17 +1769,17 @@ LegacyBiosBuildE820 (
   // First entry is 0 to (640k - EBDA)\r
   //\r
   ACCESS_PAGE0_CODE (\r
-    E820Table[0].BaseAddr  = 0;\r
-    E820Table[0].Length    = (UINT64) ((*(UINT16 *) (UINTN)0x40E) << 4);\r
-    E820Table[0].Type      = EfiAcpiAddressRangeMemory;\r
-  );\r
+    E820Table[0].BaseAddr = 0;\r
+    E820Table[0].Length   = (UINT64)((*(UINT16 *)(UINTN)0x40E) << 4);\r
+    E820Table[0].Type     = EfiAcpiAddressRangeMemory;\r
+    );\r
 \r
   //\r
   // Second entry is (640k - EBDA) to 640k\r
   //\r
-  E820Table[1].BaseAddr  = E820Table[0].Length;\r
-  E820Table[1].Length    = (UINT64) ((640 * 1024) - E820Table[0].Length);\r
-  E820Table[1].Type      = EfiAcpiAddressRangeReserved;\r
+  E820Table[1].BaseAddr = E820Table[0].Length;\r
+  E820Table[1].Length   = (UINT64)((640 * 1024) - E820Table[0].Length);\r
+  E820Table[1].Type     = EfiAcpiAddressRangeReserved;\r
 \r
   //\r
   // Third Entry is legacy BIOS\r
@@ -1760,9 +1793,9 @@ LegacyBiosBuildE820 (
   // The CSM binary image size is not the actually size that CSM binary used,\r
   // to avoid memory corrupt, we declare the 0E0000 - 0FFFFF is used by CSM binary.\r
   //\r
-  E820Table[2].BaseAddr  = 0xE0000;\r
-  E820Table[2].Length    = 0x20000;\r
-  E820Table[2].Type      = EfiAcpiAddressRangeReserved;\r
+  E820Table[2].BaseAddr = 0xE0000;\r
+  E820Table[2].Length   = 0x20000;\r
+  E820Table[2].Type     = EfiAcpiAddressRangeReserved;\r
 \r
   Above1MIndex = 2;\r
 \r
@@ -1775,7 +1808,7 @@ LegacyBiosBuildE820 (
   //\r
   EfiEntry        = EfiMemoryMap;\r
   NextEfiEntry    = NEXT_MEMORY_DESCRIPTOR (EfiEntry, EfiDescriptorSize);\r
-  EfiMemoryMapEnd = (EFI_MEMORY_DESCRIPTOR *) ((UINT8 *) EfiMemoryMap + EfiMemoryMapSize);\r
+  EfiMemoryMapEnd = (EFI_MEMORY_DESCRIPTOR *)((UINT8 *)EfiMemoryMap + EfiMemoryMapSize);\r
   while (EfiEntry < EfiMemoryMapEnd) {\r
     while (NextEfiEntry < EfiMemoryMapEnd) {\r
       if (EfiEntry->PhysicalStart > NextEfiEntry->PhysicalStart) {\r
@@ -1787,14 +1820,14 @@ LegacyBiosBuildE820 (
       NextEfiEntry = NEXT_MEMORY_DESCRIPTOR (NextEfiEntry, EfiDescriptorSize);\r
     }\r
 \r
-    EfiEntry      = NEXT_MEMORY_DESCRIPTOR (EfiEntry, EfiDescriptorSize);\r
-    NextEfiEntry  = NEXT_MEMORY_DESCRIPTOR (EfiEntry, EfiDescriptorSize);\r
+    EfiEntry     = NEXT_MEMORY_DESCRIPTOR (EfiEntry, EfiDescriptorSize);\r
+    NextEfiEntry = NEXT_MEMORY_DESCRIPTOR (EfiEntry, EfiDescriptorSize);\r
   }\r
 \r
   EfiEntry        = EfiMemoryMap;\r
-  EfiMemoryMapEnd = (EFI_MEMORY_DESCRIPTOR *) ((UINT8 *) EfiMemoryMap + EfiMemoryMapSize);\r
+  EfiMemoryMapEnd = (EFI_MEMORY_DESCRIPTOR *)((UINT8 *)EfiMemoryMap + EfiMemoryMapSize);\r
   for (Index = Above1MIndex; (EfiEntry < EfiMemoryMapEnd) && (Index < EFI_MAX_E820_ENTRY - 1); ) {\r
-    MemoryBlockLength = (UINT64) (LShiftU64 (EfiEntry->NumberOfPages, 12));\r
+    MemoryBlockLength = (UINT64)(LShiftU64 (EfiEntry->NumberOfPages, 12));\r
     if ((EfiEntry->PhysicalStart + MemoryBlockLength) < 0x100000) {\r
       //\r
       // Skip the memory block if under 1MB\r
@@ -1804,7 +1837,7 @@ LegacyBiosBuildE820 (
         //\r
         // When the memory block spans below 1MB, ensure the memory block start address is at least 1MB\r
         //\r
-        MemoryBlockLength       -= 0x100000 - EfiEntry->PhysicalStart;\r
+        MemoryBlockLength      -= 0x100000 - EfiEntry->PhysicalStart;\r
         EfiEntry->PhysicalStart =  0x100000;\r
       }\r
 \r
@@ -1823,11 +1856,12 @@ LegacyBiosBuildE820 (
         // Make a new entry\r
         //\r
         ++Index;\r
-        E820Table[Index].BaseAddr  = EfiEntry->PhysicalStart;\r
-        E820Table[Index].Length    = MemoryBlockLength;\r
-        E820Table[Index].Type      = TempType;\r
+        E820Table[Index].BaseAddr = EfiEntry->PhysicalStart;\r
+        E820Table[Index].Length   = MemoryBlockLength;\r
+        E820Table[Index].Type     = TempType;\r
       }\r
     }\r
+\r
     EfiEntry = NEXT_MEMORY_DESCRIPTOR (EfiEntry, EfiDescriptorSize);\r
   }\r
 \r
@@ -1837,26 +1871,27 @@ LegacyBiosBuildE820 (
   // Process the reserved memory map to produce E820 map ;\r
   //\r
   for (Hob.Raw = GetHobList (); !END_OF_HOB_LIST (Hob); Hob.Raw = GET_NEXT_HOB (Hob)) {\r
-    if (Hob.Raw != NULL && GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
+    if ((Hob.Raw != NULL) && (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR)) {\r
       ResourceHob = Hob.ResourceDescriptor;\r
       if (((ResourceHob->ResourceType == EFI_RESOURCE_MEMORY_MAPPED_IO) ||\r
-          (ResourceHob->ResourceType == EFI_RESOURCE_FIRMWARE_DEVICE)  ||\r
-          (ResourceHob->ResourceType == EFI_RESOURCE_MEMORY_RESERVED)    ) &&\r
+           (ResourceHob->ResourceType == EFI_RESOURCE_FIRMWARE_DEVICE)  ||\r
+           (ResourceHob->ResourceType == EFI_RESOURCE_MEMORY_RESERVED)) &&\r
           (ResourceHob->PhysicalStart > 0x100000) &&\r
-          (Index < EFI_MAX_E820_ENTRY - 1)) {\r
+          (Index < EFI_MAX_E820_ENTRY - 1))\r
+      {\r
         ++Index;\r
-        E820Table[Index].BaseAddr  = ResourceHob->PhysicalStart;\r
-        E820Table[Index].Length    = ResourceHob->ResourceLength;\r
-        E820Table[Index].Type      = EfiAcpiAddressRangeReserved;\r
+        E820Table[Index].BaseAddr = ResourceHob->PhysicalStart;\r
+        E820Table[Index].Length   = ResourceHob->ResourceLength;\r
+        E820Table[Index].Type     = EfiAcpiAddressRangeReserved;\r
       }\r
     }\r
   }\r
 \r
-  Index ++;\r
+  Index++;\r
   Private->IntThunk->EfiToLegacy16InitTable.NumberE820Entries = (UINT32)Index;\r
   Private->IntThunk->EfiToLegacy16BootTable.NumberE820Entries = (UINT32)Index;\r
-  Private->NumberE820Entries = (UINT32)Index;\r
-  *Size = (UINTN) (Index * sizeof (EFI_E820_ENTRY64));\r
+  Private->NumberE820Entries                                  = (UINT32)Index;\r
+  *Size                                                       = (UINTN)(Index * sizeof (EFI_E820_ENTRY64));\r
 \r
   //\r
   // Sort E820Table from low to high\r
@@ -1865,18 +1900,18 @@ LegacyBiosBuildE820 (
     ChangedFlag = FALSE;\r
     for (TempNextIndex = 1; TempNextIndex < Index - TempIndex; TempNextIndex++) {\r
       if (E820Table[TempNextIndex - 1].BaseAddr > E820Table[TempNextIndex].BaseAddr) {\r
-        ChangedFlag                       = TRUE;\r
-        TempE820.BaseAddr                 = E820Table[TempNextIndex - 1].BaseAddr;\r
-        TempE820.Length                   = E820Table[TempNextIndex - 1].Length;\r
-        TempE820.Type                     = E820Table[TempNextIndex - 1].Type;\r
-\r
-        E820Table[TempNextIndex - 1].BaseAddr  = E820Table[TempNextIndex].BaseAddr;\r
-        E820Table[TempNextIndex - 1].Length    = E820Table[TempNextIndex].Length;\r
-        E820Table[TempNextIndex - 1].Type      = E820Table[TempNextIndex].Type;\r
-\r
-        E820Table[TempNextIndex].BaseAddr      = TempE820.BaseAddr;\r
-        E820Table[TempNextIndex].Length        = TempE820.Length;\r
-        E820Table[TempNextIndex].Type          = TempE820.Type;\r
+        ChangedFlag       = TRUE;\r
+        TempE820.BaseAddr = E820Table[TempNextIndex - 1].BaseAddr;\r
+        TempE820.Length   = E820Table[TempNextIndex - 1].Length;\r
+        TempE820.Type     = E820Table[TempNextIndex - 1].Type;\r
+\r
+        E820Table[TempNextIndex - 1].BaseAddr = E820Table[TempNextIndex].BaseAddr;\r
+        E820Table[TempNextIndex - 1].Length   = E820Table[TempNextIndex].Length;\r
+        E820Table[TempNextIndex - 1].Type     = E820Table[TempNextIndex].Type;\r
+\r
+        E820Table[TempNextIndex].BaseAddr = TempE820.BaseAddr;\r
+        E820Table[TempNextIndex].Length   = TempE820.Length;\r
+        E820Table[TempNextIndex].Type     = TempE820.Type;\r
       }\r
     }\r
 \r
@@ -1889,49 +1924,50 @@ LegacyBiosBuildE820 (
   // Remove the overlap range\r
   //\r
   for (TempIndex = 1; TempIndex < Index; TempIndex++) {\r
-    if (E820Table[TempIndex - 1].BaseAddr <= E820Table[TempIndex].BaseAddr &&\r
+    if ((E820Table[TempIndex - 1].BaseAddr <= E820Table[TempIndex].BaseAddr) &&\r
         ((E820Table[TempIndex - 1].BaseAddr + E820Table[TempIndex - 1].Length) >=\r
-         (E820Table[TempIndex].BaseAddr +E820Table[TempIndex].Length))) {\r
-        //\r
-        //Overlap range is found\r
-        //\r
-        ASSERT (E820Table[TempIndex - 1].Type == E820Table[TempIndex].Type);\r
-\r
-        if (TempIndex == Index - 1) {\r
-          E820Table[TempIndex].BaseAddr = 0;\r
-          E820Table[TempIndex].Length   = 0;\r
-          E820Table[TempIndex].Type     = (EFI_ACPI_MEMORY_TYPE) 0;\r
-          Index--;\r
-          break;\r
-        } else {\r
-          for (IndexSort = TempIndex; IndexSort < Index - 1; IndexSort ++) {\r
-            E820Table[IndexSort].BaseAddr = E820Table[IndexSort + 1].BaseAddr;\r
-            E820Table[IndexSort].Length   = E820Table[IndexSort + 1].Length;\r
-            E820Table[IndexSort].Type     = E820Table[IndexSort + 1].Type;\r
-          }\r
-          Index--;\r
-       }\r
-    }\r
-  }\r
+         (E820Table[TempIndex].BaseAddr +E820Table[TempIndex].Length)))\r
+    {\r
+      //\r
+      // Overlap range is found\r
+      //\r
+      ASSERT (E820Table[TempIndex - 1].Type == E820Table[TempIndex].Type);\r
 \r
+      if (TempIndex == Index - 1) {\r
+        E820Table[TempIndex].BaseAddr = 0;\r
+        E820Table[TempIndex].Length   = 0;\r
+        E820Table[TempIndex].Type     = (EFI_ACPI_MEMORY_TYPE)0;\r
+        Index--;\r
+        break;\r
+      } else {\r
+        for (IndexSort = TempIndex; IndexSort < Index - 1; IndexSort++) {\r
+          E820Table[IndexSort].BaseAddr = E820Table[IndexSort + 1].BaseAddr;\r
+          E820Table[IndexSort].Length   = E820Table[IndexSort + 1].Length;\r
+          E820Table[IndexSort].Type     = E820Table[IndexSort + 1].Type;\r
+        }\r
 \r
+        Index--;\r
+      }\r
+    }\r
+  }\r
 \r
   Private->IntThunk->EfiToLegacy16InitTable.NumberE820Entries = (UINT32)Index;\r
   Private->IntThunk->EfiToLegacy16BootTable.NumberE820Entries = (UINT32)Index;\r
-  Private->NumberE820Entries = (UINT32)Index;\r
-  *Size = (UINTN) (Index * sizeof (EFI_E820_ENTRY64));\r
+  Private->NumberE820Entries                                  = (UINT32)Index;\r
+  *Size                                                       = (UINTN)(Index * sizeof (EFI_E820_ENTRY64));\r
 \r
   //\r
   // Determine OS usable memory above 1MB\r
   //\r
   Private->IntThunk->EfiToLegacy16BootTable.OsMemoryAbove1Mb = 0x0000;\r
   for (TempIndex = Above1MIndex; TempIndex < Index; TempIndex++) {\r
-    if (E820Table[TempIndex].BaseAddr >= 0x100000 && E820Table[TempIndex].BaseAddr < 0x100000000ULL) { // not include above 4G memory\r
+    if ((E820Table[TempIndex].BaseAddr >= 0x100000) && (E820Table[TempIndex].BaseAddr < 0x100000000ULL)) {\r
+      // not include above 4G memory\r
       //\r
       // ACPIReclaimMemory is also usable memory for ACPI OS, after OS dumps all ACPI tables.\r
       //\r
       if ((E820Table[TempIndex].Type == EfiAcpiAddressRangeMemory) || (E820Table[TempIndex].Type == EfiAcpiAddressRangeACPI)) {\r
-        Private->IntThunk->EfiToLegacy16BootTable.OsMemoryAbove1Mb += (UINT32) (E820Table[TempIndex].Length);\r
+        Private->IntThunk->EfiToLegacy16BootTable.OsMemoryAbove1Mb += (UINT32)(E820Table[TempIndex].Length);\r
       } else {\r
         break; // break at first not normal memory, because SMM may use reserved memory.\r
       }\r
@@ -1944,7 +1980,9 @@ LegacyBiosBuildE820 (
   // Print DEBUG information\r
   //\r
   for (TempIndex = 0; TempIndex < Index; TempIndex++) {\r
-    DEBUG((DEBUG_INFO, "E820[%2d]: 0x%016lx - 0x%016lx, Type = %d\n",\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "E820[%2d]: 0x%016lx - 0x%016lx, Type = %d\n",\r
       TempIndex,\r
       E820Table[TempIndex].BaseAddr,\r
       (E820Table[TempIndex].BaseAddr + E820Table[TempIndex].Length),\r
@@ -1955,7 +1993,6 @@ LegacyBiosBuildE820 (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Fill in the standard BDA and EBDA stuff prior to legacy Boot\r
 \r
@@ -1966,21 +2003,21 @@ LegacyBiosBuildE820 (
 **/\r
 EFI_STATUS\r
 LegacyBiosCompleteBdaBeforeBoot (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  BDA_STRUC                   *Bda;\r
-  UINT16                      MachineConfig;\r
-  DEVICE_PRODUCER_DATA_HEADER *SioPtr;\r
+  BDA_STRUC                    *Bda;\r
+  UINT16                       MachineConfig;\r
+  DEVICE_PRODUCER_DATA_HEADER  *SioPtr;\r
 \r
-  Bda           = (BDA_STRUC *) ((UINTN) 0x400);\r
+  Bda           = (BDA_STRUC *)((UINTN)0x400);\r
   MachineConfig = 0;\r
 \r
-  SioPtr        = &(Private->IntThunk->EfiToLegacy16BootTable.SioData);\r
-  Bda->Com1     = SioPtr->Serial[0].Address;\r
-  Bda->Com2     = SioPtr->Serial[1].Address;\r
-  Bda->Com3     = SioPtr->Serial[2].Address;\r
-  Bda->Com4     = SioPtr->Serial[3].Address;\r
+  SioPtr    = &(Private->IntThunk->EfiToLegacy16BootTable.SioData);\r
+  Bda->Com1 = SioPtr->Serial[0].Address;\r
+  Bda->Com2 = SioPtr->Serial[1].Address;\r
+  Bda->Com3 = SioPtr->Serial[2].Address;\r
+  Bda->Com4 = SioPtr->Serial[3].Address;\r
 \r
   if (SioPtr->Serial[0].Address != 0x00) {\r
     MachineConfig += 0x200;\r
@@ -2014,22 +2051,22 @@ LegacyBiosCompleteBdaBeforeBoot (
     MachineConfig += 0x4000;\r
   }\r
 \r
-  Bda->NumberOfDrives = (UINT8) (Bda->NumberOfDrives + Private->IdeDriveCount);\r
+  Bda->NumberOfDrives = (UINT8)(Bda->NumberOfDrives + Private->IdeDriveCount);\r
   if (SioPtr->Floppy.NumberOfFloppy != 0x00) {\r
-    MachineConfig     = (UINT16) (MachineConfig + 0x01 + (SioPtr->Floppy.NumberOfFloppy - 1) * 0x40);\r
-    Bda->FloppyXRate  = 0x07;\r
+    MachineConfig    = (UINT16)(MachineConfig + 0x01 + (SioPtr->Floppy.NumberOfFloppy - 1) * 0x40);\r
+    Bda->FloppyXRate = 0x07;\r
   }\r
 \r
-  Bda->Lpt1_2Timeout  = 0x1414;\r
-  Bda->Lpt3_4Timeout  = 0x1414;\r
-  Bda->Com1_2Timeout  = 0x0101;\r
-  Bda->Com3_4Timeout  = 0x0101;\r
+  Bda->Lpt1_2Timeout = 0x1414;\r
+  Bda->Lpt3_4Timeout = 0x1414;\r
+  Bda->Com1_2Timeout = 0x0101;\r
+  Bda->Com3_4Timeout = 0x0101;\r
 \r
   //\r
   // Force VGA and Coprocessor, indicate 101/102 keyboard\r
   //\r
-  MachineConfig       = (UINT16) (MachineConfig + 0x00 + 0x02 + (SioPtr->MousePresent * 0x04));\r
-  Bda->MachineConfig  = MachineConfig;\r
+  MachineConfig      = (UINT16)(MachineConfig + 0x00 + 0x02 + (SioPtr->MousePresent * 0x04));\r
+  Bda->MachineConfig = MachineConfig;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -2046,26 +2083,26 @@ LegacyBiosCompleteBdaBeforeBoot (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosUpdateKeyboardLedStatus (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL           *This,\r
-  IN  UINT8                             Leds\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  UINT8                    Leds\r
   )\r
 {\r
-  LEGACY_BIOS_INSTANCE  *Private;\r
-  BDA_STRUC             *Bda;\r
-  UINT8                 LocalLeds;\r
-  EFI_IA32_REGISTER_SET Regs;\r
+  LEGACY_BIOS_INSTANCE   *Private;\r
+  BDA_STRUC              *Bda;\r
+  UINT8                  LocalLeds;\r
+  EFI_IA32_REGISTER_SET  Regs;\r
 \r
-  Private             = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
+  Private = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
 \r
   ACCESS_PAGE0_CODE (\r
-    Bda                 = (BDA_STRUC *) ((UINTN) 0x400);\r
+    Bda                 = (BDA_STRUC *)((UINTN)0x400);\r
     LocalLeds           = Leds;\r
-    Bda->LedStatus      = (UINT8) ((Bda->LedStatus &~0x07) | LocalLeds);\r
-    LocalLeds           = (UINT8) (LocalLeds << 4);\r
-    Bda->ShiftStatus    = (UINT8) ((Bda->ShiftStatus &~0x70) | LocalLeds);\r
-    LocalLeds           = (UINT8) (Leds & 0x20);\r
-    Bda->KeyboardStatus = (UINT8) ((Bda->KeyboardStatus &~0x20) | LocalLeds);\r
-  );\r
+    Bda->LedStatus      = (UINT8)((Bda->LedStatus &~0x07) | LocalLeds);\r
+    LocalLeds           = (UINT8)(LocalLeds << 4);\r
+    Bda->ShiftStatus    = (UINT8)((Bda->ShiftStatus &~0x70) | LocalLeds);\r
+    LocalLeds           = (UINT8)(Leds & 0x20);\r
+    Bda->KeyboardStatus = (UINT8)((Bda->KeyboardStatus &~0x20) | LocalLeds);\r
+    );\r
 \r
   //\r
   // Call into Legacy16 code to allow it to do any processing\r
@@ -2075,18 +2112,17 @@ LegacyBiosUpdateKeyboardLedStatus (
   Regs.H.CL = Leds;\r
 \r
   Private->LegacyBios.FarCall86 (\r
-    &Private->LegacyBios,\r
-    Private->Legacy16Table->Compatibility16CallSegment,\r
-    Private->Legacy16Table->Compatibility16CallOffset,\r
-    &Regs,\r
-    NULL,\r
-    0\r
-    );\r
+                        &Private->LegacyBios,\r
+                        Private->Legacy16Table->Compatibility16CallSegment,\r
+                        Private->Legacy16Table->Compatibility16CallOffset,\r
+                        &Regs,\r
+                        NULL,\r
+                        0\r
+                        );\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Fill in the standard CMOS stuff prior to legacy Boot\r
 \r
@@ -2097,7 +2133,7 @@ LegacyBiosUpdateKeyboardLedStatus (
 **/\r
 EFI_STATUS\r
 LegacyBiosCompleteStandardCmosBeforeBoot (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
   UINT8   Bda;\r
@@ -2113,7 +2149,7 @@ LegacyBiosCompleteStandardCmosBeforeBoot (
   //\r
   ACCESS_PAGE0_CODE (\r
     Bda = (UINT8)(*((UINT8 *)((UINTN)0x410)) | BIT3);\r
-  );\r
+    );\r
 \r
   //\r
   // Force display enabled\r
@@ -2143,7 +2179,7 @@ LegacyBiosCompleteStandardCmosBeforeBoot (
   //\r
   Size = (15 * SIZE_1MB) >> 10;\r
   if (Private->IntThunk->EfiToLegacy16InitTable.OsMemoryAbove1Mb < (15 * SIZE_1MB)) {\r
-    Size  = Private->IntThunk->EfiToLegacy16InitTable.OsMemoryAbove1Mb >> 10;\r
+    Size = Private->IntThunk->EfiToLegacy16InitTable.OsMemoryAbove1Mb >> 10;\r
   }\r
 \r
   LegacyWriteStandardCmos (CMOS_17, (UINT8)(Size & 0xFF));\r
@@ -2168,8 +2204,8 @@ LegacyBiosCompleteStandardCmosBeforeBoot (
 **/\r
 EFI_STATUS\r
 RelocateImageUnder4GIfNeeded (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EFI_SUCCESS;\r
index de25e06184a42ccf3949003bed857cde7af30122..7220d8e65afe72401706bb3afd89f952c80f385c 100644 (file)
@@ -66,12 +66,12 @@ LegacyCalculateWriteStandardCmosChecksum (
   for (Checksum = 0, Register = 0x10; Register < 0x2e; Register++) {\r
     Checksum = (UINT16)(Checksum + LegacyReadStandardCmos (Register));\r
   }\r
+\r
   LegacyWriteStandardCmos (CMOS_2E, (UINT8)(Checksum >> 8));\r
   LegacyWriteStandardCmos (CMOS_2F, (UINT8)(Checksum & 0xff));\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Fill in the standard CMOS stuff before Legacy16 load\r
 \r
@@ -82,7 +82,7 @@ LegacyCalculateWriteStandardCmosChecksum (
 **/\r
 EFI_STATUS\r
 LegacyBiosInitCmos (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
   UINT32  Size;\r
@@ -103,7 +103,7 @@ LegacyBiosInitCmos (
 \r
   Size = 15 * SIZE_1MB;\r
   if (Private->IntThunk->EfiToLegacy16InitTable.OsMemoryAbove1Mb < (15 * SIZE_1MB)) {\r
-    Size  = Private->IntThunk->EfiToLegacy16InitTable.OsMemoryAbove1Mb >> 10;\r
+    Size = Private->IntThunk->EfiToLegacy16InitTable.OsMemoryAbove1Mb >> 10;\r
   }\r
 \r
   LegacyWriteStandardCmos (CMOS_17, (UINT8)(Size & 0xFF));\r
index 789f48370eb1b93447f0f10b50453727f61047e7..323f76c97054d900c80f45fc8014a6808b5b401f 100644 (file)
@@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "LegacyBiosInterface.h"\r
 \r
-BOOLEAN mIdeDataBuiltFlag = FALSE;\r
+BOOLEAN  mIdeDataBuiltFlag = FALSE;\r
 \r
 /**\r
   Collect IDE Inquiry data from the IDE disks\r
@@ -23,9 +23,9 @@ BOOLEAN mIdeDataBuiltFlag = FALSE;
 **/\r
 EFI_STATUS\r
 LegacyBiosBuildIdeData (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private,\r
-  IN  HDD_INFO                  **HddInfo,\r
-  IN  UINT16                    Flag\r
+  IN  LEGACY_BIOS_INSTANCE  *Private,\r
+  IN  HDD_INFO              **HddInfo,\r
+  IN  UINT16                Flag\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -60,14 +60,14 @@ LegacyBiosBuildIdeData (
   //\r
   PciDevicePath = NULL;\r
   LocalHddInfo  = *HddInfo;\r
-  Status = Private->LegacyBiosPlatform->GetPlatformHandle (\r
-                                          Private->LegacyBiosPlatform,\r
-                                          EfiGetPlatformIdeHandle,\r
-                                          0,\r
-                                          &HandleBuffer,\r
-                                          &HandleCount,\r
-                                          (VOID *) &LocalHddInfo\r
-                                          );\r
+  Status        = Private->LegacyBiosPlatform->GetPlatformHandle (\r
+                                                 Private->LegacyBiosPlatform,\r
+                                                 EfiGetPlatformIdeHandle,\r
+                                                 0,\r
+                                                 &HandleBuffer,\r
+                                                 &HandleCount,\r
+                                                 (VOID *)&LocalHddInfo\r
+                                                 );\r
   if (!EFI_ERROR (Status)) {\r
     IdeController = HandleBuffer[0];\r
     //\r
@@ -75,10 +75,10 @@ LegacyBiosBuildIdeData (
     //\r
     if (Flag != 0) {\r
       gBS->DisconnectController (\r
-            IdeController,\r
-            NULL,\r
-            NULL\r
-            );\r
+             IdeController,\r
+             NULL,\r
+             NULL\r
+             );\r
     }\r
 \r
     gBS->ConnectController (IdeController, NULL, NULL, FALSE);\r
@@ -88,13 +88,13 @@ LegacyBiosBuildIdeData (
     // And GetIdeHandle will switch to Legacy mode, if required.\r
     //\r
     Private->LegacyBiosPlatform->GetPlatformHandle (\r
-                                  Private->LegacyBiosPlatform,\r
-                                  EfiGetPlatformIdeHandle,\r
-                                  0,\r
-                                  &HandleBuffer,\r
-                                  &HandleCount,\r
-                                  (VOID *) &LocalHddInfo\r
-                                  );\r
+                                   Private->LegacyBiosPlatform,\r
+                                   EfiGetPlatformIdeHandle,\r
+                                   0,\r
+                                   &HandleBuffer,\r
+                                   &HandleCount,\r
+                                   (VOID *)&LocalHddInfo\r
+                                   );\r
   }\r
 \r
   mIdeDataBuiltFlag = TRUE;\r
@@ -103,19 +103,19 @@ LegacyBiosBuildIdeData (
   // Get Identity command from all drives\r
   //\r
   gBS->LocateHandleBuffer (\r
-        ByProtocol,\r
-        &gEfiDiskInfoProtocolGuid,\r
-        NULL,\r
-        &HandleCount,\r
-        &HandleBuffer\r
-        );\r
-\r
-  Private->IdeDriveCount = (UINT8) HandleCount;\r
+         ByProtocol,\r
+         &gEfiDiskInfoProtocolGuid,\r
+         NULL,\r
+         &HandleCount,\r
+         &HandleBuffer\r
+         );\r
+\r
+  Private->IdeDriveCount = (UINT8)HandleCount;\r
   for (Index = 0; Index < HandleCount; Index++) {\r
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiDiskInfoProtocolGuid,\r
-                    (VOID **) &DiskInfo\r
+                    (VOID **)&DiskInfo\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
@@ -126,7 +126,7 @@ LegacyBiosBuildIdeData (
       Status = gBS->HandleProtocol (\r
                       HandleBuffer[Index],\r
                       &gEfiDevicePathProtocolGuid,\r
-                      (VOID *) &DevicePath\r
+                      (VOID *)&DevicePath\r
                       );\r
       ASSERT_EFI_ERROR (Status);\r
 \r
@@ -134,12 +134,14 @@ LegacyBiosBuildIdeData (
       while (!IsDevicePathEnd (DevicePathNode)) {\r
         TempDevicePathNode = NextDevicePathNode (DevicePathNode);\r
         if ((DevicePathType (DevicePathNode) == HARDWARE_DEVICE_PATH) &&\r
-              ( DevicePathSubType (DevicePathNode) == HW_PCI_DP) &&\r
-              ( DevicePathType(TempDevicePathNode) == MESSAGING_DEVICE_PATH) &&\r
-              ( DevicePathSubType(TempDevicePathNode) == MSG_ATAPI_DP) ) {\r
-          PciDevicePath = (PCI_DEVICE_PATH *) DevicePathNode;\r
+            (DevicePathSubType (DevicePathNode) == HW_PCI_DP) &&\r
+            (DevicePathType (TempDevicePathNode) == MESSAGING_DEVICE_PATH) &&\r
+            (DevicePathSubType (TempDevicePathNode) == MSG_ATAPI_DP))\r
+        {\r
+          PciDevicePath = (PCI_DEVICE_PATH *)DevicePathNode;\r
           break;\r
         }\r
+\r
         DevicePathNode = NextDevicePathNode (DevicePathNode);\r
       }\r
 \r
@@ -161,7 +163,8 @@ LegacyBiosBuildIdeData (
       for (PciIndex = 0; PciIndex < 8; PciIndex++) {\r
         if ((PciDevicePath->Device == LocalHddInfo[PciIndex].Device) &&\r
             (PciDevicePath->Function == LocalHddInfo[PciIndex].Function)\r
-            ) {\r
+            )\r
+        {\r
           break;\r
         }\r
       }\r
@@ -186,15 +189,15 @@ LegacyBiosBuildIdeData (
 \r
         InquiryData     = NULL;\r
         InquiryDataSize = 0;\r
-        Status = DiskInfo->Inquiry (\r
-                             DiskInfo,\r
-                             NULL,\r
-                             &InquiryDataSize\r
-                             );\r
+        Status          = DiskInfo->Inquiry (\r
+                                      DiskInfo,\r
+                                      NULL,\r
+                                      &InquiryDataSize\r
+                                      );\r
         if (Status == EFI_BUFFER_TOO_SMALL) {\r
-          InquiryData = (UINT8 *) AllocatePool (\r
-                                  InquiryDataSize\r
-                                  );\r
+          InquiryData = (UINT8 *)AllocatePool (\r
+                                   InquiryDataSize\r
+                                   );\r
           if (InquiryData != NULL) {\r
             Status = DiskInfo->Inquiry (\r
                                  DiskInfo,\r
@@ -227,6 +230,7 @@ LegacyBiosBuildIdeData (
               LocalHddInfo[PciIndex + IdeChannel].Status |= HDD_SLAVE_ATAPI_ZIPDISK;\r
             }\r
           }\r
+\r
           FreePool (InquiryData);\r
         } else {\r
           if (IdeDevice == 0) {\r
@@ -246,7 +250,6 @@ LegacyBiosBuildIdeData (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   If the IDE channel is in compatibility (legacy) mode, remove all\r
   PCI I/O BAR addresses from the controller.\r
@@ -257,13 +260,13 @@ LegacyBiosBuildIdeData (
 **/\r
 VOID\r
 InitLegacyIdeController (\r
-  IN EFI_HANDLE                        IdeController\r
+  IN EFI_HANDLE  IdeController\r
   )\r
 {\r
-  EFI_PCI_IO_PROTOCOL               *PciIo;\r
-  UINT32                            IOBarClear;\r
-  EFI_STATUS                        Status;\r
-  PCI_TYPE00                        PciData;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  UINT32               IOBarClear;\r
+  EFI_STATUS           Status;\r
+  PCI_TYPE00           PciData;\r
 \r
   //\r
   // If the IDE channel is in compatibility (legacy) mode, remove all\r
@@ -277,20 +280,21 @@ InitLegacyIdeController (
                   (VOID **)&PciIo\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, 0, sizeof (PciData), &PciData);\r
   if (EFI_ERROR (Status)) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
   // Check whether this is IDE\r
   //\r
   if ((PciData.Hdr.ClassCode[2] != PCI_CLASS_MASS_STORAGE) ||\r
-      (PciData.Hdr.ClassCode[1] != PCI_CLASS_MASS_STORAGE_IDE)) {\r
-    return ;\r
+      (PciData.Hdr.ClassCode[1] != PCI_CLASS_MASS_STORAGE_IDE))\r
+  {\r
+    return;\r
   }\r
 \r
   //\r
@@ -301,10 +305,11 @@ InitLegacyIdeController (
     PciIo->Pci.Write (PciIo, EfiPciIoWidthUint32, 0x10, 1, &IOBarClear);\r
     PciIo->Pci.Write (PciIo, EfiPciIoWidthUint32, 0x14, 1, &IOBarClear);\r
   }\r
+\r
   if ((PciData.Hdr.ClassCode[0] & IDE_PI_REGISTER_SNE) == 0) {\r
     PciIo->Pci.Write (PciIo, EfiPciIoWidthUint32, 0x18, 1, &IOBarClear);\r
     PciIo->Pci.Write (PciIo, EfiPciIoWidthUint32, 0x1C, 1, &IOBarClear);\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r
index ea0df4972b9849eced36d0bddf4d63ded257b344..07ee5ab0996800519e93ee3ff0e6213e88f90de0 100644 (file)
@@ -9,32 +9,32 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "LegacyBiosInterface.h"\r
 #include <IndustryStandard/Pci30.h>\r
 \r
-#define PCI_START_ADDRESS(x)   (((x) + 0x7ff) & ~0x7ff)\r
+#define PCI_START_ADDRESS(x)  (((x) + 0x7ff) & ~0x7ff)\r
 \r
 #define MAX_BRIDGE_INDEX  0x20\r
 typedef struct {\r
-  UINTN PciSegment;\r
-  UINTN PciBus;\r
-  UINTN PciDevice;\r
-  UINTN PciFunction;\r
-  UINT8 PrimaryBus;\r
-  UINT8 SecondaryBus;\r
-  UINT8 SubordinateBus;\r
+  UINTN    PciSegment;\r
+  UINTN    PciBus;\r
+  UINTN    PciDevice;\r
+  UINTN    PciFunction;\r
+  UINT8    PrimaryBus;\r
+  UINT8    SecondaryBus;\r
+  UINT8    SubordinateBus;\r
 } BRIDGE_TABLE;\r
 \r
-#define ROM_MAX_ENTRIES 24\r
-BRIDGE_TABLE                        Bridges[MAX_BRIDGE_INDEX];\r
-UINTN                               SortedBridgeIndex[MAX_BRIDGE_INDEX];\r
-UINTN                               NumberOfBridges;\r
+#define ROM_MAX_ENTRIES  24\r
+BRIDGE_TABLE                 Bridges[MAX_BRIDGE_INDEX];\r
+UINTN                        SortedBridgeIndex[MAX_BRIDGE_INDEX];\r
+UINTN                        NumberOfBridges;\r
 LEGACY_PNP_EXPANSION_HEADER  *mBasePnpPtr;\r
-UINT16                              mBbsRomSegment;\r
-UINTN                               mHandleCount;\r
-EFI_HANDLE                          mVgaHandle;\r
-BOOLEAN                             mIgnoreBbsUpdateFlag;\r
-BOOLEAN                             mVgaInstallationInProgress  = FALSE;\r
-UINT32                              mRomCount                   = 0x00;\r
-ROM_INSTANCE_ENTRY                  mRomEntry[ROM_MAX_ENTRIES];\r
-EDKII_IOMMU_PROTOCOL                *mIoMmu;\r
+UINT16                       mBbsRomSegment;\r
+UINTN                        mHandleCount;\r
+EFI_HANDLE                   mVgaHandle;\r
+BOOLEAN                      mIgnoreBbsUpdateFlag;\r
+BOOLEAN                      mVgaInstallationInProgress = FALSE;\r
+UINT32                       mRomCount                  = 0x00;\r
+ROM_INSTANCE_ENTRY           mRomEntry[ROM_MAX_ENTRIES];\r
+EDKII_IOMMU_PROTOCOL         *mIoMmu;\r
 \r
 /**\r
   Query shadowed legacy ROM parameters registered by RomShadow() previously.\r
@@ -51,20 +51,20 @@ EDKII_IOMMU_PROTOCOL                *mIoMmu;
 **/\r
 EFI_STATUS\r
 GetShadowedRomParameters (\r
-  IN EFI_HANDLE                         PciHandle,\r
-  OUT UINT8                             *DiskStart          OPTIONAL,\r
-  OUT UINT8                             *DiskEnd            OPTIONAL,\r
-  OUT VOID                              **RomShadowAddress  OPTIONAL,\r
-  OUT UINTN                             *ShadowedSize       OPTIONAL\r
+  IN EFI_HANDLE  PciHandle,\r
+  OUT UINT8      *DiskStart          OPTIONAL,\r
+  OUT UINT8      *DiskEnd            OPTIONAL,\r
+  OUT VOID       **RomShadowAddress  OPTIONAL,\r
+  OUT UINTN      *ShadowedSize       OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  UINTN               Index;\r
-  UINTN               PciSegment;\r
-  UINTN               PciBus;\r
-  UINTN               PciDevice;\r
-  UINTN               PciFunction;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  UINTN                Index;\r
+  UINTN                PciSegment;\r
+  UINTN                PciBus;\r
+  UINTN                PciDevice;\r
+  UINTN                PciFunction;\r
 \r
   //\r
   // Get the PCI I/O Protocol on PciHandle\r
@@ -72,7 +72,7 @@ GetShadowedRomParameters (
   Status = gBS->HandleProtocol (\r
                   PciHandle,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo\r
+                  (VOID **)&PciIo\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -89,11 +89,12 @@ GetShadowedRomParameters (
            &PciFunction\r
            );\r
 \r
-  for(Index = 0; Index < mRomCount; Index++) {\r
+  for (Index = 0; Index < mRomCount; Index++) {\r
     if ((mRomEntry[Index].PciSegment == PciSegment) &&\r
         (mRomEntry[Index].PciBus == PciBus)         &&\r
         (mRomEntry[Index].PciDevice == PciDevice)   &&\r
-        (mRomEntry[Index].PciFunction == PciFunction)) {\r
+        (mRomEntry[Index].PciFunction == PciFunction))\r
+    {\r
       break;\r
     }\r
   }\r
@@ -141,15 +142,15 @@ GetShadowedRomParameters (
 **/\r
 EFI_STATUS\r
 RomShadow (\r
-  IN  EFI_HANDLE                                  PciHandle,\r
-  IN  UINT32                                      ShadowAddress,\r
-  IN  UINT32                                      ShadowedSize,\r
-  IN  UINT8                                       DiskStart,\r
-  IN  UINT8                                       DiskEnd\r
+  IN  EFI_HANDLE  PciHandle,\r
+  IN  UINT32      ShadowAddress,\r
+  IN  UINT32      ShadowedSize,\r
+  IN  UINT8       DiskStart,\r
+  IN  UINT8       DiskEnd\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
 \r
   //\r
   // See if there is room to register another option ROM\r
@@ -157,17 +158,19 @@ RomShadow (
   if (mRomCount >= ROM_MAX_ENTRIES) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Get the PCI I/O Protocol on PciHandle\r
   //\r
   Status = gBS->HandleProtocol (\r
                   PciHandle,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo\r
+                  (VOID **)&PciIo\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Get the location of the PCI device\r
   //\r
@@ -188,7 +191,6 @@ RomShadow (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Return EFI_SUCCESS if PciHandle has had a legacy BIOS ROM shadowed. This\r
   information represents every call to RomShadow ()\r
@@ -201,16 +203,16 @@ RomShadow (
 **/\r
 EFI_STATUS\r
 IsLegacyRom (\r
-  IN  EFI_HANDLE                PciHandle\r
+  IN  EFI_HANDLE  PciHandle\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  UINTN               Index;\r
-  UINTN               Segment;\r
-  UINTN               Bus;\r
-  UINTN               Device;\r
-  UINTN               Function;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  UINTN                Index;\r
+  UINTN                Segment;\r
+  UINTN                Bus;\r
+  UINTN                Device;\r
+  UINTN                Function;\r
 \r
   //\r
   // Get the PCI I/O Protocol on PciHandle\r
@@ -218,11 +220,12 @@ IsLegacyRom (
   Status = gBS->HandleProtocol (\r
                   PciHandle,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo\r
+                  (VOID **)&PciIo\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Get the location of the PCI device\r
   //\r
@@ -238,11 +241,12 @@ IsLegacyRom (
   // See if the option ROM from PciHandle has been previously posted\r
   //\r
   for (Index = 0; Index < mRomCount; Index++) {\r
-    if (mRomEntry[Index].PciSegment == Segment &&\r
-        mRomEntry[Index].PciBus == Bus &&\r
-        mRomEntry[Index].PciDevice == Device &&\r
-        mRomEntry[Index].PciFunction == Function\r
-        ) {\r
+    if ((mRomEntry[Index].PciSegment == Segment) &&\r
+        (mRomEntry[Index].PciBus == Bus) &&\r
+        (mRomEntry[Index].PciDevice == Device) &&\r
+        (mRomEntry[Index].PciFunction == Function)\r
+        )\r
+    {\r
       return EFI_SUCCESS;\r
     }\r
   }\r
@@ -271,14 +275,14 @@ IsLegacyRom (
 **/\r
 EFI_STATUS\r
 GetPciLegacyRom (\r
-  IN     UINT16 Csm16Revision,\r
-  IN     UINT16 VendorId,\r
-  IN     UINT16 DeviceId,\r
-  IN OUT VOID   **Rom,\r
-  IN OUT UINTN  *ImageSize,\r
-  OUT    UINTN  *MaxRuntimeImageLength    OPTIONAL,\r
-  OUT    UINT8  *OpRomRevision            OPTIONAL,\r
-  OUT    VOID   **ConfigUtilityCodeHeader OPTIONAL\r
+  IN     UINT16  Csm16Revision,\r
+  IN     UINT16  VendorId,\r
+  IN     UINT16  DeviceId,\r
+  IN OUT VOID    **Rom,\r
+  IN OUT UINTN   *ImageSize,\r
+  OUT    UINTN   *MaxRuntimeImageLength    OPTIONAL,\r
+  OUT    UINT8   *OpRomRevision            OPTIONAL,\r
+  OUT    VOID    **ConfigUtilityCodeHeader OPTIONAL\r
   )\r
 {\r
   BOOLEAN                 Match;\r
@@ -288,7 +292,6 @@ GetPciLegacyRom (
   VOID                    *BackupImage;\r
   VOID                    *BestImage;\r
 \r
-\r
   if (*ImageSize < sizeof (EFI_PCI_ROM_HEADER)) {\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -297,13 +300,14 @@ GetPciLegacyRom (
   BackupImage   = NULL;\r
   RomHeader.Raw = *Rom;\r
   while (RomHeader.Generic->Signature == PCI_EXPANSION_ROM_HEADER_SIGNATURE) {\r
-    if (RomHeader.Generic->PcirOffset == 0 ||\r
-        (RomHeader.Generic->PcirOffset & 3) !=0 ||\r
-        *ImageSize < RomHeader.Raw - (UINT8 *) *Rom + RomHeader.Generic->PcirOffset + sizeof (PCI_DATA_STRUCTURE)) {\r
+    if ((RomHeader.Generic->PcirOffset == 0) ||\r
+        ((RomHeader.Generic->PcirOffset & 3) != 0) ||\r
+        (*ImageSize < RomHeader.Raw - (UINT8 *)*Rom + RomHeader.Generic->PcirOffset + sizeof (PCI_DATA_STRUCTURE)))\r
+    {\r
       break;\r
     }\r
 \r
-    Pcir = (PCI_3_0_DATA_STRUCTURE *) (RomHeader.Raw + RomHeader.Generic->PcirOffset);\r
+    Pcir = (PCI_3_0_DATA_STRUCTURE *)(RomHeader.Raw + RomHeader.Generic->PcirOffset);\r
     //\r
     // Check signature in the PCI Data Structure.\r
     //\r
@@ -321,7 +325,7 @@ GetPciLegacyRom (
         if (Pcir->DeviceId == DeviceId) {\r
           Match = TRUE;\r
         } else if ((Pcir->Revision >= 3) && (Pcir->DeviceListOffset != 0)) {\r
-          DeviceIdList = (UINT16 *)(((UINT8 *) Pcir) + Pcir->DeviceListOffset);\r
+          DeviceIdList = (UINT16 *)(((UINT8 *)Pcir) + Pcir->DeviceListOffset);\r
           //\r
           // Checking the device list\r
           //\r
@@ -330,7 +334,8 @@ GetPciLegacyRom (
               Match = TRUE;\r
               break;\r
             }\r
-            DeviceIdList ++;\r
+\r
+            DeviceIdList++;\r
           }\r
         }\r
       }\r
@@ -345,7 +350,7 @@ GetPciLegacyRom (
             // case 1.1: meets OpRom 3.0\r
             //           Perfect!!!\r
             //\r
-            BestImage  = RomHeader.Raw;\r
+            BestImage = RomHeader.Raw;\r
             break;\r
           } else {\r
             //\r
@@ -369,7 +374,7 @@ GetPciLegacyRom (
             // case 2.2: meets OpRom 2.x\r
             //           Perfect!!!\r
             //\r
-            BestImage   = RomHeader.Raw;\r
+            BestImage = RomHeader.Raw;\r
             break;\r
           }\r
         }\r
@@ -389,15 +394,17 @@ GetPciLegacyRom (
     if (BackupImage == NULL) {\r
       return EFI_NOT_FOUND;\r
     }\r
+\r
     //\r
     // The versions of CSM16 and OpRom don't match exactly\r
     //\r
     BestImage = BackupImage;\r
   }\r
+\r
   RomHeader.Raw = BestImage;\r
-  Pcir = (PCI_3_0_DATA_STRUCTURE *) (RomHeader.Raw + RomHeader.Generic->PcirOffset);\r
-  *Rom       = BestImage;\r
-  *ImageSize = Pcir->ImageLength * 512;\r
+  Pcir          = (PCI_3_0_DATA_STRUCTURE *)(RomHeader.Raw + RomHeader.Generic->PcirOffset);\r
+  *Rom          = BestImage;\r
+  *ImageSize    = Pcir->ImageLength * 512;\r
 \r
   if (MaxRuntimeImageLength != NULL) {\r
     if (Pcir->Revision < 3) {\r
@@ -444,22 +451,22 @@ GetPciLegacyRom (
 **/\r
 EFI_STATUS\r
 CreateBridgeTable (\r
-  IN EFI_LEGACY_IRQ_ROUTING_ENTRY         *RoutingTable,\r
-  IN UINTN                                RoutingTableEntries\r
+  IN EFI_LEGACY_IRQ_ROUTING_ENTRY  *RoutingTable,\r
+  IN UINTN                         RoutingTableEntries\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  UINTN               HandleCount;\r
-  EFI_HANDLE          *HandleBuffer;\r
-  UINTN               BridgeIndex;\r
-  UINTN               Index;\r
-  UINTN               Index1;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE01          PciConfigHeader;\r
-  BRIDGE_TABLE        SlotBridges[MAX_BRIDGE_INDEX];\r
-  UINTN               SlotBridgeIndex;\r
-\r
-  BridgeIndex = 0x00;\r
+  EFI_STATUS           Status;\r
+  UINTN                HandleCount;\r
+  EFI_HANDLE           *HandleBuffer;\r
+  UINTN                BridgeIndex;\r
+  UINTN                Index;\r
+  UINTN                Index1;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE01           PciConfigHeader;\r
+  BRIDGE_TABLE         SlotBridges[MAX_BRIDGE_INDEX];\r
+  UINTN                SlotBridgeIndex;\r
+\r
+  BridgeIndex     = 0x00;\r
   SlotBridgeIndex = 0x00;\r
 \r
   //\r
@@ -475,11 +482,12 @@ CreateBridgeTable (
   if (EFI_ERROR (Status)) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   for (Index = 0; Index < HandleCount; Index++) {\r
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiPciIoProtocolGuid,\r
-                    (VOID **) &PciIo\r
+                    (VOID **)&PciIo\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       continue;\r
@@ -502,19 +510,20 @@ CreateBridgeTable (
                &Bridges[BridgeIndex].PciFunction\r
                );\r
 \r
-      Bridges[BridgeIndex].PrimaryBus     = PciConfigHeader.Bridge.PrimaryBus;\r
+      Bridges[BridgeIndex].PrimaryBus = PciConfigHeader.Bridge.PrimaryBus;\r
 \r
-      Bridges[BridgeIndex].SecondaryBus   = PciConfigHeader.Bridge.SecondaryBus;\r
+      Bridges[BridgeIndex].SecondaryBus = PciConfigHeader.Bridge.SecondaryBus;\r
 \r
       Bridges[BridgeIndex].SubordinateBus = PciConfigHeader.Bridge.SubordinateBus;\r
 \r
-      for (Index1 = 0; Index1 < RoutingTableEntries; Index1++){\r
+      for (Index1 = 0; Index1 < RoutingTableEntries; Index1++) {\r
         //\r
         // Test whether we have found the Bridge in the slot, must be the one that directly interfaced to the board\r
         // Once we find one, store it in the SlotBridges[]\r
         //\r
-        if ((RoutingTable[Index1].Slot != 0) && (Bridges[BridgeIndex].PrimaryBus == RoutingTable[Index1].Bus)\r
-           && ((Bridges[BridgeIndex].PciDevice << 3) == RoutingTable[Index1].Device)) {\r
+        if (  (RoutingTable[Index1].Slot != 0) && (Bridges[BridgeIndex].PrimaryBus == RoutingTable[Index1].Bus)\r
+           && ((Bridges[BridgeIndex].PciDevice << 3) == RoutingTable[Index1].Device))\r
+        {\r
           CopyMem (&SlotBridges[SlotBridgeIndex], &Bridges[BridgeIndex], sizeof (BRIDGE_TABLE));\r
           SlotBridgeIndex++;\r
 \r
@@ -529,10 +538,11 @@ CreateBridgeTable (
   //\r
   // Pack up Bridges by removing those useless ones\r
   //\r
-  for (Index = 0; Index < BridgeIndex;){\r
+  for (Index = 0; Index < BridgeIndex;) {\r
     for (Index1 = 0; Index1 < SlotBridgeIndex; Index1++) {\r
       if (((Bridges[Index].PciBus == SlotBridges[Index1].PrimaryBus) && (Bridges[Index].PciDevice == SlotBridges[Index1].PciDevice)) ||\r
-        ((Bridges[Index].PciBus >= SlotBridges[Index1].SecondaryBus) && (Bridges[Index].PciBus <= SlotBridges[Index1].SubordinateBus))) {\r
+          ((Bridges[Index].PciBus >= SlotBridges[Index1].SecondaryBus) && (Bridges[Index].PciBus <= SlotBridges[Index1].SubordinateBus)))\r
+      {\r
         //\r
         // We have found one that meets our criteria\r
         //\r
@@ -545,7 +555,7 @@ CreateBridgeTable (
     // This one doesn't meet criteria, pack it\r
     //\r
     if (Index1 >= SlotBridgeIndex) {\r
-      for (Index1 = Index; BridgeIndex > 1 && Index1 < BridgeIndex - 1 ; Index1++) {\r
+      for (Index1 = Index; BridgeIndex > 1 && Index1 < BridgeIndex - 1; Index1++) {\r
         CopyMem (&Bridges[Index1], &Bridges[Index1 + 1], sizeof (BRIDGE_TABLE));\r
       }\r
 \r
@@ -574,18 +584,19 @@ CreateBridgeTable (
 \r
         if ((Bridges[Index].SecondaryBus == Bridges[Index1].SecondaryBus) &&\r
             (Bridges[Index].SubordinateBus > Bridges[Index1].SubordinateBus)\r
-            ) {\r
+            )\r
+        {\r
           SortedBridgeIndex[Index]  = Index1;\r
           SortedBridgeIndex[Index1] = Index;\r
         }\r
       }\r
     }\r
   }\r
+\r
   FreePool (HandleBuffer);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Find base Bridge for device.\r
 \r
@@ -601,14 +612,15 @@ CreateBridgeTable (
 **/\r
 EFI_STATUS\r
 GetBaseBus (\r
-  IN  LEGACY_BIOS_INSTANCE        *Private,\r
-  IN UINTN                        PciBus,\r
-  IN UINTN                        PciDevice,\r
-  IN EFI_LEGACY_IRQ_ROUTING_ENTRY *RoutingTable,\r
-  IN UINTN                        RoutingTableEntries\r
+  IN  LEGACY_BIOS_INSTANCE         *Private,\r
+  IN UINTN                         PciBus,\r
+  IN UINTN                         PciDevice,\r
+  IN EFI_LEGACY_IRQ_ROUTING_ENTRY  *RoutingTable,\r
+  IN UINTN                         RoutingTableEntries\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
+\r
   for (Index = 0; Index < RoutingTableEntries; Index++) {\r
     if ((RoutingTable[Index].Bus == PciBus) && (RoutingTable[Index].Device == (PciDevice << 3))) {\r
       return EFI_SUCCESS;\r
@@ -635,11 +647,11 @@ GetBaseBus (
 **/\r
 EFI_STATUS\r
 TranslateBusPirq (\r
-  IN  LEGACY_BIOS_INSTANCE            *Private,\r
-  IN OUT UINTN                        *PciBus,\r
-  IN OUT UINTN                        *PciDevice,\r
-  IN OUT UINTN                        *PciFunction,\r
-  IN OUT UINT8                        *PirqIndex\r
+  IN  LEGACY_BIOS_INSTANCE  *Private,\r
+  IN OUT UINTN              *PciBus,\r
+  IN OUT UINTN              *PciDevice,\r
+  IN OUT UINTN              *PciFunction,\r
+  IN OUT UINT8              *PirqIndex\r
   )\r
 {\r
   /*\r
@@ -689,24 +701,25 @@ No other busses match criteria. Device to be programmed is Bus 5, Device 1.
 Rotate (B,C,D,A) by 1 giving C,D,A,B. Translated PIRQ is C.\r
 \r
 */\r
-  UINTN LocalBus;\r
-  UINTN LocalDevice;\r
-  UINTN BaseBus;\r
-  UINTN BaseDevice;\r
-  UINTN BaseFunction;\r
-  UINT8 LocalPirqIndex;\r
-  BOOLEAN BaseIndexFlag;\r
-  UINTN BridgeIndex;\r
-  UINTN SBridgeIndex;\r
-  BaseIndexFlag   = FALSE;\r
-  BridgeIndex     = 0x00;\r
-\r
-  LocalPirqIndex  = *PirqIndex;\r
-  LocalBus        = *PciBus;\r
-  LocalDevice     = *PciDevice;\r
-  BaseBus         = *PciBus;\r
-  BaseDevice      = *PciDevice;\r
-  BaseFunction    = *PciFunction;\r
+  UINTN    LocalBus;\r
+  UINTN    LocalDevice;\r
+  UINTN    BaseBus;\r
+  UINTN    BaseDevice;\r
+  UINTN    BaseFunction;\r
+  UINT8    LocalPirqIndex;\r
+  BOOLEAN  BaseIndexFlag;\r
+  UINTN    BridgeIndex;\r
+  UINTN    SBridgeIndex;\r
+\r
+  BaseIndexFlag = FALSE;\r
+  BridgeIndex   = 0x00;\r
+\r
+  LocalPirqIndex = *PirqIndex;\r
+  LocalBus       = *PciBus;\r
+  LocalDevice    = *PciDevice;\r
+  BaseBus        = *PciBus;\r
+  BaseDevice     = *PciDevice;\r
+  BaseFunction   = *PciFunction;\r
 \r
   //\r
   // LocalPirqIndex list PIRQs in rotated fashion\r
@@ -732,17 +745,17 @@ Rotate (B,C,D,A) by 1 giving C,D,A,B. Translated PIRQ is C.
         BaseFunction  = Bridges[SBridgeIndex].PciFunction;\r
         BaseIndexFlag = TRUE;\r
       } else {\r
-        LocalPirqIndex = (UINT8) ((LocalPirqIndex + (UINT8)Bridges[SBridgeIndex].PciDevice)%4);\r
+        LocalPirqIndex = (UINT8)((LocalPirqIndex + (UINT8)Bridges[SBridgeIndex].PciDevice)%4);\r
       }\r
 \r
       //\r
       // Check if at device. If not get new PCI location & PIRQ\r
       //\r
-      if (Bridges[SBridgeIndex].SecondaryBus == (UINT8) LocalBus) {\r
+      if (Bridges[SBridgeIndex].SecondaryBus == (UINT8)LocalBus) {\r
         //\r
         // Translate PIRQ\r
         //\r
-        LocalPirqIndex = (UINT8) ((LocalPirqIndex + (UINT8) (LocalDevice)) % 4);\r
+        LocalPirqIndex = (UINT8)((LocalPirqIndex + (UINT8)(LocalDevice)) % 4);\r
         break;\r
       }\r
     }\r
@@ -751,19 +764,18 @@ Rotate (B,C,D,A) by 1 giving C,D,A,B. Translated PIRQ is C.
   //\r
   // In case we fail to find the Bridge just above us, this is some potential error and we want to warn the user\r
   //\r
-  if(BridgeIndex >= NumberOfBridges){\r
+  if (BridgeIndex >= NumberOfBridges) {\r
     DEBUG ((DEBUG_ERROR, "Cannot Find IRQ Routing for Bus %d, Device %d, Function %d\n", *PciBus, *PciDevice, *PciFunction));\r
   }\r
 \r
-  *PirqIndex    = LocalPirqIndex;\r
-  *PciBus       = BaseBus;\r
-  *PciDevice    = BaseDevice;\r
-  *PciFunction  = BaseFunction;\r
+  *PirqIndex   = LocalPirqIndex;\r
+  *PciBus      = BaseBus;\r
+  *PciDevice   = BaseDevice;\r
+  *PciFunction = BaseFunction;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Copy the $PIR table as required.\r
 \r
@@ -776,59 +788,59 @@ Rotate (B,C,D,A) by 1 giving C,D,A,B. Translated PIRQ is C.
 **/\r
 VOID\r
 CopyPirqTable (\r
-  IN  LEGACY_BIOS_INSTANCE                *Private,\r
-  IN EFI_LEGACY_IRQ_ROUTING_ENTRY         *RoutingTable,\r
-  IN UINTN                                RoutingTableEntries,\r
-  IN EFI_LEGACY_PIRQ_TABLE_HEADER         *PirqTable,\r
-  IN UINTN                                PirqTableSize\r
+  IN  LEGACY_BIOS_INSTANCE         *Private,\r
+  IN EFI_LEGACY_IRQ_ROUTING_ENTRY  *RoutingTable,\r
+  IN UINTN                         RoutingTableEntries,\r
+  IN EFI_LEGACY_PIRQ_TABLE_HEADER  *PirqTable,\r
+  IN UINTN                         PirqTableSize\r
   )\r
 {\r
-  EFI_IA32_REGISTER_SET Regs;\r
-  UINT32                Granularity;\r
+  EFI_IA32_REGISTER_SET  Regs;\r
+  UINT32                 Granularity;\r
 \r
   //\r
   // Copy $PIR table, if it exists.\r
   //\r
   if (PirqTable != NULL) {\r
     Private->LegacyRegion->UnLock (\r
-                            Private->LegacyRegion,\r
-                            0xE0000,\r
-                            0x20000,\r
-                            &Granularity\r
-                            );\r
-\r
-    Private->InternalIrqRoutingTable  = RoutingTable;\r
-    Private->NumberIrqRoutingEntries  = (UINT16) (RoutingTableEntries);\r
+                             Private->LegacyRegion,\r
+                             0xE0000,\r
+                             0x20000,\r
+                             &Granularity\r
+                             );\r
+\r
+    Private->InternalIrqRoutingTable = RoutingTable;\r
+    Private->NumberIrqRoutingEntries = (UINT16)(RoutingTableEntries);\r
     ZeroMem (&Regs, sizeof (EFI_IA32_REGISTER_SET));\r
 \r
     Regs.X.AX = Legacy16GetTableAddress;\r
-    Regs.X.CX = (UINT16) PirqTableSize;\r
+    Regs.X.CX = (UINT16)PirqTableSize;\r
     //\r
     // Allocate at F segment according to PCI IRQ Routing Table Specification\r
     //\r
-    Regs.X.BX = (UINT16) 0x1;\r
+    Regs.X.BX = (UINT16)0x1;\r
     //\r
     // 16-byte boundary alignment requirement according to\r
     // PCI IRQ Routing Table Specification\r
     //\r
     Regs.X.DX = 0x10;\r
     Private->LegacyBios.FarCall86 (\r
-      &Private->LegacyBios,\r
-      Private->Legacy16CallSegment,\r
-      Private->Legacy16CallOffset,\r
-      &Regs,\r
-      NULL,\r
-      0\r
-      );\r
+                          &Private->LegacyBios,\r
+                          Private->Legacy16CallSegment,\r
+                          Private->Legacy16CallOffset,\r
+                          &Regs,\r
+                          NULL,\r
+                          0\r
+                          );\r
 \r
-    Private->Legacy16Table->IrqRoutingTablePointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);\r
+    Private->Legacy16Table->IrqRoutingTablePointer = (UINT32)(Regs.X.DS * 16 + Regs.X.BX);\r
     if (Regs.X.AX != 0) {\r
       DEBUG ((DEBUG_ERROR, "PIRQ table length insufficient - %x\n", PirqTableSize));\r
     } else {\r
       DEBUG ((DEBUG_INFO, "PIRQ table in legacy region - %x\n", Private->Legacy16Table->IrqRoutingTablePointer));\r
       Private->Legacy16Table->IrqRoutingTableLength = (UINT32)PirqTableSize;\r
       CopyMem (\r
-        (VOID *) (UINTN)Private->Legacy16Table->IrqRoutingTablePointer,\r
+        (VOID *)(UINTN)Private->Legacy16Table->IrqRoutingTablePointer,\r
         PirqTable,\r
         PirqTableSize\r
         );\r
@@ -890,10 +902,10 @@ DumpPciHandle (
 **/\r
 VOID\r
 InstallLegacyIrqHandler (\r
-  IN LEGACY_BIOS_INSTANCE       *Private,\r
-  IN EFI_PCI_IO_PROTOCOL        *PciIo,\r
-  IN UINT8                      PciIrq,\r
-  IN PCI_TYPE00                 *PciConfigHeader\r
+  IN LEGACY_BIOS_INSTANCE  *Private,\r
+  IN EFI_PCI_IO_PROTOCOL   *PciIo,\r
+  IN UINT8                 PciIrq,\r
+  IN PCI_TYPE00            *PciConfigHeader\r
   )\r
 {\r
   EFI_IA32_REGISTER_SET     Regs;\r
@@ -924,7 +936,7 @@ InstallLegacyIrqHandler (
                 NULL\r
                 );\r
 \r
-  LegMask = (UINT16) (LegMask | (UINT16) (1 << PciIrq));\r
+  LegMask = (UINT16)(LegMask | (UINT16)(1 << PciIrq));\r
 \r
   Legacy8259->SetMask (\r
                 Legacy8259,\r
@@ -935,18 +947,18 @@ InstallLegacyIrqHandler (
                 );\r
 \r
   PciIo->GetLocation (\r
-          PciIo,\r
-          &PciSegment,\r
-          &PciBus,\r
-          &PciDevice,\r
-          &PciFunction\r
-          );\r
-  Private->IntThunk->PciHandler.PciBus              = (UINT8) PciBus;\r
-  Private->IntThunk->PciHandler.PciDeviceFun        = (UINT8) ((PciDevice << 3) + PciFunction);\r
-  Private->IntThunk->PciHandler.PciSegment          = (UINT8) PciSegment;\r
-  Private->IntThunk->PciHandler.PciClass            = PciConfigHeader->Hdr.ClassCode[2];\r
-  Private->IntThunk->PciHandler.PciSubclass         = PciConfigHeader->Hdr.ClassCode[1];\r
-  Private->IntThunk->PciHandler.PciInterface        = PciConfigHeader->Hdr.ClassCode[0];\r
+           PciIo,\r
+           &PciSegment,\r
+           &PciBus,\r
+           &PciDevice,\r
+           &PciFunction\r
+           );\r
+  Private->IntThunk->PciHandler.PciBus       = (UINT8)PciBus;\r
+  Private->IntThunk->PciHandler.PciDeviceFun = (UINT8)((PciDevice << 3) + PciFunction);\r
+  Private->IntThunk->PciHandler.PciSegment   = (UINT8)PciSegment;\r
+  Private->IntThunk->PciHandler.PciClass     = PciConfigHeader->Hdr.ClassCode[2];\r
+  Private->IntThunk->PciHandler.PciSubclass  = PciConfigHeader->Hdr.ClassCode[1];\r
+  Private->IntThunk->PciHandler.PciInterface = PciConfigHeader->Hdr.ClassCode[0];\r
 \r
   //\r
   // Use native mode base address registers in two cases:\r
@@ -954,30 +966,30 @@ InstallLegacyIrqHandler (
   // in native mode OR\r
   // 2. PCI device Sub Class Code is not IDE\r
   //\r
-  Private->IntThunk->PciHandler.PrimaryBusMaster  = (UINT16)(PciConfigHeader->Device.Bar[4] & 0xfffc);\r
+  Private->IntThunk->PciHandler.PrimaryBusMaster = (UINT16)(PciConfigHeader->Device.Bar[4] & 0xfffc);\r
   if (((PciConfigHeader->Hdr.ClassCode[0] & 0x01) != 0) || (PciConfigHeader->Hdr.ClassCode[1] != PCI_CLASS_MASS_STORAGE_IDE)) {\r
-    Private->IntThunk->PciHandler.PrimaryIrq      = PciIrq;\r
-    Private->IntThunk->PciHandler.PrimaryBase     = (UINT16) (PciConfigHeader->Device.Bar[0] & 0xfffc);\r
-    Private->IntThunk->PciHandler.PrimaryControl  = (UINT16) ((PciConfigHeader->Device.Bar[1] & 0xfffc) + 2);\r
+    Private->IntThunk->PciHandler.PrimaryIrq     = PciIrq;\r
+    Private->IntThunk->PciHandler.PrimaryBase    = (UINT16)(PciConfigHeader->Device.Bar[0] & 0xfffc);\r
+    Private->IntThunk->PciHandler.PrimaryControl = (UINT16)((PciConfigHeader->Device.Bar[1] & 0xfffc) + 2);\r
   } else {\r
-    Private->IntThunk->PciHandler.PrimaryIrq      = 14;\r
-    Private->IntThunk->PciHandler.PrimaryBase     = 0x1f0;\r
-    Private->IntThunk->PciHandler.PrimaryControl  = 0x3f6;\r
+    Private->IntThunk->PciHandler.PrimaryIrq     = 14;\r
+    Private->IntThunk->PciHandler.PrimaryBase    = 0x1f0;\r
+    Private->IntThunk->PciHandler.PrimaryControl = 0x3f6;\r
   }\r
+\r
   //\r
   // Secondary controller data\r
   //\r
   if (Private->IntThunk->PciHandler.PrimaryBusMaster != 0) {\r
-    Private->IntThunk->PciHandler.SecondaryBusMaster  = (UINT16) ((PciConfigHeader->Device.Bar[4] & 0xfffc) + 8);\r
-    PrimaryMaster = (UINT16) (Private->IntThunk->PciHandler.PrimaryBusMaster + 2);\r
-    SecondaryMaster = (UINT16) (Private->IntThunk->PciHandler.SecondaryBusMaster + 2);\r
+    Private->IntThunk->PciHandler.SecondaryBusMaster = (UINT16)((PciConfigHeader->Device.Bar[4] & 0xfffc) + 8);\r
+    PrimaryMaster                                    = (UINT16)(Private->IntThunk->PciHandler.PrimaryBusMaster + 2);\r
+    SecondaryMaster                                  = (UINT16)(Private->IntThunk->PciHandler.SecondaryBusMaster + 2);\r
 \r
     //\r
     // Clear pending interrupts in Bus Master registers\r
     //\r
     IoWrite16 (PrimaryMaster, 0x04);\r
     IoWrite16 (SecondaryMaster, 0x04);\r
-\r
   }\r
 \r
   //\r
@@ -987,14 +999,13 @@ InstallLegacyIrqHandler (
   // 2. PCI device Sub Class Code is not IDE\r
   //\r
   if (((PciConfigHeader->Hdr.ClassCode[0] & 0x04) != 0) || (PciConfigHeader->Hdr.ClassCode[1] != PCI_CLASS_MASS_STORAGE_IDE)) {\r
-    Private->IntThunk->PciHandler.SecondaryIrq      = PciIrq;\r
-    Private->IntThunk->PciHandler.SecondaryBase     = (UINT16) (PciConfigHeader->Device.Bar[2] & 0xfffc);\r
-    Private->IntThunk->PciHandler.SecondaryControl  = (UINT16) ((PciConfigHeader->Device.Bar[3] & 0xfffc) + 2);\r
+    Private->IntThunk->PciHandler.SecondaryIrq     = PciIrq;\r
+    Private->IntThunk->PciHandler.SecondaryBase    = (UINT16)(PciConfigHeader->Device.Bar[2] & 0xfffc);\r
+    Private->IntThunk->PciHandler.SecondaryControl = (UINT16)((PciConfigHeader->Device.Bar[3] & 0xfffc) + 2);\r
   } else {\r
-\r
-    Private->IntThunk->PciHandler.SecondaryIrq      = 15;\r
-    Private->IntThunk->PciHandler.SecondaryBase     = 0x170;\r
-    Private->IntThunk->PciHandler.SecondaryControl  = 0x376;\r
+    Private->IntThunk->PciHandler.SecondaryIrq     = 15;\r
+    Private->IntThunk->PciHandler.SecondaryBase    = 0x170;\r
+    Private->IntThunk->PciHandler.SecondaryControl = 0x376;\r
   }\r
 \r
   //\r
@@ -1021,20 +1032,20 @@ InstallLegacyIrqHandler (
                            );\r
 \r
   Regs.X.AX = Legacy16InstallPciHandler;\r
-  TempData  = (UINTN) &Private->IntThunk->PciHandler;\r
-  Regs.X.ES = EFI_SEGMENT ((UINT32) TempData);\r
-  Regs.X.BX = EFI_OFFSET ((UINT32) TempData);\r
+  TempData  = (UINTN)&Private->IntThunk->PciHandler;\r
+  Regs.X.ES = EFI_SEGMENT ((UINT32)TempData);\r
+  Regs.X.BX = EFI_OFFSET ((UINT32)TempData);\r
 \r
   DumpPciHandle (&Private->IntThunk->PciHandler);\r
 \r
   Private->LegacyBios.FarCall86 (\r
-    &Private->LegacyBios,\r
-    Private->Legacy16CallSegment,\r
-    Private->Legacy16CallOffset,\r
-    &Regs,\r
-    NULL,\r
-    0\r
-    );\r
+                        &Private->LegacyBios,\r
+                        Private->Legacy16CallSegment,\r
+                        Private->Legacy16CallOffset,\r
+                        &Regs,\r
+                        NULL,\r
+                        0\r
+                        );\r
 \r
   Private->Cpu->FlushDataCache (Private->Cpu, 0xE0000, 0x20000, EfiCpuFlushTypeWriteBackInvalidate);\r
   Private->LegacyRegion->Lock (\r
@@ -1043,10 +1054,8 @@ InstallLegacyIrqHandler (
                            0x20000,\r
                            &Granularity\r
                            );\r
-\r
 }\r
 \r
-\r
 /**\r
   Program the interrupt routing register in all the PCI devices. On a PC AT system\r
   this register contains the 8259 IRQ vector that matches its PCI interrupt.\r
@@ -1059,37 +1068,37 @@ InstallLegacyIrqHandler (
 **/\r
 EFI_STATUS\r
 PciProgramAllInterruptLineRegisters (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_PCI_IO_PROTOCOL               *PciIo;\r
-  EFI_LEGACY_8259_PROTOCOL          *Legacy8259;\r
-  EFI_LEGACY_INTERRUPT_PROTOCOL     *LegacyInterrupt;\r
-  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL *LegacyBiosPlatform;\r
-  UINT8                             InterruptPin;\r
-  UINTN                             Index;\r
-  UINTN                             HandleCount;\r
-  EFI_HANDLE                        *HandleBuffer;\r
-  UINTN                             MassStorageHandleCount;\r
-  EFI_HANDLE                        *MassStorageHandleBuffer;\r
-  UINTN                             MassStorageHandleIndex;\r
-  UINT8                             PciIrq;\r
-  UINT16                            Command;\r
-  UINTN                             PciSegment;\r
-  UINTN                             PciBus;\r
-  UINTN                             PciDevice;\r
-  UINTN                             PciFunction;\r
-  EFI_LEGACY_IRQ_ROUTING_ENTRY      *RoutingTable;\r
-  UINTN                             RoutingTableEntries;\r
-  UINT16                            LegMask;\r
-  UINT16                            LegEdgeLevel;\r
-  PCI_TYPE00                        PciConfigHeader;\r
-  EFI_LEGACY_PIRQ_TABLE_HEADER      *PirqTable;\r
-  UINTN                             PirqTableSize;\r
-  UINTN                             Flags;\r
-  HDD_INFO                          *HddInfo;\r
-  UINT64                            Supports;\r
+  EFI_STATUS                         Status;\r
+  EFI_PCI_IO_PROTOCOL                *PciIo;\r
+  EFI_LEGACY_8259_PROTOCOL           *Legacy8259;\r
+  EFI_LEGACY_INTERRUPT_PROTOCOL      *LegacyInterrupt;\r
+  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL  *LegacyBiosPlatform;\r
+  UINT8                              InterruptPin;\r
+  UINTN                              Index;\r
+  UINTN                              HandleCount;\r
+  EFI_HANDLE                         *HandleBuffer;\r
+  UINTN                              MassStorageHandleCount;\r
+  EFI_HANDLE                         *MassStorageHandleBuffer;\r
+  UINTN                              MassStorageHandleIndex;\r
+  UINT8                              PciIrq;\r
+  UINT16                             Command;\r
+  UINTN                              PciSegment;\r
+  UINTN                              PciBus;\r
+  UINTN                              PciDevice;\r
+  UINTN                              PciFunction;\r
+  EFI_LEGACY_IRQ_ROUTING_ENTRY       *RoutingTable;\r
+  UINTN                              RoutingTableEntries;\r
+  UINT16                             LegMask;\r
+  UINT16                             LegEdgeLevel;\r
+  PCI_TYPE00                         PciConfigHeader;\r
+  EFI_LEGACY_PIRQ_TABLE_HEADER       *PirqTable;\r
+  UINTN                              PirqTableSize;\r
+  UINTN                              Flags;\r
+  HDD_INFO                           *HddInfo;\r
+  UINT64                             Supports;\r
 \r
   //\r
   // Note - This routine use to return immediately if Private->PciInterruptLine\r
@@ -1101,15 +1110,15 @@ PciProgramAllInterruptLineRegisters (
   // EFI_ALREADY_STARTED. In addition check if PCI device InterruptLine != 0.\r
   // If zero then function unprogrammed else skip function.\r
   //\r
-  Legacy8259          = Private->Legacy8259;\r
-  LegacyInterrupt     = Private->LegacyInterrupt;\r
-  LegacyBiosPlatform  = Private->LegacyBiosPlatform;\r
+  Legacy8259         = Private->Legacy8259;\r
+  LegacyInterrupt    = Private->LegacyInterrupt;\r
+  LegacyBiosPlatform = Private->LegacyBiosPlatform;\r
 \r
   LegacyBiosPlatform->GetRoutingTable (\r
                         Private->LegacyBiosPlatform,\r
-                        (VOID *) &RoutingTable,\r
+                        (VOID *)&RoutingTable,\r
                         &RoutingTableEntries,\r
-                        (VOID *) &PirqTable,\r
+                        (VOID *)&PirqTable,\r
                         &PirqTableSize,\r
                         NULL,\r
                         NULL\r
@@ -1136,6 +1145,7 @@ PciProgramAllInterruptLineRegisters (
   if (EFI_ERROR (Status)) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   if (HandleCount == mHandleCount) {\r
     FreePool (HandleBuffer);\r
     return EFI_ALREADY_STARTED;\r
@@ -1164,7 +1174,7 @@ PciProgramAllInterruptLineRegisters (
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiPciIoProtocolGuid,\r
-                    (VOID **) &PciIo\r
+                    (VOID **)&PciIo\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
@@ -1192,13 +1202,14 @@ PciProgramAllInterruptLineRegisters (
                       );\r
     if (!EFI_ERROR (Status)) {\r
       Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;\r
-      Status = PciIo->Attributes (\r
-                        PciIo,\r
-                        EfiPciIoAttributeOperationEnable,\r
-                        Supports,\r
-                        NULL\r
-                        );\r
+      Status    = PciIo->Attributes (\r
+                           PciIo,\r
+                           EfiPciIoAttributeOperationEnable,\r
+                           Supports,\r
+                           NULL\r
+                           );\r
     }\r
+\r
     PciIo->Pci.Write (PciIo, EfiPciIoWidthUint16, 0x04, 1, &Command);\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -1238,6 +1249,7 @@ PciProgramAllInterruptLineRegisters (
           &InterruptPin\r
           );\r
       }\r
+\r
       //\r
       // Translate InterruptPin(0-3) into PIRQ\r
       //\r
@@ -1290,7 +1302,7 @@ PciProgramAllInterruptLineRegisters (
         // since ConnectController may force native mode and we don't\r
         // want that for primary IDE controller\r
         //\r
-        MassStorageHandleCount = 0;\r
+        MassStorageHandleCount  = 0;\r
         MassStorageHandleBuffer = NULL;\r
         LegacyBiosPlatform->GetPlatformHandle (\r
                               Private->LegacyBiosPlatform,\r
@@ -1327,6 +1339,7 @@ PciProgramAllInterruptLineRegisters (
           }\r
         }\r
       }\r
+\r
       //\r
       // Write InterruptPin and enable 8259.\r
       //\r
@@ -1337,7 +1350,7 @@ PciProgramAllInterruptLineRegisters (
                    1,\r
                    &PciIrq\r
                    );\r
-      Private->IntThunk->EfiToLegacy16BootTable.PciIrqMask = (UINT16) (Private->IntThunk->EfiToLegacy16BootTable.PciIrqMask | (UINT16) (1 << PciIrq));\r
+      Private->IntThunk->EfiToLegacy16BootTable.PciIrqMask = (UINT16)(Private->IntThunk->EfiToLegacy16BootTable.PciIrqMask | (UINT16)(1 << PciIrq));\r
 \r
       Legacy8259->GetMask (\r
                     Legacy8259,\r
@@ -1347,8 +1360,8 @@ PciProgramAllInterruptLineRegisters (
                     NULL\r
                     );\r
 \r
-      LegMask       = (UINT16) (LegMask & (UINT16)~(1 << PciIrq));\r
-      LegEdgeLevel  = (UINT16) (LegEdgeLevel | (UINT16) (1 << PciIrq));\r
+      LegMask      = (UINT16)(LegMask & (UINT16) ~(1 << PciIrq));\r
+      LegEdgeLevel = (UINT16)(LegEdgeLevel | (UINT16)(1 << PciIrq));\r
       Legacy8259->SetMask (\r
                     Legacy8259,\r
                     &LegMask,\r
@@ -1358,11 +1371,11 @@ PciProgramAllInterruptLineRegisters (
                     );\r
     }\r
   }\r
+\r
   FreePool (HandleBuffer);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Find & verify PnP Expansion header in ROM image\r
 \r
@@ -1377,43 +1390,43 @@ PciProgramAllInterruptLineRegisters (
 **/\r
 EFI_STATUS\r
 FindNextPnpExpansionHeader (\r
-  IN  LEGACY_BIOS_INSTANCE             *Private,\r
-  IN BOOLEAN                           FirstHeader,\r
-  IN OUT LEGACY_PNP_EXPANSION_HEADER   **PnpPtr\r
+  IN  LEGACY_BIOS_INSTANCE            *Private,\r
+  IN BOOLEAN                          FirstHeader,\r
+  IN OUT LEGACY_PNP_EXPANSION_HEADER  **PnpPtr\r
 \r
   )\r
 {\r
-  UINTN                       TempData;\r
-  LEGACY_PNP_EXPANSION_HEADER *LocalPnpPtr;\r
+  UINTN                        TempData;\r
+  LEGACY_PNP_EXPANSION_HEADER  *LocalPnpPtr;\r
+\r
   LocalPnpPtr = *PnpPtr;\r
   if (FirstHeader == FIRST_INSTANCE) {\r
-    mBasePnpPtr     = LocalPnpPtr;\r
-    mBbsRomSegment  = (UINT16) ((UINTN) mBasePnpPtr >> 4);\r
+    mBasePnpPtr    = LocalPnpPtr;\r
+    mBbsRomSegment = (UINT16)((UINTN)mBasePnpPtr >> 4);\r
     //\r
     // Offset 0x1a gives offset to PnP expansion header for the first\r
     // instance, there after the structure gives the offset to the next\r
     // structure\r
     //\r
-    LocalPnpPtr = (LEGACY_PNP_EXPANSION_HEADER *) ((UINT8 *) LocalPnpPtr + 0x1a);\r
-    TempData    = (*((UINT16 *) LocalPnpPtr));\r
+    LocalPnpPtr = (LEGACY_PNP_EXPANSION_HEADER *)((UINT8 *)LocalPnpPtr + 0x1a);\r
+    TempData    = (*((UINT16 *)LocalPnpPtr));\r
   } else {\r
-    TempData = (UINT16) LocalPnpPtr->NextHeader;\r
+    TempData = (UINT16)LocalPnpPtr->NextHeader;\r
   }\r
 \r
-  LocalPnpPtr = (LEGACY_PNP_EXPANSION_HEADER *) (((UINT8 *) mBasePnpPtr + TempData));\r
+  LocalPnpPtr = (LEGACY_PNP_EXPANSION_HEADER *)(((UINT8 *)mBasePnpPtr + TempData));\r
 \r
   //\r
   // Search for PnP table in Shadowed ROM\r
   //\r
   *PnpPtr = LocalPnpPtr;\r
-  if (*(UINT32 *) LocalPnpPtr == SIGNATURE_32 ('$', 'P', 'n', 'P')) {\r
+  if (*(UINT32 *)LocalPnpPtr == SIGNATURE_32 ('$', 'P', 'n', 'P')) {\r
     return EFI_SUCCESS;\r
   } else {\r
     return EFI_NOT_FOUND;\r
   }\r
 }\r
 \r
-\r
 /**\r
   Update list of Bev or BCV table entries.\r
 \r
@@ -1432,38 +1445,39 @@ UpdateBevBcvTable (
   IN  EFI_PCI_IO_PROTOCOL              *PciIo\r
   )\r
 {\r
-  VOID                            *RomEnd;\r
-  BBS_TABLE                       *BbsTable;\r
-  UINTN                           BbsIndex;\r
-  EFI_LEGACY_EXPANSION_ROM_HEADER *PciPtr;\r
-  LEGACY_PNP_EXPANSION_HEADER     *PnpPtr;\r
-  BOOLEAN                         Instance;\r
-  EFI_STATUS                      Status;\r
-  UINTN                           Segment;\r
-  UINTN                           Bus;\r
-  UINTN                           Device;\r
-  UINTN                           Function;\r
-  UINT8                           Class;\r
-  UINT16                          DeviceType;\r
-  Segment     = 0;\r
-  Bus         = 0;\r
-  Device      = 0;\r
-  Function    = 0;\r
-  Class       = 0;\r
-  DeviceType  = BBS_UNKNOWN;\r
+  VOID                             *RomEnd;\r
+  BBS_TABLE                        *BbsTable;\r
+  UINTN                            BbsIndex;\r
+  EFI_LEGACY_EXPANSION_ROM_HEADER  *PciPtr;\r
+  LEGACY_PNP_EXPANSION_HEADER      *PnpPtr;\r
+  BOOLEAN                          Instance;\r
+  EFI_STATUS                       Status;\r
+  UINTN                            Segment;\r
+  UINTN                            Bus;\r
+  UINTN                            Device;\r
+  UINTN                            Function;\r
+  UINT8                            Class;\r
+  UINT16                           DeviceType;\r
+\r
+  Segment    = 0;\r
+  Bus        = 0;\r
+  Device     = 0;\r
+  Function   = 0;\r
+  Class      = 0;\r
+  DeviceType = BBS_UNKNOWN;\r
 \r
   //\r
   // Skip floppy and 2*onboard IDE controller entries(Master/Slave per\r
   // controller).\r
   //\r
-  BbsIndex  = Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries;\r
+  BbsIndex = Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries;\r
 \r
-  BbsTable  = (BBS_TABLE*)(UINTN) Private->IntThunk->EfiToLegacy16BootTable.BbsTable;\r
-  PnpPtr    = (LEGACY_PNP_EXPANSION_HEADER *) RomStart;\r
-  PciPtr    = (EFI_LEGACY_EXPANSION_ROM_HEADER *) RomStart;\r
+  BbsTable = (BBS_TABLE *)(UINTN)Private->IntThunk->EfiToLegacy16BootTable.BbsTable;\r
+  PnpPtr   = (LEGACY_PNP_EXPANSION_HEADER *)RomStart;\r
+  PciPtr   = (EFI_LEGACY_EXPANSION_ROM_HEADER *)RomStart;\r
 \r
-  RomEnd    = (VOID *) (PciPtr->Size512 * 512 + (UINTN) PciPtr);\r
-  Instance  = FIRST_INSTANCE;\r
+  RomEnd   = (VOID *)(PciPtr->Size512 * 512 + (UINTN)PciPtr);\r
+  Instance = FIRST_INSTANCE;\r
   //\r
   // OPROMs like PXE may not be tied to a piece of hardware and thus\r
   // don't have a PciIo associated with them\r
@@ -1494,20 +1508,21 @@ UpdateBevBcvTable (
   }\r
 \r
   while (TRUE) {\r
-    Status    = FindNextPnpExpansionHeader (Private, Instance, &PnpPtr);\r
-    Instance  = NOT_FIRST_INSTANCE;\r
+    Status   = FindNextPnpExpansionHeader (Private, Instance, &PnpPtr);\r
+    Instance = NOT_FIRST_INSTANCE;\r
     if (EFI_ERROR (Status)) {\r
       break;\r
     }\r
+\r
     //\r
     // There can be additional $PnP headers within the OPROM.\r
     // Example: SCSI can have one per drive.\r
     //\r
     BbsTable[BbsIndex].BootPriority             = BBS_UNPRIORITIZED_ENTRY;\r
     BbsTable[BbsIndex].DeviceType               = DeviceType;\r
-    BbsTable[BbsIndex].Bus                      = (UINT32) Bus;\r
-    BbsTable[BbsIndex].Device                   = (UINT32) Device;\r
-    BbsTable[BbsIndex].Function                 = (UINT32) Function;\r
+    BbsTable[BbsIndex].Bus                      = (UINT32)Bus;\r
+    BbsTable[BbsIndex].Device                   = (UINT32)Device;\r
+    BbsTable[BbsIndex].Function                 = (UINT32)Function;\r
     BbsTable[BbsIndex].StatusFlags.OldPosition  = 0;\r
     BbsTable[BbsIndex].StatusFlags.Reserved1    = 0;\r
     BbsTable[BbsIndex].StatusFlags.Enabled      = 0;\r
@@ -1532,22 +1547,21 @@ UpdateBevBcvTable (
     }\r
 \r
     if (PnpPtr->Bev != 0) {\r
-      BbsTable[BbsIndex].BootHandlerOffset  = PnpPtr->Bev;\r
-      BbsTable[BbsIndex].DeviceType         = BBS_BEV_DEVICE;\r
+      BbsTable[BbsIndex].BootHandlerOffset = PnpPtr->Bev;\r
+      BbsTable[BbsIndex].DeviceType        = BBS_BEV_DEVICE;\r
       ++BbsIndex;\r
     }\r
 \r
-    if ((PnpPtr == (LEGACY_PNP_EXPANSION_HEADER *) PciPtr) || (PnpPtr > (LEGACY_PNP_EXPANSION_HEADER *) RomEnd)) {\r
+    if ((PnpPtr == (LEGACY_PNP_EXPANSION_HEADER *)PciPtr) || (PnpPtr > (LEGACY_PNP_EXPANSION_HEADER *)RomEnd)) {\r
       break;\r
     }\r
   }\r
 \r
-  BbsTable[BbsIndex].BootPriority = BBS_IGNORE_ENTRY;\r
-  Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries = (UINT32) BbsIndex;\r
+  BbsTable[BbsIndex].BootPriority                            = BBS_IGNORE_ENTRY;\r
+  Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries = (UINT32)BbsIndex;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Shadow all the PCI legacy ROMs. Use data from the Legacy BIOS Protocol\r
   to chose the order. Skip any devices that have already have legacy\r
@@ -1561,22 +1575,22 @@ UpdateBevBcvTable (
 **/\r
 EFI_STATUS\r
 PciShadowRoms (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_PCI_IO_PROTOCOL               *PciIo;\r
-  PCI_TYPE00                        Pci;\r
-  UINTN                             Index;\r
-  UINTN                             HandleCount;\r
-  EFI_HANDLE                        *HandleBuffer;\r
-  EFI_HANDLE                        VgaHandle;\r
-  EFI_HANDLE                        FirstHandle;\r
-  VOID                              **RomStart;\r
-  UINTN                             Flags;\r
-  PCI_TYPE00                        PciConfigHeader;\r
-  UINT16                            *Command;\r
-  UINT64                            Supports;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
+  UINTN                Index;\r
+  UINTN                HandleCount;\r
+  EFI_HANDLE           *HandleBuffer;\r
+  EFI_HANDLE           VgaHandle;\r
+  EFI_HANDLE           FirstHandle;\r
+  VOID                 **RomStart;\r
+  UINTN                Flags;\r
+  PCI_TYPE00           PciConfigHeader;\r
+  UINT16               *Command;\r
+  UINT64               Supports;\r
 \r
   //\r
   // Make the VGA device first\r
@@ -1606,6 +1620,7 @@ PciShadowRoms (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Place the VGA handle as first.\r
   //\r
@@ -1617,27 +1632,28 @@ PciShadowRoms (
       break;\r
     }\r
   }\r
+\r
   //\r
   // Allocate memory to save Command WORD from each device. We do this\r
   // to restore devices to same state as EFI after switching to legacy.\r
   //\r
-  Command = (UINT16 *) AllocatePool (\r
-                         sizeof (UINT16) * (HandleCount + 1)\r
-                         );\r
+  Command = (UINT16 *)AllocatePool (\r
+                        sizeof (UINT16) * (HandleCount + 1)\r
+                        );\r
   if (NULL == Command) {\r
     FreePool (HandleBuffer);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Disconnect all EFI devices first. This covers cases where alegacy BIOS\r
   // may control multiple PCI devices.\r
   //\r
   for (Index = 0; Index < HandleCount; Index++) {\r
-\r
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiPciIoProtocolGuid,\r
-                    (VOID **) &PciIo\r
+                    (VOID **)&PciIo\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
@@ -1659,6 +1675,7 @@ PciShadowRoms (
     if (!EFI_ERROR (Status)) {\r
       continue;\r
     }\r
+\r
     //\r
     // Stop EFI Drivers with oprom.\r
     //\r
@@ -1668,15 +1685,15 @@ PciShadowRoms (
            NULL\r
            );\r
   }\r
+\r
   //\r
   // For every device that has not had a legacy ROM started. Start a legacy ROM.\r
   //\r
   for (Index = 0; Index < HandleCount; Index++) {\r
-\r
     Status = gBS->HandleProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiPciIoProtocolGuid,\r
-                    (VOID **) &PciIo\r
+                    (VOID **)&PciIo\r
                     );\r
 \r
     ASSERT_EFI_ERROR (Status);\r
@@ -1698,9 +1715,10 @@ PciShadowRoms (
     // one will work in legacy mode (OPROM will be given control) and\r
     // other Video devices will work in native mode (OS driver will handle these devices).\r
     //\r
-    if (IS_PCI_DISPLAY (&Pci) && Index != 0) {\r
+    if (IS_PCI_DISPLAY (&Pci) && (Index != 0)) {\r
       continue;\r
     }\r
+\r
     //\r
     // Skip any device that already has a legacy ROM run\r
     //\r
@@ -1712,7 +1730,7 @@ PciShadowRoms (
     //\r
     // If legacy VBIOS Oprom has not been dispatched before, install legacy VBIOS here.\r
     //\r
-    if (IS_PCI_DISPLAY (&Pci) && Index == 0) {\r
+    if (IS_PCI_DISPLAY (&Pci) && (Index == 0)) {\r
       Status = LegacyBiosInstallVgaRom (Private);\r
       //\r
       // A return status of EFI_NOT_FOUND is considered valid (No EFI\r
@@ -1732,7 +1750,7 @@ PciShadowRoms (
                &Flags,\r
                NULL,\r
                NULL,\r
-               (VOID **) &RomStart,\r
+               (VOID **)&RomStart,\r
                NULL\r
                );\r
     if (EFI_ERROR (Status)) {\r
@@ -1740,6 +1758,7 @@ PciShadowRoms (
         continue;\r
       }\r
     }\r
+\r
     //\r
     // Restore Command register so legacy has same devices enabled or disabled\r
     // as EFI.\r
@@ -1766,13 +1785,14 @@ PciShadowRoms (
                           );\r
         if (!EFI_ERROR (Status)) {\r
           Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;\r
-          Status = PciIo->Attributes (\r
-                            PciIo,\r
-                            EfiPciIoAttributeOperationEnable,\r
-                            Supports,\r
-                            NULL\r
-                            );\r
+          Status    = PciIo->Attributes (\r
+                               PciIo,\r
+                               EfiPciIoAttributeOperationEnable,\r
+                               Supports,\r
+                               NULL\r
+                               );\r
         }\r
+\r
         if (!EFI_ERROR (Status)) {\r
           Command[Index] = 0x1f;\r
         }\r
@@ -1793,7 +1813,6 @@ PciShadowRoms (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Test to see if a legacy PCI ROM exists for this device. Optionally return\r
   the Legacy ROM instance for this PCI device.\r
@@ -1812,11 +1831,11 @@ PciShadowRoms (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosCheckPciRom (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL           *This,\r
-  IN  EFI_HANDLE                        PciHandle,\r
-  OUT VOID                              **RomImage  OPTIONAL,\r
-  OUT UINTN                             *RomSize  OPTIONAL,\r
-  OUT UINTN                             *Flags\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  EFI_HANDLE               PciHandle,\r
+  OUT VOID                     **RomImage  OPTIONAL,\r
+  OUT UINTN                    *RomSize  OPTIONAL,\r
+  OUT UINTN                    *Flags\r
   )\r
 {\r
   return LegacyBiosCheckPciRomEx (\r
@@ -1829,7 +1848,6 @@ LegacyBiosCheckPciRom (
            NULL,\r
            NULL\r
            );\r
-\r
 }\r
 \r
 /**\r
@@ -1854,31 +1872,31 @@ LegacyBiosCheckPciRom (
 **/\r
 EFI_STATUS\r
 LegacyBiosCheckPciRomEx (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL           *This,\r
-  IN  EFI_HANDLE                        PciHandle,\r
-  OUT VOID                              **RomImage  OPTIONAL,\r
-  OUT UINTN                             *RomSize  OPTIONAL,\r
-  OUT UINTN                             *RuntimeImageLength  OPTIONAL,\r
-  OUT UINTN                             *Flags  OPTIONAL,\r
-  OUT UINT8                             *OpromRevision  OPTIONAL,\r
-  OUT VOID                              **ConfigUtilityCodeHeader OPTIONAL\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  EFI_HANDLE               PciHandle,\r
+  OUT VOID                     **RomImage  OPTIONAL,\r
+  OUT UINTN                    *RomSize  OPTIONAL,\r
+  OUT UINTN                    *RuntimeImageLength  OPTIONAL,\r
+  OUT UINTN                    *Flags  OPTIONAL,\r
+  OUT UINT8                    *OpromRevision  OPTIONAL,\r
+  OUT VOID                     **ConfigUtilityCodeHeader OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  LEGACY_BIOS_INSTANCE            *Private;\r
-  EFI_PCI_IO_PROTOCOL             *PciIo;\r
-  UINTN                           LocalRomSize;\r
-  VOID                            *LocalRomImage;\r
-  PCI_TYPE00                      PciConfigHeader;\r
-  VOID                            *LocalConfigUtilityCodeHeader;\r
+  EFI_STATUS            Status;\r
+  LEGACY_BIOS_INSTANCE  *Private;\r
+  EFI_PCI_IO_PROTOCOL   *PciIo;\r
+  UINTN                 LocalRomSize;\r
+  VOID                  *LocalRomImage;\r
+  PCI_TYPE00            PciConfigHeader;\r
+  VOID                  *LocalConfigUtilityCodeHeader;\r
 \r
   LocalConfigUtilityCodeHeader = NULL;\r
-  *Flags = NO_ROM;\r
-  Status = gBS->HandleProtocol (\r
-                  PciHandle,\r
-                  &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo\r
-                  );\r
+  *Flags                       = NO_ROM;\r
+  Status                       = gBS->HandleProtocol (\r
+                                        PciHandle,\r
+                                        &gEfiPciIoProtocolGuid,\r
+                                        (VOID **)&PciIo\r
+                                        );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
@@ -1891,10 +1909,11 @@ LegacyBiosCheckPciRomEx (
     *Flags |= (UINTN)(ROM_FOUND | VALID_LEGACY_ROM);\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // Check for PCI ROM Bar\r
   //\r
-  LocalRomSize  = (UINTN) PciIo->RomSize;\r
+  LocalRomSize  = (UINTN)PciIo->RomSize;\r
   LocalRomImage = PciIo->RomImage;\r
   if (LocalRomSize != 0) {\r
     *Flags |= ROM_FOUND;\r
@@ -1912,16 +1931,16 @@ LegacyBiosCheckPciRomEx (
                );\r
 \r
   Private = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
-  Status = GetPciLegacyRom (\r
-             Private->Csm16PciInterfaceVersion,\r
-             PciConfigHeader.Hdr.VendorId,\r
-             PciConfigHeader.Hdr.DeviceId,\r
-             &LocalRomImage,\r
-             &LocalRomSize,\r
-             RuntimeImageLength,\r
-             OpromRevision,\r
-             &LocalConfigUtilityCodeHeader\r
-             );\r
+  Status  = GetPciLegacyRom (\r
+              Private->Csm16PciInterfaceVersion,\r
+              PciConfigHeader.Hdr.VendorId,\r
+              PciConfigHeader.Hdr.DeviceId,\r
+              &LocalRomImage,\r
+              &LocalRomSize,\r
+              RuntimeImageLength,\r
+              OpromRevision,\r
+              &LocalConfigUtilityCodeHeader\r
+              );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
@@ -1964,11 +1983,11 @@ EnablePs2Keyboard (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  EFI_HANDLE                          *HandleBuffer;\r
-  UINTN                               HandleCount;\r
-  EFI_ISA_IO_PROTOCOL                 *IsaIo;\r
-  UINTN                               Index;\r
+  EFI_STATUS           Status;\r
+  EFI_HANDLE           *HandleBuffer;\r
+  UINTN                HandleCount;\r
+  EFI_ISA_IO_PROTOCOL  *IsaIo;\r
+  UINTN                Index;\r
 \r
   //\r
   // Get SimpleTextIn and find PS2 controller\r
@@ -1983,6 +2002,7 @@ EnablePs2Keyboard (
   if (EFI_ERROR (Status)) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   for (Index = 0; Index < HandleCount; Index++) {\r
     //\r
     // Open the IO Abstraction(s) needed to perform the supported test\r
@@ -1990,7 +2010,7 @@ EnablePs2Keyboard (
     Status = gBS->OpenProtocol (\r
                     HandleBuffer[Index],\r
                     &gEfiIsaIoProtocolGuid,\r
-                    (VOID **) &IsaIo,\r
+                    (VOID **)&IsaIo,\r
                     NULL,\r
                     HandleBuffer[Index],\r
                     EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL\r
@@ -2001,7 +2021,7 @@ EnablePs2Keyboard (
       // Use the ISA I/O Protocol to see if Controller is the Keyboard\r
       // controller\r
       //\r
-      if (IsaIo->ResourceList->Device.HID != EISA_PNP_ID (0x303) || IsaIo->ResourceList->Device.UID != 0) {\r
+      if ((IsaIo->ResourceList->Device.HID != EISA_PNP_ID (0x303)) || (IsaIo->ResourceList->Device.UID != 0)) {\r
         Status = EFI_UNSUPPORTED;\r
       }\r
 \r
@@ -2017,11 +2037,11 @@ EnablePs2Keyboard (
       gBS->ConnectController (HandleBuffer[Index], NULL, NULL, FALSE);\r
     }\r
   }\r
+\r
   FreePool (HandleBuffer);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Load a legacy PC-AT OpROM for VGA controller.\r
 \r
@@ -2035,7 +2055,7 @@ EnablePs2Keyboard (
 **/\r
 EFI_STATUS\r
 LegacyBiosInstallVgaRom (\r
-  IN  LEGACY_BIOS_INSTANCE            *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
   EFI_STATUS                           Status;\r
@@ -2103,7 +2123,7 @@ LegacyBiosInstallVgaRom (
       Status = gBS->HandleProtocol (\r
                       OpenInfoBuffer[Index].AgentHandle,\r
                       &gEfiLegacyBiosGuid,\r
-                      (VOID **) &Interface\r
+                      (VOID **)&Interface\r
                       );\r
       if (!EFI_ERROR (Status)) {\r
         //\r
@@ -2132,19 +2152,20 @@ LegacyBiosInstallVgaRom (
       return Status;\r
     }\r
   }\r
+\r
   //\r
   // Find all the Thunk Driver\r
   //\r
   HandleBuffer = NULL;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  &gEfiLegacyBiosGuid,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &HandleBuffer\r
-                  );\r
+  Status       = gBS->LocateHandleBuffer (\r
+                        ByProtocol,\r
+                        &gEfiLegacyBiosGuid,\r
+                        NULL,\r
+                        &HandleCount,\r
+                        &HandleBuffer\r
+                        );\r
   ASSERT_EFI_ERROR (Status);\r
-  ConnectHandleBuffer = (EFI_HANDLE *) AllocatePool (sizeof (EFI_HANDLE) * (HandleCount + 1));\r
+  ConnectHandleBuffer = (EFI_HANDLE *)AllocatePool (sizeof (EFI_HANDLE) * (HandleCount + 1));\r
   ASSERT (ConnectHandleBuffer != NULL);\r
 \r
   CopyMem (\r
@@ -2162,7 +2183,7 @@ LegacyBiosInstallVgaRom (
   Status = gBS->HandleProtocol (\r
                   VgaHandle,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo\r
+                  (VOID **)&PciIo\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
   PciIo->Pci.Read (\r
@@ -2208,7 +2229,6 @@ LegacyBiosInstallVgaRom (
   FreePool (ConnectHandleBuffer);\r
 \r
   if (EFI_ERROR (Status)) {\r
-\r
     Private->VgaInstalled = FALSE;\r
 \r
     //\r
@@ -2221,7 +2241,6 @@ LegacyBiosInstallVgaRom (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Load a legacy PC-AT OpROM.\r
 \r
@@ -2249,41 +2268,41 @@ LegacyBiosInstallVgaRom (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosInstallRom (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL           *This,\r
-  IN LEGACY_BIOS_INSTANCE               *Private,\r
-  IN EFI_HANDLE                         PciHandle,\r
-  IN UINT8                              OpromRevision,\r
-  IN VOID                               *RomImage,\r
-  IN UINTN                              ImageSize,\r
-  IN OUT UINTN                          *RuntimeImageLength,\r
-  OUT UINT8                             *DiskStart  OPTIONAL,\r
-  OUT UINT8                             *DiskEnd  OPTIONAL,\r
-  OUT VOID                              **RomShadowAddress OPTIONAL\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN LEGACY_BIOS_INSTANCE      *Private,\r
+  IN EFI_HANDLE                PciHandle,\r
+  IN UINT8                     OpromRevision,\r
+  IN VOID                      *RomImage,\r
+  IN UINTN                     ImageSize,\r
+  IN OUT UINTN                 *RuntimeImageLength,\r
+  OUT UINT8                    *DiskStart  OPTIONAL,\r
+  OUT UINT8                    *DiskEnd  OPTIONAL,\r
+  OUT VOID                     **RomShadowAddress OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  EFI_STATUS            PciEnableStatus;\r
-  EFI_PCI_IO_PROTOCOL   *PciIo;\r
-  UINT8                 LocalDiskStart;\r
-  UINT8                 LocalDiskEnd;\r
-  UINTN                 Segment;\r
-  UINTN                 Bus;\r
-  UINTN                 Device;\r
-  UINTN                 Function;\r
-  EFI_IA32_REGISTER_SET Regs;\r
-  UINT8                 VideoMode;\r
-  UINT8                 OldVideoMode;\r
-  EFI_TIME              BootTime;\r
-  UINT32                *BdaPtr;\r
-  UINT32                LocalTime;\r
-  UINT32                StartBbsIndex;\r
-  UINT32                EndBbsIndex;\r
-  UINT32                MaxRomAddr;\r
-  UINTN                 TempData;\r
-  UINTN                 InitAddress;\r
-  UINTN                 RuntimeAddress;\r
-  EFI_PHYSICAL_ADDRESS  PhysicalAddress;\r
-  UINT32                Granularity;\r
+  EFI_STATUS             Status;\r
+  EFI_STATUS             PciEnableStatus;\r
+  EFI_PCI_IO_PROTOCOL    *PciIo;\r
+  UINT8                  LocalDiskStart;\r
+  UINT8                  LocalDiskEnd;\r
+  UINTN                  Segment;\r
+  UINTN                  Bus;\r
+  UINTN                  Device;\r
+  UINTN                  Function;\r
+  EFI_IA32_REGISTER_SET  Regs;\r
+  UINT8                  VideoMode;\r
+  UINT8                  OldVideoMode;\r
+  EFI_TIME               BootTime;\r
+  UINT32                 *BdaPtr;\r
+  UINT32                 LocalTime;\r
+  UINT32                 StartBbsIndex;\r
+  UINT32                 EndBbsIndex;\r
+  UINT32                 MaxRomAddr;\r
+  UINTN                  TempData;\r
+  UINTN                  InitAddress;\r
+  UINTN                  RuntimeAddress;\r
+  EFI_PHYSICAL_ADDRESS   PhysicalAddress;\r
+  UINT32                 Granularity;\r
 \r
   PciIo           = NULL;\r
   LocalDiskStart  = 0;\r
@@ -2297,14 +2316,14 @@ LegacyBiosInstallRom (
   PhysicalAddress = 0;\r
   MaxRomAddr      = PcdGet32 (PcdEndOpromShadowAddress);\r
 \r
-  if ((Private->Legacy16Table->TableLength >= OFFSET_OF(EFI_COMPATIBILITY16_TABLE, HiPermanentMemoryAddress)) &&\r
+  if ((Private->Legacy16Table->TableLength >= OFFSET_OF (EFI_COMPATIBILITY16_TABLE, HiPermanentMemoryAddress)) &&\r
       (Private->Legacy16Table->UmaAddress != 0) &&\r
       (Private->Legacy16Table->UmaSize != 0) &&\r
-      (MaxRomAddr > (Private->Legacy16Table->UmaAddress))) {\r
+      (MaxRomAddr > (Private->Legacy16Table->UmaAddress)))\r
+  {\r
     MaxRomAddr = Private->Legacy16Table->UmaAddress;\r
   }\r
 \r
-\r
   PciProgramAllInterruptLineRegisters (Private);\r
 \r
   if ((OpromRevision >= 3) && (Private->Csm16PciInterfaceVersion >= 0x0300)) {\r
@@ -2313,12 +2332,12 @@ LegacyBiosInstallRom (
     //   first test if there is enough space for its INIT code\r
     //\r
     PhysicalAddress = CONVENTIONAL_MEMORY_TOP;\r
-    Status = gBS->AllocatePages (\r
-                    AllocateMaxAddress,\r
-                    EfiBootServicesCode,\r
-                    EFI_SIZE_TO_PAGES (ImageSize),\r
-                    &PhysicalAddress\r
-                    );\r
+    Status          = gBS->AllocatePages (\r
+                             AllocateMaxAddress,\r
+                             EfiBootServicesCode,\r
+                             EFI_SIZE_TO_PAGES (ImageSize),\r
+                             &PhysicalAddress\r
+                             );\r
 \r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", DEBUG_LINE_NUMBER));\r
@@ -2331,7 +2350,8 @@ LegacyBiosInstallRom (
         );\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    InitAddress = (UINTN) PhysicalAddress;\r
+\r
+    InitAddress = (UINTN)PhysicalAddress;\r
     //\r
     //   then test if there is enough space for its RT code\r
     //\r
@@ -2353,7 +2373,7 @@ LegacyBiosInstallRom (
     // CSM16 2.x meets PCI 2.x/3.0 OpROM\r
     //   test if there is enough space for its INIT code\r
     //\r
-    InitAddress    = PCI_START_ADDRESS (Private->OptionRom);\r
+    InitAddress = PCI_START_ADDRESS (Private->OptionRom);\r
     if (InitAddress + ImageSize > MaxRomAddr) {\r
       DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", DEBUG_LINE_NUMBER));\r
       //\r
@@ -2378,14 +2398,14 @@ LegacyBiosInstallRom (
 \r
   Private->LegacyRegion->UnLock (\r
                            Private->LegacyRegion,\r
-                           (UINT32) RuntimeAddress,\r
-                           (UINT32) ImageSize,\r
+                           (UINT32)RuntimeAddress,\r
+                           (UINT32)ImageSize,\r
                            &Granularity\r
                            );\r
 \r
   DEBUG ((DEBUG_INFO, " Shadowing OpROM init/runtime/isize = %x/%x/%x\n", InitAddress, RuntimeAddress, ImageSize));\r
 \r
-  CopyMem ((VOID *) InitAddress, RomImage, ImageSize);\r
+  CopyMem ((VOID *)InitAddress, RomImage, ImageSize);\r
 \r
   //\r
   // Read the highest disk number "installed: and assume a new disk will\r
@@ -2397,32 +2417,32 @@ LegacyBiosInstallRom (
   // 3. Onboard IDE controllers will change 40:75\r
   //\r
   ACCESS_PAGE0_CODE (\r
-    LocalDiskStart = (UINT8) ((*(UINT8 *) ((UINTN) 0x475)) + 0x80);\r
+    LocalDiskStart = (UINT8)((*(UINT8 *)((UINTN)0x475)) + 0x80);\r
     if ((Private->Disk4075 + 0x80) < LocalDiskStart) {\r
-      //\r
-      // Update table since onboard IDE drives found\r
-      //\r
-      Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciSegment        = 0xff;\r
-      Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciBus            = 0xff;\r
-      Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciDevice         = 0xff;\r
-      Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciFunction       = 0xff;\r
-      Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].StartDriveNumber  = (UINT8) (Private->Disk4075 + 0x80);\r
-      Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].EndDriveNumber    = LocalDiskStart;\r
-      Private->LegacyEfiHddTableIndex ++;\r
-      Private->Disk4075 = (UINT8) (LocalDiskStart & 0x7f);\r
-      Private->DiskEnd  = LocalDiskStart;\r
-    }\r
+    //\r
+    // Update table since onboard IDE drives found\r
+    //\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciSegment       = 0xff;\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciBus           = 0xff;\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciDevice        = 0xff;\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciFunction      = 0xff;\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].StartDriveNumber = (UINT8)(Private->Disk4075 + 0x80);\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].EndDriveNumber   = LocalDiskStart;\r
+    Private->LegacyEfiHddTableIndex++;\r
+    Private->Disk4075 = (UINT8)(LocalDiskStart & 0x7f);\r
+    Private->DiskEnd  = LocalDiskStart;\r
+  }\r
 \r
     if (PciHandle != mVgaHandle) {\r
+    EnablePs2Keyboard ();\r
 \r
-      EnablePs2Keyboard ();\r
+    //\r
+    // Store current mode settings since PrepareToScanRom may change mode.\r
+    //\r
+    VideoMode = *(UINT8 *)((UINTN)(0x400 + BDA_VIDEO_MODE));\r
+  }\r
 \r
-      //\r
-      // Store current mode settings since PrepareToScanRom may change mode.\r
-      //\r
-      VideoMode = *(UINT8 *) ((UINTN) (0x400 + BDA_VIDEO_MODE));\r
-    }\r
-  );\r
+    );\r
 \r
   //\r
   // Notify the platform that we are about to scan the ROM\r
@@ -2466,9 +2486,9 @@ LegacyBiosInstallRom (
   //\r
   ACCESS_PAGE0_CODE (\r
     LocalTime = (LocalTime * 182) / 10;\r
-    BdaPtr    = (UINT32 *) ((UINTN) 0x46C);\r
+    BdaPtr    = (UINT32 *)((UINTN)0x46C);\r
     *BdaPtr   = LocalTime;\r
-  );\r
+    );\r
 \r
   //\r
   // Pass in handoff data\r
@@ -2476,11 +2496,10 @@ LegacyBiosInstallRom (
   PciEnableStatus = EFI_UNSUPPORTED;\r
   ZeroMem (&Regs, sizeof (Regs));\r
   if (PciHandle != NULL) {\r
-\r
     Status = gBS->HandleProtocol (\r
                     PciHandle,\r
                     &gEfiPciIoProtocolGuid,\r
-                    (VOID **) &PciIo\r
+                    (VOID **)&PciIo\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
@@ -2504,23 +2523,23 @@ LegacyBiosInstallRom (
     DEBUG ((DEBUG_INFO, "Shadowing OpROM on the PCI device %x/%x/%x\n", Bus, Device, Function));\r
   }\r
 \r
-  mIgnoreBbsUpdateFlag  = FALSE;\r
-  Regs.X.AX             = Legacy16DispatchOprom;\r
+  mIgnoreBbsUpdateFlag = FALSE;\r
+  Regs.X.AX            = Legacy16DispatchOprom;\r
 \r
   //\r
   // Generate DispatchOpRomTable data\r
   //\r
   Private->IntThunk->DispatchOpromTable.PnPInstallationCheckSegment = Private->Legacy16Table->PnPInstallationCheckSegment;\r
   Private->IntThunk->DispatchOpromTable.PnPInstallationCheckOffset  = Private->Legacy16Table->PnPInstallationCheckOffset;\r
-  Private->IntThunk->DispatchOpromTable.OpromSegment                = (UINT16) (InitAddress >> 4);\r
-  Private->IntThunk->DispatchOpromTable.PciBus                      = (UINT8) Bus;\r
-  Private->IntThunk->DispatchOpromTable.PciDeviceFunction           = (UINT8) ((Device << 3) | Function);\r
-  Private->IntThunk->DispatchOpromTable.NumberBbsEntries            = (UINT8) Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries;\r
-  Private->IntThunk->DispatchOpromTable.BbsTablePointer             = (UINT32) (UINTN) Private->BbsTablePtr;\r
+  Private->IntThunk->DispatchOpromTable.OpromSegment                = (UINT16)(InitAddress >> 4);\r
+  Private->IntThunk->DispatchOpromTable.PciBus                      = (UINT8)Bus;\r
+  Private->IntThunk->DispatchOpromTable.PciDeviceFunction           = (UINT8)((Device << 3) | Function);\r
+  Private->IntThunk->DispatchOpromTable.NumberBbsEntries            = (UINT8)Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries;\r
+  Private->IntThunk->DispatchOpromTable.BbsTablePointer             = (UINT32)(UINTN)Private->BbsTablePtr;\r
   Private->IntThunk->DispatchOpromTable.RuntimeSegment              = (UINT16)((OpromRevision < 3) ? 0xffff : (RuntimeAddress >> 4));\r
-  TempData = (UINTN) &Private->IntThunk->DispatchOpromTable;\r
-  Regs.X.ES = EFI_SEGMENT ((UINT32) TempData);\r
-  Regs.X.BX = EFI_OFFSET ((UINT32) TempData);\r
+  TempData                                                          = (UINTN)&Private->IntThunk->DispatchOpromTable;\r
+  Regs.X.ES                                                         = EFI_SEGMENT ((UINT32)TempData);\r
+  Regs.X.BX                                                         = EFI_OFFSET ((UINT32)TempData);\r
   //\r
   // Skip dispatching ROM for those PCI devices that can not be enabled by PciIo->Attributes\r
   // Otherwise, it may cause the system to hang in some cases\r
@@ -2528,35 +2547,37 @@ LegacyBiosInstallRom (
   if (!EFI_ERROR (PciEnableStatus)) {\r
     DEBUG ((DEBUG_INFO, " Legacy16DispatchOprom - %02x/%02x/%02x\n", Bus, Device, Function));\r
     Private->LegacyBios.FarCall86 (\r
-      &Private->LegacyBios,\r
-      Private->Legacy16CallSegment,\r
-      Private->Legacy16CallOffset,\r
-      &Regs,\r
-      NULL,\r
-      0\r
-      );\r
+                          &Private->LegacyBios,\r
+                          Private->Legacy16CallSegment,\r
+                          Private->Legacy16CallOffset,\r
+                          &Regs,\r
+                          NULL,\r
+                          0\r
+                          );\r
   } else {\r
     Regs.X.BX = 0;\r
   }\r
 \r
-  if (Private->IntThunk->DispatchOpromTable.NumberBbsEntries != (UINT8) Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries) {\r
-    Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries  = (UINT8) Private->IntThunk->DispatchOpromTable.NumberBbsEntries;\r
-    mIgnoreBbsUpdateFlag = TRUE;\r
+  if (Private->IntThunk->DispatchOpromTable.NumberBbsEntries != (UINT8)Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries) {\r
+    Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries = (UINT8)Private->IntThunk->DispatchOpromTable.NumberBbsEntries;\r
+    mIgnoreBbsUpdateFlag                                       = TRUE;\r
   }\r
+\r
   //\r
   // Check if non-BBS compliant drives found\r
   //\r
   if (Regs.X.BX != 0) {\r
-    LocalDiskEnd  = (UINT8) (LocalDiskStart + Regs.H.BL);\r
-    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciSegment        = (UINT8) Segment;\r
-    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciBus            = (UINT8) Bus;\r
-    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciDevice         = (UINT8) Device;\r
-    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciFunction       = (UINT8) Function;\r
-    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].StartDriveNumber  = Private->DiskEnd;\r
-    Private->DiskEnd = LocalDiskEnd;\r
-    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].EndDriveNumber = Private->DiskEnd;\r
-    Private->LegacyEfiHddTableIndex += 1;\r
+    LocalDiskEnd                                                                 = (UINT8)(LocalDiskStart + Regs.H.BL);\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciSegment       = (UINT8)Segment;\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciBus           = (UINT8)Bus;\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciDevice        = (UINT8)Device;\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciFunction      = (UINT8)Function;\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].StartDriveNumber = Private->DiskEnd;\r
+    Private->DiskEnd                                                             = LocalDiskEnd;\r
+    Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].EndDriveNumber   = Private->DiskEnd;\r
+    Private->LegacyEfiHddTableIndex                                             += 1;\r
   }\r
+\r
   //\r
   // Skip video mode set, if installing VGA\r
   //\r
@@ -2564,9 +2585,11 @@ LegacyBiosInstallRom (
     //\r
     // Set mode settings since PrepareToScanRom may change mode\r
     //\r
-    ACCESS_PAGE0_CODE ({\r
-      OldVideoMode = *(UINT8 *) ((UINTN) (0x400 + BDA_VIDEO_MODE));\r
-    });\r
+    ACCESS_PAGE0_CODE (\r
+    {\r
+      OldVideoMode = *(UINT8 *)((UINTN)(0x400 + BDA_VIDEO_MODE));\r
+    }\r
+      );\r
 \r
     if (VideoMode != OldVideoMode) {\r
       //\r
@@ -2577,6 +2600,7 @@ LegacyBiosInstallRom (
       Private->LegacyBios.Int86 (&Private->LegacyBios, 0x10, &Regs);\r
     }\r
   }\r
+\r
   //\r
   // Regs.X.AX from the adapter initializion is ignored since some adapters\r
   // do not follow the standard of setting AX = 0 on success.\r
@@ -2584,14 +2608,14 @@ LegacyBiosInstallRom (
   //\r
   // The ROM could have updated its size so we need to read again.\r
   //\r
-  if (((EFI_LEGACY_EXPANSION_ROM_HEADER *) RuntimeAddress)->Signature != PCI_EXPANSION_ROM_HEADER_SIGNATURE) {\r
+  if (((EFI_LEGACY_EXPANSION_ROM_HEADER *)RuntimeAddress)->Signature != PCI_EXPANSION_ROM_HEADER_SIGNATURE) {\r
     //\r
     // Now we check the signature (0xaa55) to judge whether the run-time code is truly generated by INIT function.\r
     // If signature is not valid, that means the INIT function didn't copy the run-time code to RuntimeAddress.\r
     //\r
     *RuntimeImageLength = 0;\r
   } else {\r
-    *RuntimeImageLength = ((EFI_LEGACY_EXPANSION_ROM_HEADER *) RuntimeAddress)->Size512 * 512;\r
+    *RuntimeImageLength = ((EFI_LEGACY_EXPANSION_ROM_HEADER *)RuntimeAddress)->Size512 * 512;\r
   }\r
 \r
   DEBUG ((DEBUG_INFO, " fsize = %x\n", *RuntimeImageLength));\r
@@ -2604,13 +2628,13 @@ LegacyBiosInstallRom (
       //\r
       // Make area from end of shadowed rom to end of original rom all ffs\r
       //\r
-      gBS->SetMem ((VOID *) (InitAddress + *RuntimeImageLength), ImageSize - *RuntimeImageLength, 0xff);\r
+      gBS->SetMem ((VOID *)(InitAddress + *RuntimeImageLength), ImageSize - *RuntimeImageLength, 0xff);\r
     }\r
   }\r
 \r
   ACCESS_PAGE0_CODE (\r
-    LocalDiskEnd = (UINT8) ((*(UINT8 *) ((UINTN) 0x475)) + 0x80);\r
-  );\r
+    LocalDiskEnd = (UINT8)((*(UINT8 *)((UINTN)0x475)) + 0x80);\r
+    );\r
 \r
   //\r
   // Allow platform to perform any required actions after the\r
@@ -2634,29 +2658,30 @@ LegacyBiosInstallRom (
       TempData      = RuntimeAddress;\r
       UpdateBevBcvTable (\r
         Private,\r
-        (EFI_LEGACY_EXPANSION_ROM_HEADER *) TempData,\r
+        (EFI_LEGACY_EXPANSION_ROM_HEADER *)TempData,\r
         PciIo\r
         );\r
-      EndBbsIndex   = Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries;\r
-      LocalDiskEnd  = (UINT8) (LocalDiskStart + (UINT8) (EndBbsIndex - StartBbsIndex));\r
+      EndBbsIndex  = Private->IntThunk->EfiToLegacy16BootTable.NumberBbsEntries;\r
+      LocalDiskEnd = (UINT8)(LocalDiskStart + (UINT8)(EndBbsIndex - StartBbsIndex));\r
       if (LocalDiskEnd != LocalDiskStart) {\r
-        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciSegment        = (UINT8) Segment;\r
-        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciBus            = (UINT8) Bus;\r
-        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciDevice         = (UINT8) Device;\r
-        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciFunction       = (UINT8) Function;\r
-        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].StartDriveNumber  = Private->DiskEnd;\r
-        Private->DiskEnd = LocalDiskEnd;\r
-        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].EndDriveNumber = Private->DiskEnd;\r
-        Private->LegacyEfiHddTableIndex += 1;\r
+        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciSegment       = (UINT8)Segment;\r
+        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciBus           = (UINT8)Bus;\r
+        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciDevice        = (UINT8)Device;\r
+        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].PciFunction      = (UINT8)Function;\r
+        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].StartDriveNumber = Private->DiskEnd;\r
+        Private->DiskEnd                                                             = LocalDiskEnd;\r
+        Private->LegacyEfiHddTable[Private->LegacyEfiHddTableIndex].EndDriveNumber   = Private->DiskEnd;\r
+        Private->LegacyEfiHddTableIndex                                             += 1;\r
       }\r
     }\r
+\r
     //\r
     // Mark PCI device as having a legacy BIOS ROM loaded.\r
     //\r
     RomShadow (\r
       PciHandle,\r
-      (UINT32) RuntimeAddress,\r
-      (UINT32) *RuntimeImageLength,\r
+      (UINT32)RuntimeAddress,\r
+      (UINT32)*RuntimeImageLength,\r
       LocalDiskStart,\r
       LocalDiskEnd\r
       );\r
@@ -2666,7 +2691,7 @@ LegacyBiosInstallRom (
   // Stuff caller's OPTIONAL return parameters.\r
   //\r
   if (RomShadowAddress != NULL) {\r
-    *RomShadowAddress = (VOID *) RuntimeAddress;\r
+    *RomShadowAddress = (VOID *)RuntimeAddress;\r
   }\r
 \r
   if (DiskStart != NULL) {\r
@@ -2677,7 +2702,7 @@ LegacyBiosInstallRom (
     *DiskEnd = LocalDiskEnd;\r
   }\r
 \r
-  Private->OptionRom = (UINT32) (RuntimeAddress + *RuntimeImageLength);\r
+  Private->OptionRom = (UINT32)(RuntimeAddress + *RuntimeImageLength);\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -2713,14 +2738,14 @@ Done:
 **/\r
 EFI_STATUS\r
 IoMmuGrantAccess (\r
-  IN  EFI_HANDLE                        PciHandle,\r
-  IN  EFI_PHYSICAL_ADDRESS              HostAddress,\r
-  IN  UINTN                             NumberOfBytes\r
+  IN  EFI_HANDLE            PciHandle,\r
+  IN  EFI_PHYSICAL_ADDRESS  HostAddress,\r
+  IN  UINTN                 NumberOfBytes\r
   )\r
 {\r
-  EFI_PHYSICAL_ADDRESS            DeviceAddress;\r
-  VOID                            *Mapping;\r
-  EFI_STATUS                      Status;\r
+  EFI_PHYSICAL_ADDRESS  DeviceAddress;\r
+  VOID                  *Mapping;\r
+  EFI_STATUS            Status;\r
 \r
   if (PciHandle == NULL) {\r
     return EFI_UNSUPPORTED;\r
@@ -2730,6 +2755,7 @@ IoMmuGrantAccess (
   if (mIoMmu == NULL) {\r
     gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **)&mIoMmu);\r
   }\r
+\r
   if (mIoMmu != NULL) {\r
     Status = mIoMmu->Map (\r
                        mIoMmu,\r
@@ -2739,7 +2765,7 @@ IoMmuGrantAccess (
                        &DeviceAddress,\r
                        &Mapping\r
                        );\r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "LegacyPci - IoMmuMap - %r\n", Status));\r
     } else {\r
       ASSERT (DeviceAddress == HostAddress);\r
@@ -2749,11 +2775,12 @@ IoMmuGrantAccess (
                          Mapping,\r
                          EDKII_IOMMU_ACCESS_READ | EDKII_IOMMU_ACCESS_WRITE\r
                          );\r
-      if (EFI_ERROR(Status)) {\r
+      if (EFI_ERROR (Status)) {\r
         DEBUG ((DEBUG_ERROR, "LegacyPci - IoMmuSetAttribute - %r\n", Status));\r
       }\r
     }\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -2787,34 +2814,34 @@ IoMmuGrantAccess (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBiosInstallPciRom (\r
-  IN EFI_LEGACY_BIOS_PROTOCOL           * This,\r
-  IN  EFI_HANDLE                        PciHandle,\r
-  IN  VOID                              **RomImage,\r
-  OUT UINTN                             *Flags,\r
-  OUT UINT8                             *DiskStart  OPTIONAL,\r
-  OUT UINT8                             *DiskEnd  OPTIONAL,\r
-  OUT VOID                              **RomShadowAddress  OPTIONAL,\r
-  OUT UINT32                            *RomShadowedSize OPTIONAL\r
+  IN EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  EFI_HANDLE               PciHandle,\r
+  IN  VOID                     **RomImage,\r
+  OUT UINTN                    *Flags,\r
+  OUT UINT8                    *DiskStart  OPTIONAL,\r
+  OUT UINT8                    *DiskEnd  OPTIONAL,\r
+  OUT VOID                     **RomShadowAddress  OPTIONAL,\r
+  OUT UINT32                   *RomShadowedSize OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  LEGACY_BIOS_INSTANCE            *Private;\r
-  VOID                            *LocalRomImage;\r
-  UINTN                           ImageSize;\r
-  UINTN                           RuntimeImageLength;\r
-  EFI_PCI_IO_PROTOCOL             *PciIo;\r
-  PCI_TYPE01                      PciConfigHeader;\r
-  UINTN                           HandleCount;\r
-  EFI_HANDLE                      *HandleBuffer;\r
-  UINTN                           PciSegment;\r
-  UINTN                           PciBus;\r
-  UINTN                           PciDevice;\r
-  UINTN                           PciFunction;\r
-  UINTN                           LastBus;\r
-  UINTN                           Index;\r
-  UINT8                           OpromRevision;\r
-  UINT32                          Granularity;\r
-  PCI_3_0_DATA_STRUCTURE          *Pcir;\r
+  EFI_STATUS              Status;\r
+  LEGACY_BIOS_INSTANCE    *Private;\r
+  VOID                    *LocalRomImage;\r
+  UINTN                   ImageSize;\r
+  UINTN                   RuntimeImageLength;\r
+  EFI_PCI_IO_PROTOCOL     *PciIo;\r
+  PCI_TYPE01              PciConfigHeader;\r
+  UINTN                   HandleCount;\r
+  EFI_HANDLE              *HandleBuffer;\r
+  UINTN                   PciSegment;\r
+  UINTN                   PciBus;\r
+  UINTN                   PciDevice;\r
+  UINTN                   PciFunction;\r
+  UINTN                   LastBus;\r
+  UINTN                   Index;\r
+  UINT8                   OpromRevision;\r
+  UINT32                  Granularity;\r
+  PCI_3_0_DATA_STRUCTURE  *Pcir;\r
 \r
   OpromRevision = 0;\r
 \r
@@ -2836,7 +2863,7 @@ LegacyBiosInstallPciRom (
       Status = gBS->HandleProtocol (\r
                       HandleBuffer[Index],\r
                       &gEfiPciIoProtocolGuid,\r
-                      (VOID **) &PciIo\r
+                      (VOID **)&PciIo\r
                       );\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
@@ -2860,7 +2887,7 @@ LegacyBiosInstallPciRom (
                              0x20000,\r
                              &Granularity\r
                              );\r
-    Private->Legacy16Table->LastPciBus = (UINT8) LastBus;\r
+    Private->Legacy16Table->LastPciBus = (UINT8)LastBus;\r
     Private->LegacyRegion->Lock (\r
                              Private->LegacyRegion,\r
                              0xE0000,\r
@@ -2878,7 +2905,7 @@ LegacyBiosInstallPciRom (
     Status = gBS->HandleProtocol (\r
                     PciHandle,\r
                     &gEfiPciIoProtocolGuid,\r
-                    (VOID **) &PciIo\r
+                    (VOID **)&PciIo\r
                     );\r
 \r
     if (!EFI_ERROR (Status)) {\r
@@ -2894,16 +2921,17 @@ LegacyBiosInstallPciRom (
       // if video installed & OPROM is video return\r
       //\r
       if (\r
-          (\r
-           ((PciConfigHeader.Hdr.ClassCode[2] == PCI_CLASS_OLD) &&\r
-            (PciConfigHeader.Hdr.ClassCode[1] == PCI_CLASS_OLD_VGA))\r
-           ||\r
-           ((PciConfigHeader.Hdr.ClassCode[2] == PCI_CLASS_DISPLAY) &&\r
-            (PciConfigHeader.Hdr.ClassCode[1] == PCI_CLASS_DISPLAY_VGA))\r
-          )\r
-          &&\r
-          (!Private->VgaInstalled)\r
-         ) {\r
+            (\r
+               ((PciConfigHeader.Hdr.ClassCode[2] == PCI_CLASS_OLD) &&\r
+              (PciConfigHeader.Hdr.ClassCode[1] == PCI_CLASS_OLD_VGA))\r
+            ||\r
+             ((PciConfigHeader.Hdr.ClassCode[2] == PCI_CLASS_DISPLAY) &&\r
+              (PciConfigHeader.Hdr.ClassCode[1] == PCI_CLASS_DISPLAY_VGA))\r
+            )\r
+         &&\r
+            (!Private->VgaInstalled)\r
+            )\r
+      {\r
         mVgaInstallationInProgress = TRUE;\r
 \r
         //\r
@@ -2911,6 +2939,7 @@ LegacyBiosInstallPciRom (
         //\r
       }\r
     }\r
+\r
     //\r
     // To run any legacy image, the VGA needs to be installed first.\r
     // if installing the video, then don't need the thunk as already installed.\r
@@ -2931,8 +2960,8 @@ LegacyBiosInstallPciRom (
         // A return status of EFI_NOT_FOUND is considered valid (No EFI\r
         // driver is controlling video.\r
         //\r
-        mVgaInstallationInProgress  = TRUE;\r
-        Status                      = LegacyBiosInstallVgaRom (Private);\r
+        mVgaInstallationInProgress = TRUE;\r
+        Status                     = LegacyBiosInstallVgaRom (Private);\r
         if (EFI_ERROR (Status)) {\r
           if (Status != EFI_NOT_FOUND) {\r
             mVgaInstallationInProgress = FALSE;\r
@@ -2943,6 +2972,7 @@ LegacyBiosInstallPciRom (
         }\r
       }\r
     }\r
+\r
     //\r
     // See if the option ROM for PciHandle has already been executed\r
     //\r
@@ -2955,7 +2985,7 @@ LegacyBiosInstallPciRom (
         DiskStart,\r
         DiskEnd,\r
         RomShadowAddress,\r
-        (UINTN *) RomShadowedSize\r
+        (UINTN *)RomShadowedSize\r
         );\r
       return EFI_SUCCESS;\r
     }\r
@@ -2999,8 +3029,8 @@ LegacyBiosInstallPciRom (
       // A return status of EFI_NOT_FOUND is considered valid (No EFI\r
       // driver is controlling video.\r
       //\r
-      mVgaInstallationInProgress  = TRUE;\r
-      Status                      = LegacyBiosInstallVgaRom (Private);\r
+      mVgaInstallationInProgress = TRUE;\r
+      Status                     = LegacyBiosInstallVgaRom (Private);\r
       if (EFI_ERROR (Status)) {\r
         if (Status != EFI_NOT_FOUND) {\r
           mVgaInstallationInProgress = FALSE;\r
@@ -3012,15 +3042,16 @@ LegacyBiosInstallPciRom (
     }\r
 \r
     LocalRomImage = *RomImage;\r
-    if (((PCI_EXPANSION_ROM_HEADER *) LocalRomImage)->Signature != PCI_EXPANSION_ROM_HEADER_SIGNATURE ||\r
-        ((PCI_EXPANSION_ROM_HEADER *) LocalRomImage)->PcirOffset == 0 ||\r
-        (((PCI_EXPANSION_ROM_HEADER *) LocalRomImage)->PcirOffset & 3 ) != 0) {\r
+    if ((((PCI_EXPANSION_ROM_HEADER *)LocalRomImage)->Signature != PCI_EXPANSION_ROM_HEADER_SIGNATURE) ||\r
+        (((PCI_EXPANSION_ROM_HEADER *)LocalRomImage)->PcirOffset == 0) ||\r
+        ((((PCI_EXPANSION_ROM_HEADER *)LocalRomImage)->PcirOffset & 3) != 0))\r
+    {\r
       mVgaInstallationInProgress = FALSE;\r
       return EFI_UNSUPPORTED;\r
     }\r
 \r
     Pcir = (PCI_3_0_DATA_STRUCTURE *)\r
-           ((UINT8 *) LocalRomImage + ((PCI_EXPANSION_ROM_HEADER *) LocalRomImage)->PcirOffset);\r
+           ((UINT8 *)LocalRomImage + ((PCI_EXPANSION_ROM_HEADER *)LocalRomImage)->PcirOffset);\r
 \r
     if ((Pcir->Signature != PCI_DATA_STRUCTURE_SIGNATURE) || (Pcir->CodeType != PCI_CODE_TYPE_PCAT_IMAGE)) {\r
       mVgaInstallationInProgress = FALSE;\r
@@ -3033,6 +3064,7 @@ LegacyBiosInstallPciRom (
     } else {\r
       OpromRevision = 0;\r
     }\r
+\r
     if (Pcir->Revision < 3) {\r
       RuntimeImageLength = 0;\r
     } else {\r
@@ -3059,22 +3091,22 @@ LegacyBiosInstallPciRom (
   //\r
   ASSERT (Private->TraceIndex < 0x200);\r
   Private->Trace[Private->TraceIndex] = LEGACY_PCI_TRACE_000;\r
-  Private->TraceIndex ++;\r
-  Private->TraceIndex = (UINT16) (Private->TraceIndex % 0x200);\r
-  Status = LegacyBiosInstallRom (\r
-             This,\r
-             Private,\r
-             PciHandle,\r
-             OpromRevision,\r
-             LocalRomImage,\r
-             ImageSize,\r
-             &RuntimeImageLength,\r
-             DiskStart,\r
-             DiskEnd,\r
-             RomShadowAddress\r
-             );\r
+  Private->TraceIndex++;\r
+  Private->TraceIndex = (UINT16)(Private->TraceIndex % 0x200);\r
+  Status              = LegacyBiosInstallRom (\r
+                          This,\r
+                          Private,\r
+                          PciHandle,\r
+                          OpromRevision,\r
+                          LocalRomImage,\r
+                          ImageSize,\r
+                          &RuntimeImageLength,\r
+                          DiskStart,\r
+                          DiskEnd,\r
+                          RomShadowAddress\r
+                          );\r
   if (RomShadowedSize != NULL) {\r
-    *RomShadowedSize = (UINT32) RuntimeImageLength;\r
+    *RomShadowedSize = (UINT32)RuntimeImageLength;\r
   }\r
 \r
   mVgaInstallationInProgress = FALSE;\r
index 6b9bb5ed8b2a6ee1d47c2ca7d8d0b38b13da2fad..0cb48fa8abeafd2b1f529c7565691a79f54a4aee 100644 (file)
@@ -21,32 +21,32 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 EFI_STATUS\r
 LegacyBiosBuildSioDataFromSio (\r
-  IN DEVICE_PRODUCER_DATA_HEADER             *SioPtr\r
+  IN DEVICE_PRODUCER_DATA_HEADER  *SioPtr\r
   )\r
 {\r
-  EFI_STATUS                                 Status;\r
-  DEVICE_PRODUCER_SERIAL                     *SioSerial;\r
-  DEVICE_PRODUCER_PARALLEL                   *SioParallel;\r
-  DEVICE_PRODUCER_FLOPPY                     *SioFloppy;\r
-  UINTN                                      HandleCount;\r
-  EFI_HANDLE                                 *HandleBuffer;\r
-  UINTN                                      Index;\r
-  UINTN                                      ChildIndex;\r
-  EFI_SIO_PROTOCOL                           *Sio;\r
-  ACPI_RESOURCE_HEADER_PTR                   Resources;\r
-  EFI_ACPI_IO_PORT_DESCRIPTOR                *IoResource;\r
-  EFI_ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR *FixedIoResource;\r
-  EFI_ACPI_DMA_DESCRIPTOR                    *DmaResource;\r
-  EFI_ACPI_IRQ_NOFLAG_DESCRIPTOR             *IrqResource;\r
-  UINT16                                     Address;\r
-  UINT8                                      Dma;\r
-  UINT8                                      Irq;\r
-  UINTN                                      EntryCount;\r
-  EFI_OPEN_PROTOCOL_INFORMATION_ENTRY        *OpenInfoBuffer;\r
-  EFI_BLOCK_IO_PROTOCOL                      *BlockIo;\r
-  EFI_SERIAL_IO_PROTOCOL                     *SerialIo;\r
-  EFI_DEVICE_PATH_PROTOCOL                   *DevicePath;\r
-  ACPI_HID_DEVICE_PATH                       *Acpi;\r
+  EFI_STATUS                                  Status;\r
+  DEVICE_PRODUCER_SERIAL                      *SioSerial;\r
+  DEVICE_PRODUCER_PARALLEL                    *SioParallel;\r
+  DEVICE_PRODUCER_FLOPPY                      *SioFloppy;\r
+  UINTN                                       HandleCount;\r
+  EFI_HANDLE                                  *HandleBuffer;\r
+  UINTN                                       Index;\r
+  UINTN                                       ChildIndex;\r
+  EFI_SIO_PROTOCOL                            *Sio;\r
+  ACPI_RESOURCE_HEADER_PTR                    Resources;\r
+  EFI_ACPI_IO_PORT_DESCRIPTOR                 *IoResource;\r
+  EFI_ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR  *FixedIoResource;\r
+  EFI_ACPI_DMA_DESCRIPTOR                     *DmaResource;\r
+  EFI_ACPI_IRQ_NOFLAG_DESCRIPTOR              *IrqResource;\r
+  UINT16                                      Address;\r
+  UINT8                                       Dma;\r
+  UINT8                                       Irq;\r
+  UINTN                                       EntryCount;\r
+  EFI_OPEN_PROTOCOL_INFORMATION_ENTRY         *OpenInfoBuffer;\r
+  EFI_BLOCK_IO_PROTOCOL                       *BlockIo;\r
+  EFI_SERIAL_IO_PROTOCOL                      *SerialIo;\r
+  EFI_DEVICE_PATH_PROTOCOL                    *DevicePath;\r
+  ACPI_HID_DEVICE_PATH                        *Acpi;\r
 \r
   //\r
   // Get the list of ISA controllers in the system\r
@@ -61,11 +61,12 @@ LegacyBiosBuildSioDataFromSio (
   if (EFI_ERROR (Status)) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   //\r
   // Collect legacy information from each of the ISA controllers in the system\r
   //\r
   for (Index = 0; Index < HandleCount; Index++) {\r
-    Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiSioProtocolGuid, (VOID **) &Sio);\r
+    Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiSioProtocolGuid, (VOID **)&Sio);\r
     if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r
@@ -73,46 +74,46 @@ LegacyBiosBuildSioDataFromSio (
     Address = MAX_UINT16;\r
     Dma     = MAX_UINT8;\r
     Irq     = MAX_UINT8;\r
-    Status = Sio->GetResources (Sio, &Resources);\r
+    Status  = Sio->GetResources (Sio, &Resources);\r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // Get the base address information from ACPI resource descriptor.\r
       //\r
       while (Resources.SmallHeader->Byte != ACPI_END_TAG_DESCRIPTOR) {\r
         switch (Resources.SmallHeader->Byte) {\r
-        case ACPI_IO_PORT_DESCRIPTOR:\r
-          IoResource = (EFI_ACPI_IO_PORT_DESCRIPTOR *) Resources.SmallHeader;\r
-          Address = IoResource->BaseAddressMin;\r
-          break;\r
-\r
-        case ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR:\r
-          FixedIoResource = (EFI_ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR *) Resources.SmallHeader;\r
-          Address = FixedIoResource->BaseAddress;\r
-          break;\r
-\r
-        case ACPI_DMA_DESCRIPTOR:\r
-          DmaResource = (EFI_ACPI_DMA_DESCRIPTOR *) Resources.SmallHeader;\r
-          Dma = (UINT8) LowBitSet32 (DmaResource->ChannelMask);\r
-          break;\r
-\r
-        case ACPI_IRQ_DESCRIPTOR:\r
-        case ACPI_IRQ_NOFLAG_DESCRIPTOR:\r
-          IrqResource = (EFI_ACPI_IRQ_NOFLAG_DESCRIPTOR *) Resources.SmallHeader;\r
-          Irq = (UINT8) LowBitSet32 (IrqResource->Mask);\r
-          break;\r
-\r
-        default:\r
-          break;\r
+          case ACPI_IO_PORT_DESCRIPTOR:\r
+            IoResource = (EFI_ACPI_IO_PORT_DESCRIPTOR *)Resources.SmallHeader;\r
+            Address    = IoResource->BaseAddressMin;\r
+            break;\r
+\r
+          case ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR:\r
+            FixedIoResource = (EFI_ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR *)Resources.SmallHeader;\r
+            Address         = FixedIoResource->BaseAddress;\r
+            break;\r
+\r
+          case ACPI_DMA_DESCRIPTOR:\r
+            DmaResource = (EFI_ACPI_DMA_DESCRIPTOR *)Resources.SmallHeader;\r
+            Dma         = (UINT8)LowBitSet32 (DmaResource->ChannelMask);\r
+            break;\r
+\r
+          case ACPI_IRQ_DESCRIPTOR:\r
+          case ACPI_IRQ_NOFLAG_DESCRIPTOR:\r
+            IrqResource = (EFI_ACPI_IRQ_NOFLAG_DESCRIPTOR *)Resources.SmallHeader;\r
+            Irq         = (UINT8)LowBitSet32 (IrqResource->Mask);\r
+            break;\r
+\r
+          default:\r
+            break;\r
         }\r
 \r
         if (Resources.SmallHeader->Bits.Type == 0) {\r
-          Resources.SmallHeader = (ACPI_SMALL_RESOURCE_HEADER *) ((UINT8 *) Resources.SmallHeader\r
-                                                                  + Resources.SmallHeader->Bits.Length\r
-                                                                  + sizeof (*Resources.SmallHeader));\r
+          Resources.SmallHeader = (ACPI_SMALL_RESOURCE_HEADER *)((UINT8 *)Resources.SmallHeader\r
+                                                                 + Resources.SmallHeader->Bits.Length\r
+                                                                 + sizeof (*Resources.SmallHeader));\r
         } else {\r
-          Resources.LargeHeader = (ACPI_LARGE_RESOURCE_HEADER *) ((UINT8 *) Resources.LargeHeader\r
-                                                                  + Resources.LargeHeader->Length\r
-                                                                  + sizeof (*Resources.LargeHeader));\r
+          Resources.LargeHeader = (ACPI_LARGE_RESOURCE_HEADER *)((UINT8 *)Resources.LargeHeader\r
+                                                                 + Resources.LargeHeader->Length\r
+                                                                 + sizeof (*Resources.LargeHeader));\r
         }\r
       }\r
     }\r
@@ -126,13 +127,14 @@ LegacyBiosBuildSioDataFromSio (
 \r
     Acpi = NULL;\r
     while (!IsDevicePathEnd (DevicePath)) {\r
-      Acpi = (ACPI_HID_DEVICE_PATH *) DevicePath;\r
+      Acpi       = (ACPI_HID_DEVICE_PATH *)DevicePath;\r
       DevicePath = NextDevicePathNode (DevicePath);\r
     }\r
 \r
     if ((Acpi == NULL) || (DevicePathType (Acpi) != ACPI_DEVICE_PATH) ||\r
         ((DevicePathSubType (Acpi) != ACPI_DP) && (DevicePathSubType (Acpi) != ACPI_EXTENDED_DP))\r
-        ) {\r
+        )\r
+    {\r
       continue;\r
     }\r
 \r
@@ -141,9 +143,8 @@ LegacyBiosBuildSioDataFromSio (
     //\r
     // Ignore DMA resource since it is always returned NULL\r
     //\r
-    if (Acpi->HID == EISA_PNP_ID (0x500) || Acpi->HID == EISA_PNP_ID (0x501)) {\r
-\r
-      if (Acpi->UID < 4 && Address != MAX_UINT16 && Irq != MAX_UINT8) {\r
+    if ((Acpi->HID == EISA_PNP_ID (0x500)) || (Acpi->HID == EISA_PNP_ID (0x501))) {\r
+      if ((Acpi->UID < 4) && (Address != MAX_UINT16) && (Irq != MAX_UINT8)) {\r
         //\r
         // Get the handle of the child device that has opened the Super I/O Protocol\r
         //\r
@@ -156,14 +157,15 @@ LegacyBiosBuildSioDataFromSio (
         if (EFI_ERROR (Status)) {\r
           continue;\r
         }\r
+\r
         for (ChildIndex = 0; ChildIndex < EntryCount; ChildIndex++) {\r
           if ((OpenInfoBuffer[ChildIndex].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {\r
-            Status = gBS->HandleProtocol (OpenInfoBuffer[ChildIndex].ControllerHandle, &gEfiSerialIoProtocolGuid, (VOID **) &SerialIo);\r
+            Status = gBS->HandleProtocol (OpenInfoBuffer[ChildIndex].ControllerHandle, &gEfiSerialIoProtocolGuid, (VOID **)&SerialIo);\r
             if (!EFI_ERROR (Status)) {\r
-              SioSerial           = &SioPtr->Serial[Acpi->UID];\r
-              SioSerial->Address  = Address;\r
-              SioSerial->Irq      = Irq;\r
-              SioSerial->Mode     = DEVICE_SERIAL_MODE_NORMAL | DEVICE_SERIAL_MODE_DUPLEX_HALF;\r
+              SioSerial          = &SioPtr->Serial[Acpi->UID];\r
+              SioSerial->Address = Address;\r
+              SioSerial->Irq     = Irq;\r
+              SioSerial->Mode    = DEVICE_SERIAL_MODE_NORMAL | DEVICE_SERIAL_MODE_DUPLEX_HALF;\r
               break;\r
             }\r
           }\r
@@ -172,36 +174,39 @@ LegacyBiosBuildSioDataFromSio (
         FreePool (OpenInfoBuffer);\r
       }\r
     }\r
+\r
     //\r
     // See if this is an ISA parallel port\r
     //\r
     // Ignore DMA resource since it is always returned NULL, port\r
     // only used in output mode.\r
     //\r
-    if (Acpi->HID == EISA_PNP_ID (0x400) || Acpi->HID == EISA_PNP_ID (0x401)) {\r
-      if (Acpi->UID < 3 && Address != MAX_UINT16 && Irq != MAX_UINT8 && Dma != MAX_UINT8) {\r
-        SioParallel           = &SioPtr->Parallel[Acpi->UID];\r
-        SioParallel->Address  = Address;\r
-        SioParallel->Irq      = Irq;\r
-        SioParallel->Dma      = Dma;\r
-        SioParallel->Mode     = DEVICE_PARALLEL_MODE_MODE_OUTPUT_ONLY;\r
+    if ((Acpi->HID == EISA_PNP_ID (0x400)) || (Acpi->HID == EISA_PNP_ID (0x401))) {\r
+      if ((Acpi->UID < 3) && (Address != MAX_UINT16) && (Irq != MAX_UINT8) && (Dma != MAX_UINT8)) {\r
+        SioParallel          = &SioPtr->Parallel[Acpi->UID];\r
+        SioParallel->Address = Address;\r
+        SioParallel->Irq     = Irq;\r
+        SioParallel->Dma     = Dma;\r
+        SioParallel->Mode    = DEVICE_PARALLEL_MODE_MODE_OUTPUT_ONLY;\r
       }\r
     }\r
+\r
     //\r
     // See if this is an ISA floppy controller\r
     //\r
     if (Acpi->HID == EISA_PNP_ID (0x604)) {\r
-      if (Address != MAX_UINT16 && Irq != MAX_UINT8 && Dma != MAX_UINT8) {\r
-        Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiBlockIoProtocolGuid, (VOID **) &BlockIo);\r
+      if ((Address != MAX_UINT16) && (Irq != MAX_UINT8) && (Dma != MAX_UINT8)) {\r
+        Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiBlockIoProtocolGuid, (VOID **)&BlockIo);\r
         if (!EFI_ERROR (Status)) {\r
-          SioFloppy           = &SioPtr->Floppy;\r
-          SioFloppy->Address  = Address;\r
-          SioFloppy->Irq      = Irq;\r
-          SioFloppy->Dma      = Dma;\r
+          SioFloppy          = &SioPtr->Floppy;\r
+          SioFloppy->Address = Address;\r
+          SioFloppy->Irq     = Irq;\r
+          SioFloppy->Dma     = Dma;\r
           SioFloppy->NumberOfFloppy++;\r
         }\r
       }\r
     }\r
+\r
     //\r
     // See if this is a mouse\r
     // Always set mouse found so USB hot plug will work\r
@@ -225,7 +230,6 @@ LegacyBiosBuildSioDataFromSio (
 \r
   FreePool (HandleBuffer);\r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -239,27 +243,27 @@ LegacyBiosBuildSioDataFromSio (
 **/\r
 EFI_STATUS\r
 LegacyBiosBuildSioDataFromIsaIo (\r
-  IN DEVICE_PRODUCER_DATA_HEADER      *SioPtr\r
+  IN DEVICE_PRODUCER_DATA_HEADER  *SioPtr\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  DEVICE_PRODUCER_SERIAL              *SioSerial;\r
-  DEVICE_PRODUCER_PARALLEL            *SioParallel;\r
-  DEVICE_PRODUCER_FLOPPY              *SioFloppy;\r
-  UINTN                               HandleCount;\r
-  EFI_HANDLE                          *HandleBuffer;\r
-  UINTN                               Index;\r
-  UINTN                               ResourceIndex;\r
-  UINTN                               ChildIndex;\r
-  EFI_ISA_IO_PROTOCOL                 *IsaIo;\r
-  EFI_ISA_ACPI_RESOURCE_LIST          *ResourceList;\r
-  EFI_ISA_ACPI_RESOURCE               *IoResource;\r
-  EFI_ISA_ACPI_RESOURCE               *DmaResource;\r
-  EFI_ISA_ACPI_RESOURCE               *InterruptResource;\r
-  UINTN                               EntryCount;\r
-  EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfoBuffer;\r
-  EFI_BLOCK_IO_PROTOCOL               *BlockIo;\r
-  EFI_SERIAL_IO_PROTOCOL              *SerialIo;\r
+  EFI_STATUS                           Status;\r
+  DEVICE_PRODUCER_SERIAL               *SioSerial;\r
+  DEVICE_PRODUCER_PARALLEL             *SioParallel;\r
+  DEVICE_PRODUCER_FLOPPY               *SioFloppy;\r
+  UINTN                                HandleCount;\r
+  EFI_HANDLE                           *HandleBuffer;\r
+  UINTN                                Index;\r
+  UINTN                                ResourceIndex;\r
+  UINTN                                ChildIndex;\r
+  EFI_ISA_IO_PROTOCOL                  *IsaIo;\r
+  EFI_ISA_ACPI_RESOURCE_LIST           *ResourceList;\r
+  EFI_ISA_ACPI_RESOURCE                *IoResource;\r
+  EFI_ISA_ACPI_RESOURCE                *DmaResource;\r
+  EFI_ISA_ACPI_RESOURCE                *InterruptResource;\r
+  UINTN                                EntryCount;\r
+  EFI_OPEN_PROTOCOL_INFORMATION_ENTRY  *OpenInfoBuffer;\r
+  EFI_BLOCK_IO_PROTOCOL                *BlockIo;\r
+  EFI_SERIAL_IO_PROTOCOL               *SerialIo;\r
 \r
   //\r
   // Get the list of ISA controllers in the system\r
@@ -274,12 +278,12 @@ LegacyBiosBuildSioDataFromIsaIo (
   if (EFI_ERROR (Status)) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   //\r
   // Collect legacy information from each of the ISA controllers in the system\r
   //\r
   for (Index = 0; Index < HandleCount; Index++) {\r
-\r
-    Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiIsaIoProtocolGuid, (VOID **) &IsaIo);\r
+    Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiIsaIoProtocolGuid, (VOID **)&IsaIo);\r
     if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r
@@ -289,6 +293,7 @@ LegacyBiosBuildSioDataFromIsaIo (
     if (ResourceList == NULL) {\r
       continue;\r
     }\r
+\r
     //\r
     // Collect the resource types neededto fill in the SIO data structure\r
     //\r
@@ -298,38 +303,40 @@ LegacyBiosBuildSioDataFromIsaIo (
     for (ResourceIndex = 0;\r
          ResourceList->ResourceItem[ResourceIndex].Type != EfiIsaAcpiResourceEndOfList;\r
          ResourceIndex++\r
-        ) {\r
+         )\r
+    {\r
       switch (ResourceList->ResourceItem[ResourceIndex].Type) {\r
-      case EfiIsaAcpiResourceIo:\r
-        IoResource = &ResourceList->ResourceItem[ResourceIndex];\r
-        break;\r
+        case EfiIsaAcpiResourceIo:\r
+          IoResource = &ResourceList->ResourceItem[ResourceIndex];\r
+          break;\r
 \r
-      case EfiIsaAcpiResourceMemory:\r
-        break;\r
+        case EfiIsaAcpiResourceMemory:\r
+          break;\r
 \r
-      case EfiIsaAcpiResourceDma:\r
-        DmaResource = &ResourceList->ResourceItem[ResourceIndex];\r
-        break;\r
+        case EfiIsaAcpiResourceDma:\r
+          DmaResource = &ResourceList->ResourceItem[ResourceIndex];\r
+          break;\r
 \r
-      case EfiIsaAcpiResourceInterrupt:\r
-        InterruptResource = &ResourceList->ResourceItem[ResourceIndex];\r
-        break;\r
+        case EfiIsaAcpiResourceInterrupt:\r
+          InterruptResource = &ResourceList->ResourceItem[ResourceIndex];\r
+          break;\r
 \r
-      default:\r
-        break;\r
+        default:\r
+          break;\r
       }\r
     }\r
+\r
     //\r
     // See if this is an ISA serial port\r
     //\r
     // Ignore DMA resource since it is always returned NULL\r
     //\r
-    if (ResourceList->Device.HID == EISA_PNP_ID (0x500) || ResourceList->Device.HID == EISA_PNP_ID (0x501)) {\r
-\r
-      if (ResourceList->Device.UID <= 3 &&\r
-          IoResource != NULL &&\r
-          InterruptResource != NULL\r
-          ) {\r
+    if ((ResourceList->Device.HID == EISA_PNP_ID (0x500)) || (ResourceList->Device.HID == EISA_PNP_ID (0x501))) {\r
+      if ((ResourceList->Device.UID <= 3) &&\r
+          (IoResource != NULL) &&\r
+          (InterruptResource != NULL)\r
+          )\r
+      {\r
         //\r
         // Get the handle of the child device that has opened the ISA I/O Protocol\r
         //\r
@@ -342,17 +349,18 @@ LegacyBiosBuildSioDataFromIsaIo (
         if (EFI_ERROR (Status)) {\r
           continue;\r
         }\r
+\r
         //\r
         // We want resource for legacy even if no 32-bit driver installed\r
         //\r
         for (ChildIndex = 0; ChildIndex < EntryCount; ChildIndex++) {\r
           if ((OpenInfoBuffer[ChildIndex].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {\r
-            Status = gBS->HandleProtocol (OpenInfoBuffer[ChildIndex].ControllerHandle, &gEfiSerialIoProtocolGuid, (VOID **) &SerialIo);\r
+            Status = gBS->HandleProtocol (OpenInfoBuffer[ChildIndex].ControllerHandle, &gEfiSerialIoProtocolGuid, (VOID **)&SerialIo);\r
             if (!EFI_ERROR (Status)) {\r
-              SioSerial           = &SioPtr->Serial[ResourceList->Device.UID];\r
-              SioSerial->Address  = (UINT16) IoResource->StartRange;\r
-              SioSerial->Irq      = (UINT8) InterruptResource->StartRange;\r
-              SioSerial->Mode     = DEVICE_SERIAL_MODE_NORMAL | DEVICE_SERIAL_MODE_DUPLEX_HALF;\r
+              SioSerial          = &SioPtr->Serial[ResourceList->Device.UID];\r
+              SioSerial->Address = (UINT16)IoResource->StartRange;\r
+              SioSerial->Irq     = (UINT8)InterruptResource->StartRange;\r
+              SioSerial->Mode    = DEVICE_SERIAL_MODE_NORMAL | DEVICE_SERIAL_MODE_DUPLEX_HALF;\r
               break;\r
             }\r
           }\r
@@ -361,40 +369,44 @@ LegacyBiosBuildSioDataFromIsaIo (
         FreePool (OpenInfoBuffer);\r
       }\r
     }\r
+\r
     //\r
     // See if this is an ISA parallel port\r
     //\r
     // Ignore DMA resource since it is always returned NULL, port\r
     // only used in output mode.\r
     //\r
-    if (ResourceList->Device.HID == EISA_PNP_ID (0x400) || ResourceList->Device.HID == EISA_PNP_ID (0x401)) {\r
-      if (ResourceList->Device.UID <= 2 &&\r
-          IoResource != NULL &&\r
-          InterruptResource != NULL &&\r
-          DmaResource != NULL\r
-          ) {\r
-        SioParallel           = &SioPtr->Parallel[ResourceList->Device.UID];\r
-        SioParallel->Address  = (UINT16) IoResource->StartRange;\r
-        SioParallel->Irq      = (UINT8) InterruptResource->StartRange;\r
-        SioParallel->Dma      = (UINT8) DmaResource->StartRange;\r
-        SioParallel->Mode     = DEVICE_PARALLEL_MODE_MODE_OUTPUT_ONLY;\r
+    if ((ResourceList->Device.HID == EISA_PNP_ID (0x400)) || (ResourceList->Device.HID == EISA_PNP_ID (0x401))) {\r
+      if ((ResourceList->Device.UID <= 2) &&\r
+          (IoResource != NULL) &&\r
+          (InterruptResource != NULL) &&\r
+          (DmaResource != NULL)\r
+          )\r
+      {\r
+        SioParallel          = &SioPtr->Parallel[ResourceList->Device.UID];\r
+        SioParallel->Address = (UINT16)IoResource->StartRange;\r
+        SioParallel->Irq     = (UINT8)InterruptResource->StartRange;\r
+        SioParallel->Dma     = (UINT8)DmaResource->StartRange;\r
+        SioParallel->Mode    = DEVICE_PARALLEL_MODE_MODE_OUTPUT_ONLY;\r
       }\r
     }\r
+\r
     //\r
     // See if this is an ISA floppy controller\r
     //\r
     if (ResourceList->Device.HID == EISA_PNP_ID (0x604)) {\r
-      if (IoResource != NULL && InterruptResource != NULL && DmaResource != NULL) {\r
-        Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiBlockIoProtocolGuid, (VOID **) &BlockIo);\r
+      if ((IoResource != NULL) && (InterruptResource != NULL) && (DmaResource != NULL)) {\r
+        Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiBlockIoProtocolGuid, (VOID **)&BlockIo);\r
         if (!EFI_ERROR (Status)) {\r
-          SioFloppy           = &SioPtr->Floppy;\r
-          SioFloppy->Address  = (UINT16) IoResource->StartRange;\r
-          SioFloppy->Irq      = (UINT8) InterruptResource->StartRange;\r
-          SioFloppy->Dma      = (UINT8) DmaResource->StartRange;\r
+          SioFloppy          = &SioPtr->Floppy;\r
+          SioFloppy->Address = (UINT16)IoResource->StartRange;\r
+          SioFloppy->Irq     = (UINT8)InterruptResource->StartRange;\r
+          SioFloppy->Dma     = (UINT8)DmaResource->StartRange;\r
           SioFloppy->NumberOfFloppy++;\r
         }\r
       }\r
     }\r
+\r
     //\r
     // See if this is a mouse\r
     // Always set mouse found so USB hot plug will work\r
@@ -430,14 +442,14 @@ LegacyBiosBuildSioDataFromIsaIo (
 **/\r
 EFI_STATUS\r
 LegacyBiosBuildSioData (\r
-  IN  LEGACY_BIOS_INSTANCE      *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  DEVICE_PRODUCER_DATA_HEADER         *SioPtr;\r
-  EFI_HANDLE                          IsaBusController;\r
-  UINTN                               HandleCount;\r
-  EFI_HANDLE                          *HandleBuffer;\r
+  EFI_STATUS                   Status;\r
+  DEVICE_PRODUCER_DATA_HEADER  *SioPtr;\r
+  EFI_HANDLE                   IsaBusController;\r
+  UINTN                        HandleCount;\r
+  EFI_HANDLE                   *HandleBuffer;\r
 \r
   //\r
   // Get the pointer to the SIO data structure\r
index dd706fbd6e237fef18ca35cbf80dce6015ad10eb..62f19b65191230861f852f9e4693528f5888ae37 100644 (file)
@@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "LegacyBiosInterface.h"\r
 \r
-THUNK_CONTEXT      mThunkContext;\r
+THUNK_CONTEXT  mThunkContext;\r
 \r
 /**\r
   Sets the counter value for Timer #0 in a legacy 8254 timer.\r
@@ -23,8 +23,8 @@ SetPitCount (
   )\r
 {\r
   IoWrite8 (TIMER_CONTROL_PORT, TIMER0_CONTROL_WORD);\r
-  IoWrite8 (TIMER0_COUNT_PORT, (UINT8) (Count & 0xFF));\r
-  IoWrite8 (TIMER0_COUNT_PORT, (UINT8) ((Count>>8) & 0xFF));\r
+  IoWrite8 (TIMER0_COUNT_PORT, (UINT8)(Count & 0xFF));\r
+  IoWrite8 (TIMER0_COUNT_PORT, (UINT8)((Count>>8) & 0xFF));\r
 }\r
 \r
 /**\r
@@ -45,13 +45,13 @@ SetPitCount (
 BOOLEAN\r
 EFIAPI\r
 LegacyBiosInt86 (\r
-  IN  EFI_LEGACY_BIOS_PROTOCOL      *This,\r
-  IN  UINT8                         BiosInt,\r
-  IN  EFI_IA32_REGISTER_SET         *Regs\r
+  IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  UINT8                     BiosInt,\r
+  IN  EFI_IA32_REGISTER_SET     *Regs\r
   )\r
 {\r
-  UINT16                Segment;\r
-  UINT16                Offset;\r
+  UINT16  Segment;\r
+  UINT16  Offset;\r
 \r
   Regs->X.Flags.Reserved1 = 1;\r
   Regs->X.Flags.Reserved2 = 0;\r
@@ -67,9 +67,9 @@ LegacyBiosInt86 (
   // We use this base address to get the legacy interrupt handler.\r
   //\r
   ACCESS_PAGE0_CODE (\r
-    Segment               = (UINT16)(((UINT32 *)0)[BiosInt] >> 16);\r
-    Offset                = (UINT16)((UINT32 *)0)[BiosInt];\r
-  );\r
+    Segment = (UINT16)(((UINT32 *)0)[BiosInt] >> 16);\r
+    Offset  = (UINT16)((UINT32 *)0)[BiosInt];\r
+    );\r
 \r
   return InternalLegacyBiosFarCall (\r
            This,\r
@@ -102,12 +102,12 @@ LegacyBiosInt86 (
 BOOLEAN\r
 EFIAPI\r
 LegacyBiosFarCall86 (\r
-  IN  EFI_LEGACY_BIOS_PROTOCOL        *This,\r
-  IN  UINT16                          Segment,\r
-  IN  UINT16                          Offset,\r
-  IN  EFI_IA32_REGISTER_SET           *Regs,\r
-  IN  VOID                            *Stack,\r
-  IN  UINTN                           StackSize\r
+  IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  UINT16                    Segment,\r
+  IN  UINT16                    Offset,\r
+  IN  EFI_IA32_REGISTER_SET     *Regs,\r
+  IN  VOID                      *Stack,\r
+  IN  UINTN                     StackSize\r
   )\r
 {\r
   Regs->X.Flags.Reserved1 = 1;\r
@@ -134,8 +134,8 @@ LegacyBiosFarCall86 (
 VOID\r
 EFIAPI\r
 LegacyBiosNullInterruptHandler (\r
-  IN EFI_EXCEPTION_TYPE   InterruptType,\r
-  IN EFI_SYSTEM_CONTEXT   SystemContext\r
+  IN EFI_EXCEPTION_TYPE  InterruptType,\r
+  IN EFI_SYSTEM_CONTEXT  SystemContext\r
   )\r
 {\r
 }\r
@@ -161,12 +161,12 @@ LegacyBiosNullInterruptHandler (
 BOOLEAN\r
 EFIAPI\r
 InternalLegacyBiosFarCall (\r
-  IN  EFI_LEGACY_BIOS_PROTOCOL        *This,\r
-  IN  UINT16                          Segment,\r
-  IN  UINT16                          Offset,\r
-  IN  EFI_IA32_REGISTER_SET           *Regs,\r
-  IN  VOID                            *Stack,\r
-  IN  UINTN                           StackSize\r
+  IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
+  IN  UINT16                    Segment,\r
+  IN  UINT16                    Offset,\r
+  IN  EFI_IA32_REGISTER_SET     *Regs,\r
+  IN  VOID                      *Stack,\r
+  IN  UINTN                     StackSize\r
   )\r
 {\r
   UINTN                 Status;\r
@@ -180,19 +180,19 @@ InternalLegacyBiosFarCall (
   Private = LEGACY_BIOS_INSTANCE_FROM_THIS (This);\r
 \r
   ZeroMem (&ThunkRegSet, sizeof (ThunkRegSet));\r
-  ThunkRegSet.X.DI   = Regs->X.DI;\r
-  ThunkRegSet.X.SI   = Regs->X.SI;\r
-  ThunkRegSet.X.BP   = Regs->X.BP;\r
-  ThunkRegSet.X.BX   = Regs->X.BX;\r
-  ThunkRegSet.X.DX   = Regs->X.DX;\r
+  ThunkRegSet.X.DI = Regs->X.DI;\r
+  ThunkRegSet.X.SI = Regs->X.SI;\r
+  ThunkRegSet.X.BP = Regs->X.BP;\r
+  ThunkRegSet.X.BX = Regs->X.BX;\r
+  ThunkRegSet.X.DX = Regs->X.DX;\r
   //\r
   // Sometimes, ECX is used to pass in 32 bit data. For example, INT 1Ah, AX = B10Dh is\r
   // "PCI BIOS v2.0c + Write Configuration DWORD" and ECX has the dword to write.\r
   //\r
-  ThunkRegSet.E.ECX   = Regs->E.ECX;\r
-  ThunkRegSet.X.AX   = Regs->X.AX;\r
-  ThunkRegSet.E.DS   = Regs->X.DS;\r
-  ThunkRegSet.E.ES   = Regs->X.ES;\r
+  ThunkRegSet.E.ECX = Regs->E.ECX;\r
+  ThunkRegSet.X.AX  = Regs->X.AX;\r
+  ThunkRegSet.E.DS  = Regs->X.DS;\r
+  ThunkRegSet.E.ES  = Regs->X.ES;\r
 \r
   CopyMem (&(ThunkRegSet.E.EFLAGS.UintN), &(Regs->X.Flags), sizeof (Regs->X.Flags));\r
 \r
@@ -200,7 +200,7 @@ InternalLegacyBiosFarCall (
   // Clear the error flag; thunk code may set it. Stack16 should be the high address\r
   // Make Statk16 address the low 16 bit must be not zero.\r
   //\r
-  Stack16 = (UINT16 *)((UINT8 *) mThunkContext.RealModeBuffer + mThunkContext.RealModeBufferSize - sizeof (UINT16));\r
+  Stack16 = (UINT16 *)((UINT8 *)mThunkContext.RealModeBuffer + mThunkContext.RealModeBufferSize - sizeof (UINT16));\r
 \r
   //\r
   // Save current rate of DXE Timer\r
@@ -229,22 +229,25 @@ InternalLegacyBiosFarCall (
   // handled properly from real mode.\r
   //\r
   DEBUG_CODE_BEGIN ();\r
-    UINTN  Vector;\r
-    UINTN  Count;\r
-\r
-    for (Vector = 0x20, Count = 0; Vector < 0x100; Vector++) {\r
-      Status = Private->Cpu->RegisterInterruptHandler (Private->Cpu, Vector, LegacyBiosNullInterruptHandler);\r
-      if (Status == EFI_ALREADY_STARTED) {\r
-        Count++;\r
-      }\r
-      if (Status == EFI_SUCCESS) {\r
-        Private->Cpu->RegisterInterruptHandler (Private->Cpu, Vector, NULL);\r
-      }\r
+  UINTN  Vector;\r
+  UINTN  Count;\r
+\r
+  for (Vector = 0x20, Count = 0; Vector < 0x100; Vector++) {\r
+    Status = Private->Cpu->RegisterInterruptHandler (Private->Cpu, Vector, LegacyBiosNullInterruptHandler);\r
+    if (Status == EFI_ALREADY_STARTED) {\r
+      Count++;\r
     }\r
-    if (Count >= 2) {\r
-      DEBUG ((DEBUG_ERROR, "ERROR: More than one HW interrupt active with CSM enabled\n"));\r
+\r
+    if (Status == EFI_SUCCESS) {\r
+      Private->Cpu->RegisterInterruptHandler (Private->Cpu, Vector, NULL);\r
     }\r
-    ASSERT (Count < 2);\r
+  }\r
+\r
+  if (Count >= 2) {\r
+    DEBUG ((DEBUG_ERROR, "ERROR: More than one HW interrupt active with CSM enabled\n"));\r
+  }\r
+\r
+  ASSERT (Count < 2);\r
   DEBUG_CODE_END ();\r
 \r
   //\r
@@ -252,11 +255,11 @@ InternalLegacyBiosFarCall (
   // period is less than the CSM required rate of 54.9254, then force the 8254\r
   // PIT counter to 0, which is the CSM required rate of 54.9254 ms\r
   //\r
-  if (Private->TimerUses8254 && TimerPeriod < 549254) {\r
+  if (Private->TimerUses8254 && (TimerPeriod < 549254)) {\r
     SetPitCount (0);\r
   }\r
 \r
-  if (Stack != NULL && StackSize != 0) {\r
+  if ((Stack != NULL) && (StackSize != 0)) {\r
     //\r
     // Copy Stack to low memory stack\r
     //\r
@@ -264,12 +267,12 @@ InternalLegacyBiosFarCall (
     CopyMem (Stack16, Stack, StackSize);\r
   }\r
 \r
-  ThunkRegSet.E.SS   = (UINT16) (((UINTN) Stack16 >> 16) << 12);\r
-  ThunkRegSet.E.ESP  = (UINT16) (UINTN) Stack16;\r
-  ThunkRegSet.E.CS   = Segment;\r
-  ThunkRegSet.E.Eip  = Offset;\r
+  ThunkRegSet.E.SS  = (UINT16)(((UINTN)Stack16 >> 16) << 12);\r
+  ThunkRegSet.E.ESP = (UINT16)(UINTN)Stack16;\r
+  ThunkRegSet.E.CS  = Segment;\r
+  ThunkRegSet.E.Eip = Offset;\r
 \r
-  mThunkContext.RealModeState      = &ThunkRegSet;\r
+  mThunkContext.RealModeState = &ThunkRegSet;\r
 \r
   //\r
   // Set Legacy16 state. 0x08, 0x70 is legacy 8259 vector bases.\r
@@ -279,7 +282,7 @@ InternalLegacyBiosFarCall (
 \r
   AsmThunk16 (&mThunkContext);\r
 \r
-  if (Stack != NULL && StackSize != 0) {\r
+  if ((Stack != NULL) && (StackSize != 0)) {\r
     //\r
     // Copy low memory stack to Stack\r
     //\r
@@ -311,17 +314,17 @@ InternalLegacyBiosFarCall (
   // PcdEbdaReservedMemorySize should be adjusted to larger for more OPROMs.\r
   //\r
   DEBUG_CODE_BEGIN ();\r
-    {\r
-      UINTN                 EbdaBaseAddress;\r
-      UINTN                 ReservedEbdaBaseAddress;\r
-\r
-      ACCESS_PAGE0_CODE (\r
-        EbdaBaseAddress = (*(UINT16 *) (UINTN) 0x40E) << 4;\r
-        ReservedEbdaBaseAddress = CONVENTIONAL_MEMORY_TOP\r
-                                  - PcdGet32 (PcdEbdaReservedMemorySize);\r
-        ASSERT (ReservedEbdaBaseAddress <= EbdaBaseAddress);\r
+  {\r
+    UINTN  EbdaBaseAddress;\r
+    UINTN  ReservedEbdaBaseAddress;\r
+\r
+    ACCESS_PAGE0_CODE (\r
+      EbdaBaseAddress         = (*(UINT16 *)(UINTN)0x40E) << 4;\r
+      ReservedEbdaBaseAddress = CONVENTIONAL_MEMORY_TOP\r
+                                - PcdGet32 (PcdEbdaReservedMemorySize);\r
+      ASSERT (ReservedEbdaBaseAddress <= EbdaBaseAddress);\r
       );\r
-    }\r
+  }\r
   DEBUG_CODE_END ();\r
 \r
   //\r
@@ -329,21 +332,21 @@ InternalLegacyBiosFarCall (
   //\r
   SaveAndSetDebugTimerInterrupt (InterruptState);\r
 \r
-  Regs->E.EDI      = ThunkRegSet.E.EDI;\r
-  Regs->E.ESI      = ThunkRegSet.E.ESI;\r
-  Regs->E.EBP      = ThunkRegSet.E.EBP;\r
-  Regs->E.EBX      = ThunkRegSet.E.EBX;\r
-  Regs->E.EDX      = ThunkRegSet.E.EDX;\r
-  Regs->E.ECX      = ThunkRegSet.E.ECX;\r
-  Regs->E.EAX      = ThunkRegSet.E.EAX;\r
-  Regs->X.SS       = ThunkRegSet.E.SS;\r
-  Regs->X.CS       = ThunkRegSet.E.CS;\r
-  Regs->X.DS       = ThunkRegSet.E.DS;\r
-  Regs->X.ES       = ThunkRegSet.E.ES;\r
+  Regs->E.EDI = ThunkRegSet.E.EDI;\r
+  Regs->E.ESI = ThunkRegSet.E.ESI;\r
+  Regs->E.EBP = ThunkRegSet.E.EBP;\r
+  Regs->E.EBX = ThunkRegSet.E.EBX;\r
+  Regs->E.EDX = ThunkRegSet.E.EDX;\r
+  Regs->E.ECX = ThunkRegSet.E.ECX;\r
+  Regs->E.EAX = ThunkRegSet.E.EAX;\r
+  Regs->X.SS  = ThunkRegSet.E.SS;\r
+  Regs->X.CS  = ThunkRegSet.E.CS;\r
+  Regs->X.DS  = ThunkRegSet.E.DS;\r
+  Regs->X.ES  = ThunkRegSet.E.ES;\r
 \r
   CopyMem (&(Regs->X.Flags), &(ThunkRegSet.E.EFLAGS.UintN), sizeof (Regs->X.Flags));\r
 \r
-  return (BOOLEAN) (Regs->X.Flags.CF == 1);\r
+  return (BOOLEAN)(Regs->X.Flags.CF == 1);\r
 }\r
 \r
 /**\r
@@ -357,16 +360,16 @@ InternalLegacyBiosFarCall (
 **/\r
 EFI_STATUS\r
 LegacyBiosInitializeThunk (\r
-  IN  LEGACY_BIOS_INSTANCE    *Private\r
+  IN  LEGACY_BIOS_INSTANCE  *Private\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  EFI_PHYSICAL_ADDRESS    MemoryAddress;\r
-  UINT8                   TimerVector;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  MemoryAddress;\r
+  UINT8                 TimerVector;\r
 \r
-  MemoryAddress   = (EFI_PHYSICAL_ADDRESS) (UINTN) Private->IntThunk;\r
+  MemoryAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)Private->IntThunk;\r
 \r
-  mThunkContext.RealModeBuffer     = (VOID *) (UINTN) (MemoryAddress + ((sizeof (LOW_MEMORY_THUNK) / EFI_PAGE_SIZE) + 1) * EFI_PAGE_SIZE);\r
+  mThunkContext.RealModeBuffer     = (VOID *)(UINTN)(MemoryAddress + ((sizeof (LOW_MEMORY_THUNK) / EFI_PAGE_SIZE) + 1) * EFI_PAGE_SIZE);\r
   mThunkContext.RealModeBufferSize = EFI_PAGE_SIZE;\r
   mThunkContext.ThunkAttributes    = THUNK_ATTRIBUTE_BIG_REAL_MODE | THUNK_ATTRIBUTE_DISABLE_A20_MASK_INT_15;\r
 \r
@@ -376,7 +379,7 @@ LegacyBiosInitializeThunk (
   // Get the interrupt vector number corresponding to IRQ0 from the 8259 driver\r
   //\r
   TimerVector = 0;\r
-  Status = Private->Legacy8259->GetVector (Private->Legacy8259, Efi8259Irq0, &TimerVector);\r
+  Status      = Private->Legacy8259->GetVector (Private->Legacy8259, Efi8259Irq0, &TimerVector);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
index 31e211a7b90492581acc31f5c0226d59b77b5b84..6b4fa933f26d07edbdc968bfef2077c83a041c9b 100644 (file)
@@ -7,67 +7,63 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "LegacyBootMaintUi.h"\r
 \r
 LEGACY_BOOT_OPTION_CALLBACK_DATA  *mLegacyBootOptionPrivate = NULL;\r
-EFI_GUID  mLegacyBootOptionGuid     = LEGACY_BOOT_OPTION_FORMSET_GUID;\r
-CHAR16    mLegacyBootStorageName[]  = L"LegacyBootData";\r
-BBS_TYPE  mBbsType[] = {BBS_FLOPPY, BBS_HARDDISK, BBS_CDROM, BBS_EMBED_NETWORK, BBS_BEV_DEVICE, BBS_UNKNOWN};\r
-BOOLEAN   mFirstEnterLegacyForm = FALSE;\r
-\r
+EFI_GUID                          mLegacyBootOptionGuid     = LEGACY_BOOT_OPTION_FORMSET_GUID;\r
+CHAR16                            mLegacyBootStorageName[]  = L"LegacyBootData";\r
+BBS_TYPE                          mBbsType[]                = { BBS_FLOPPY, BBS_HARDDISK, BBS_CDROM, BBS_EMBED_NETWORK, BBS_BEV_DEVICE, BBS_UNKNOWN };\r
+BOOLEAN                           mFirstEnterLegacyForm     = FALSE;\r
 \r
 ///\r
 /// Legacy FD Info from LegacyBios.GetBbsInfo()\r
 ///\r
-LEGACY_MENU_OPTION      LegacyFDMenu = {\r
+LEGACY_MENU_OPTION  LegacyFDMenu = {\r
   LEGACY_MENU_OPTION_SIGNATURE,\r
-  {NULL},\r
+  { NULL },\r
   0\r
 };\r
 \r
 ///\r
 /// Legacy HD Info from LegacyBios.GetBbsInfo()\r
 ///\r
-LEGACY_MENU_OPTION      LegacyHDMenu = {\r
+LEGACY_MENU_OPTION  LegacyHDMenu = {\r
   LEGACY_MENU_OPTION_SIGNATURE,\r
-  {NULL},\r
+  { NULL },\r
   0\r
 };\r
 \r
 ///\r
 /// Legacy CD Info from LegacyBios.GetBbsInfo()\r
 ///\r
-LEGACY_MENU_OPTION      LegacyCDMenu = {\r
+LEGACY_MENU_OPTION  LegacyCDMenu = {\r
   LEGACY_MENU_OPTION_SIGNATURE,\r
-  {NULL},\r
+  { NULL },\r
   0\r
 };\r
 \r
 ///\r
 /// Legacy NET Info from LegacyBios.GetBbsInfo()\r
 ///\r
-LEGACY_MENU_OPTION      LegacyNETMenu = {\r
+LEGACY_MENU_OPTION  LegacyNETMenu = {\r
   LEGACY_MENU_OPTION_SIGNATURE,\r
-  {NULL},\r
+  { NULL },\r
   0\r
 };\r
 \r
 ///\r
 /// Legacy NET Info from LegacyBios.GetBbsInfo()\r
 ///\r
-LEGACY_MENU_OPTION      LegacyBEVMenu = {\r
+LEGACY_MENU_OPTION  LegacyBEVMenu = {\r
   LEGACY_MENU_OPTION_SIGNATURE,\r
-  {NULL},\r
+  { NULL },\r
   0\r
 };\r
 \r
-\r
 VOID                *mLegacyStartOpCodeHandle = NULL;\r
-VOID                *mLegacyEndOpCodeHandle = NULL;\r
-EFI_IFR_GUID_LABEL  *mLegacyStartLabel = NULL;\r
-EFI_IFR_GUID_LABEL  *mLegacyEndLabel = NULL;\r
-\r
+VOID                *mLegacyEndOpCodeHandle   = NULL;\r
+EFI_IFR_GUID_LABEL  *mLegacyStartLabel        = NULL;\r
+EFI_IFR_GUID_LABEL  *mLegacyEndLabel          = NULL;\r
 \r
 HII_VENDOR_DEVICE_PATH  mLegacyBootOptionHiiVendorDevicePath = {\r
   {\r
@@ -75,18 +71,19 @@ HII_VENDOR_DEVICE_PATH  mLegacyBootOptionHiiVendorDevicePath = {
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    { 0x6bc75598, 0x89b4, 0x483d, { 0x91, 0x60, 0x7f, 0x46, 0x9a, 0x96, 0x35, 0x31 } }\r
+    { 0x6bc75598, 0x89b4, 0x483d, { 0x91, 0x60, 0x7f, 0x46, 0x9a, 0x96, 0x35, 0x31 }\r
+    }\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     {\r
-      (UINT8) (END_DEVICE_PATH_LENGTH),\r
-      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+      (UINT8)(END_DEVICE_PATH_LENGTH),\r
+      (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
   }\r
 };\r
@@ -101,7 +98,6 @@ GetLegacyOptions (
   VOID\r
   );\r
 \r
-\r
 /**\r
 \r
   Base on the L"LegacyDevOrder" variable to build the current order data.\r
@@ -131,28 +127,28 @@ GetLegacyOptionsOrder (
 **/\r
 EFI_STATUS\r
 OrderLegacyBootOption4SameType (\r
-  UINT16                   *DevOrder,\r
-  UINTN                    DevOrderCount,\r
-  UINT16                   **EnBootOption,\r
-  UINTN                    *EnBootOptionCount,\r
-  UINT16                   **DisBootOption,\r
-  UINTN                    *DisBootOptionCount\r
+  UINT16  *DevOrder,\r
+  UINTN   DevOrderCount,\r
+  UINT16  **EnBootOption,\r
+  UINTN   *EnBootOptionCount,\r
+  UINT16  **DisBootOption,\r
+  UINTN   *DisBootOptionCount\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  UINT16                   *NewBootOption;\r
-  UINT16                   *BootOrder;\r
-  UINTN                    BootOrderSize;\r
-  UINTN                    Index;\r
-  UINTN                    StartPosition;\r
+  EFI_STATUS  Status;\r
+  UINT16      *NewBootOption;\r
+  UINT16      *BootOrder;\r
+  UINTN       BootOrderSize;\r
+  UINTN       Index;\r
+  UINTN       StartPosition;\r
 \r
-  EFI_BOOT_MANAGER_LOAD_OPTION    BootOption;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  BootOption;\r
 \r
-  CHAR16                           OptionName[sizeof ("Boot####")];\r
-  UINT16                   *BbsIndexArray;\r
-  UINT16                   *DeviceTypeArray;\r
+  CHAR16  OptionName[sizeof ("Boot####")];\r
+  UINT16  *BbsIndexArray;\r
+  UINT16  *DeviceTypeArray;\r
 \r
-  GetEfiGlobalVariable2 (L"BootOrder", (VOID **) &BootOrder, &BootOrderSize);\r
+  GetEfiGlobalVariable2 (L"BootOrder", (VOID **)&BootOrder, &BootOrderSize);\r
   ASSERT (BootOrder != NULL);\r
 \r
   BbsIndexArray       = AllocatePool (BootOrderSize);\r
@@ -170,24 +166,25 @@ OrderLegacyBootOption4SameType (
   ASSERT (*DisBootOption != NULL);\r
 \r
   for (Index = 0; Index < BootOrderSize / sizeof (UINT16); Index++) {\r
-\r
     UnicodeSPrint (OptionName, sizeof (OptionName), L"Boot%04x", BootOrder[Index]);\r
     Status = EfiBootManagerVariableToLoadOption (OptionName, &BootOption);\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     if ((DevicePathType (BootOption.FilePath) == BBS_DEVICE_PATH) &&\r
-        (DevicePathSubType (BootOption.FilePath) == BBS_BBS_DP)) {\r
+        (DevicePathSubType (BootOption.FilePath) == BBS_BBS_DP))\r
+    {\r
       //\r
       // Legacy Boot Option\r
       //\r
       ASSERT (BootOption.OptionalDataSize == sizeof (LEGACY_BOOT_OPTION_BBS_DATA));\r
 \r
-      DeviceTypeArray[Index] = ((BBS_BBS_DEVICE_PATH *) BootOption.FilePath)->DeviceType;\r
-      BbsIndexArray  [Index] = ((LEGACY_BOOT_OPTION_BBS_DATA *) BootOption.OptionalData)->BbsIndex;\r
+      DeviceTypeArray[Index] = ((BBS_BBS_DEVICE_PATH *)BootOption.FilePath)->DeviceType;\r
+      BbsIndexArray[Index]   = ((LEGACY_BOOT_OPTION_BBS_DATA *)BootOption.OptionalData)->BbsIndex;\r
     } else {\r
       DeviceTypeArray[Index] = BBS_TYPE_UNKNOWN;\r
-      BbsIndexArray  [Index] = 0xFFFF;\r
+      BbsIndexArray[Index]   = 0xFFFF;\r
     }\r
+\r
     EfiBootManagerFreeLoadOption (&BootOption);\r
   }\r
 \r
@@ -201,7 +198,7 @@ OrderLegacyBootOption4SameType (
   while (DevOrderCount-- != 0) {\r
     for (Index = 0; Index < BootOrderSize / sizeof (UINT16); Index++) {\r
       if (BbsIndexArray[Index] == (DevOrder[DevOrderCount] & 0xFF)) {\r
-        StartPosition = MIN (StartPosition, Index);\r
+        StartPosition                = MIN (StartPosition, Index);\r
         NewBootOption[DevOrderCount] = BootOrder[Index];\r
 \r
         if ((DevOrder[DevOrderCount] & 0xFF00) == 0xFF00) {\r
@@ -211,6 +208,7 @@ OrderLegacyBootOption4SameType (
           (*EnBootOption)[*EnBootOptionCount] = BootOrder[Index];\r
           (*EnBootOptionCount)++;\r
         }\r
+\r
         break;\r
       }\r
     }\r
@@ -249,93 +247,92 @@ OrderLegacyBootOption4SameType (
 **/\r
 EFI_STATUS\r
 UpdateBBSOption (\r
-  IN LEGACY_BOOT_NV_DATA            *NVMapData\r
+  IN LEGACY_BOOT_NV_DATA  *NVMapData\r
   )\r
 {\r
-  UINTN                       Index;\r
-  UINTN                       Index2;\r
-  UINTN                       CurrentType;\r
-  VOID                        *BootOptionVar;\r
-  CHAR16                      VarName[100];\r
-  UINTN                       OptionSize;\r
-  EFI_STATUS                  Status;\r
-  UINT32                      *Attribute;\r
-  LEGACY_MENU_OPTION          *OptionMenu;\r
-  UINT16                      *LegacyDev;\r
-  UINT16                      *InitialLegacyDev;\r
-  UINT8                       *VarData;\r
-  UINTN                       VarSize;\r
-  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
-  UINT8                       *OriginalPtr;\r
-  UINT8                       *DisMap;\r
-  UINTN                       Pos;\r
-  UINTN                       Bit;\r
-  UINT16                      *NewOrder;\r
-  UINT16                      Tmp;\r
-  UINT16                      *EnBootOption;\r
-  UINTN                       EnBootOptionCount;\r
-  UINT16                      *DisBootOption;\r
-  UINTN                       DisBootOptionCount;\r
-  UINTN                       BufferSize;\r
-\r
-\r
-  DisMap              = NULL;\r
-  NewOrder            = NULL;\r
-  CurrentType         = 0;\r
-  EnBootOption        = NULL;\r
-  DisBootOption       = NULL;\r
-\r
-\r
-  DisMap  = mLegacyBootOptionPrivate->MaintainMapData->DisableMap;\r
-  Status  = EFI_SUCCESS;\r
+  UINTN                   Index;\r
+  UINTN                   Index2;\r
+  UINTN                   CurrentType;\r
+  VOID                    *BootOptionVar;\r
+  CHAR16                  VarName[100];\r
+  UINTN                   OptionSize;\r
+  EFI_STATUS              Status;\r
+  UINT32                  *Attribute;\r
+  LEGACY_MENU_OPTION      *OptionMenu;\r
+  UINT16                  *LegacyDev;\r
+  UINT16                  *InitialLegacyDev;\r
+  UINT8                   *VarData;\r
+  UINTN                   VarSize;\r
+  LEGACY_DEV_ORDER_ENTRY  *DevOrder;\r
+  UINT8                   *OriginalPtr;\r
+  UINT8                   *DisMap;\r
+  UINTN                   Pos;\r
+  UINTN                   Bit;\r
+  UINT16                  *NewOrder;\r
+  UINT16                  Tmp;\r
+  UINT16                  *EnBootOption;\r
+  UINTN                   EnBootOptionCount;\r
+  UINT16                  *DisBootOption;\r
+  UINTN                   DisBootOptionCount;\r
+  UINTN                   BufferSize;\r
+\r
+  DisMap        = NULL;\r
+  NewOrder      = NULL;\r
+  CurrentType   = 0;\r
+  EnBootOption  = NULL;\r
+  DisBootOption = NULL;\r
+\r
+  DisMap = mLegacyBootOptionPrivate->MaintainMapData->DisableMap;\r
+  Status = EFI_SUCCESS;\r
 \r
   //\r
   // Update the Variable "LegacyDevOrder"\r
   //\r
-  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **) &VarData, &VarSize);\r
+  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **)&VarData, &VarSize);\r
   if (VarData == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   OriginalPtr = VarData;\r
 \r
   while (mBbsType[CurrentType] != BBS_UNKNOWN) {\r
     switch (mBbsType[CurrentType]) {\r
-    case BBS_FLOPPY:\r
-      OptionMenu            = (LEGACY_MENU_OPTION *) &LegacyFDMenu;\r
-      LegacyDev             = NVMapData->LegacyFD;\r
-      InitialLegacyDev     = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyFD;\r
-      BufferSize            = sizeof (NVMapData->LegacyFD);\r
-      break;\r
+      case BBS_FLOPPY:\r
+        OptionMenu       = (LEGACY_MENU_OPTION *)&LegacyFDMenu;\r
+        LegacyDev        = NVMapData->LegacyFD;\r
+        InitialLegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyFD;\r
+        BufferSize       = sizeof (NVMapData->LegacyFD);\r
+        break;\r
 \r
-    case BBS_HARDDISK:\r
-      OptionMenu            = (LEGACY_MENU_OPTION *) &LegacyHDMenu;\r
-      LegacyDev             = NVMapData->LegacyHD;\r
-      InitialLegacyDev     = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyHD;\r
+      case BBS_HARDDISK:\r
+        OptionMenu       = (LEGACY_MENU_OPTION *)&LegacyHDMenu;\r
+        LegacyDev        = NVMapData->LegacyHD;\r
+        InitialLegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyHD;\r
 \r
-      BufferSize            = sizeof (NVMapData->LegacyHD);\r
-      break;\r
+        BufferSize = sizeof (NVMapData->LegacyHD);\r
+        break;\r
 \r
-    case BBS_CDROM:\r
-      OptionMenu            = (LEGACY_MENU_OPTION *) &LegacyCDMenu;\r
-      LegacyDev             = NVMapData->LegacyCD;\r
-      InitialLegacyDev     = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyCD;\r
-      BufferSize            = sizeof (NVMapData->LegacyCD);\r
-      break;\r
+      case BBS_CDROM:\r
+        OptionMenu       = (LEGACY_MENU_OPTION *)&LegacyCDMenu;\r
+        LegacyDev        = NVMapData->LegacyCD;\r
+        InitialLegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyCD;\r
+        BufferSize       = sizeof (NVMapData->LegacyCD);\r
+        break;\r
 \r
-    case BBS_EMBED_NETWORK:\r
-      OptionMenu            = (LEGACY_MENU_OPTION *) &LegacyNETMenu;\r
-      LegacyDev             = NVMapData->LegacyNET;\r
-      InitialLegacyDev     = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyNET;\r
-      BufferSize            = sizeof (NVMapData->LegacyNET);\r
-      break;\r
+      case BBS_EMBED_NETWORK:\r
+        OptionMenu       = (LEGACY_MENU_OPTION *)&LegacyNETMenu;\r
+        LegacyDev        = NVMapData->LegacyNET;\r
+        InitialLegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyNET;\r
+        BufferSize       = sizeof (NVMapData->LegacyNET);\r
+        break;\r
 \r
-    default:\r
-      ASSERT (mBbsType[CurrentType] == BBS_BEV_DEVICE);\r
-      OptionMenu            = (LEGACY_MENU_OPTION *) &LegacyBEVMenu;\r
-      LegacyDev             = NVMapData->LegacyBEV;\r
-      InitialLegacyDev     = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyBEV;\r
-      BufferSize            = sizeof (NVMapData->LegacyBEV);\r
-      break;\r
+      default:\r
+        ASSERT (mBbsType[CurrentType] == BBS_BEV_DEVICE);\r
+        OptionMenu       = (LEGACY_MENU_OPTION *)&LegacyBEVMenu;\r
+        LegacyDev        = NVMapData->LegacyBEV;\r
+        InitialLegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyBEV;\r
+        BufferSize       = sizeof (NVMapData->LegacyBEV);\r
+        break;\r
     }\r
 \r
     //\r
@@ -346,14 +343,14 @@ UpdateBBSOption (
       continue;\r
     }\r
 \r
-    DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) OriginalPtr;\r
+    DevOrder = (LEGACY_DEV_ORDER_ENTRY *)OriginalPtr;\r
     while (VarData < OriginalPtr + VarSize) {\r
       if (DevOrder->BbsType == mBbsType[CurrentType]) {\r
         break;\r
       }\r
 \r
       VarData += sizeof (BBS_TYPE) + DevOrder->Length;\r
-      DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
+      DevOrder = (LEGACY_DEV_ORDER_ENTRY *)VarData;\r
     }\r
 \r
     if (VarData >= OriginalPtr + VarSize) {\r
@@ -382,11 +379,11 @@ UpdateBBSOption (
     // so we use DisMap to set en/dis state of each item in NewOrder array\r
     //\r
     for (Index2 = 0; Index2 < OptionMenu->MenuNumber; Index2++) {\r
-      Tmp = (UINT16) (DevOrder->Data[Index2] & 0xFF);\r
+      Tmp = (UINT16)(DevOrder->Data[Index2] & 0xFF);\r
       Pos = Tmp / 8;\r
       Bit = 7 - (Tmp % 8);\r
       if ((DisMap[Pos] & (1 << Bit)) != 0) {\r
-        NewOrder[Index] = (UINT16) (0xFF00 | Tmp);\r
+        NewOrder[Index] = (UINT16)(0xFF00 | Tmp);\r
         Index++;\r
       }\r
     }\r
@@ -406,25 +403,25 @@ UpdateBBSOption (
     ASSERT (OptionMenu->MenuNumber == DevOrder->Length / sizeof (UINT16) - 1);\r
 \r
     Status = OrderLegacyBootOption4SameType (\r
-      DevOrder->Data,\r
-      DevOrder->Length / sizeof (UINT16) - 1,\r
-      &EnBootOption,\r
-      &EnBootOptionCount,\r
-      &DisBootOption,\r
-      &DisBootOptionCount\r
-      );\r
-     if (EFI_ERROR(Status)) {\r
-       goto Fail;\r
-     }\r
+               DevOrder->Data,\r
+               DevOrder->Length / sizeof (UINT16) - 1,\r
+               &EnBootOption,\r
+               &EnBootOptionCount,\r
+               &DisBootOption,\r
+               &DisBootOptionCount\r
+               );\r
+    if (EFI_ERROR (Status)) {\r
+      goto Fail;\r
+    }\r
 \r
     //\r
     // 2. Deactivate the DisBootOption and activate the EnBootOption\r
     //\r
     for (Index = 0; Index < DisBootOptionCount; Index++) {\r
       UnicodeSPrint (VarName, sizeof (VarName), L"Boot%04x", DisBootOption[Index]);\r
-      GetEfiGlobalVariable2 (VarName, (VOID **) &BootOptionVar, &OptionSize);\r
+      GetEfiGlobalVariable2 (VarName, (VOID **)&BootOptionVar, &OptionSize);\r
       if (BootOptionVar != NULL) {\r
-        Attribute   = (UINT32 *) BootOptionVar;\r
+        Attribute   = (UINT32 *)BootOptionVar;\r
         *Attribute &= ~LOAD_OPTION_ACTIVE;\r
 \r
         Status = gRT->SetVariable (\r
@@ -441,9 +438,9 @@ UpdateBBSOption (
 \r
     for (Index = 0; Index < EnBootOptionCount; Index++) {\r
       UnicodeSPrint (VarName, sizeof (VarName), L"Boot%04x", EnBootOption[Index]);\r
-      GetEfiGlobalVariable2 (VarName, (VOID **) &BootOptionVar, &OptionSize);\r
+      GetEfiGlobalVariable2 (VarName, (VOID **)&BootOptionVar, &OptionSize);\r
       if (BootOptionVar != NULL) {\r
-        Attribute   = (UINT32 *) BootOptionVar;\r
+        Attribute   = (UINT32 *)BootOptionVar;\r
         *Attribute |= LOAD_OPTION_ACTIVE;\r
 \r
         Status = gRT->SetVariable (\r
@@ -458,7 +455,6 @@ UpdateBBSOption (
       }\r
     }\r
 \r
-\r
     FreePool (EnBootOption);\r
     FreePool (DisBootOption);\r
 \r
@@ -511,15 +507,16 @@ Fail:
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootOptionExtractConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Request,\r
-  OUT EFI_STRING                             *Progress,\r
-  OUT EFI_STRING                             *Results\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Request,\r
+  OUT EFI_STRING                            *Progress,\r
+  OUT EFI_STRING                            *Results\r
   )\r
 {\r
-  if (Progress == NULL || Results == NULL) {\r
+  if ((Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   *Progress = Request;\r
   return EFI_NOT_FOUND;\r
 }\r
@@ -543,18 +540,17 @@ LegacyBootOptionExtractConfig (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootOptionRouteConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Configuration,\r
-  OUT       EFI_STRING                       *Progress\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Configuration,\r
+  OUT       EFI_STRING                      *Progress\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_HII_CONFIG_ROUTING_PROTOCOL *ConfigRouting;\r
-  LEGACY_BOOT_NV_DATA             *CurrentNVMapData;\r
-  UINTN                           BufferSize;\r
+  EFI_STATUS                       Status;\r
+  EFI_HII_CONFIG_ROUTING_PROTOCOL  *ConfigRouting;\r
+  LEGACY_BOOT_NV_DATA              *CurrentNVMapData;\r
+  UINTN                            BufferSize;\r
 \r
-\r
-  if (Configuration == NULL || Progress == NULL) {\r
+  if ((Configuration == NULL) || (Progress == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -571,7 +567,7 @@ LegacyBootOptionRouteConfig (
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiConfigRoutingProtocolGuid,\r
                   NULL,\r
-                  (VOID **) &ConfigRouting\r
+                  (VOID **)&ConfigRouting\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -581,13 +577,13 @@ LegacyBootOptionRouteConfig (
   // Convert <ConfigResp> to buffer data by helper function ConfigToBlock()\r
   //\r
   CurrentNVMapData = &mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData;\r
-  Status = ConfigRouting->ConfigToBlock (\r
-                            ConfigRouting,\r
-                            Configuration,\r
-                            (UINT8 *) CurrentNVMapData,\r
-                            &BufferSize,\r
-                            Progress\r
-                            );\r
+  Status           = ConfigRouting->ConfigToBlock (\r
+                                      ConfigRouting,\r
+                                      Configuration,\r
+                                      (UINT8 *)CurrentNVMapData,\r
+                                      &BufferSize,\r
+                                      Progress\r
+                                      );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = UpdateBBSOption (CurrentNVMapData);\r
@@ -610,6 +606,7 @@ RefreshLegacyUpdateData (
   if (mLegacyStartOpCodeHandle != NULL) {\r
     HiiFreeOpCodeHandle (mLegacyStartOpCodeHandle);\r
   }\r
+\r
   if (mLegacyEndOpCodeHandle != NULL) {\r
     HiiFreeOpCodeHandle (mLegacyEndOpCodeHandle);\r
   }\r
@@ -618,17 +615,17 @@ RefreshLegacyUpdateData (
   // Create new OpCode Handle\r
   //\r
   mLegacyStartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
-  mLegacyEndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
+  mLegacyEndOpCodeHandle   = HiiAllocateOpCodeHandle ();\r
 \r
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
-  mLegacyStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                         mLegacyStartOpCodeHandle,\r
-                                         &gEfiIfrTianoGuid,\r
-                                         NULL,\r
-                                         sizeof (EFI_IFR_GUID_LABEL)\r
-                                         );\r
+  mLegacyStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                              mLegacyStartOpCodeHandle,\r
+                                              &gEfiIfrTianoGuid,\r
+                                              NULL,\r
+                                              sizeof (EFI_IFR_GUID_LABEL)\r
+                                              );\r
   mLegacyStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
 \r
   mLegacyStartLabel->Number = FORM_BOOT_LEGACY_DEVICE_ID;\r
@@ -636,16 +633,15 @@ RefreshLegacyUpdateData (
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
-  mLegacyEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                         mLegacyEndOpCodeHandle,\r
-                                         &gEfiIfrTianoGuid,\r
-                                         NULL,\r
-                                         sizeof (EFI_IFR_GUID_LABEL)\r
-                                         );\r
+  mLegacyEndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                            mLegacyEndOpCodeHandle,\r
+                                            &gEfiIfrTianoGuid,\r
+                                            NULL,\r
+                                            sizeof (EFI_IFR_GUID_LABEL)\r
+                                            );\r
   mLegacyEndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
 \r
   mLegacyEndLabel->Number = FORM_BOOT_LEGACY_LABEL_END;\r
-\r
 }\r
 \r
 /**\r
@@ -662,13 +658,13 @@ RefreshLegacyUpdateData (
 **/\r
 LEGACY_MENU_ENTRY *\r
 GetMenuEntry (\r
-  LEGACY_MENU_OPTION      *MenuOption,\r
-  UINTN                   MenuNumber\r
+  LEGACY_MENU_OPTION  *MenuOption,\r
+  UINTN               MenuNumber\r
   )\r
 {\r
-  LEGACY_MENU_ENTRY   *NewMenuEntry;\r
-  UINTN               Index;\r
-  LIST_ENTRY          *List;\r
+  LEGACY_MENU_ENTRY  *NewMenuEntry;\r
+  UINTN              Index;\r
+  LIST_ENTRY         *List;\r
 \r
   ASSERT (MenuNumber < MenuOption->MenuNumber);\r
 \r
@@ -691,12 +687,12 @@ GetMenuEntry (
 **/\r
 VOID\r
 CreateLegacyMenuStringToken (\r
-  IN EFI_HII_HANDLE                   HiiHandle,\r
-  IN LEGACY_MENU_OPTION               *MenuOption\r
+  IN EFI_HII_HANDLE      HiiHandle,\r
+  IN LEGACY_MENU_OPTION  *MenuOption\r
   )\r
 {\r
-  LEGACY_MENU_ENTRY *NewMenuEntry;\r
-  UINTN             Index;\r
+  LEGACY_MENU_ENTRY  *NewMenuEntry;\r
+  UINTN              Index;\r
 \r
   for (Index = 0; Index < MenuOption->MenuNumber; Index++) {\r
     NewMenuEntry = GetMenuEntry (MenuOption, Index);\r
@@ -731,22 +727,22 @@ CreateLegacyMenuStringToken (
 **/\r
 VOID\r
 UpdateLegacyDeviceOrderPage (\r
-  IN UINT16                           UpdatePageId\r
+  IN UINT16  UpdatePageId\r
   )\r
 {\r
-  LEGACY_MENU_OPTION          *OptionMenu;\r
-  LEGACY_MENU_ENTRY           *NewMenuEntry;\r
-  EFI_STRING_ID               StrRef;\r
-  EFI_STRING_ID               StrRefHelp;\r
-  UINT16                      *Default;\r
-  UINT16                      Index;\r
-  UINT16                      Key;\r
-  CHAR16                      String[100];\r
-  CHAR16                      *TypeStr;\r
-  CHAR16                      *TypeStrHelp;\r
-  CHAR16                      *FormTitle;\r
-  VOID                        *OptionsOpCodeHandle;\r
-  VOID                        *DefaultOpCodeHandle;\r
+  LEGACY_MENU_OPTION  *OptionMenu;\r
+  LEGACY_MENU_ENTRY   *NewMenuEntry;\r
+  EFI_STRING_ID       StrRef;\r
+  EFI_STRING_ID       StrRefHelp;\r
+  UINT16              *Default;\r
+  UINT16              Index;\r
+  UINT16              Key;\r
+  CHAR16              String[100];\r
+  CHAR16              *TypeStr;\r
+  CHAR16              *TypeStrHelp;\r
+  CHAR16              *FormTitle;\r
+  VOID                *OptionsOpCodeHandle;\r
+  VOID                *DefaultOpCodeHandle;\r
 \r
   Key         = 0;\r
   StrRef      = 0;\r
@@ -756,70 +752,69 @@ UpdateLegacyDeviceOrderPage (
   TypeStrHelp = NULL;\r
   Default     = NULL;\r
 \r
-  RefreshLegacyUpdateData();\r
+  RefreshLegacyUpdateData ();\r
 \r
   //\r
   // Create oneof option list\r
   //\r
   switch (UpdatePageId) {\r
-  case FORM_FLOPPY_BOOT_ID:\r
-    OptionMenu  = (LEGACY_MENU_OPTION *) &LegacyFDMenu;\r
-    Key         = (UINT16) LEGACY_FD_QUESTION_ID;\r
-    TypeStr     = STR_FLOPPY;\r
-    TypeStrHelp = STR_FLOPPY_HELP;\r
-    FormTitle   = STR_FLOPPY_TITLE;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyFD;\r
-    break;\r
-\r
-  case FORM_HARDDISK_BOOT_ID:\r
-    OptionMenu  = (LEGACY_MENU_OPTION *) &LegacyHDMenu;\r
-    Key         = (UINT16) LEGACY_HD_QUESTION_ID;\r
-    TypeStr     = STR_HARDDISK;\r
-    TypeStrHelp = STR_HARDDISK_HELP;\r
-    FormTitle   = STR_HARDDISK_TITLE;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyHD;\r
-    break;\r
-\r
-  case FORM_CDROM_BOOT_ID:\r
-    OptionMenu  = (LEGACY_MENU_OPTION *) &LegacyCDMenu;\r
-    Key         = (UINT16) LEGACY_CD_QUESTION_ID;\r
-    TypeStr     = STR_CDROM;\r
-    TypeStrHelp = STR_CDROM_HELP;\r
-    FormTitle   = STR_CDROM_TITLE;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyCD;\r
-    break;\r
-\r
-  case FORM_NET_BOOT_ID:\r
-    OptionMenu  = (LEGACY_MENU_OPTION *) &LegacyNETMenu;\r
-    Key         = (UINT16) LEGACY_NET_QUESTION_ID;\r
-    TypeStr     = STR_NET;\r
-    TypeStrHelp = STR_NET_HELP;\r
-    FormTitle   = STR_NET_TITLE;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyNET;\r
-    break;\r
-\r
-  case FORM_BEV_BOOT_ID:\r
-    OptionMenu  = (LEGACY_MENU_OPTION *) &LegacyBEVMenu;\r
-    Key         = (UINT16) LEGACY_BEV_QUESTION_ID;\r
-    TypeStr     = STR_BEV;\r
-    TypeStrHelp = STR_BEV_HELP;\r
-    FormTitle   = STR_BEV_TITLE;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyBEV;\r
-    break;\r
-\r
-  default:\r
-    DEBUG ((DEBUG_ERROR, "Invalid command ID for updating page!\n"));\r
-    return;\r
+    case FORM_FLOPPY_BOOT_ID:\r
+      OptionMenu  = (LEGACY_MENU_OPTION *)&LegacyFDMenu;\r
+      Key         = (UINT16)LEGACY_FD_QUESTION_ID;\r
+      TypeStr     = STR_FLOPPY;\r
+      TypeStrHelp = STR_FLOPPY_HELP;\r
+      FormTitle   = STR_FLOPPY_TITLE;\r
+      Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyFD;\r
+      break;\r
+\r
+    case FORM_HARDDISK_BOOT_ID:\r
+      OptionMenu  = (LEGACY_MENU_OPTION *)&LegacyHDMenu;\r
+      Key         = (UINT16)LEGACY_HD_QUESTION_ID;\r
+      TypeStr     = STR_HARDDISK;\r
+      TypeStrHelp = STR_HARDDISK_HELP;\r
+      FormTitle   = STR_HARDDISK_TITLE;\r
+      Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyHD;\r
+      break;\r
+\r
+    case FORM_CDROM_BOOT_ID:\r
+      OptionMenu  = (LEGACY_MENU_OPTION *)&LegacyCDMenu;\r
+      Key         = (UINT16)LEGACY_CD_QUESTION_ID;\r
+      TypeStr     = STR_CDROM;\r
+      TypeStrHelp = STR_CDROM_HELP;\r
+      FormTitle   = STR_CDROM_TITLE;\r
+      Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyCD;\r
+      break;\r
+\r
+    case FORM_NET_BOOT_ID:\r
+      OptionMenu  = (LEGACY_MENU_OPTION *)&LegacyNETMenu;\r
+      Key         = (UINT16)LEGACY_NET_QUESTION_ID;\r
+      TypeStr     = STR_NET;\r
+      TypeStrHelp = STR_NET_HELP;\r
+      FormTitle   = STR_NET_TITLE;\r
+      Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyNET;\r
+      break;\r
+\r
+    case FORM_BEV_BOOT_ID:\r
+      OptionMenu  = (LEGACY_MENU_OPTION *)&LegacyBEVMenu;\r
+      Key         = (UINT16)LEGACY_BEV_QUESTION_ID;\r
+      TypeStr     = STR_BEV;\r
+      TypeStrHelp = STR_BEV_HELP;\r
+      FormTitle   = STR_BEV_TITLE;\r
+      Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyBEV;\r
+      break;\r
+\r
+    default:\r
+      DEBUG ((DEBUG_ERROR, "Invalid command ID for updating page!\n"));\r
+      return;\r
   }\r
 \r
-  HiiSetString (mLegacyBootOptionPrivate->HiiHandle, STRING_TOKEN(STR_ORDER_CHANGE_PROMPT), FormTitle, NULL);\r
+  HiiSetString (mLegacyBootOptionPrivate->HiiHandle, STRING_TOKEN (STR_ORDER_CHANGE_PROMPT), FormTitle, NULL);\r
 \r
   CreateLegacyMenuStringToken (mLegacyBootOptionPrivate->HiiHandle, OptionMenu);\r
 \r
   OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (OptionsOpCodeHandle != NULL);\r
 \r
-\r
   for (Index = 0; Index < OptionMenu->MenuNumber; Index++) {\r
     NewMenuEntry = GetMenuEntry (OptionMenu, Index);\r
     //\r
@@ -830,7 +825,7 @@ UpdateLegacyDeviceOrderPage (
       NewMenuEntry->DisplayStringToken,\r
       0,\r
       EFI_IFR_TYPE_NUM_SIZE_16,\r
-      ((LEGACY_DEVICE_CONTEXT *) NewMenuEntry->VariableContext)->BbsIndex\r
+      ((LEGACY_DEVICE_CONTEXT *)NewMenuEntry->VariableContext)->BbsIndex\r
       );\r
   }\r
 \r
@@ -870,15 +865,15 @@ UpdateLegacyDeviceOrderPage (
 \r
     HiiCreateOneOfOpCode (\r
       mLegacyStartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (Key + Index),\r
+      (EFI_QUESTION_ID)(Key + Index),\r
       VARSTORE_ID_LEGACY_BOOT,\r
-      (UINT16) (Key + Index * 2 - CONFIG_OPTION_OFFSET),\r
+      (UINT16)(Key + Index * 2 - CONFIG_OPTION_OFFSET),\r
       StrRef,\r
       StrRefHelp,\r
       EFI_IFR_FLAG_CALLBACK,\r
       EFI_IFR_NUMERIC_SIZE_2,\r
       OptionsOpCodeHandle,\r
-      DefaultOpCodeHandle //NULL //\r
+      DefaultOpCodeHandle // NULL //\r
       );\r
 \r
     HiiFreeOpCodeHandle (DefaultOpCodeHandle);\r
@@ -895,7 +890,6 @@ UpdateLegacyDeviceOrderPage (
   HiiFreeOpCodeHandle (OptionsOpCodeHandle);\r
 }\r
 \r
-\r
 /**\r
   Adjust question value when one question value has been changed.\r
 \r
@@ -905,30 +899,30 @@ UpdateLegacyDeviceOrderPage (
 **/\r
 VOID\r
 AdjustOptionValue (\r
-  IN  UINT16                                 QuestionId,\r
-  IN  EFI_IFR_TYPE_VALUE                     *Value\r
+  IN  UINT16              QuestionId,\r
+  IN  EFI_IFR_TYPE_VALUE  *Value\r
   )\r
 {\r
-  UINTN                       Number;\r
-  UINT16                      *Default;\r
-  LEGACY_BOOT_NV_DATA         *CurrentNVMap;\r
-  UINT16                      *CurrentVal;\r
-  UINTN                       Index;\r
-  UINTN                       Index2;\r
-  UINTN                       Index3;\r
-  UINTN                       NewValuePos;\r
-  UINTN                       OldValue;\r
-  UINTN                       NewValue;\r
-  UINT8                       *DisMap;\r
-  UINTN                       Pos;\r
-  UINTN                       Bit;\r
-\r
-  Number = 0;\r
-  CurrentVal = 0;\r
-  Default = NULL;\r
-  NewValue = 0;\r
+  UINTN                Number;\r
+  UINT16               *Default;\r
+  LEGACY_BOOT_NV_DATA  *CurrentNVMap;\r
+  UINT16               *CurrentVal;\r
+  UINTN                Index;\r
+  UINTN                Index2;\r
+  UINTN                Index3;\r
+  UINTN                NewValuePos;\r
+  UINTN                OldValue;\r
+  UINTN                NewValue;\r
+  UINT8                *DisMap;\r
+  UINTN                Pos;\r
+  UINTN                Bit;\r
+\r
+  Number      = 0;\r
+  CurrentVal  = 0;\r
+  Default     = NULL;\r
+  NewValue    = 0;\r
   NewValuePos = 0;\r
-  OldValue = 0;\r
+  OldValue    = 0;\r
 \r
   //\r
   // Update Select FD/HD/CD/NET/BEV Order Form\r
@@ -936,29 +930,29 @@ AdjustOptionValue (
   ASSERT ((QuestionId >= LEGACY_FD_QUESTION_ID) && (QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER));\r
 \r
   CurrentNVMap = &mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData;\r
-  HiiGetBrowserData (&mLegacyBootOptionGuid, mLegacyBootStorageName, sizeof (LEGACY_BOOT_NV_DATA), (UINT8 *) CurrentNVMap);\r
-  DisMap  = mLegacyBootOptionPrivate->MaintainMapData->DisableMap;\r
-\r
-  if (QuestionId >= LEGACY_FD_QUESTION_ID && QuestionId < LEGACY_FD_QUESTION_ID + MAX_MENU_NUMBER) {\r
-    Number      = (UINT16) LegacyFDMenu.MenuNumber;\r
-    CurrentVal  = CurrentNVMap->LegacyFD;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyFD;\r
-  } else if (QuestionId >= LEGACY_HD_QUESTION_ID && QuestionId < LEGACY_HD_QUESTION_ID + MAX_MENU_NUMBER) {\r
-    Number      = (UINT16) LegacyHDMenu.MenuNumber;\r
-    CurrentVal  = CurrentNVMap->LegacyHD;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyHD;\r
-  } else if (QuestionId >= LEGACY_CD_QUESTION_ID && QuestionId < LEGACY_CD_QUESTION_ID + MAX_MENU_NUMBER) {\r
-    Number      = (UINT16) LegacyCDMenu.MenuNumber;\r
-    CurrentVal  = CurrentNVMap->LegacyCD;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyCD;\r
-  } else if (QuestionId >= LEGACY_NET_QUESTION_ID && QuestionId < LEGACY_NET_QUESTION_ID + MAX_MENU_NUMBER) {\r
-    Number      = (UINT16) LegacyNETMenu.MenuNumber;\r
-    CurrentVal  = CurrentNVMap->LegacyNET;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyNET;\r
-  } else if (QuestionId >= LEGACY_BEV_QUESTION_ID && QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER) {\r
-    Number      = (UINT16) LegacyBEVMenu.MenuNumber;\r
-    CurrentVal  = CurrentNVMap->LegacyBEV;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyBEV;\r
+  HiiGetBrowserData (&mLegacyBootOptionGuid, mLegacyBootStorageName, sizeof (LEGACY_BOOT_NV_DATA), (UINT8 *)CurrentNVMap);\r
+  DisMap = mLegacyBootOptionPrivate->MaintainMapData->DisableMap;\r
+\r
+  if ((QuestionId >= LEGACY_FD_QUESTION_ID) && (QuestionId < LEGACY_FD_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+    Number     = (UINT16)LegacyFDMenu.MenuNumber;\r
+    CurrentVal = CurrentNVMap->LegacyFD;\r
+    Default    = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyFD;\r
+  } else if ((QuestionId >= LEGACY_HD_QUESTION_ID) && (QuestionId < LEGACY_HD_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+    Number     = (UINT16)LegacyHDMenu.MenuNumber;\r
+    CurrentVal = CurrentNVMap->LegacyHD;\r
+    Default    = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyHD;\r
+  } else if ((QuestionId >= LEGACY_CD_QUESTION_ID) && (QuestionId < LEGACY_CD_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+    Number     = (UINT16)LegacyCDMenu.MenuNumber;\r
+    CurrentVal = CurrentNVMap->LegacyCD;\r
+    Default    = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyCD;\r
+  } else if ((QuestionId >= LEGACY_NET_QUESTION_ID) && (QuestionId < LEGACY_NET_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+    Number     = (UINT16)LegacyNETMenu.MenuNumber;\r
+    CurrentVal = CurrentNVMap->LegacyNET;\r
+    Default    = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyNET;\r
+  } else if ((QuestionId >= LEGACY_BEV_QUESTION_ID) && (QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+    Number     = (UINT16)LegacyBEVMenu.MenuNumber;\r
+    CurrentVal = CurrentNVMap->LegacyBEV;\r
+    Default    = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyBEV;\r
   }\r
 \r
   //\r
@@ -967,8 +961,8 @@ AdjustOptionValue (
   //\r
   for (Index = 0; Index < Number; Index++) {\r
     if (CurrentVal[Index] != Default[Index]) {\r
-      OldValue  = Default[Index];\r
-      NewValue  = CurrentVal[Index];\r
+      OldValue = Default[Index];\r
+      NewValue = CurrentVal[Index];\r
       break;\r
     }\r
   }\r
@@ -982,9 +976,9 @@ AdjustOptionValue (
       // This item will be disable\r
       // Just move the items behind this forward to overlap it\r
       //\r
-      Pos = OldValue / 8;\r
-      Bit = 7 - (OldValue % 8);\r
-      DisMap[Pos] = (UINT8) (DisMap[Pos] | (UINT8) (1 << Bit));\r
+      Pos         = OldValue / 8;\r
+      Bit         = 7 - (OldValue % 8);\r
+      DisMap[Pos] = (UINT8)(DisMap[Pos] | (UINT8)(1 << Bit));\r
       for (Index2 = Index; Index2 < Number - 1; Index2++) {\r
         CurrentVal[Index2] = CurrentVal[Index2 + 1];\r
       }\r
@@ -1025,27 +1019,28 @@ AdjustOptionValue (
         // If NewValue is not in OldlegacyDev array, we are changing to a disabled item\r
         // so we should modify DisMap to reflect the change\r
         //\r
-        Pos = NewValue / 8;\r
-        Bit = 7 - (NewValue % 8);\r
-        DisMap[Pos] = (UINT8) (DisMap[Pos] & (~ (UINT8) (1 << Bit)));\r
+        Pos         = NewValue / 8;\r
+        Bit         = 7 - (NewValue % 8);\r
+        DisMap[Pos] = (UINT8)(DisMap[Pos] & (~(UINT8)(1 << Bit)));\r
         if (0xFF != OldValue) {\r
           //\r
           // Because NewValue is a item that was disabled before\r
           // so after changing the OldValue should be disabled\r
           // actually we are doing a swap of enable-disable states of two items\r
           //\r
-          Pos = OldValue / 8;\r
-          Bit = 7 - (OldValue % 8);\r
-          DisMap[Pos] = (UINT8) (DisMap[Pos] | (UINT8) (1 << Bit));\r
+          Pos         = OldValue / 8;\r
+          Bit         = 7 - (OldValue % 8);\r
+          DisMap[Pos] = (UINT8)(DisMap[Pos] | (UINT8)(1 << Bit));\r
         }\r
       }\r
     }\r
+\r
     //\r
     // To prevent DISABLE appears in the middle of the list\r
     // we should perform a re-ordering\r
     //\r
     Index3 = Index;\r
-    Index = 0;\r
+    Index  = 0;\r
     while (Index < Number) {\r
       if (0xFF != CurrentVal[Index]) {\r
         Index++;\r
@@ -1063,8 +1058,8 @@ AdjustOptionValue (
       }\r
 \r
       if (Index2 < Number) {\r
-        CurrentVal[Index]   = CurrentVal[Index2];\r
-        CurrentVal[Index2]  = 0xFF;\r
+        CurrentVal[Index]  = CurrentVal[Index2];\r
+        CurrentVal[Index2] = 0xFF;\r
       }\r
 \r
       Index++;\r
@@ -1080,7 +1075,7 @@ AdjustOptionValue (
   //\r
   // Pass changed uncommitted data back to Form Browser\r
   //\r
-  HiiSetBrowserData (&mLegacyBootOptionGuid, mLegacyBootStorageName, sizeof (LEGACY_BOOT_NV_DATA), (UINT8 *) CurrentNVMap, NULL);\r
+  HiiSetBrowserData (&mLegacyBootOptionGuid, mLegacyBootStorageName, sizeof (LEGACY_BOOT_NV_DATA), (UINT8 *)CurrentNVMap, NULL);\r
 }\r
 \r
 /**\r
@@ -1104,15 +1099,15 @@ AdjustOptionValue (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootOptionCallback (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  EFI_BROWSER_ACTION                     Action,\r
-  IN  EFI_QUESTION_ID                        QuestionId,\r
-  IN  UINT8                                  Type,\r
-  IN  EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  EFI_BROWSER_ACTION                    Action,\r
+  IN  EFI_QUESTION_ID                       QuestionId,\r
+  IN  UINT8                                 Type,\r
+  IN  EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   )\r
 {\r
-  if (Action != EFI_BROWSER_ACTION_CHANGED && Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_FORM_OPEN) {\r
+  if ((Action != EFI_BROWSER_ACTION_CHANGED) && (Action != EFI_BROWSER_ACTION_CHANGING) && (Action != EFI_BROWSER_ACTION_FORM_OPEN)) {\r
     //\r
     // Do nothing for other UEFI Action. Only do call back when data is changed or the form is open.\r
     //\r
@@ -1140,16 +1135,16 @@ LegacyBootOptionCallback (
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
     switch (QuestionId) {\r
-    case FORM_FLOPPY_BOOT_ID:\r
-    case FORM_HARDDISK_BOOT_ID:\r
-    case FORM_CDROM_BOOT_ID:\r
-    case FORM_NET_BOOT_ID:\r
-    case FORM_BEV_BOOT_ID:\r
-      UpdateLegacyDeviceOrderPage (QuestionId);\r
-      break;\r
+      case FORM_FLOPPY_BOOT_ID:\r
+      case FORM_HARDDISK_BOOT_ID:\r
+      case FORM_CDROM_BOOT_ID:\r
+      case FORM_NET_BOOT_ID:\r
+      case FORM_BEV_BOOT_ID:\r
+        UpdateLegacyDeviceOrderPage (QuestionId);\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     if ((Value == NULL) || (ActionRequest == NULL)) {\r
@@ -1157,13 +1152,13 @@ LegacyBootOptionCallback (
     }\r
 \r
     if ((QuestionId >= LEGACY_FD_QUESTION_ID) && (QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER)) {\r
-      AdjustOptionValue(QuestionId, Value);\r
+      AdjustOptionValue (QuestionId, Value);\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Create a menu entry by given menu type.\r
 \r
@@ -1178,7 +1173,7 @@ CreateMenuEntry (
   VOID\r
   )\r
 {\r
-  LEGACY_MENU_ENTRY *MenuEntry;\r
+  LEGACY_MENU_ENTRY  *MenuEntry;\r
 \r
   //\r
   // Create new menu entry\r
@@ -1194,7 +1189,7 @@ CreateMenuEntry (
     return NULL;\r
   }\r
 \r
-  MenuEntry->Signature        = LEGACY_MENU_ENTRY_SIGNATURE;\r
+  MenuEntry->Signature = LEGACY_MENU_ENTRY_SIGNATURE;\r
   return MenuEntry;\r
 }\r
 \r
@@ -1208,20 +1203,20 @@ GetLegacyOptionsOrder (
   VOID\r
   )\r
 {\r
-  UINTN                       VarSize;\r
-  UINT8                       *VarData;\r
-  UINT8                       *VarTmp;\r
-  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
-  UINT16                      *LegacyDev;\r
-  UINTN                       Index;\r
-  LEGACY_MENU_OPTION          *OptionMenu;\r
-  UINT16                      VarDevOrder;\r
-  UINTN                       Pos;\r
-  UINTN                       Bit;\r
-  UINT8                       *DisMap;\r
-  UINTN                       TotalLength;\r
-\r
-  LegacyDev = NULL;\r
+  UINTN                   VarSize;\r
+  UINT8                   *VarData;\r
+  UINT8                   *VarTmp;\r
+  LEGACY_DEV_ORDER_ENTRY  *DevOrder;\r
+  UINT16                  *LegacyDev;\r
+  UINTN                   Index;\r
+  LEGACY_MENU_OPTION      *OptionMenu;\r
+  UINT16                  VarDevOrder;\r
+  UINTN                   Pos;\r
+  UINTN                   Bit;\r
+  UINT8                   *DisMap;\r
+  UINTN                   TotalLength;\r
+\r
+  LegacyDev  = NULL;\r
   OptionMenu = NULL;\r
 \r
   DisMap = ZeroMem (mLegacyBootOptionPrivate->MaintainMapData->DisableMap, sizeof (mLegacyBootOptionPrivate->MaintainMapData->DisableMap));\r
@@ -1229,42 +1224,42 @@ GetLegacyOptionsOrder (
   //\r
   // Get Device Order from variable\r
   //\r
-  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **) &VarData, &VarSize);\r
+  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **)&VarData, &VarSize);\r
   VarTmp = VarData;\r
   if (NULL != VarData) {\r
-    DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
+    DevOrder = (LEGACY_DEV_ORDER_ENTRY *)VarData;\r
     while (VarData < VarTmp + VarSize) {\r
       switch (DevOrder->BbsType) {\r
-      case BBS_FLOPPY:\r
-        LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyFD;\r
-        OptionMenu = &LegacyFDMenu;\r
-        break;\r
+        case BBS_FLOPPY:\r
+          LegacyDev  = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyFD;\r
+          OptionMenu = &LegacyFDMenu;\r
+          break;\r
 \r
-      case BBS_HARDDISK:\r
-        LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyHD;\r
-        OptionMenu = &LegacyHDMenu;\r
-        break;\r
+        case BBS_HARDDISK:\r
+          LegacyDev  = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyHD;\r
+          OptionMenu = &LegacyHDMenu;\r
+          break;\r
 \r
-      case BBS_CDROM:\r
-        LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyCD;\r
-        OptionMenu = &LegacyCDMenu;\r
-        break;\r
+        case BBS_CDROM:\r
+          LegacyDev  = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyCD;\r
+          OptionMenu = &LegacyCDMenu;\r
+          break;\r
 \r
-      case BBS_EMBED_NETWORK:\r
-        LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyNET;\r
-        OptionMenu = &LegacyNETMenu;\r
-        break;\r
+        case BBS_EMBED_NETWORK:\r
+          LegacyDev  = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyNET;\r
+          OptionMenu = &LegacyNETMenu;\r
+          break;\r
 \r
-      case BBS_BEV_DEVICE:\r
-        LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyBEV;\r
-        OptionMenu = &LegacyBEVMenu;\r
-        break;\r
+        case BBS_BEV_DEVICE:\r
+          LegacyDev  = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyBEV;\r
+          OptionMenu = &LegacyBEVMenu;\r
+          break;\r
 \r
-      case BBS_UNKNOWN:\r
-      default:\r
-        ASSERT (FALSE);\r
-        DEBUG ((DEBUG_ERROR, "Unsupported device type found!\n"));\r
-        break;\r
+        case BBS_UNKNOWN:\r
+        default:\r
+          ASSERT (FALSE);\r
+          DEBUG ((DEBUG_ERROR, "Unsupported device type found!\n"));\r
+          break;\r
       }\r
 \r
       //\r
@@ -1272,21 +1267,21 @@ GetLegacyOptionsOrder (
       //\r
       for (Index = 0; Index < OptionMenu->MenuNumber; Index++) {\r
         TotalLength = sizeof (BBS_TYPE) + sizeof (UINT16) + Index * sizeof (UINT16);\r
-        VarDevOrder = *(UINT16 *) ((UINT8 *) DevOrder + TotalLength);\r
+        VarDevOrder = *(UINT16 *)((UINT8 *)DevOrder + TotalLength);\r
 \r
         if (0xFF00 == (VarDevOrder & 0xFF00)) {\r
-          LegacyDev[Index]  = 0xFF;\r
-          Pos               = (VarDevOrder & 0xFF) / 8;\r
-          Bit               = 7 - ((VarDevOrder & 0xFF) % 8);\r
-          DisMap[Pos]       = (UINT8) (DisMap[Pos] | (UINT8) (1 << Bit));\r
+          LegacyDev[Index] = 0xFF;\r
+          Pos              = (VarDevOrder & 0xFF) / 8;\r
+          Bit              = 7 - ((VarDevOrder & 0xFF) % 8);\r
+          DisMap[Pos]      = (UINT8)(DisMap[Pos] | (UINT8)(1 << Bit));\r
         } else {\r
           LegacyDev[Index] = VarDevOrder & 0xFF;\r
         }\r
       }\r
 \r
-      VarData ++;\r
-      VarData += *(UINT16 *) VarData;\r
-      DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
+      VarData++;\r
+      VarData += *(UINT16 *)VarData;\r
+      DevOrder = (LEGACY_DEV_ORDER_ENTRY *)VarData;\r
     }\r
   }\r
 \r
@@ -1324,11 +1319,11 @@ GetLegacyOptions (
   InitializeListHead (&LegacyNETMenu.Head);\r
   InitializeListHead (&LegacyBEVMenu.Head);\r
 \r
-  FDNum   = 0;\r
-  HDNum   = 0;\r
-  CDNum   = 0;\r
-  NETNum  = 0;\r
-  BEVNum  = 0;\r
+  FDNum  = 0;\r
+  HDNum  = 0;\r
+  CDNum  = 0;\r
+  NETNum = 0;\r
+  BEVNum = 0;\r
 \r
   EfiBootManagerConnectAll ();\r
 \r
@@ -1343,59 +1338,60 @@ GetLegacyOptions (
   for (Index = 0; Index < BootOptionCount; Index++) {\r
     if ((DevicePathType (BootOption[Index].FilePath) != BBS_DEVICE_PATH) ||\r
         (DevicePathSubType (BootOption[Index].FilePath) != BBS_BBS_DP)\r
-       ) {\r
+        )\r
+    {\r
       continue;\r
     }\r
+\r
     ASSERT (BootOption[Index].OptionalDataSize == sizeof (LEGACY_BOOT_OPTION_BBS_DATA));\r
     NewMenuEntry = CreateMenuEntry ();\r
     ASSERT (NewMenuEntry != NULL);\r
 \r
-    NewLegacyDevContext              = (LEGACY_DEVICE_CONTEXT *) NewMenuEntry->VariableContext;\r
-    NewLegacyDevContext->BbsIndex    = ((LEGACY_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex;\r
+    NewLegacyDevContext              = (LEGACY_DEVICE_CONTEXT *)NewMenuEntry->VariableContext;\r
+    NewLegacyDevContext->BbsIndex    = ((LEGACY_BOOT_OPTION_BBS_DATA *)BootOption[Index].OptionalData)->BbsIndex;\r
     NewLegacyDevContext->Description = AllocateCopyPool (StrSize (BootOption[Index].Description), BootOption[Index].Description);\r
     ASSERT (NewLegacyDevContext->Description != NULL);\r
 \r
     NewMenuEntry->DisplayString = NewLegacyDevContext->Description;\r
     NewMenuEntry->HelpString    = NULL;\r
 \r
-    switch (((BBS_BBS_DEVICE_PATH *) BootOption[Index].FilePath)->DeviceType) {\r
-    case BBS_TYPE_FLOPPY:\r
-      InsertTailList (&LegacyFDMenu.Head, &NewMenuEntry->Link);\r
-      FDNum++;\r
-      break;\r
+    switch (((BBS_BBS_DEVICE_PATH *)BootOption[Index].FilePath)->DeviceType) {\r
+      case BBS_TYPE_FLOPPY:\r
+        InsertTailList (&LegacyFDMenu.Head, &NewMenuEntry->Link);\r
+        FDNum++;\r
+        break;\r
 \r
-    case BBS_TYPE_HARDDRIVE:\r
-      InsertTailList (&LegacyHDMenu.Head, &NewMenuEntry->Link);\r
-      HDNum++;\r
-      break;\r
+      case BBS_TYPE_HARDDRIVE:\r
+        InsertTailList (&LegacyHDMenu.Head, &NewMenuEntry->Link);\r
+        HDNum++;\r
+        break;\r
 \r
-    case BBS_TYPE_CDROM:\r
-      InsertTailList (&LegacyCDMenu.Head, &NewMenuEntry->Link);\r
-      CDNum++;\r
-      break;\r
+      case BBS_TYPE_CDROM:\r
+        InsertTailList (&LegacyCDMenu.Head, &NewMenuEntry->Link);\r
+        CDNum++;\r
+        break;\r
 \r
-    case BBS_TYPE_EMBEDDED_NETWORK:\r
-      InsertTailList (&LegacyNETMenu.Head, &NewMenuEntry->Link);\r
-      NETNum++;\r
-      break;\r
+      case BBS_TYPE_EMBEDDED_NETWORK:\r
+        InsertTailList (&LegacyNETMenu.Head, &NewMenuEntry->Link);\r
+        NETNum++;\r
+        break;\r
 \r
-    case BBS_TYPE_BEV:\r
-      InsertTailList (&LegacyBEVMenu.Head, &NewMenuEntry->Link);\r
-      BEVNum++;\r
-      break;\r
+      case BBS_TYPE_BEV:\r
+        InsertTailList (&LegacyBEVMenu.Head, &NewMenuEntry->Link);\r
+        BEVNum++;\r
+        break;\r
     }\r
   }\r
 \r
   EfiBootManagerFreeLoadOptions (BootOption, BootOptionCount);\r
 \r
-  LegacyFDMenu.MenuNumber   = FDNum;\r
-  LegacyHDMenu.MenuNumber   = HDNum;\r
-  LegacyCDMenu.MenuNumber   = CDNum;\r
-  LegacyNETMenu.MenuNumber  = NETNum;\r
-  LegacyBEVMenu.MenuNumber  = BEVNum;\r
+  LegacyFDMenu.MenuNumber  = FDNum;\r
+  LegacyHDMenu.MenuNumber  = HDNum;\r
+  LegacyCDMenu.MenuNumber  = CDNum;\r
+  LegacyNETMenu.MenuNumber = NETNum;\r
+  LegacyBEVMenu.MenuNumber = BEVNum;\r
 }\r
 \r
-\r
 /**\r
 \r
   Install Boot Manager Menu driver.\r
@@ -1410,15 +1406,15 @@ GetLegacyOptions (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootMaintUiLibConstructor (\r
-  IN EFI_HANDLE                            ImageHandle,\r
-  IN EFI_SYSTEM_TABLE                      *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_STATUS                        Status;\r
   EFI_LEGACY_BIOS_PROTOCOL          *LegacyBios;\r
   LEGACY_BOOT_OPTION_CALLBACK_DATA  *LegacyBootOptionData;\r
 \r
-  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Create LegacyBootOptionData structures for Driver Callback\r
@@ -1450,12 +1446,12 @@ LegacyBootMaintUiLibConstructor (
     // Publish our HII data\r
     //\r
     LegacyBootOptionData->HiiHandle = HiiAddPackages (\r
-                                      &mLegacyBootOptionGuid,\r
-                                      LegacyBootOptionData->DriverHandle,\r
-                                      LegacyBootMaintUiVfrBin,\r
-                                      LegacyBootMaintUiLibStrings,\r
-                                      NULL\r
-                                      );\r
+                                        &mLegacyBootOptionGuid,\r
+                                        LegacyBootOptionData->DriverHandle,\r
+                                        LegacyBootMaintUiVfrBin,\r
+                                        LegacyBootMaintUiLibStrings,\r
+                                        NULL\r
+                                        );\r
     ASSERT (LegacyBootOptionData->HiiHandle != NULL);\r
 \r
     mLegacyBootOptionPrivate = LegacyBootOptionData;\r
@@ -1481,9 +1477,9 @@ LegacyBootMaintUiLibDestructor (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
-  if (mLegacyBootOptionPrivate != NULL && mLegacyBootOptionPrivate->DriverHandle != NULL) {\r
+  if ((mLegacyBootOptionPrivate != NULL) && (mLegacyBootOptionPrivate->DriverHandle != NULL)) {\r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
                     mLegacyBootOptionPrivate->DriverHandle,\r
                     &gEfiDevicePathProtocolGuid,\r
@@ -1502,4 +1498,3 @@ LegacyBootMaintUiLibDestructor (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index 87290294df26e16f9957e80982dd13c6ab475c6b..65aa89327a2fc365764a3388f90ac4d627989b1a 100644 (file)
@@ -6,13 +6,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #ifndef _EFI_LEGACY_BOOT_OPTION_H_\r
 #define _EFI_LEGACY_BOOT_OPTION_H_\r
 \r
 #include <PiDxe.h>\r
 \r
-\r
 #include <Guid/GlobalVariable.h>\r
 #include <Guid/LegacyDevOrder.h>\r
 #include <Guid/MdeModuleHii.h>\r
@@ -38,42 +36,40 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "LegacyBootMaintUiVfr.h"\r
 \r
-#define CONFIG_OPTION_OFFSET    0x1200\r
+#define CONFIG_OPTION_OFFSET  0x1200\r
 \r
 //\r
 // VarOffset that will be used to create question\r
 // all these values are computed from the structure\r
 // defined below\r
 //\r
-#define VAR_OFFSET(Field)              ((UINT16) ((UINTN) &(((LEGACY_BOOT_NV_DATA *) 0)->Field)))\r
+#define VAR_OFFSET(Field)  ((UINT16) ((UINTN) &(((LEGACY_BOOT_NV_DATA *) 0)->Field)))\r
 \r
 //\r
 // Question Id of Zero is invalid, so add an offset to it\r
 //\r
-#define QUESTION_ID(Field)             (VAR_OFFSET (Field) + CONFIG_OPTION_OFFSET)\r
-\r
-\r
-#define LEGACY_FD_QUESTION_ID           QUESTION_ID (LegacyFD)\r
-#define LEGACY_HD_QUESTION_ID           QUESTION_ID (LegacyHD)\r
-#define LEGACY_CD_QUESTION_ID           QUESTION_ID (LegacyCD)\r
-#define LEGACY_NET_QUESTION_ID          QUESTION_ID (LegacyNET)\r
-#define LEGACY_BEV_QUESTION_ID          QUESTION_ID (LegacyBEV)\r
+#define QUESTION_ID(Field)  (VAR_OFFSET (Field) + CONFIG_OPTION_OFFSET)\r
 \r
+#define LEGACY_FD_QUESTION_ID   QUESTION_ID (LegacyFD)\r
+#define LEGACY_HD_QUESTION_ID   QUESTION_ID (LegacyHD)\r
+#define LEGACY_CD_QUESTION_ID   QUESTION_ID (LegacyCD)\r
+#define LEGACY_NET_QUESTION_ID  QUESTION_ID (LegacyNET)\r
+#define LEGACY_BEV_QUESTION_ID  QUESTION_ID (LegacyBEV)\r
 \r
 //\r
 // String Constant\r
 //\r
-#define STR_FLOPPY          L"Floppy Drive #%02x"\r
-#define STR_HARDDISK        L"HardDisk Drive #%02x"\r
-#define STR_CDROM           L"ATAPI CDROM Drive #%02x"\r
-#define STR_NET             L"NET Drive #%02x"\r
-#define STR_BEV             L"BEV Drive #%02x"\r
-\r
-#define STR_FLOPPY_HELP     L"Select Floppy Drive #%02x"\r
-#define STR_HARDDISK_HELP   L"Select HardDisk Drive #%02x"\r
-#define STR_CDROM_HELP      L"Select ATAPI CDROM Drive #%02x"\r
-#define STR_NET_HELP        L"NET Drive #%02x"\r
-#define STR_BEV_HELP        L"BEV Drive #%02x"\r
+#define STR_FLOPPY    L"Floppy Drive #%02x"\r
+#define STR_HARDDISK  L"HardDisk Drive #%02x"\r
+#define STR_CDROM     L"ATAPI CDROM Drive #%02x"\r
+#define STR_NET       L"NET Drive #%02x"\r
+#define STR_BEV       L"BEV Drive #%02x"\r
+\r
+#define STR_FLOPPY_HELP    L"Select Floppy Drive #%02x"\r
+#define STR_HARDDISK_HELP  L"Select HardDisk Drive #%02x"\r
+#define STR_CDROM_HELP     L"Select ATAPI CDROM Drive #%02x"\r
+#define STR_NET_HELP       L"NET Drive #%02x"\r
+#define STR_BEV_HELP       L"BEV Drive #%02x"\r
 \r
 #define STR_FLOPPY_TITLE    L"Set Legacy Floppy Drive Order"\r
 #define STR_HARDDISK_TITLE  L"Set Legacy HardDisk Drive Order"\r
@@ -84,7 +80,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // These are the VFR compiler generated data representing our VFR data.\r
 //\r
-extern UINT8 LegacyBootMaintUiVfrBin[];\r
+extern UINT8  LegacyBootMaintUiVfrBin[];\r
 \r
 #pragma pack(1)\r
 \r
@@ -92,52 +88,49 @@ extern UINT8 LegacyBootMaintUiVfrBin[];
 /// HII specific Vendor Device Path definition.\r
 ///\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH             VendorDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL       End;\r
+  VENDOR_DEVICE_PATH          VendorDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } HII_VENDOR_DEVICE_PATH;\r
 \r
-\r
-\r
 //\r
 // Variable created with this flag will be "Efi:...."\r
 //\r
 #define VAR_FLAG  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE\r
 \r
-\r
 #define LEGACY_BOOT_OPTION_CALLBACK_DATA_SIGNATURE  SIGNATURE_32 ('L', 'G', 'C', 'B')\r
 \r
 typedef struct {\r
-  UINTN                            Signature;\r
+  UINTN                             Signature;\r
 \r
   //\r
   // HII relative handles\r
   //\r
-  EFI_HII_HANDLE                   HiiHandle;\r
-  EFI_HANDLE                       DriverHandle;\r
+  EFI_HII_HANDLE                    HiiHandle;\r
+  EFI_HANDLE                        DriverHandle;\r
 \r
   //\r
   // Produced protocols\r
   //\r
-  EFI_HII_CONFIG_ACCESS_PROTOCOL   ConfigAccess;\r
+  EFI_HII_CONFIG_ACCESS_PROTOCOL    ConfigAccess;\r
 \r
   //\r
   // Maintain the data.\r
   //\r
-  LEGACY_BOOT_MAINTAIN_DATA        *MaintainMapData;\r
+  LEGACY_BOOT_MAINTAIN_DATA         *MaintainMapData;\r
 } LEGACY_BOOT_OPTION_CALLBACK_DATA;\r
 \r
 //\r
 // All of the signatures that will be used in list structure\r
 //\r
-#define LEGACY_MENU_OPTION_SIGNATURE      SIGNATURE_32 ('m', 'e', 'n', 'u')\r
-#define LEGACY_MENU_ENTRY_SIGNATURE       SIGNATURE_32 ('e', 'n', 't', 'r')\r
+#define LEGACY_MENU_OPTION_SIGNATURE  SIGNATURE_32 ('m', 'e', 'n', 'u')\r
+#define LEGACY_MENU_ENTRY_SIGNATURE   SIGNATURE_32 ('e', 'n', 't', 'r')\r
 \r
 #define LEGACY_LEGACY_DEV_CONTEXT_SELECT  0x9\r
 \r
 typedef struct {\r
-  UINTN           Signature;\r
-  LIST_ENTRY      Head;\r
-  UINTN           MenuNumber;\r
+  UINTN         Signature;\r
+  LIST_ENTRY    Head;\r
+  UINTN         MenuNumber;\r
 } LEGACY_MENU_OPTION;\r
 \r
 typedef struct {\r
@@ -146,18 +139,18 @@ typedef struct {
 } LEGACY_DEVICE_CONTEXT;\r
 \r
 typedef struct {\r
-  UINTN           Signature;\r
-  LIST_ENTRY      Link;\r
-  UINTN           OptionNumber;\r
-  UINT16          *DisplayString;\r
-  UINT16          *HelpString;\r
-  EFI_STRING_ID   DisplayStringToken;\r
-  EFI_STRING_ID   HelpStringToken;\r
-  VOID            *VariableContext;\r
+  UINTN            Signature;\r
+  LIST_ENTRY       Link;\r
+  UINTN            OptionNumber;\r
+  UINT16           *DisplayString;\r
+  UINT16           *HelpString;\r
+  EFI_STRING_ID    DisplayStringToken;\r
+  EFI_STRING_ID    HelpStringToken;\r
+  VOID             *VariableContext;\r
 } LEGACY_MENU_ENTRY;\r
 \r
 typedef struct {\r
-  UINT16     BbsIndex;\r
+  UINT16    BbsIndex;\r
 } LEGACY_BOOT_OPTION_BBS_DATA;\r
 \r
 #pragma pack()\r
@@ -183,12 +176,12 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootOptionCallback (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  EFI_BROWSER_ACTION                     Action,\r
-  IN  EFI_QUESTION_ID                        QuestionId,\r
-  IN  UINT8                                  Type,\r
-  IN  EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  EFI_BROWSER_ACTION                    Action,\r
+  IN  EFI_QUESTION_ID                       QuestionId,\r
+  IN  UINT8                                 Type,\r
+  IN  EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   );\r
 \r
 /**\r
@@ -216,10 +209,10 @@ LegacyBootOptionCallback (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootOptionExtractConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Request,\r
-  OUT EFI_STRING                             *Progress,\r
-  OUT EFI_STRING                             *Results\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Request,\r
+  OUT EFI_STRING                            *Progress,\r
+  OUT EFI_STRING                            *Results\r
   );\r
 \r
 /**\r
@@ -241,9 +234,9 @@ LegacyBootOptionExtractConfig (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootOptionRouteConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Configuration,\r
-  OUT EFI_STRING                             *Progress\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Configuration,\r
+  OUT EFI_STRING                            *Progress\r
   );\r
 \r
 #endif\r
index 13354865745d16c0790b8dd62e79b5de552b92ee..7c751fc73c70491790157b9933e57512317b4211 100644 (file)
@@ -6,34 +6,28 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #ifndef _EFI_LEGACY_BOOT_OPTION_VFR_H_\r
 #define _EFI_LEGACY_BOOT_OPTION_VFR_H_\r
 \r
 #include <Guid/HiiBootMaintenanceFormset.h>\r
 \r
-#define MAX_MENU_NUMBER 100\r
+#define MAX_MENU_NUMBER  100\r
 \r
 #define LEGACY_BOOT_OPTION_FORMSET_GUID  { 0x6bc75598, 0x89b4, 0x483d, { 0x91, 0x60, 0x7f, 0x46, 0x9a, 0x96, 0x35, 0x31 } }\r
 \r
-#define VARSTORE_ID_LEGACY_BOOT      0x0001\r
-\r
+#define VARSTORE_ID_LEGACY_BOOT  0x0001\r
 \r
 #define LEGACY_BOOT_FORM_ID          0x1000\r
 #define LEGACY_ORDER_CHANGE_FORM_ID  0x1001\r
 \r
+#define FORM_FLOPPY_BOOT_ID    0x2000\r
+#define FORM_HARDDISK_BOOT_ID  0x2001\r
+#define FORM_CDROM_BOOT_ID     0x2002\r
+#define FORM_NET_BOOT_ID       0x2003\r
+#define FORM_BEV_BOOT_ID       0x2004\r
 \r
-#define FORM_FLOPPY_BOOT_ID          0x2000\r
-#define FORM_HARDDISK_BOOT_ID        0x2001\r
-#define FORM_CDROM_BOOT_ID           0x2002\r
-#define FORM_NET_BOOT_ID             0x2003\r
-#define FORM_BEV_BOOT_ID             0x2004\r
-\r
-\r
-\r
-#define FORM_BOOT_LEGACY_DEVICE_ID   0x9000\r
-#define FORM_BOOT_LEGACY_LABEL_END   0x9001\r
-\r
+#define FORM_BOOT_LEGACY_DEVICE_ID  0x9000\r
+#define FORM_BOOT_LEGACY_LABEL_END  0x9001\r
 \r
 #pragma pack(1)\r
 \r
@@ -49,11 +43,11 @@ typedef struct {
   //\r
   // Legacy Device Order Selection Storage\r
   //\r
-  UINT16   LegacyFD[MAX_MENU_NUMBER];\r
-  UINT16   LegacyHD[MAX_MENU_NUMBER];\r
-  UINT16   LegacyCD[MAX_MENU_NUMBER];\r
-  UINT16   LegacyNET[MAX_MENU_NUMBER];\r
-  UINT16   LegacyBEV[MAX_MENU_NUMBER];\r
+  UINT16    LegacyFD[MAX_MENU_NUMBER];\r
+  UINT16    LegacyHD[MAX_MENU_NUMBER];\r
+  UINT16    LegacyCD[MAX_MENU_NUMBER];\r
+  UINT16    LegacyNET[MAX_MENU_NUMBER];\r
+  UINT16    LegacyBEV[MAX_MENU_NUMBER];\r
 } LEGACY_BOOT_NV_DATA;\r
 \r
 ///\r
@@ -68,10 +62,10 @@ typedef struct {
   //\r
   // Legacy Device Order Selection Storage\r
   //\r
-  LEGACY_BOOT_NV_DATA   InitialNvData;\r
-  LEGACY_BOOT_NV_DATA   CurrentNvData;\r
-  LEGACY_BOOT_NV_DATA   LastTimeNvData;\r
-  UINT8                 DisableMap[32];\r
+  LEGACY_BOOT_NV_DATA    InitialNvData;\r
+  LEGACY_BOOT_NV_DATA    CurrentNvData;\r
+  LEGACY_BOOT_NV_DATA    LastTimeNvData;\r
+  UINT8                  DisableMap[32];\r
 } LEGACY_BOOT_MAINTAIN_DATA;\r
 \r
 #pragma pack()\r
index 292e2c1e7a7a3667251578eced0974ca64bd0cf7..8dd8b884d37538c2a7fbdf0f711c41b555670dc1 100644 (file)
@@ -28,7 +28,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT16     BbsIndex;\r
+  UINT16    BbsIndex;\r
 } LEGACY_BM_BOOT_OPTION_BBS_DATA;\r
 #pragma pack()\r
 \r
@@ -44,7 +44,7 @@ typedef struct {
 VOID\r
 EFIAPI\r
 LegacyBmBoot (\r
-  IN  EFI_BOOT_MANAGER_LOAD_OPTION           *BootOption\r
+  IN  EFI_BOOT_MANAGER_LOAD_OPTION  *BootOption\r
   );\r
 \r
 /**\r
index cd0e02060f20320bb4db454540f2c16a12cf7c2c..032aacba68de404a2f835f3edc69609a66cd5262 100644 (file)
@@ -25,9 +25,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootManagerLibConstructor (\r
-  IN EFI_HANDLE                            ImageHandle,\r
-  IN EFI_SYSTEM_TABLE                      *SystemTable\r
-)\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
+  )\r
 {\r
   EfiBootManagerRegisterLegacyBootSupport (\r
     LegacyBmRefreshAllBootOption,\r
@@ -45,12 +45,14 @@ LegacyBootManagerLibConstructor (
 **/\r
 UINT16\r
 LegacyBmDeviceType (\r
-  EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r
   )\r
 {\r
-  ASSERT ((DevicePathType (DevicePath) == BBS_DEVICE_PATH) &&\r
-          (DevicePathSubType (DevicePath) == BBS_BBS_DP));\r
-  return ((BBS_BBS_DEVICE_PATH *) DevicePath)->DeviceType;\r
+  ASSERT (\r
+    (DevicePathType (DevicePath) == BBS_DEVICE_PATH) &&\r
+    (DevicePathSubType (DevicePath) == BBS_BBS_DP)\r
+    );\r
+  return ((BBS_BBS_DEVICE_PATH *)DevicePath)->DeviceType;\r
 }\r
 \r
 /**\r
@@ -63,7 +65,7 @@ LegacyBmDeviceType (
 **/\r
 BOOLEAN\r
 LegacyBmValidBbsEntry (\r
-  IN BBS_TABLE   *BbsEntry\r
+  IN BBS_TABLE  *BbsEntry\r
   )\r
 {\r
   switch (BbsEntry->BootPriority) {\r
@@ -87,10 +89,10 @@ LegacyBmValidBbsEntry (
 **/\r
 VOID\r
 LegacyBmBuildLegacyDevNameString (\r
-  IN  BBS_TABLE                 *CurBBSEntry,\r
-  IN  UINTN                     Index,\r
-  IN  UINTN                     BufSize,\r
-  OUT CHAR16                    *BootString\r
+  IN  BBS_TABLE  *CurBBSEntry,\r
+  IN  UINTN      Index,\r
+  IN  UINTN      BufSize,\r
+  OUT CHAR16     *BootString\r
   )\r
 {\r
   CHAR16  *Fmt;\r
@@ -100,77 +102,78 @@ LegacyBmBuildLegacyDevNameString (
   CHAR16  StringBufferU[LEGACY_BM_BOOT_DESCRIPTION_LENGTH + 1];\r
 \r
   switch (Index) {\r
-  //\r
-  // Primary Master\r
-  //\r
-  case 1:\r
-    Fmt = L"Primary Master %s";\r
-    break;\r
+    //\r
+    // Primary Master\r
+    //\r
+    case 1:\r
+      Fmt = L"Primary Master %s";\r
+      break;\r
 \r
- //\r
- // Primary Slave\r
- //\r
-  case 2:\r
-    Fmt = L"Primary Slave %s";\r
-    break;\r
   //\r
   // Primary Slave\r
   //\r
+    case 2:\r
+      Fmt = L"Primary Slave %s";\r
+      break;\r
 \r
-  //\r
-  // Secondary Master\r
-  //\r
-  case 3:\r
-    Fmt = L"Secondary Master %s";\r
-    break;\r
+    //\r
+    // Secondary Master\r
+    //\r
+    case 3:\r
+      Fmt = L"Secondary Master %s";\r
+      break;\r
 \r
-  //\r
-  // Secondary Slave\r
-  //\r
-  case 4:\r
-    Fmt = L"Secondary Slave %s";\r
-    break;\r
+    //\r
+    // Secondary Slave\r
+    //\r
+    case 4:\r
+      Fmt = L"Secondary Slave %s";\r
+      break;\r
 \r
-  default:\r
-    Fmt = L"%s";\r
-    break;\r
+    default:\r
+      Fmt = L"%s";\r
+      break;\r
   }\r
 \r
   switch (CurBBSEntry->DeviceType) {\r
-  case BBS_FLOPPY:\r
-    Type = L"Floppy";\r
-    break;\r
-\r
-  case BBS_HARDDISK:\r
-    Type = L"Harddisk";\r
-    break;\r
-\r
-  case BBS_CDROM:\r
-    Type = L"CDROM";\r
-    break;\r
-\r
-  case BBS_PCMCIA:\r
-    Type = L"PCMCIAe";\r
-    break;\r
-\r
-  case BBS_USB:\r
-    Type = L"USB";\r
-    break;\r
-\r
-  case BBS_EMBED_NETWORK:\r
-    Type = L"Network";\r
-    break;\r
-\r
-  case BBS_BEV_DEVICE:\r
-    Type = L"BEVe";\r
-    break;\r
-\r
-  case BBS_UNKNOWN:\r
-  default:\r
-    Type = L"Unknown";\r
-    break;\r
+    case BBS_FLOPPY:\r
+      Type = L"Floppy";\r
+      break;\r
+\r
+    case BBS_HARDDISK:\r
+      Type = L"Harddisk";\r
+      break;\r
+\r
+    case BBS_CDROM:\r
+      Type = L"CDROM";\r
+      break;\r
+\r
+    case BBS_PCMCIA:\r
+      Type = L"PCMCIAe";\r
+      break;\r
+\r
+    case BBS_USB:\r
+      Type = L"USB";\r
+      break;\r
+\r
+    case BBS_EMBED_NETWORK:\r
+      Type = L"Network";\r
+      break;\r
+\r
+    case BBS_BEV_DEVICE:\r
+      Type = L"BEVe";\r
+      break;\r
+\r
+    case BBS_UNKNOWN:\r
+    default:\r
+      Type = L"Unknown";\r
+      break;\r
   }\r
+\r
   //\r
   // If current BBS entry has its description then use it.\r
   //\r
-  StringDesc = (CHAR8 *) (((UINTN) CurBBSEntry->DescStringSegment << 4) + CurBBSEntry->DescStringOffset);\r
+  StringDesc = (CHAR8 *)(((UINTN)CurBBSEntry->DescStringSegment << 4) + CurBBSEntry->DescStringOffset);\r
   if (NULL != StringDesc) {\r
     //\r
     // Only get first 32 characters, this is suggested by BBS spec\r
@@ -178,15 +181,15 @@ LegacyBmBuildLegacyDevNameString (
     CopyMem (StringBufferA, StringDesc, LEGACY_BM_BOOT_DESCRIPTION_LENGTH);\r
     StringBufferA[LEGACY_BM_BOOT_DESCRIPTION_LENGTH] = 0;\r
     AsciiStrToUnicodeStrS (StringBufferA, StringBufferU, ARRAY_SIZE (StringBufferU));\r
-    Fmt   = L"%s";\r
-    Type  = StringBufferU;\r
+    Fmt  = L"%s";\r
+    Type = StringBufferU;\r
   }\r
 \r
   //\r
   // BbsTable 16 entries are for onboard IDE.\r
   // Set description string for SATA harddisks, Harddisk 0 ~ Harddisk 11\r
   //\r
-  if (Index >= 5 && Index <= 16 && (CurBBSEntry->DeviceType == BBS_HARDDISK || CurBBSEntry->DeviceType == BBS_CDROM)) {\r
+  if ((Index >= 5) && (Index <= 16) && ((CurBBSEntry->DeviceType == BBS_HARDDISK) || (CurBBSEntry->DeviceType == BBS_CDROM))) {\r
     Fmt = L"%s %d";\r
     UnicodeSPrint (BootString, BufSize, Fmt, Type, Index - 5);\r
   } else {\r
@@ -206,23 +209,24 @@ LegacyBmBuildLegacyDevNameString (
 **/\r
 UINT16\r
 LegacyBmFuzzyMatch (\r
-  EFI_BOOT_MANAGER_LOAD_OPTION   *BootOption,\r
-  BBS_TABLE                      *BbsTable,\r
-  UINT16                         BbsCount,\r
-  BOOLEAN                        *BbsIndexUsed\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  *BootOption,\r
+  BBS_TABLE                     *BbsTable,\r
+  UINT16                        BbsCount,\r
+  BOOLEAN                       *BbsIndexUsed\r
   )\r
 {\r
-  UINT16                         Index;\r
-  LEGACY_BM_BOOT_OPTION_BBS_DATA *BbsData;\r
-  CHAR16                         Description[LEGACY_BM_BOOT_DESCRIPTION_LENGTH + 1];\r
+  UINT16                          Index;\r
+  LEGACY_BM_BOOT_OPTION_BBS_DATA  *BbsData;\r
+  CHAR16                          Description[LEGACY_BM_BOOT_DESCRIPTION_LENGTH + 1];\r
 \r
-  BbsData = (LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption->OptionalData;\r
+  BbsData = (LEGACY_BM_BOOT_OPTION_BBS_DATA *)BootOption->OptionalData;\r
 \r
   //\r
   // Directly check the BBS index stored in BootOption\r
   //\r
   if ((BbsData->BbsIndex < BbsCount) &&\r
-      (LegacyBmDeviceType (BootOption->FilePath) == BbsTable[BbsData->BbsIndex].DeviceType)) {\r
+      (LegacyBmDeviceType (BootOption->FilePath) == BbsTable[BbsData->BbsIndex].DeviceType))\r
+  {\r
     LegacyBmBuildLegacyDevNameString (\r
       &BbsTable[BbsData->BbsIndex],\r
       BbsData->BbsIndex,\r
@@ -246,7 +250,8 @@ LegacyBmFuzzyMatch (
   //\r
   for (Index = 0; Index < BbsCount; Index++) {\r
     if (!LegacyBmValidBbsEntry (&BbsTable[Index]) ||\r
-        (BbsTable[Index].DeviceType != LegacyBmDeviceType (BootOption->FilePath))) {\r
+        (BbsTable[Index].DeviceType != LegacyBmDeviceType (BootOption->FilePath)))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -289,44 +294,48 @@ LegacyBmFuzzyMatch (
 **/\r
 VOID\r
 LegacyBmUpdateBbsIndex (\r
-  LEGACY_DEV_ORDER_ENTRY   *LegacyDevOrder,\r
-  UINTN                    *LegacyDevOrderSize,\r
-  UINT16                   DeviceType,\r
-  UINT16                   OldBbsIndex,\r
-  UINT16                   NewBbsIndex // Delete entry if -1\r
+  LEGACY_DEV_ORDER_ENTRY  *LegacyDevOrder,\r
+  UINTN                   *LegacyDevOrderSize,\r
+  UINT16                  DeviceType,\r
+  UINT16                  OldBbsIndex,\r
+  UINT16                  NewBbsIndex  // Delete entry if -1\r
   )\r
 {\r
-  LEGACY_DEV_ORDER_ENTRY   *Entry;\r
-  UINTN                    Index;\r
+  LEGACY_DEV_ORDER_ENTRY  *Entry;\r
+  UINTN                   Index;\r
 \r
-  ASSERT (((LegacyDevOrder == NULL) && (*LegacyDevOrderSize == 0)) ||\r
-          ((LegacyDevOrder != NULL) && (*LegacyDevOrderSize != 0))\r
-         );\r
+  ASSERT (\r
+    ((LegacyDevOrder == NULL) && (*LegacyDevOrderSize == 0)) ||\r
+    ((LegacyDevOrder != NULL) && (*LegacyDevOrderSize != 0))\r
+    );\r
 \r
   for (Entry = LegacyDevOrder;\r
-       Entry < (LEGACY_DEV_ORDER_ENTRY *) ((UINT8 *) LegacyDevOrder + *LegacyDevOrderSize);\r
-       Entry = (LEGACY_DEV_ORDER_ENTRY *) ((UINTN) Entry + sizeof (BBS_TYPE) + Entry->Length)\r
-       ) {\r
+       Entry < (LEGACY_DEV_ORDER_ENTRY *)((UINT8 *)LegacyDevOrder + *LegacyDevOrderSize);\r
+       Entry = (LEGACY_DEV_ORDER_ENTRY *)((UINTN)Entry + sizeof (BBS_TYPE) + Entry->Length)\r
+       )\r
+  {\r
     if (Entry->BbsType == DeviceType) {\r
       for (Index = 0; Index < Entry->Length / sizeof (UINT16) - 1; Index++) {\r
         if (Entry->Data[Index] == OldBbsIndex) {\r
-          if (NewBbsIndex == (UINT16) -1) {\r
+          if (NewBbsIndex == (UINT16)-1) {\r
             //\r
             // Delete the old entry\r
             //\r
             CopyMem (\r
               &Entry->Data[Index],\r
               &Entry->Data[Index + 1],\r
-              (UINT8 *) LegacyDevOrder + *LegacyDevOrderSize - (UINT8 *) &Entry->Data[Index + 1]\r
+              (UINT8 *)LegacyDevOrder + *LegacyDevOrderSize - (UINT8 *)&Entry->Data[Index + 1]\r
               );\r
             Entry->Length       -= sizeof (UINT16);\r
-            *LegacyDevOrderSize -= sizeof(UINT16);\r
+            *LegacyDevOrderSize -= sizeof (UINT16);\r
           } else {\r
-            Entry->Data[Index]   = NewBbsIndex;\r
+            Entry->Data[Index] = NewBbsIndex;\r
           }\r
+\r
           break;\r
         }\r
       }\r
+\r
       break;\r
     }\r
   }\r
@@ -350,7 +359,8 @@ LegacyBmDeleteAllBootOptions (
   BootOption = EfiBootManagerGetLoadOptions (&BootOptionCount, LoadOptionTypeBoot);\r
   for (Index = 0; Index < BootOptionCount; Index++) {\r
     if ((DevicePathType (BootOption[Index].FilePath) == BBS_DEVICE_PATH) &&\r
-        (DevicePathSubType (BootOption[Index].FilePath) == BBS_BBS_DP)) {\r
+        (DevicePathSubType (BootOption[Index].FilePath) == BBS_BBS_DP))\r
+    {\r
       Status = EfiBootManagerDeleteLoadOptionVariable (BootOption[Index].OptionNumber, BootOption[Index].OptionType);\r
       //\r
       // Deleting variable with current variable implementation shouldn't fail.\r
@@ -374,7 +384,6 @@ LegacyBmDeleteAllBootOptions (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Delete all the invalid legacy boot options.\r
 \r
@@ -401,12 +410,12 @@ LegacyBmDeleteAllInvalidBootOptions (
   UINTN                         LegacyDevOrderSize;\r
   BOOLEAN                       *BbsIndexUsed;\r
 \r
-  HddCount      = 0;\r
-  BbsCount      = 0;\r
-  HddInfo       = NULL;\r
-  BbsTable      = NULL;\r
+  HddCount = 0;\r
+  BbsCount = 0;\r
+  HddInfo  = NULL;\r
+  BbsTable = NULL;\r
 \r
-  Status        = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -422,7 +431,7 @@ LegacyBmDeleteAllInvalidBootOptions (
     return Status;\r
   }\r
 \r
-  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **) &LegacyDevOrder, &LegacyDevOrderSize);\r
+  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **)&LegacyDevOrder, &LegacyDevOrderSize);\r
 \r
   BootOption = EfiBootManagerGetLoadOptions (&BootOptionCount, LoadOptionTypeBoot);\r
 \r
@@ -434,13 +443,14 @@ LegacyBmDeleteAllInvalidBootOptions (
     // Skip non legacy boot option\r
     //\r
     if ((DevicePathType (BootOption[Index].FilePath) != BBS_DEVICE_PATH) ||\r
-        (DevicePathSubType (BootOption[Index].FilePath) != BBS_BBS_DP)) {\r
+        (DevicePathSubType (BootOption[Index].FilePath) != BBS_BBS_DP))\r
+    {\r
       continue;\r
     }\r
 \r
     BbsIndex = LegacyBmFuzzyMatch (&BootOption[Index], BbsTable, BbsCount, BbsIndexUsed);\r
     if (BbsIndex == BbsCount) {\r
-      DEBUG ((DEBUG_INFO, "[LegacyBds] Delete Boot Option Boot%04x: %s\n", (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description));\r
+      DEBUG ((DEBUG_INFO, "[LegacyBds] Delete Boot Option Boot%04x: %s\n", (UINTN)BootOption[Index].OptionNumber, BootOption[Index].Description));\r
       //\r
       // Delete entry from LegacyDevOrder\r
       //\r
@@ -448,14 +458,20 @@ LegacyBmDeleteAllInvalidBootOptions (
         LegacyDevOrder,\r
         &LegacyDevOrderSize,\r
         LegacyBmDeviceType (BootOption[Index].FilePath),\r
-        ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex,\r
-        (UINT16) -1\r
+        ((LEGACY_BM_BOOT_OPTION_BBS_DATA *)BootOption[Index].OptionalData)->BbsIndex,\r
+        (UINT16)-1\r
         );\r
       EfiBootManagerDeleteLoadOptionVariable (BootOption[Index].OptionNumber, BootOption[Index].OptionType);\r
     } else {\r
-      if (((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex != BbsIndex) {\r
-        DEBUG ((DEBUG_INFO, "[LegacyBds] Update Boot Option Boot%04x: %s Bbs0x%04x->Bbs0x%04x\n", (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description,\r
-                (UINTN) ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex, (UINTN) BbsIndex));\r
+      if (((LEGACY_BM_BOOT_OPTION_BBS_DATA *)BootOption[Index].OptionalData)->BbsIndex != BbsIndex) {\r
+        DEBUG ((\r
+          DEBUG_INFO,\r
+          "[LegacyBds] Update Boot Option Boot%04x: %s Bbs0x%04x->Bbs0x%04x\n",\r
+          (UINTN)BootOption[Index].OptionNumber,\r
+          BootOption[Index].Description,\r
+          (UINTN)((LEGACY_BM_BOOT_OPTION_BBS_DATA *)BootOption[Index].OptionalData)->BbsIndex,\r
+          (UINTN)BbsIndex\r
+          ));\r
         //\r
         // Update the BBS index in LegacyDevOrder\r
         //\r
@@ -463,18 +479,19 @@ LegacyBmDeleteAllInvalidBootOptions (
           LegacyDevOrder,\r
           &LegacyDevOrderSize,\r
           LegacyBmDeviceType (BootOption[Index].FilePath),\r
-          ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex,\r
+          ((LEGACY_BM_BOOT_OPTION_BBS_DATA *)BootOption[Index].OptionalData)->BbsIndex,\r
           BbsIndex\r
           );\r
 \r
         //\r
         // Update the OptionalData in the Boot#### variable\r
         //\r
-        ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex = BbsIndex;\r
+        ((LEGACY_BM_BOOT_OPTION_BBS_DATA *)BootOption[Index].OptionalData)->BbsIndex = BbsIndex;\r
         EfiBootManagerLoadOptionToVariable (&BootOption[Index]);\r
       }\r
     }\r
   }\r
+\r
   EfiBootManagerFreeLoadOptions (BootOption, BootOptionCount);\r
 \r
   if (LegacyDevOrder != NULL) {\r
@@ -492,7 +509,8 @@ LegacyBmDeleteAllInvalidBootOptions (
 \r
     FreePool (LegacyDevOrder);\r
   }\r
-  FreePool(BbsIndexUsed);\r
+\r
+  FreePool (BbsIndexUsed);\r
   return Status;\r
 }\r
 \r
@@ -514,13 +532,13 @@ LegacyBmCreateLegacyBootOption (
   IN UINT16                            BbsIndex\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_DEVICE_PATH_PROTOCOL     *DevicePath;\r
-  CHAR16                       Description[LEGACY_BM_BOOT_DESCRIPTION_LENGTH + 1];\r
-  CHAR8                        HelpString[LEGACY_BM_BOOT_DESCRIPTION_LENGTH + 1];\r
-  UINTN                        StringLen;\r
+  EFI_STATUS                      Status;\r
+  EFI_DEVICE_PATH_PROTOCOL        *DevicePath;\r
+  CHAR16                          Description[LEGACY_BM_BOOT_DESCRIPTION_LENGTH + 1];\r
+  CHAR8                           HelpString[LEGACY_BM_BOOT_DESCRIPTION_LENGTH + 1];\r
+  UINTN                           StringLen;\r
   LEGACY_BM_BOOT_OPTION_BBS_DATA  *OptionalData;\r
-  BBS_BBS_DEVICE_PATH          *BbsNode;\r
+  BBS_BBS_DEVICE_PATH             *BbsNode;\r
 \r
   if ((BootOption == NULL) || (BbsEntry == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -532,11 +550,11 @@ LegacyBmCreateLegacyBootOption (
   // Create the BBS device path with description string\r
   //\r
   UnicodeStrToAsciiStrS (Description, HelpString, sizeof (HelpString));\r
-  StringLen = AsciiStrLen (HelpString);\r
+  StringLen  = AsciiStrLen (HelpString);\r
   DevicePath = AllocatePool (sizeof (BBS_BBS_DEVICE_PATH) + StringLen + END_DEVICE_PATH_LENGTH);\r
   ASSERT (DevicePath != NULL);\r
 \r
-  BbsNode = (BBS_BBS_DEVICE_PATH *) DevicePath;\r
+  BbsNode = (BBS_BBS_DEVICE_PATH *)DevicePath;\r
   SetDevicePathNodeLength (BbsNode, sizeof (BBS_BBS_DEVICE_PATH) + StringLen);\r
   BbsNode->Header.Type    = BBS_DEVICE_PATH;\r
   BbsNode->Header.SubType = BBS_BBS_DP;\r
@@ -563,7 +581,7 @@ LegacyBmCreateLegacyBootOption (
              LOAD_OPTION_ACTIVE,\r
              Description,\r
              DevicePath,\r
-             (UINT8 *) OptionalData,\r
+             (UINT8 *)OptionalData,\r
              sizeof (LEGACY_BM_BOOT_OPTION_BBS_DATA)\r
              );\r
   FreePool (DevicePath);\r
@@ -585,13 +603,13 @@ LegacyBmCreateLegacyBootOption (
 **/\r
 UINT16 *\r
 LegacyBmFillDevOrderBuf (\r
-  IN BBS_TABLE                    *BbsTable,\r
-  IN BBS_TYPE                     BbsType,\r
-  IN UINTN                        BbsCount,\r
-  OUT UINT16                      *Buf\r
+  IN BBS_TABLE  *BbsTable,\r
+  IN BBS_TYPE   BbsType,\r
+  IN UINTN      BbsCount,\r
+  OUT UINT16    *Buf\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
 \r
   for (Index = 0; Index < BbsCount; Index++) {\r
     if (!LegacyBmValidBbsEntry (&BbsTable[Index])) {\r
@@ -602,7 +620,7 @@ LegacyBmFillDevOrderBuf (
       continue;\r
     }\r
 \r
-    *Buf = (UINT16) (Index & 0xFF);\r
+    *Buf = (UINT16)(Index & 0xFF);\r
     Buf++;\r
   }\r
 \r
@@ -624,31 +642,31 @@ LegacyBmFillDevOrderBuf (
 **/\r
 EFI_STATUS\r
 LegacyBmCreateDevOrder (\r
-  IN BBS_TABLE                  *BbsTable,\r
-  IN UINT16                     BbsCount\r
+  IN BBS_TABLE  *BbsTable,\r
+  IN UINT16     BbsCount\r
   )\r
 {\r
-  UINTN                       Index;\r
-  UINTN                       FDCount;\r
-  UINTN                       HDCount;\r
-  UINTN                       CDCount;\r
-  UINTN                       NETCount;\r
-  UINTN                       BEVCount;\r
-  UINTN                       TotalSize;\r
-  UINTN                       HeaderSize;\r
-  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
-  LEGACY_DEV_ORDER_ENTRY      *DevOrderPtr;\r
-  EFI_STATUS                  Status;\r
-\r
-  FDCount     = 0;\r
-  HDCount     = 0;\r
-  CDCount     = 0;\r
-  NETCount    = 0;\r
-  BEVCount    = 0;\r
-  TotalSize   = 0;\r
-  HeaderSize  = sizeof (BBS_TYPE) + sizeof (UINT16);\r
-  DevOrder    = NULL;\r
-  Status      = EFI_SUCCESS;\r
+  UINTN                   Index;\r
+  UINTN                   FDCount;\r
+  UINTN                   HDCount;\r
+  UINTN                   CDCount;\r
+  UINTN                   NETCount;\r
+  UINTN                   BEVCount;\r
+  UINTN                   TotalSize;\r
+  UINTN                   HeaderSize;\r
+  LEGACY_DEV_ORDER_ENTRY  *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY  *DevOrderPtr;\r
+  EFI_STATUS              Status;\r
+\r
+  FDCount    = 0;\r
+  HDCount    = 0;\r
+  CDCount    = 0;\r
+  NETCount   = 0;\r
+  BEVCount   = 0;\r
+  TotalSize  = 0;\r
+  HeaderSize = sizeof (BBS_TYPE) + sizeof (UINT16);\r
+  DevOrder   = NULL;\r
+  Status     = EFI_SUCCESS;\r
 \r
   //\r
   // Count all boot devices\r
@@ -659,28 +677,28 @@ LegacyBmCreateDevOrder (
     }\r
 \r
     switch (BbsTable[Index].DeviceType) {\r
-    case BBS_FLOPPY:\r
-      FDCount++;\r
-      break;\r
+      case BBS_FLOPPY:\r
+        FDCount++;\r
+        break;\r
 \r
-    case BBS_HARDDISK:\r
-      HDCount++;\r
-      break;\r
+      case BBS_HARDDISK:\r
+        HDCount++;\r
+        break;\r
 \r
-    case BBS_CDROM:\r
-      CDCount++;\r
-      break;\r
+      case BBS_CDROM:\r
+        CDCount++;\r
+        break;\r
 \r
-    case BBS_EMBED_NETWORK:\r
-      NETCount++;\r
-      break;\r
+      case BBS_EMBED_NETWORK:\r
+        NETCount++;\r
+        break;\r
 \r
-    case BBS_BEV_DEVICE:\r
-      BEVCount++;\r
-      break;\r
+      case BBS_BEV_DEVICE:\r
+        BEVCount++;\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   }\r
 \r
@@ -697,29 +715,30 @@ LegacyBmCreateDevOrder (
   if (NULL == DevOrder) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  DevOrderPtr          = DevOrder;\r
+\r
+  DevOrderPtr = DevOrder;\r
 \r
   DevOrderPtr->BbsType = BBS_FLOPPY;\r
-  DevOrderPtr->Length  = (UINT16) (sizeof (DevOrderPtr->Length) + FDCount * sizeof (UINT16));\r
-  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) LegacyBmFillDevOrderBuf (BbsTable, BBS_FLOPPY, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr->Length  = (UINT16)(sizeof (DevOrderPtr->Length) + FDCount * sizeof (UINT16));\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *)LegacyBmFillDevOrderBuf (BbsTable, BBS_FLOPPY, BbsCount, DevOrderPtr->Data);\r
 \r
   DevOrderPtr->BbsType = BBS_HARDDISK;\r
-  DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16));\r
-  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) LegacyBmFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr->Length  = (UINT16)(sizeof (UINT16) + HDCount * sizeof (UINT16));\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *)LegacyBmFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data);\r
 \r
   DevOrderPtr->BbsType = BBS_CDROM;\r
-  DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16));\r
-  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) LegacyBmFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr->Length  = (UINT16)(sizeof (UINT16) + CDCount * sizeof (UINT16));\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *)LegacyBmFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data);\r
 \r
   DevOrderPtr->BbsType = BBS_EMBED_NETWORK;\r
-  DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16));\r
-  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) LegacyBmFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr->Length  = (UINT16)(sizeof (UINT16) + NETCount * sizeof (UINT16));\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *)LegacyBmFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data);\r
 \r
   DevOrderPtr->BbsType = BBS_BEV_DEVICE;\r
-  DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));\r
-  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) LegacyBmFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr->Length  = (UINT16)(sizeof (UINT16) + BEVCount * sizeof (UINT16));\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *)LegacyBmFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);\r
 \r
-  ASSERT (TotalSize == ((UINTN) DevOrderPtr - (UINTN) DevOrder));\r
+  ASSERT (TotalSize == ((UINTN)DevOrderPtr - (UINTN)DevOrder));\r
 \r
   //\r
   // Save device order for legacy boot device to variable.\r
@@ -751,54 +770,54 @@ LegacyBmUpdateDevOrder (
   VOID\r
   )\r
 {\r
-  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
-  LEGACY_DEV_ORDER_ENTRY      *NewDevOrder;\r
-  LEGACY_DEV_ORDER_ENTRY      *Ptr;\r
-  LEGACY_DEV_ORDER_ENTRY      *NewPtr;\r
-  EFI_LEGACY_BIOS_PROTOCOL    *LegacyBios;\r
-  EFI_STATUS                  Status;\r
-  UINT16                      HddCount;\r
-  UINT16                      BbsCount;\r
-  HDD_INFO                    *LocalHddInfo;\r
-  BBS_TABLE                   *LocalBbsTable;\r
-  UINTN                       Index;\r
-  UINTN                       Index2;\r
-  UINTN                       *Idx;\r
-  UINTN                       FDCount;\r
-  UINTN                       HDCount;\r
-  UINTN                       CDCount;\r
-  UINTN                       NETCount;\r
-  UINTN                       BEVCount;\r
-  UINTN                       TotalSize;\r
-  UINTN                       HeaderSize;\r
-  UINT16                      *NewFDPtr;\r
-  UINT16                      *NewHDPtr;\r
-  UINT16                      *NewCDPtr;\r
-  UINT16                      *NewNETPtr;\r
-  UINT16                      *NewBEVPtr;\r
-  UINT16                      *NewDevPtr;\r
-  UINTN                       FDIndex;\r
-  UINTN                       HDIndex;\r
-  UINTN                       CDIndex;\r
-  UINTN                       NETIndex;\r
-  UINTN                       BEVIndex;\r
-\r
-  Idx           = NULL;\r
-  FDCount       = 0;\r
-  HDCount       = 0;\r
-  CDCount       = 0;\r
-  NETCount      = 0;\r
-  BEVCount      = 0;\r
-  TotalSize     = 0;\r
-  HeaderSize    = sizeof (BBS_TYPE) + sizeof (UINT16);\r
-  FDIndex       = 0;\r
-  HDIndex       = 0;\r
-  CDIndex       = 0;\r
-  NETIndex      = 0;\r
-  BEVIndex      = 0;\r
-  NewDevPtr     = NULL;\r
-\r
-  Status        = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
+  LEGACY_DEV_ORDER_ENTRY    *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY    *NewDevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY    *Ptr;\r
+  LEGACY_DEV_ORDER_ENTRY    *NewPtr;\r
+  EFI_LEGACY_BIOS_PROTOCOL  *LegacyBios;\r
+  EFI_STATUS                Status;\r
+  UINT16                    HddCount;\r
+  UINT16                    BbsCount;\r
+  HDD_INFO                  *LocalHddInfo;\r
+  BBS_TABLE                 *LocalBbsTable;\r
+  UINTN                     Index;\r
+  UINTN                     Index2;\r
+  UINTN                     *Idx;\r
+  UINTN                     FDCount;\r
+  UINTN                     HDCount;\r
+  UINTN                     CDCount;\r
+  UINTN                     NETCount;\r
+  UINTN                     BEVCount;\r
+  UINTN                     TotalSize;\r
+  UINTN                     HeaderSize;\r
+  UINT16                    *NewFDPtr;\r
+  UINT16                    *NewHDPtr;\r
+  UINT16                    *NewCDPtr;\r
+  UINT16                    *NewNETPtr;\r
+  UINT16                    *NewBEVPtr;\r
+  UINT16                    *NewDevPtr;\r
+  UINTN                     FDIndex;\r
+  UINTN                     HDIndex;\r
+  UINTN                     CDIndex;\r
+  UINTN                     NETIndex;\r
+  UINTN                     BEVIndex;\r
+\r
+  Idx        = NULL;\r
+  FDCount    = 0;\r
+  HDCount    = 0;\r
+  CDCount    = 0;\r
+  NETCount   = 0;\r
+  BEVCount   = 0;\r
+  TotalSize  = 0;\r
+  HeaderSize = sizeof (BBS_TYPE) + sizeof (UINT16);\r
+  FDIndex    = 0;\r
+  HDIndex    = 0;\r
+  CDIndex    = 0;\r
+  NETIndex   = 0;\r
+  BEVIndex   = 0;\r
+  NewDevPtr  = NULL;\r
+\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -814,10 +833,11 @@ LegacyBmUpdateDevOrder (
     return Status;\r
   }\r
 \r
-  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **) &DevOrder, NULL);\r
+  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **)&DevOrder, NULL);\r
   if (NULL == DevOrder) {\r
     return LegacyBmCreateDevOrder (LocalBbsTable, BbsCount);\r
   }\r
+\r
   //\r
   // First we figure out how many boot devices with same device type respectively\r
   //\r
@@ -827,28 +847,28 @@ LegacyBmUpdateDevOrder (
     }\r
 \r
     switch (LocalBbsTable[Index].DeviceType) {\r
-    case BBS_FLOPPY:\r
-      FDCount++;\r
-      break;\r
+      case BBS_FLOPPY:\r
+        FDCount++;\r
+        break;\r
 \r
-    case BBS_HARDDISK:\r
-      HDCount++;\r
-      break;\r
+      case BBS_HARDDISK:\r
+        HDCount++;\r
+        break;\r
 \r
-    case BBS_CDROM:\r
-      CDCount++;\r
-      break;\r
+      case BBS_CDROM:\r
+        CDCount++;\r
+        break;\r
 \r
-    case BBS_EMBED_NETWORK:\r
-      NETCount++;\r
-      break;\r
+      case BBS_EMBED_NETWORK:\r
+        NETCount++;\r
+        break;\r
 \r
-    case BBS_BEV_DEVICE:\r
-      BEVCount++;\r
-      break;\r
+      case BBS_BEV_DEVICE:\r
+        BEVCount++;\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   }\r
 \r
@@ -869,93 +889,103 @@ LegacyBmUpdateDevOrder (
   Ptr             = DevOrder;\r
   NewPtr          = NewDevOrder;\r
   NewPtr->BbsType = Ptr->BbsType;\r
-  NewPtr->Length  = (UINT16) (sizeof (UINT16) + FDCount * sizeof (UINT16));\r
+  NewPtr->Length  = (UINT16)(sizeof (UINT16) + FDCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
     if (!LegacyBmValidBbsEntry (&LocalBbsTable[Ptr->Data[Index] & 0xFF]) ||\r
-        LocalBbsTable[Ptr->Data[Index] & 0xFF].DeviceType != BBS_FLOPPY\r
-        ) {\r
+        (LocalBbsTable[Ptr->Data[Index] & 0xFF].DeviceType != BBS_FLOPPY)\r
+        )\r
+    {\r
       continue;\r
     }\r
 \r
     NewPtr->Data[FDIndex] = Ptr->Data[Index];\r
     FDIndex++;\r
   }\r
+\r
   NewFDPtr = NewPtr->Data;\r
 \r
   //\r
   // copy HD\r
   //\r
-  Ptr             = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr          = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr             = (LEGACY_DEV_ORDER_ENTRY *)(&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr          = (LEGACY_DEV_ORDER_ENTRY *)(&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
-  NewPtr->Length  = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16));\r
+  NewPtr->Length  = (UINT16)(sizeof (UINT16) + HDCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
     if (!LegacyBmValidBbsEntry (&LocalBbsTable[Ptr->Data[Index] & 0xFF]) ||\r
-        LocalBbsTable[Ptr->Data[Index] & 0xFF].DeviceType != BBS_HARDDISK\r
-        ) {\r
+        (LocalBbsTable[Ptr->Data[Index] & 0xFF].DeviceType != BBS_HARDDISK)\r
+        )\r
+    {\r
       continue;\r
     }\r
 \r
     NewPtr->Data[HDIndex] = Ptr->Data[Index];\r
     HDIndex++;\r
   }\r
+\r
   NewHDPtr = NewPtr->Data;\r
 \r
   //\r
   // copy CD\r
   //\r
-  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr             = (LEGACY_DEV_ORDER_ENTRY *)(&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr          = (LEGACY_DEV_ORDER_ENTRY *)(&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
-  NewPtr->Length  = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16));\r
+  NewPtr->Length  = (UINT16)(sizeof (UINT16) + CDCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
     if (!LegacyBmValidBbsEntry (&LocalBbsTable[Ptr->Data[Index] & 0xFF]) ||\r
-        LocalBbsTable[Ptr->Data[Index] & 0xFF].DeviceType != BBS_CDROM\r
-        ) {\r
+        (LocalBbsTable[Ptr->Data[Index] & 0xFF].DeviceType != BBS_CDROM)\r
+        )\r
+    {\r
       continue;\r
     }\r
 \r
     NewPtr->Data[CDIndex] = Ptr->Data[Index];\r
     CDIndex++;\r
   }\r
+\r
   NewCDPtr = NewPtr->Data;\r
 \r
   //\r
   // copy NET\r
   //\r
-  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr             = (LEGACY_DEV_ORDER_ENTRY *)(&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr          = (LEGACY_DEV_ORDER_ENTRY *)(&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
-  NewPtr->Length  = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16));\r
+  NewPtr->Length  = (UINT16)(sizeof (UINT16) + NETCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
     if (!LegacyBmValidBbsEntry (&LocalBbsTable[Ptr->Data[Index] & 0xFF]) ||\r
-        LocalBbsTable[Ptr->Data[Index] & 0xFF].DeviceType != BBS_EMBED_NETWORK\r
-        ) {\r
+        (LocalBbsTable[Ptr->Data[Index] & 0xFF].DeviceType != BBS_EMBED_NETWORK)\r
+        )\r
+    {\r
       continue;\r
     }\r
 \r
     NewPtr->Data[NETIndex] = Ptr->Data[Index];\r
     NETIndex++;\r
   }\r
+\r
   NewNETPtr = NewPtr->Data;\r
 \r
   //\r
   // copy BEV\r
   //\r
-  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr             = (LEGACY_DEV_ORDER_ENTRY *)(&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr          = (LEGACY_DEV_ORDER_ENTRY *)(&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
-  NewPtr->Length  = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));\r
+  NewPtr->Length  = (UINT16)(sizeof (UINT16) + BEVCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
     if (!LegacyBmValidBbsEntry (&LocalBbsTable[Ptr->Data[Index] & 0xFF]) ||\r
-        LocalBbsTable[Ptr->Data[Index] & 0xFF].DeviceType != BBS_BEV_DEVICE\r
-        ) {\r
+        (LocalBbsTable[Ptr->Data[Index] & 0xFF].DeviceType != BBS_BEV_DEVICE)\r
+        )\r
+    {\r
       continue;\r
     }\r
 \r
     NewPtr->Data[BEVIndex] = Ptr->Data[Index];\r
     BEVIndex++;\r
   }\r
+\r
   NewBEVPtr = NewPtr->Data;\r
 \r
   for (Index = 0; Index < BbsCount; Index++) {\r
@@ -964,42 +994,43 @@ LegacyBmUpdateDevOrder (
     }\r
 \r
     switch (LocalBbsTable[Index].DeviceType) {\r
-    case BBS_FLOPPY:\r
-      Idx       = &FDIndex;\r
-      NewDevPtr = NewFDPtr;\r
-      break;\r
+      case BBS_FLOPPY:\r
+        Idx       = &FDIndex;\r
+        NewDevPtr = NewFDPtr;\r
+        break;\r
 \r
-    case BBS_HARDDISK:\r
-      Idx       = &HDIndex;\r
-      NewDevPtr = NewHDPtr;\r
-      break;\r
+      case BBS_HARDDISK:\r
+        Idx       = &HDIndex;\r
+        NewDevPtr = NewHDPtr;\r
+        break;\r
 \r
-    case BBS_CDROM:\r
-      Idx       = &CDIndex;\r
-      NewDevPtr = NewCDPtr;\r
-      break;\r
+      case BBS_CDROM:\r
+        Idx       = &CDIndex;\r
+        NewDevPtr = NewCDPtr;\r
+        break;\r
 \r
-    case BBS_EMBED_NETWORK:\r
-      Idx       = &NETIndex;\r
-      NewDevPtr = NewNETPtr;\r
-      break;\r
+      case BBS_EMBED_NETWORK:\r
+        Idx       = &NETIndex;\r
+        NewDevPtr = NewNETPtr;\r
+        break;\r
 \r
-    case BBS_BEV_DEVICE:\r
-      Idx       = &BEVIndex;\r
-      NewDevPtr = NewBEVPtr;\r
-      break;\r
+      case BBS_BEV_DEVICE:\r
+        Idx       = &BEVIndex;\r
+        NewDevPtr = NewBEVPtr;\r
+        break;\r
 \r
-    default:\r
-      Idx = NULL;\r
-      break;\r
+      default:\r
+        Idx = NULL;\r
+        break;\r
     }\r
+\r
     //\r
     // at this point we have copied those valid indexes to new buffer\r
     // and we should check if there is any new appeared boot device\r
     //\r
     if (Idx != NULL) {\r
       for (Index2 = 0; Index2 < *Idx; Index2++) {\r
-        if ((NewDevPtr[Index2] & 0xFF) == (UINT16) Index) {\r
+        if ((NewDevPtr[Index2] & 0xFF) == (UINT16)Index) {\r
           break;\r
         }\r
       }\r
@@ -1015,8 +1046,9 @@ LegacyBmUpdateDevOrder (
             break;\r
           }\r
         }\r
+\r
         CopyMem (&NewDevPtr[Index2 + 1], &NewDevPtr[Index2], (*Idx - Index2) * sizeof (UINT16));\r
-        NewDevPtr[Index2] = (UINT16) (Index & 0xFF);\r
+        NewDevPtr[Index2] = (UINT16)(Index & 0xFF);\r
         (*Idx)++;\r
       }\r
     }\r
@@ -1051,37 +1083,37 @@ LegacyBmUpdateDevOrder (
 **/\r
 EFI_STATUS\r
 LegacyBmSetPriorityForSameTypeDev (\r
-  IN UINT16                                              DeviceType,\r
-  IN UINTN                                               BbsIndex,\r
-  IN OUT BBS_TABLE                                       *LocalBbsTable,\r
-  IN OUT UINT16                                          *Priority\r
+  IN UINT16         DeviceType,\r
+  IN UINTN          BbsIndex,\r
+  IN OUT BBS_TABLE  *LocalBbsTable,\r
+  IN OUT UINT16     *Priority\r
   )\r
 {\r
-  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
-  LEGACY_DEV_ORDER_ENTRY      *DevOrderPtr;\r
-  UINTN                       DevOrderSize;\r
-  UINTN                       Index;\r
+  LEGACY_DEV_ORDER_ENTRY  *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY  *DevOrderPtr;\r
+  UINTN                   DevOrderSize;\r
+  UINTN                   Index;\r
 \r
-  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **) &DevOrder, &DevOrderSize);\r
+  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **)&DevOrder, &DevOrderSize);\r
   if (NULL == DevOrder) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   DevOrderPtr = DevOrder;\r
-  while ((UINT8 *) DevOrderPtr < (UINT8 *) DevOrder + DevOrderSize) {\r
+  while ((UINT8 *)DevOrderPtr < (UINT8 *)DevOrder + DevOrderSize) {\r
     if (DevOrderPtr->BbsType == DeviceType) {\r
       break;\r
     }\r
 \r
-    DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) ((UINTN) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);\r
+    DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *)((UINTN)DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);\r
   }\r
 \r
-  if ((UINT8 *) DevOrderPtr >= (UINT8 *) DevOrder + DevOrderSize) {\r
+  if ((UINT8 *)DevOrderPtr >= (UINT8 *)DevOrder + DevOrderSize) {\r
     FreePool (DevOrder);\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  if (BbsIndex != (UINTN) -1) {\r
+  if (BbsIndex != (UINTN)-1) {\r
     //\r
     // In case the BBS entry isn't valid because devices were plugged or removed.\r
     //\r
@@ -1089,9 +1121,11 @@ LegacyBmSetPriorityForSameTypeDev (
       FreePool (DevOrder);\r
       return EFI_NOT_FOUND;\r
     }\r
+\r
     LocalBbsTable[BbsIndex].BootPriority = *Priority;\r
     (*Priority)++;\r
   }\r
+\r
   //\r
   // If the high byte of the DevIndex is 0xFF, it indicates that this device has been disabled.\r
   //\r
@@ -1134,20 +1168,20 @@ LegacyBmPrintBbsTable (
 \r
     DEBUG (\r
       (DEBUG_INFO,\r
-      " %02x: %04x %02x/%02x/%02x %02x/%02x %04x %04x %04x:%04x\n",\r
-      (UINTN) Index,\r
-      (UINTN) LocalBbsTable[Index].BootPriority,\r
-      (UINTN) LocalBbsTable[Index].Bus,\r
-      (UINTN) LocalBbsTable[Index].Device,\r
-      (UINTN) LocalBbsTable[Index].Function,\r
-      (UINTN) LocalBbsTable[Index].Class,\r
-      (UINTN) LocalBbsTable[Index].SubClass,\r
-      (UINTN) LocalBbsTable[Index].DeviceType,\r
-      (UINTN) * (UINT16 *) &LocalBbsTable[Index].StatusFlags,\r
-      (UINTN) LocalBbsTable[Index].BootHandlerSegment,\r
-      (UINTN) LocalBbsTable[Index].BootHandlerOffset,\r
-      (UINTN) ((LocalBbsTable[Index].MfgStringSegment << 4) + LocalBbsTable[Index].MfgStringOffset),\r
-      (UINTN) ((LocalBbsTable[Index].DescStringSegment << 4) + LocalBbsTable[Index].DescStringOffset))\r
+       " %02x: %04x %02x/%02x/%02x %02x/%02x %04x %04x %04x:%04x\n",\r
+       (UINTN)Index,\r
+       (UINTN)LocalBbsTable[Index].BootPriority,\r
+       (UINTN)LocalBbsTable[Index].Bus,\r
+       (UINTN)LocalBbsTable[Index].Device,\r
+       (UINTN)LocalBbsTable[Index].Function,\r
+       (UINTN)LocalBbsTable[Index].Class,\r
+       (UINTN)LocalBbsTable[Index].SubClass,\r
+       (UINTN)LocalBbsTable[Index].DeviceType,\r
+       (UINTN)*(UINT16 *)&LocalBbsTable[Index].StatusFlags,\r
+       (UINTN)LocalBbsTable[Index].BootHandlerSegment,\r
+       (UINTN)LocalBbsTable[Index].BootHandlerOffset,\r
+       (UINTN)((LocalBbsTable[Index].MfgStringSegment << 4) + LocalBbsTable[Index].MfgStringOffset),\r
+       (UINTN)((LocalBbsTable[Index].DescStringSegment << 4) + LocalBbsTable[Index].DescStringOffset))\r
       );\r
   }\r
 \r
@@ -1165,7 +1199,7 @@ LegacyBmPrintBbsTable (
 **/\r
 EFI_STATUS\r
 LegacyBmRefreshBbsTableForBoot (\r
-  IN EFI_BOOT_MANAGER_LOAD_OPTION        *BootOption\r
+  IN EFI_BOOT_MANAGER_LOAD_OPTION  *BootOption\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -1190,7 +1224,7 @@ LegacyBmRefreshBbsTableForBoot (
   LocalBbsTable = NULL;\r
   DevType       = BBS_UNKNOWN;\r
 \r
-  Status        = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1215,38 +1249,42 @@ LegacyBmRefreshBbsTableForBoot (
       LocalBbsTable[Index].BootPriority = BBS_UNPRIORITIZED_ENTRY;\r
     }\r
   }\r
+\r
   //\r
   // boot priority always starts at 0\r
   //\r
   Priority = 0;\r
   if ((DevicePathType (BootOption->FilePath) == BBS_DEVICE_PATH) &&\r
-      (DevicePathSubType (BootOption->FilePath) == BBS_BBS_DP)) {\r
+      (DevicePathSubType (BootOption->FilePath) == BBS_BBS_DP))\r
+  {\r
     //\r
     // If BootOption stands for a legacy boot option, we prioritize the devices with the same type first.\r
     //\r
     DevType  = LegacyBmDeviceType (BootOption->FilePath);\r
-    BbsIndex = ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption->OptionalData)->BbsIndex;\r
-    Status = LegacyBmSetPriorityForSameTypeDev (\r
-               DevType,\r
-               BbsIndex,\r
-               LocalBbsTable,\r
-               &Priority\r
-               );\r
+    BbsIndex = ((LEGACY_BM_BOOT_OPTION_BBS_DATA *)BootOption->OptionalData)->BbsIndex;\r
+    Status   = LegacyBmSetPriorityForSameTypeDev (\r
+                 DevType,\r
+                 BbsIndex,\r
+                 LocalBbsTable,\r
+                 &Priority\r
+                 );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
   }\r
+\r
   //\r
   // we have to set the boot priority for other BBS entries with different device types\r
   //\r
-  Option          = EfiBootManagerGetLoadOptions (&OptionCount, LoadOptionTypeBoot);\r
-  DeviceType      = AllocatePool (sizeof (UINT16) * OptionCount);\r
+  Option     = EfiBootManagerGetLoadOptions (&OptionCount, LoadOptionTypeBoot);\r
+  DeviceType = AllocatePool (sizeof (UINT16) * OptionCount);\r
   ASSERT (DeviceType != NULL);\r
   DeviceType[0]   = DevType;\r
   DeviceTypeCount = 1;\r
   for (Index = 0; Index < OptionCount; Index++) {\r
     if ((DevicePathType (Option[Index].FilePath) != BBS_DEVICE_PATH) ||\r
-        (DevicePathSubType (Option[Index].FilePath) != BBS_BBS_DP)) {\r
+        (DevicePathSubType (Option[Index].FilePath) != BBS_BBS_DP))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -1256,6 +1294,7 @@ LegacyBmRefreshBbsTableForBoot (
         break;\r
       }\r
     }\r
+\r
     if (DeviceTypeIndex < DeviceTypeCount) {\r
       //\r
       // We don't want to process twice for a device type\r
@@ -1268,21 +1307,21 @@ LegacyBmRefreshBbsTableForBoot (
 \r
     Status = LegacyBmSetPriorityForSameTypeDev (\r
                DevType,\r
-               (UINTN) -1,\r
+               (UINTN)-1,\r
                LocalBbsTable,\r
                &Priority\r
                );\r
   }\r
+\r
   EfiBootManagerFreeLoadOptions (Option, OptionCount);\r
 \r
-  DEBUG_CODE_BEGIN();\r
-    LegacyBmPrintBbsTable (LocalBbsTable, BbsCount);\r
-  DEBUG_CODE_END();\r
+  DEBUG_CODE_BEGIN ();\r
+  LegacyBmPrintBbsTable (LocalBbsTable, BbsCount);\r
+  DEBUG_CODE_END ();\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Boot the legacy system with the boot option.\r
 \r
@@ -1295,13 +1334,13 @@ LegacyBmRefreshBbsTableForBoot (
 VOID\r
 EFIAPI\r
 LegacyBmBoot (\r
-  IN  EFI_BOOT_MANAGER_LOAD_OPTION           *BootOption\r
+  IN  EFI_BOOT_MANAGER_LOAD_OPTION  *BootOption\r
   )\r
 {\r
   EFI_STATUS                Status;\r
   EFI_LEGACY_BIOS_PROTOCOL  *LegacyBios;\r
 \r
-  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // If no LegacyBios protocol we do not support legacy boot\r
@@ -1309,6 +1348,7 @@ LegacyBmBoot (
     BootOption->Status = EFI_UNSUPPORTED;\r
     return;\r
   }\r
+\r
   //\r
   // Notes: if we separate the int 19, then we don't need to refresh BBS\r
   //\r
@@ -1320,7 +1360,7 @@ LegacyBmBoot (
 \r
   BootOption->Status = LegacyBios->LegacyBoot (\r
                                      LegacyBios,\r
-                                     (BBS_BBS_DEVICE_PATH *) BootOption->FilePath,\r
+                                     (BBS_BBS_DEVICE_PATH *)BootOption->FilePath,\r
                                      BootOption->OptionalDataSize,\r
                                      BootOption->OptionalData\r
                                      );\r
@@ -1335,7 +1375,7 @@ LegacyBmBoot (
 **/\r
 EFI_BOOT_MANAGER_LOAD_OPTION *\r
 LegacyBmEnumerateAllBootOptions (\r
-  UINTN                         *BootOptionCount\r
+  UINTN  *BootOptionCount\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -1353,7 +1393,7 @@ LegacyBmEnumerateAllBootOptions (
   *BootOptionCount = 0;\r
   BbsCount         = 0;\r
 \r
-  Status        = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
   }\r
@@ -1402,19 +1442,20 @@ LegacyBmEnumerateAllBootOptions (
 **/\r
 INTN\r
 LegacyBmFindBootOption (\r
-  IN CONST EFI_BOOT_MANAGER_LOAD_OPTION *Key,\r
-  IN CONST EFI_BOOT_MANAGER_LOAD_OPTION *Array,\r
-  IN UINTN                              Count\r
+  IN CONST EFI_BOOT_MANAGER_LOAD_OPTION  *Key,\r
+  IN CONST EFI_BOOT_MANAGER_LOAD_OPTION  *Array,\r
+  IN UINTN                               Count\r
   )\r
 {\r
-  UINTN                             Index;\r
+  UINTN  Index;\r
 \r
   for (Index = 0; Index < Count; Index++) {\r
     if ((StrCmp (Key->Description, Array[Index].Description) == 0) &&\r
         (CompareMem (Key->FilePath, Array[Index].FilePath, GetDevicePathSize (Key->FilePath)) == 0) &&\r
         (Key->OptionalDataSize == Array[Index].OptionalDataSize) &&\r
-        (CompareMem (Key->OptionalData, Array[Index].OptionalData, Key->OptionalDataSize) == 0)) {\r
-      return (INTN) Index;\r
+        (CompareMem (Key->OptionalData, Array[Index].OptionalData, Key->OptionalDataSize) == 0))\r
+    {\r
+      return (INTN)Index;\r
     }\r
   }\r
 \r
@@ -1431,25 +1472,26 @@ LegacyBmRefreshAllBootOption (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                                 Status;\r
-  EFI_LEGACY_BIOS_PROTOCOL                   *LegacyBios;\r
-  UINTN                                      RootBridgeHandleCount;\r
-  EFI_HANDLE                                 *RootBridgeHandleBuffer;\r
-  UINTN                                      HandleCount;\r
-  EFI_HANDLE                                 *HandleBuffer;\r
-  UINTN                                      RootBridgeIndex;\r
-  UINTN                                      Index;\r
-  UINTN                                      Flags;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION               *BootOptions;\r
-  UINTN                                      BootOptionCount;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION               *ExistingBootOptions;\r
-  UINTN                                      ExistingBootOptionCount;\r
-\r
-  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
+  EFI_STATUS                    Status;\r
+  EFI_LEGACY_BIOS_PROTOCOL      *LegacyBios;\r
+  UINTN                         RootBridgeHandleCount;\r
+  EFI_HANDLE                    *RootBridgeHandleBuffer;\r
+  UINTN                         HandleCount;\r
+  EFI_HANDLE                    *HandleBuffer;\r
+  UINTN                         RootBridgeIndex;\r
+  UINTN                         Index;\r
+  UINTN                         Flags;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  *BootOptions;\r
+  UINTN                         BootOptionCount;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  *ExistingBootOptions;\r
+  UINTN                         ExistingBootOptionCount;\r
+\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     LegacyBmDeleteAllBootOptions ();\r
     return;\r
   }\r
+\r
   PERF_START (NULL, "LegacyBootOptionEnum", "BDS", 0);\r
 \r
   //\r
@@ -1500,15 +1542,16 @@ LegacyBmRefreshAllBootOption (
   LegacyBmDeleteAllInvalidBootOptions ();\r
 \r
   ExistingBootOptions = EfiBootManagerGetLoadOptions (&ExistingBootOptionCount, LoadOptionTypeBoot);\r
-  BootOptions         = LegacyBmEnumerateAllBootOptions   (&BootOptionCount);\r
+  BootOptions         = LegacyBmEnumerateAllBootOptions (&BootOptionCount);\r
 \r
   for (Index = 0; Index < BootOptionCount; Index++) {\r
     if (LegacyBmFindBootOption (&BootOptions[Index], ExistingBootOptions, ExistingBootOptionCount) == -1) {\r
-      Status = EfiBootManagerAddLoadOptionVariable (&BootOptions[Index], (UINTN) -1);\r
+      Status = EfiBootManagerAddLoadOptionVariable (&BootOptions[Index], (UINTN)-1);\r
       DEBUG ((\r
-        DEBUG_INFO, "[LegacyBds] New Boot Option: Boot%04x Bbs0x%04x %s %r\n",\r
-        (UINTN) BootOptions[Index].OptionNumber,\r
-        (UINTN) ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOptions[Index].OptionalData)->BbsIndex,\r
+        DEBUG_INFO,\r
+        "[LegacyBds] New Boot Option: Boot%04x Bbs0x%04x %s %r\n",\r
+        (UINTN)BootOptions[Index].OptionNumber,\r
+        (UINTN)((LEGACY_BM_BOOT_OPTION_BBS_DATA *)BootOptions[Index].OptionalData)->BbsIndex,\r
         BootOptions[Index].Description,\r
         Status\r
         ));\r
@@ -1519,12 +1562,12 @@ LegacyBmRefreshAllBootOption (
   }\r
 \r
   EfiBootManagerFreeLoadOptions (ExistingBootOptions, ExistingBootOptionCount);\r
-  EfiBootManagerFreeLoadOptions (BootOptions,         BootOptionCount);\r
+  EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);\r
 \r
   //\r
   // Failure to create LegacyDevOrder variable only impacts the boot order.\r
   //\r
   LegacyBmUpdateDevOrder ();\r
 \r
-  PERF_END   (NULL, "LegacyBootOptionEnum", "BDS", 0);\r
+  PERF_END (NULL, "LegacyBootOptionEnum", "BDS", 0);\r
 }\r
index 766ad1e59f472e8fe38f92e17b9fe77fc2c9df80..99558e97eb6756d3cdb78689bf2ee6b3a0b22926 100644 (file)
 //\r
 // This is needed for runtime variable access.\r
 //\r
-EFI_EVENT   mEmuVarsFvbAddrChangeEvent = NULL;\r
+EFI_EVENT  mEmuVarsFvbAddrChangeEvent = NULL;\r
 \r
 //\r
 // This is the single instance supported by this driver.  It\r
 // supports the FVB and Device Path protocols.\r
 //\r
-EFI_FW_VOL_BLOCK_DEVICE mEmuVarsFvb = {\r
+EFI_FW_VOL_BLOCK_DEVICE  mEmuVarsFvb = {\r
   FVB_DEVICE_SIGNATURE,\r
   {     // DevicePath\r
     {\r
@@ -67,9 +67,9 @@ EFI_FW_VOL_BLOCK_DEVICE mEmuVarsFvb = {
       }\r
     }\r
   },\r
-  NULL, // BufferPtr\r
+  NULL,               // BufferPtr\r
   EMU_FVB_BLOCK_SIZE, // BlockSize\r
-  EMU_FVB_SIZE, // Size\r
+  EMU_FVB_SIZE,       // Size\r
   {     // FwVolBlockInstance\r
     FvbProtocolGetAttributes,\r
     FvbProtocolSetAttributes,\r
@@ -82,7 +82,6 @@ EFI_FW_VOL_BLOCK_DEVICE mEmuVarsFvb = {
   },\r
 };\r
 \r
-\r
 /**\r
   Notification function of EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE.\r
 \r
@@ -96,14 +95,13 @@ EFI_FW_VOL_BLOCK_DEVICE mEmuVarsFvb = {
 VOID\r
 EFIAPI\r
 FvbVirtualAddressChangeEvent (\r
-  IN EFI_EVENT        Event,\r
-  IN VOID             *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
   EfiConvertPointer (0x0, &mEmuVarsFvb.BufferPtr);\r
 }\r
 \r
-\r
 //\r
 // FVB protocol APIs\r
 //\r
@@ -128,20 +126,19 @@ FvbVirtualAddressChangeEvent (
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetPhysicalAddress (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  OUT       EFI_PHYSICAL_ADDRESS                *Address\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  OUT       EFI_PHYSICAL_ADDRESS                 *Address\r
   )\r
 {\r
-  EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+  EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice;\r
 \r
   FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
 \r
-  *Address = (EFI_PHYSICAL_ADDRESS)(UINTN) FvbDevice->BufferPtr;\r
+  *Address = (EFI_PHYSICAL_ADDRESS)(UINTN)FvbDevice->BufferPtr;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   The GetBlockSize() function retrieves the size of the requested\r
   block. It also returns the number of additional blocks with\r
@@ -171,13 +168,13 @@ FvbProtocolGetPhysicalAddress (
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetBlockSize (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN        EFI_LBA                             Lba,\r
-  OUT       UINTN                               *BlockSize,\r
-  OUT       UINTN                               *NumberOfBlocks\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN        EFI_LBA                              Lba,\r
+  OUT       UINTN                                *BlockSize,\r
+  OUT       UINTN                                *NumberOfBlocks\r
   )\r
 {\r
-  EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+  EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice;\r
 \r
   if (Lba >= EMU_FVB_NUM_TOTAL_BLOCKS) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -185,13 +182,12 @@ FvbProtocolGetBlockSize (
 \r
   FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
 \r
-  *BlockSize = FvbDevice->BlockSize;\r
+  *BlockSize      = FvbDevice->BlockSize;\r
   *NumberOfBlocks = (UINTN)(EMU_FVB_NUM_TOTAL_BLOCKS - Lba);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   The GetAttributes() function retrieves the attributes and\r
   current settings of the block. Status Codes Returned\r
@@ -210,23 +206,22 @@ FvbProtocolGetBlockSize (
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetAttributes (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  OUT       EFI_FVB_ATTRIBUTES_2                *Attributes\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  OUT       EFI_FVB_ATTRIBUTES_2                 *Attributes\r
   )\r
 {\r
   *Attributes =\r
-    (EFI_FVB_ATTRIBUTES_2) (\r
-      EFI_FVB2_READ_ENABLED_CAP |\r
-      EFI_FVB2_READ_STATUS |\r
-      EFI_FVB2_WRITE_ENABLED_CAP |\r
-      EFI_FVB2_WRITE_STATUS |\r
-      EFI_FVB2_ERASE_POLARITY\r
-      );\r
+    (EFI_FVB_ATTRIBUTES_2)(\r
+                           EFI_FVB2_READ_ENABLED_CAP |\r
+                           EFI_FVB2_READ_STATUS |\r
+                           EFI_FVB2_WRITE_ENABLED_CAP |\r
+                           EFI_FVB2_WRITE_STATUS |\r
+                           EFI_FVB2_ERASE_POLARITY\r
+                           );\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   The SetAttributes() function sets configurable firmware volume\r
   attributes and returns the new settings of the firmware volume.\r
@@ -252,14 +247,13 @@ FvbProtocolGetAttributes (
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN OUT    EFI_FVB_ATTRIBUTES_2                *Attributes\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN OUT    EFI_FVB_ATTRIBUTES_2                 *Attributes\r
   )\r
 {\r
   return EFI_ACCESS_DENIED;\r
 }\r
 \r
-\r
 /**\r
   Erases and initializes a firmware volume block.\r
 \r
@@ -311,16 +305,16 @@ FvbProtocolSetAttributes (
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolEraseBlocks (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
   ...\r
   )\r
 {\r
-  EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
-  VA_LIST                 Args;\r
-  EFI_LBA                 StartingLba;\r
-  UINTN                   NumOfLba;\r
-  UINT8                   *ErasePtr;\r
-  UINTN                   EraseSize;\r
+  EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice;\r
+  VA_LIST                  Args;\r
+  EFI_LBA                  StartingLba;\r
+  UINTN                    NumOfLba;\r
+  UINT8                    *ErasePtr;\r
+  UINTN                    EraseSize;\r
 \r
   FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
 \r
@@ -333,14 +327,17 @@ FvbProtocolEraseBlocks (
     if (StartingLba == EFI_LBA_LIST_TERMINATOR) {\r
       break;\r
     }\r
+\r
     NumOfLba = VA_ARG (Args, UINTN);\r
 \r
-    if (StartingLba > EMU_FVB_NUM_TOTAL_BLOCKS ||\r
-        NumOfLba > EMU_FVB_NUM_TOTAL_BLOCKS - StartingLba) {\r
+    if ((StartingLba > EMU_FVB_NUM_TOTAL_BLOCKS) ||\r
+        (NumOfLba > EMU_FVB_NUM_TOTAL_BLOCKS - StartingLba))\r
+    {\r
       VA_END (Args);\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   } while (1);\r
+\r
   VA_END (Args);\r
 \r
   //\r
@@ -352,14 +349,16 @@ FvbProtocolEraseBlocks (
     if (StartingLba == EFI_LBA_LIST_TERMINATOR) {\r
       break;\r
     }\r
+\r
     NumOfLba = VA_ARG (Args, UINTN);\r
 \r
-    ErasePtr = FvbDevice->BufferPtr;\r
+    ErasePtr  = FvbDevice->BufferPtr;\r
     ErasePtr += (UINTN)StartingLba * FvbDevice->BlockSize;\r
     EraseSize = NumOfLba * FvbDevice->BlockSize;\r
 \r
     SetMem (ErasePtr, EraseSize, ERASED_UINT8);\r
   } while (1);\r
+\r
   VA_END (Args);\r
 \r
   //\r
@@ -372,7 +371,6 @@ FvbProtocolEraseBlocks (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Writes the specified number of bytes from the input buffer to the block.\r
 \r
@@ -435,31 +433,32 @@ FvbProtocolEraseBlocks (
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolWrite (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN        EFI_LBA                             Lba,\r
-  IN        UINTN                               Offset,\r
-  IN OUT    UINTN                               *NumBytes,\r
-  IN        UINT8                               *Buffer\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN        EFI_LBA                              Lba,\r
+  IN        UINTN                                Offset,\r
+  IN OUT    UINTN                                *NumBytes,\r
+  IN        UINT8                                *Buffer\r
   )\r
 {\r
-  EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
-  UINT8                   *FvbDataPtr;\r
-  EFI_STATUS              Status;\r
+  EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice;\r
+  UINT8                    *FvbDataPtr;\r
+  EFI_STATUS               Status;\r
 \r
   FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
 \r
-  if (Lba >= EMU_FVB_NUM_TOTAL_BLOCKS ||\r
-      Offset > FvbDevice->BlockSize) {\r
+  if ((Lba >= EMU_FVB_NUM_TOTAL_BLOCKS) ||\r
+      (Offset > FvbDevice->BlockSize))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Status = EFI_SUCCESS;\r
   if (*NumBytes > FvbDevice->BlockSize - Offset) {\r
     *NumBytes = FvbDevice->BlockSize - Offset;\r
-    Status = EFI_BAD_BUFFER_SIZE;\r
+    Status    = EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  FvbDataPtr = FvbDevice->BufferPtr;\r
+  FvbDataPtr  = FvbDevice->BufferPtr;\r
   FvbDataPtr += (UINTN)Lba * FvbDevice->BlockSize;\r
   FvbDataPtr += Offset;\r
 \r
@@ -468,7 +467,6 @@ FvbProtocolWrite (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Reads the specified number of bytes into a buffer from the specified block.\r
 \r
@@ -519,31 +517,32 @@ FvbProtocolWrite (
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolRead (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN        EFI_LBA                             Lba,\r
-  IN        UINTN                               Offset,\r
-  IN OUT    UINTN                               *NumBytes,\r
-  IN OUT    UINT8                               *Buffer\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN        EFI_LBA                              Lba,\r
+  IN        UINTN                                Offset,\r
+  IN OUT    UINTN                                *NumBytes,\r
+  IN OUT    UINT8                                *Buffer\r
   )\r
 {\r
-  EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
-  UINT8                   *FvbDataPtr;\r
-  EFI_STATUS              Status;\r
+  EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice;\r
+  UINT8                    *FvbDataPtr;\r
+  EFI_STATUS               Status;\r
 \r
   FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
 \r
-  if (Lba >= EMU_FVB_NUM_TOTAL_BLOCKS ||\r
-      Offset > FvbDevice->BlockSize) {\r
+  if ((Lba >= EMU_FVB_NUM_TOTAL_BLOCKS) ||\r
+      (Offset > FvbDevice->BlockSize))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Status = EFI_SUCCESS;\r
   if (*NumBytes > FvbDevice->BlockSize - Offset) {\r
     *NumBytes = FvbDevice->BlockSize - Offset;\r
-    Status = EFI_BAD_BUFFER_SIZE;\r
+    Status    = EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  FvbDataPtr = FvbDevice->BufferPtr;\r
+  FvbDataPtr  = FvbDevice->BufferPtr;\r
   FvbDataPtr += (UINTN)Lba * FvbDevice->BlockSize;\r
   FvbDataPtr += Offset;\r
 \r
@@ -552,7 +551,6 @@ FvbProtocolRead (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Check the integrity of firmware volume header.\r
 \r
@@ -564,7 +562,7 @@ FvbProtocolRead (
 **/\r
 EFI_STATUS\r
 ValidateFvHeader (\r
-  IN EFI_FIRMWARE_VOLUME_HEADER   *FwVolHeader\r
+  IN EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader\r
   )\r
 {\r
   UINT16  Checksum;\r
@@ -578,14 +576,16 @@ ValidateFvHeader (
       (FwVolHeader->Signature != EFI_FVH_SIGNATURE) ||\r
       (FwVolHeader->FvLength != EMU_FVB_SIZE) ||\r
       (FwVolHeader->HeaderLength != EMU_FV_HEADER_LENGTH)\r
-      ) {\r
+      )\r
+  {\r
     DEBUG ((DEBUG_INFO, "EMU Variable FVB: Basic FV headers were invalid\n"));\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   //\r
   // Verify the header checksum\r
   //\r
-  Checksum = CalculateSum16((VOID*) FwVolHeader, FwVolHeader->HeaderLength);\r
+  Checksum = CalculateSum16 ((VOID *)FwVolHeader, FwVolHeader->HeaderLength);\r
 \r
   if (Checksum != 0) {\r
     DEBUG ((DEBUG_INFO, "EMU Variable FVB: FV checksum was invalid\n"));\r
@@ -595,7 +595,6 @@ ValidateFvHeader (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Initializes the FV Header and Variable Store Header\r
   to support variable operations.\r
@@ -605,13 +604,13 @@ ValidateFvHeader (
 **/\r
 VOID\r
 InitializeFvAndVariableStoreHeaders (\r
-  IN  VOID   *Ptr\r
+  IN  VOID  *Ptr\r
   )\r
 {\r
   //\r
   // Templates for authenticated variable FV header\r
   //\r
-  STATIC FVB_FV_HDR_AND_VARS_TEMPLATE FvAndAuthenticatedVarTemplate = {\r
+  STATIC FVB_FV_HDR_AND_VARS_TEMPLATE  FvAndAuthenticatedVarTemplate = {\r
     { // EFI_FIRMWARE_VOLUME_HEADER FvHdr;\r
       // UINT8                     ZeroVector[16];\r
       { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\r
@@ -638,7 +637,7 @@ InitializeFvAndVariableStoreHeaders (
       0,\r
 \r
       // UINT8                     Reserved[1];\r
-      {0},\r
+      { 0 },\r
 \r
       // UINT8                     Revision;\r
       EFI_FVH_REVISION,\r
@@ -647,20 +646,20 @@ InitializeFvAndVariableStoreHeaders (
       {\r
         {\r
           EMU_FVB_NUM_TOTAL_BLOCKS, // UINT32 NumBlocks;\r
-          EMU_FVB_BLOCK_SIZE  // UINT32 Length;\r
+          EMU_FVB_BLOCK_SIZE        // UINT32 Length;\r
         }\r
       }\r
     },\r
     // EFI_FV_BLOCK_MAP_ENTRY     EndBlockMap;\r
     { 0, 0 }, // End of block map\r
     { // VARIABLE_STORE_HEADER      VarHdr;\r
-        // EFI_GUID  Signature;     // need authenticated variables for secure boot\r
-        EFI_AUTHENTICATED_VARIABLE_GUID,\r
+      // EFI_GUID  Signature;     // need authenticated variables for secure boot\r
+      EFI_AUTHENTICATED_VARIABLE_GUID,\r
 \r
       // UINT32  Size;\r
       (\r
-        FixedPcdGet32 (PcdFlashNvStorageVariableSize) -\r
-        OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)\r
+       FixedPcdGet32 (PcdFlashNvStorageVariableSize) -\r
+       OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)\r
       ),\r
 \r
       // UINT8   Format;\r
@@ -691,7 +690,7 @@ InitializeFvAndVariableStoreHeaders (
   //\r
   // Update the checksum for the FV header\r
   //\r
-  Fv = (EFI_FIRMWARE_VOLUME_HEADER*) Ptr;\r
+  Fv           = (EFI_FIRMWARE_VOLUME_HEADER *)Ptr;\r
   Fv->Checksum = CalculateCheckSum16 (Ptr, Fv->HeaderLength);\r
 }\r
 \r
@@ -707,38 +706,44 @@ InitializeFvAndVariableStoreHeaders (
 EFI_STATUS\r
 EFIAPI\r
 FvbInitialize (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  VOID                                *Ptr;\r
-  VOID                                *SubPtr;\r
-  BOOLEAN                             Initialize;\r
-  EFI_HANDLE                          Handle;\r
-  EFI_PHYSICAL_ADDRESS                Address;\r
-  RETURN_STATUS                       PcdStatus;\r
+  EFI_STATUS            Status;\r
+  VOID                  *Ptr;\r
+  VOID                  *SubPtr;\r
+  BOOLEAN               Initialize;\r
+  EFI_HANDLE            Handle;\r
+  EFI_PHYSICAL_ADDRESS  Address;\r
+  RETURN_STATUS         PcdStatus;\r
 \r
   DEBUG ((DEBUG_INFO, "EMU Variable FVB Started\n"));\r
 \r
   //\r
   // Verify that the PCD's are set correctly.\r
   //\r
-  ASSERT (FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) %\r
-          EMU_FVB_BLOCK_SIZE == 0);\r
+  ASSERT (\r
+    FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) %\r
+    EMU_FVB_BLOCK_SIZE == 0\r
+    );\r
   if (\r
-       (PcdGet32 (PcdFlashNvStorageVariableSize) +\r
-        PcdGet32 (PcdFlashNvStorageFtwWorkingSize)\r
-       ) >\r
-       EMU_FVB_NUM_SPARE_BLOCKS * EMU_FVB_BLOCK_SIZE\r
-     ) {\r
+      (PcdGet32 (PcdFlashNvStorageVariableSize) +\r
+       PcdGet32 (PcdFlashNvStorageFtwWorkingSize)\r
+      ) >\r
+      EMU_FVB_NUM_SPARE_BLOCKS * EMU_FVB_BLOCK_SIZE\r
+      )\r
+  {\r
     DEBUG ((DEBUG_ERROR, "EMU Variable invalid PCD sizes\n"));\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (PcdGet64 (PcdFlashNvStorageVariableBase64) != 0) {\r
-    DEBUG ((DEBUG_INFO, "Disabling EMU Variable FVB since "\r
-                        "flash variables appear to be supported.\n"));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "Disabling EMU Variable FVB since "\r
+      "flash variables appear to be supported.\n"\r
+      ));\r
     return EFI_ABORTED;\r
   }\r
 \r
@@ -752,7 +757,7 @@ FvbInitialize (
   //\r
   Initialize = TRUE;\r
   if (PcdGet64 (PcdEmuVariableNvStoreReserved) != 0) {\r
-    Ptr = (VOID*)(UINTN) PcdGet64 (PcdEmuVariableNvStoreReserved);\r
+    Ptr = (VOID *)(UINTN)PcdGet64 (PcdEmuVariableNvStoreReserved);\r
     DEBUG ((\r
       DEBUG_INFO,\r
       "EMU Variable FVB: Using pre-reserved block at %p\n",\r
@@ -776,32 +781,37 @@ FvbInitialize (
     SetMem (Ptr, EMU_FVB_SIZE, ERASED_UINT8);\r
     InitializeFvAndVariableStoreHeaders (Ptr);\r
   }\r
-  PcdStatus = PcdSet64S (PcdFlashNvStorageVariableBase64, (UINT32)(UINTN) Ptr);\r
+\r
+  PcdStatus = PcdSet64S (PcdFlashNvStorageVariableBase64, (UINT32)(UINTN)Ptr);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   //\r
   // Initialize the Fault Tolerant Write data area\r
   //\r
-  SubPtr = (VOID*) ((UINT8*) Ptr + PcdGet32 (PcdFlashNvStorageVariableSize));\r
-  PcdStatus = PcdSet32S (PcdFlashNvStorageFtwWorkingBase,\r
-                (UINT32)(UINTN) SubPtr);\r
+  SubPtr    = (VOID *)((UINT8 *)Ptr + PcdGet32 (PcdFlashNvStorageVariableSize));\r
+  PcdStatus = PcdSet32S (\r
+                PcdFlashNvStorageFtwWorkingBase,\r
+                (UINT32)(UINTN)SubPtr\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   //\r
   // Initialize the Fault Tolerant Write spare block\r
   //\r
-  SubPtr = (VOID*) ((UINT8*) Ptr +\r
+  SubPtr = (VOID *)((UINT8 *)Ptr +\r
                     EMU_FVB_NUM_SPARE_BLOCKS * EMU_FVB_BLOCK_SIZE);\r
-  PcdStatus = PcdSet32S (PcdFlashNvStorageFtwSpareBase,\r
-                (UINT32)(UINTN) SubPtr);\r
+  PcdStatus = PcdSet32S (\r
+                PcdFlashNvStorageFtwSpareBase,\r
+                (UINT32)(UINTN)SubPtr\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   //\r
   // Setup FVB device path\r
   //\r
-  Address = (EFI_PHYSICAL_ADDRESS)(UINTN) Ptr;\r
+  Address                                              = (EFI_PHYSICAL_ADDRESS)(UINTN)Ptr;\r
   mEmuVarsFvb.DevicePath.MemMapDevPath.StartingAddress = Address;\r
-  mEmuVarsFvb.DevicePath.MemMapDevPath.EndingAddress = Address + EMU_FVB_SIZE - 1;\r
+  mEmuVarsFvb.DevicePath.MemMapDevPath.EndingAddress   = Address + EMU_FVB_SIZE - 1;\r
 \r
   //\r
   // Install the protocols\r
@@ -833,5 +843,3 @@ FvbInitialize (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
-\r
index 4cf8a38ba54d86f50ddaafdcf73220a5493aabae..8299fe3f11aa339eaaaee7a43fd6f40846db0a8a 100644 (file)
@@ -19,36 +19,33 @@ Abstract:
 //\r
 // Fvb Protocol instance data\r
 //\r
-#define FVB_DEVICE_FROM_THIS(a)         CR (a, EFI_FW_VOL_BLOCK_DEVICE, FwVolBlockInstance, FVB_DEVICE_SIGNATURE)\r
-#define FVB_DEVICE_SIGNATURE            SIGNATURE_32 ('F', 'V', 'B', 'N')\r
+#define FVB_DEVICE_FROM_THIS(a)  CR (a, EFI_FW_VOL_BLOCK_DEVICE, FwVolBlockInstance, FVB_DEVICE_SIGNATURE)\r
+#define FVB_DEVICE_SIGNATURE  SIGNATURE_32 ('F', 'V', 'B', 'N')\r
 \r
 #pragma pack (1)\r
 \r
 typedef struct {\r
-\r
-  EFI_FIRMWARE_VOLUME_HEADER FvHdr;\r
-  EFI_FV_BLOCK_MAP_ENTRY     EndBlockMap;\r
-  VARIABLE_STORE_HEADER      VarHdr;\r
-\r
+  EFI_FIRMWARE_VOLUME_HEADER    FvHdr;\r
+  EFI_FV_BLOCK_MAP_ENTRY        EndBlockMap;\r
+  VARIABLE_STORE_HEADER         VarHdr;\r
 } FVB_FV_HDR_AND_VARS_TEMPLATE;\r
 \r
 typedef struct {\r
-  MEMMAP_DEVICE_PATH        MemMapDevPath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevPath;\r
+  MEMMAP_DEVICE_PATH          MemMapDevPath;\r
+  EFI_DEVICE_PATH_PROTOCOL    EndDevPath;\r
 } FV_DEVICE_PATH;\r
 \r
 #pragma pack ()\r
 \r
 typedef struct {\r
-  UINTN                               Signature;\r
-  FV_DEVICE_PATH                      DevicePath;\r
-  VOID                                *BufferPtr;\r
-  UINTN                               BlockSize;\r
-  UINTN                               Size;\r
-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  FwVolBlockInstance;\r
+  UINTN                                 Signature;\r
+  FV_DEVICE_PATH                        DevicePath;\r
+  VOID                                  *BufferPtr;\r
+  UINTN                                 BlockSize;\r
+  UINTN                                 Size;\r
+  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    FwVolBlockInstance;\r
 } EFI_FW_VOL_BLOCK_DEVICE;\r
 \r
-\r
 //\r
 // Constants\r
 //\r
@@ -63,12 +60,12 @@ typedef struct {
 #define FTW_WRITE_QUEUE_SIZE \\r
   (FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) - \\r
    sizeof (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER))\r
-#define EMU_FV_HEADER_LENGTH OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)\r
+#define EMU_FV_HEADER_LENGTH  OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)\r
 \r
-#define NOT_ERASED_BIT 0\r
-#define ERASED_BIT     1\r
-#define ERASED_UINT8   0xff\r
-#define ERASED_UINT32  0xffffffff\r
+#define NOT_ERASED_BIT  0\r
+#define ERASED_BIT      1\r
+#define ERASED_UINT8    0xff\r
+#define ERASED_UINT32   0xffffffff\r
 \r
 //\r
 // Protocol APIs\r
index 3b4856a01f481259a6b54aacc6836342234618de..53ee7f7003c974e8767ced81d4b70de1b4de4c70 100644 (file)
@@ -8,14 +8,13 @@
 \r
 #include "EnrollDefaultKeys.h"\r
 \r
-\r
 //\r
 // Second KEK: "Microsoft Corporation KEK CA 2011".\r
 // SHA1: 31:59:0b:fd:89:c9:d7:4e:d0:87:df:ac:66:33:4b:39:31:25:4b:30\r
 //\r
 // "dbx" updates in "dbxtool" are signed with a key derived from this KEK.\r
 //\r
-CONST UINT8 mMicrosoftKek[] = {\r
+CONST UINT8  mMicrosoftKek[] = {\r
   0x30, 0x82, 0x05, 0xe8, 0x30, 0x82, 0x03, 0xd0, 0xa0, 0x03, 0x02, 0x01, 0x02,\r
   0x02, 0x0a, 0x61, 0x0a, 0xd1, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x30,\r
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,\r
@@ -135,8 +134,7 @@ CONST UINT8 mMicrosoftKek[] = {
   0x57, 0x4e, 0x36, 0xd2, 0x32, 0x84, 0xbf, 0x9e\r
 };\r
 \r
-CONST UINTN mSizeOfMicrosoftKek = sizeof mMicrosoftKek;\r
-\r
+CONST UINTN  mSizeOfMicrosoftKek = sizeof mMicrosoftKek;\r
 \r
 //\r
 // First DB entry: "Microsoft Windows Production PCA 2011"\r
@@ -145,7 +143,7 @@ CONST UINTN mSizeOfMicrosoftKek = sizeof mMicrosoftKek;
 // Windows 8 and Windows Server 2012 R2 boot loaders are signed with a chain\r
 // rooted in this certificate.\r
 //\r
-CONST UINT8 mMicrosoftPca[] = {\r
+CONST UINT8  mMicrosoftPca[] = {\r
   0x30, 0x82, 0x05, 0xd7, 0x30, 0x82, 0x03, 0xbf, 0xa0, 0x03, 0x02, 0x01, 0x02,\r
   0x02, 0x0a, 0x61, 0x07, 0x76, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x30,\r
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,\r
@@ -264,8 +262,7 @@ CONST UINT8 mMicrosoftPca[] = {
   0x62, 0x1c, 0x59, 0x7e\r
 };\r
 \r
-CONST UINTN mSizeOfMicrosoftPca = sizeof mMicrosoftPca;\r
-\r
+CONST UINTN  mSizeOfMicrosoftPca = sizeof mMicrosoftPca;\r
 \r
 //\r
 // Second DB entry: "Microsoft Corporation UEFI CA 2011"\r
@@ -273,7 +270,7 @@ CONST UINTN mSizeOfMicrosoftPca = sizeof mMicrosoftPca;
 //\r
 // To verify the "shim" binary and PCI expansion ROMs with.\r
 //\r
-CONST UINT8 mMicrosoftUefiCa[] = {\r
+CONST UINT8  mMicrosoftUefiCa[] = {\r
   0x30, 0x82, 0x06, 0x10, 0x30, 0x82, 0x03, 0xf8, 0xa0, 0x03, 0x02, 0x01, 0x02,\r
   0x02, 0x0a, 0x61, 0x08, 0xd3, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x30,\r
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,\r
@@ -396,8 +393,7 @@ CONST UINT8 mMicrosoftUefiCa[] = {
   0x07, 0x92, 0x9b, 0xf5, 0xa6, 0xbc, 0x59, 0x83, 0x58\r
 };\r
 \r
-CONST UINTN mSizeOfMicrosoftUefiCa = sizeof mMicrosoftUefiCa;\r
-\r
+CONST UINTN  mSizeOfMicrosoftUefiCa = sizeof mMicrosoftUefiCa;\r
 \r
 //\r
 // The Microsoft.UefiSecureBootLogo.Tests.OutOfBoxConfirmDBXisPresent test case\r
@@ -431,10 +427,10 @@ CONST UINTN mSizeOfMicrosoftUefiCa = sizeof mMicrosoftUefiCa;
 // practice recommended -- in natural English langauge -- in the\r
 // above-referenced TechNet article.\r
 //\r
-CONST UINT8 mSha256OfDevNull[] = {\r
+CONST UINT8  mSha256OfDevNull[] = {\r
   0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, 0x99,\r
   0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95,\r
   0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55\r
 };\r
 \r
-CONST UINTN mSizeOfSha256OfDevNull = sizeof mSha256OfDevNull;\r
+CONST UINTN  mSizeOfSha256OfDevNull = sizeof mSha256OfDevNull;\r
index 302b80d97720c05305b3ec9853e185b5b09742f3..094e4c821bd5dd4eb5fc6d50aa87637106344ec1 100644 (file)
@@ -24,7 +24,6 @@
 \r
 #include "EnrollDefaultKeys.h"\r
 \r
-\r
 /**\r
   Fetch the X509 certificate (to be used as Platform Key and first Key Exchange\r
   Key) from SMBIOS.\r
 STATIC\r
 EFI_STATUS\r
 GetPkKek1 (\r
-  OUT UINT8 **PkKek1,\r
-  OUT UINTN *SizeOfPkKek1\r
+  OUT UINT8  **PkKek1,\r
+  OUT UINTN  *SizeOfPkKek1\r
   )\r
 {\r
-  CONST CHAR8             *Base64Cert;\r
-  CHAR8                   OvmfPkKek1AppPrefix[GUID_STRING_LENGTH + 1 + 1];\r
-  EFI_STATUS              Status;\r
-  EFI_SMBIOS_PROTOCOL     *Smbios;\r
-  EFI_SMBIOS_HANDLE       Handle;\r
-  EFI_SMBIOS_TYPE         Type;\r
-  EFI_SMBIOS_TABLE_HEADER *Header;\r
-  SMBIOS_TABLE_TYPE11     *OemStringsTable;\r
-  UINTN                   Base64CertLen;\r
-  UINTN                   DecodedCertSize;\r
-  UINT8                   *DecodedCert;\r
+  CONST CHAR8              *Base64Cert;\r
+  CHAR8                    OvmfPkKek1AppPrefix[GUID_STRING_LENGTH + 1 + 1];\r
+  EFI_STATUS               Status;\r
+  EFI_SMBIOS_PROTOCOL      *Smbios;\r
+  EFI_SMBIOS_HANDLE        Handle;\r
+  EFI_SMBIOS_TYPE          Type;\r
+  EFI_SMBIOS_TABLE_HEADER  *Header;\r
+  SMBIOS_TABLE_TYPE11      *OemStringsTable;\r
+  UINTN                    Base64CertLen;\r
+  UINTN                    DecodedCertSize;\r
+  UINT8                    *DecodedCert;\r
 \r
   Base64Cert = NULL;\r
 \r
   //\r
   // Format the application prefix, for OEM String matching.\r
   //\r
-  AsciiSPrint (OvmfPkKek1AppPrefix, sizeof OvmfPkKek1AppPrefix, "%g:",\r
-    &gOvmfPkKek1AppPrefixGuid);\r
+  AsciiSPrint (\r
+    OvmfPkKek1AppPrefix,\r
+    sizeof OvmfPkKek1AppPrefix,\r
+    "%g:",\r
+    &gOvmfPkKek1AppPrefixGuid\r
+    );\r
 \r
   //\r
   // Scan all "OEM Strings" tables.\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL,\r
-                  (VOID **)&Smbios);\r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiSmbiosProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&Smbios\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     AsciiPrint ("error: failed to locate EFI_SMBIOS_PROTOCOL: %r\n", Status);\r
     return Status;\r
   }\r
 \r
   Handle = SMBIOS_HANDLE_PI_RESERVED;\r
-  Type = SMBIOS_TYPE_OEM_STRINGS;\r
+  Type   = SMBIOS_TYPE_OEM_STRINGS;\r
   for (Status = Smbios->GetNext (Smbios, &Handle, &Type, &Header, NULL);\r
        !EFI_ERROR (Status);\r
-       Status = Smbios->GetNext (Smbios, &Handle, &Type, &Header, NULL)) {\r
-    CONST CHAR8 *OemString;\r
-    UINTN       Idx;\r
+       Status = Smbios->GetNext (Smbios, &Handle, &Type, &Header, NULL))\r
+  {\r
+    CONST CHAR8  *OemString;\r
+    UINTN        Idx;\r
 \r
     if (Header->Length < sizeof *OemStringsTable) {\r
       //\r
@@ -102,6 +109,7 @@ GetPkKek1 (
       //\r
       continue;\r
     }\r
+\r
     OemStringsTable = (SMBIOS_TABLE_TYPE11 *)Header;\r
 \r
     //\r
@@ -110,13 +118,17 @@ GetPkKek1 (
     //\r
     OemString = (CONST CHAR8 *)(OemStringsTable + 1);\r
     for (Idx = 0; Idx < OemStringsTable->StringCount; ++Idx) {\r
-      CHAR8 CandidatePrefix[sizeof OvmfPkKek1AppPrefix];\r
+      CHAR8  CandidatePrefix[sizeof OvmfPkKek1AppPrefix];\r
 \r
       //\r
       // NUL-terminate the candidate prefix for case-insensitive comparison.\r
       //\r
-      AsciiStrnCpyS (CandidatePrefix, sizeof CandidatePrefix, OemString,\r
-        GUID_STRING_LENGTH + 1);\r
+      AsciiStrnCpyS (\r
+        CandidatePrefix,\r
+        sizeof CandidatePrefix,\r
+        OemString,\r
+        GUID_STRING_LENGTH + 1\r
+        );\r
       if (AsciiStriCmp (OvmfPkKek1AppPrefix, CandidatePrefix) == 0) {\r
         //\r
         // The current string matches the prefix.\r
@@ -124,6 +136,7 @@ GetPkKek1 (
         Base64Cert = OemString + GUID_STRING_LENGTH + 1;\r
         break;\r
       }\r
+\r
       OemString += AsciiStrSize (OemString);\r
     }\r
 \r
@@ -139,8 +152,11 @@ GetPkKek1 (
     //\r
     // No table with a matching string has been found.\r
     //\r
-    AsciiPrint ("error: OEM String with app prefix %g not found: %r\n",\r
-      &gOvmfPkKek1AppPrefixGuid, Status);\r
+    AsciiPrint (\r
+      "error: OEM String with app prefix %g not found: %r\n",\r
+      &gOvmfPkKek1AppPrefixGuid,\r
+      Status\r
+      );\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -151,19 +167,23 @@ GetPkKek1 (
   // Verify the base64 encoding, and determine the decoded size.\r
   //\r
   DecodedCertSize = 0;\r
-  Status = Base64Decode (Base64Cert, Base64CertLen, NULL, &DecodedCertSize);\r
+  Status          = Base64Decode (Base64Cert, Base64CertLen, NULL, &DecodedCertSize);\r
   switch (Status) {\r
-  case EFI_BUFFER_TOO_SMALL:\r
-    ASSERT (DecodedCertSize > 0);\r
-    break;\r
-  case EFI_SUCCESS:\r
-    AsciiPrint ("error: empty certificate after app prefix %g\n",\r
-      &gOvmfPkKek1AppPrefixGuid);\r
-    return EFI_PROTOCOL_ERROR;\r
-  default:\r
-    AsciiPrint ("error: invalid base64 string after app prefix %g\n",\r
-      &gOvmfPkKek1AppPrefixGuid);\r
-    return EFI_PROTOCOL_ERROR;\r
+    case EFI_BUFFER_TOO_SMALL:\r
+      ASSERT (DecodedCertSize > 0);\r
+      break;\r
+    case EFI_SUCCESS:\r
+      AsciiPrint (\r
+        "error: empty certificate after app prefix %g\n",\r
+        &gOvmfPkKek1AppPrefixGuid\r
+        );\r
+      return EFI_PROTOCOL_ERROR;\r
+    default:\r
+      AsciiPrint (\r
+        "error: invalid base64 string after app prefix %g\n",\r
+        &gOvmfPkKek1AppPrefixGuid\r
+        );\r
+      return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
   //\r
@@ -178,16 +198,19 @@ GetPkKek1 (
   //\r
   // Decoding will succeed at this point.\r
   //\r
-  Status = Base64Decode (Base64Cert, Base64CertLen, DecodedCert,\r
-             &DecodedCertSize);\r
+  Status = Base64Decode (\r
+             Base64Cert,\r
+             Base64CertLen,\r
+             DecodedCert,\r
+             &DecodedCertSize\r
+             );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  *PkKek1 = DecodedCert;\r
+  *PkKek1       = DecodedCert;\r
   *SizeOfPkKek1 = DecodedCertSize;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Enroll a set of certificates in a global variable, overwriting it.\r
 \r
@@ -235,20 +258,20 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 EnrollListOfCerts (\r
-  IN CHAR16   *VariableName,\r
-  IN EFI_GUID *VendorGuid,\r
-  IN EFI_GUID *CertType,\r
+  IN CHAR16    *VariableName,\r
+  IN EFI_GUID  *VendorGuid,\r
+  IN EFI_GUID  *CertType,\r
   ...\r
   )\r
 {\r
-  UINTN            DataSize;\r
-  SINGLE_HEADER    *SingleHeader;\r
-  REPEATING_HEADER *RepeatingHeader;\r
-  VA_LIST          Marker;\r
-  CONST UINT8      *Cert;\r
-  EFI_STATUS       Status;\r
-  UINT8            *Data;\r
-  UINT8            *Position;\r
+  UINTN             DataSize;\r
+  SINGLE_HEADER     *SingleHeader;\r
+  REPEATING_HEADER  *RepeatingHeader;\r
+  VA_LIST           Marker;\r
+  CONST UINT8       *Cert;\r
+  EFI_STATUS        Status;\r
+  UINT8             *Data;\r
+  UINT8             *Position;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -259,25 +282,30 @@ EnrollListOfCerts (
   VA_START (Marker, CertType);\r
   for (Cert = VA_ARG (Marker, CONST UINT8 *);\r
        Cert != NULL;\r
-       Cert = VA_ARG (Marker, CONST UINT8 *)) {\r
-    UINTN          CertSize;\r
+       Cert = VA_ARG (Marker, CONST UINT8 *))\r
+  {\r
+    UINTN  CertSize;\r
 \r
     CertSize = VA_ARG (Marker, UINTN);\r
     (VOID)VA_ARG (Marker, CONST EFI_GUID *);\r
 \r
-    if (CertSize == 0 ||\r
-        CertSize > MAX_UINT32 - sizeof *RepeatingHeader ||\r
-        DataSize > MAX_UINT32 - sizeof *RepeatingHeader - CertSize) {\r
+    if ((CertSize == 0) ||\r
+        (CertSize > MAX_UINT32 - sizeof *RepeatingHeader) ||\r
+        (DataSize > MAX_UINT32 - sizeof *RepeatingHeader - CertSize))\r
+    {\r
       Status = EFI_INVALID_PARAMETER;\r
       break;\r
     }\r
+\r
     DataSize += sizeof *RepeatingHeader + CertSize;\r
   }\r
+\r
   VA_END (Marker);\r
 \r
   if (DataSize == sizeof *SingleHeader) {\r
     Status = EFI_INVALID_PARAMETER;\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     goto Out;\r
   }\r
@@ -291,27 +319,28 @@ EnrollListOfCerts (
   Position = Data;\r
 \r
   SingleHeader = (SINGLE_HEADER *)Position;\r
-  Status = gRT->GetTime (&SingleHeader->TimeStamp, NULL);\r
+  Status       = gRT->GetTime (&SingleHeader->TimeStamp, NULL);\r
   if (EFI_ERROR (Status)) {\r
     goto FreeData;\r
   }\r
+\r
   SingleHeader->TimeStamp.Pad1       = 0;\r
   SingleHeader->TimeStamp.Nanosecond = 0;\r
   SingleHeader->TimeStamp.TimeZone   = 0;\r
   SingleHeader->TimeStamp.Daylight   = 0;\r
   SingleHeader->TimeStamp.Pad2       = 0;\r
-#if 0\r
-  SingleHeader->dwLength         = DataSize - sizeof SingleHeader->TimeStamp;\r
-#else\r
+ #if 0\r
+  SingleHeader->dwLength = DataSize - sizeof SingleHeader->TimeStamp;\r
+ #else\r
   //\r
   // This looks like a bug in edk2. According to the UEFI specification,\r
   // dwLength is "The length of the entire certificate, including the length of\r
   // the header, in bytes". That shouldn't stop right after CertType -- it\r
   // should include everything below it.\r
   //\r
-  SingleHeader->dwLength         = sizeof *SingleHeader\r
-                                     - sizeof SingleHeader->TimeStamp;\r
-#endif\r
+  SingleHeader->dwLength = sizeof *SingleHeader\r
+                           - sizeof SingleHeader->TimeStamp;\r
+ #endif\r
   SingleHeader->wRevision        = 0x0200;\r
   SingleHeader->wCertificateType = WIN_CERT_TYPE_EFI_GUID;\r
   CopyGuid (&SingleHeader->CertType, &gEfiCertPkcs7Guid);\r
@@ -320,16 +349,17 @@ EnrollListOfCerts (
   VA_START (Marker, CertType);\r
   for (Cert = VA_ARG (Marker, CONST UINT8 *);\r
        Cert != NULL;\r
-       Cert = VA_ARG (Marker, CONST UINT8 *)) {\r
-    UINTN            CertSize;\r
-    CONST EFI_GUID   *OwnerGuid;\r
+       Cert = VA_ARG (Marker, CONST UINT8 *))\r
+  {\r
+    UINTN           CertSize;\r
+    CONST EFI_GUID  *OwnerGuid;\r
 \r
     CertSize  = VA_ARG (Marker, UINTN);\r
     OwnerGuid = VA_ARG (Marker, CONST EFI_GUID *);\r
 \r
     RepeatingHeader = (REPEATING_HEADER *)Position;\r
     CopyGuid (&RepeatingHeader->SignatureType, CertType);\r
-    RepeatingHeader->SignatureListSize   =\r
+    RepeatingHeader->SignatureListSize =\r
       (UINT32)(sizeof *RepeatingHeader + CertSize);\r
     RepeatingHeader->SignatureHeaderSize = 0;\r
     RepeatingHeader->SignatureSize       =\r
@@ -340,29 +370,39 @@ EnrollListOfCerts (
     CopyMem (Position, Cert, CertSize);\r
     Position += CertSize;\r
   }\r
+\r
   VA_END (Marker);\r
 \r
   ASSERT (Data + DataSize == Position);\r
 \r
-  Status = gRT->SetVariable (VariableName, VendorGuid,\r
+  Status = gRT->SetVariable (\r
+                  VariableName,\r
+                  VendorGuid,\r
                   (EFI_VARIABLE_NON_VOLATILE |\r
                    EFI_VARIABLE_BOOTSERVICE_ACCESS |\r
                    EFI_VARIABLE_RUNTIME_ACCESS |\r
                    EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS),\r
-                  DataSize, Data);\r
+                  DataSize,\r
+                  Data\r
+                  );\r
 \r
 FreeData:\r
   FreePool (Data);\r
 \r
 Out:\r
   if (EFI_ERROR (Status)) {\r
-    AsciiPrint ("error: %a(\"%s\", %g): %r\n", __FUNCTION__, VariableName,\r
-      VendorGuid, Status);\r
+    AsciiPrint (\r
+      "error: %a(\"%s\", %g): %r\n",\r
+      __FUNCTION__,\r
+      VariableName,\r
+      VendorGuid,\r
+      Status\r
+      );\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Read a UEFI variable into a caller-allocated buffer, enforcing an exact size.\r
 \r
@@ -404,39 +444,48 @@ Out:
 STATIC\r
 EFI_STATUS\r
 GetExact (\r
-  IN CHAR16   *VariableName,\r
-  IN EFI_GUID *VendorGuid,\r
-  OUT VOID    *Data,\r
-  IN UINTN    DataSize,\r
-  IN BOOLEAN  AllowMissing\r
+  IN CHAR16    *VariableName,\r
+  IN EFI_GUID  *VendorGuid,\r
+  OUT VOID     *Data,\r
+  IN UINTN     DataSize,\r
+  IN BOOLEAN   AllowMissing\r
   )\r
 {\r
-  UINTN      Size;\r
-  EFI_STATUS Status;\r
+  UINTN       Size;\r
+  EFI_STATUS  Status;\r
 \r
-  Size = DataSize;\r
+  Size   = DataSize;\r
   Status = gRT->GetVariable (VariableName, VendorGuid, NULL, &Size, Data);\r
   if (EFI_ERROR (Status)) {\r
-    if (Status == EFI_NOT_FOUND && AllowMissing) {\r
+    if ((Status == EFI_NOT_FOUND) && AllowMissing) {\r
       ZeroMem (Data, DataSize);\r
       return EFI_SUCCESS;\r
     }\r
 \r
-    AsciiPrint ("error: GetVariable(\"%s\", %g): %r\n", VariableName,\r
-      VendorGuid, Status);\r
+    AsciiPrint (\r
+      "error: GetVariable(\"%s\", %g): %r\n",\r
+      VariableName,\r
+      VendorGuid,\r
+      Status\r
+      );\r
     return Status;\r
   }\r
 \r
   if (Size != DataSize) {\r
-    AsciiPrint ("error: GetVariable(\"%s\", %g): expected size 0x%Lx, "\r
-      "got 0x%Lx\n", VariableName, VendorGuid, (UINT64)DataSize, (UINT64)Size);\r
+    AsciiPrint (\r
+      "error: GetVariable(\"%s\", %g): expected size 0x%Lx, "\r
+      "got 0x%Lx\n",\r
+      VariableName,\r
+      VendorGuid,\r
+      (UINT64)DataSize,\r
+      (UINT64)Size\r
+      );\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Populate a SETTINGS structure from the underlying UEFI variables.\r
 \r
@@ -464,42 +513,65 @@ GetExact (
 STATIC\r
 EFI_STATUS\r
 GetSettings (\r
-  OUT SETTINGS *Settings\r
+  OUT SETTINGS  *Settings\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
-  Status = GetExact (EFI_SETUP_MODE_NAME, &gEfiGlobalVariableGuid,\r
-             &Settings->SetupMode, sizeof Settings->SetupMode, FALSE);\r
+  Status = GetExact (\r
+             EFI_SETUP_MODE_NAME,\r
+             &gEfiGlobalVariableGuid,\r
+             &Settings->SetupMode,\r
+             sizeof Settings->SetupMode,\r
+             FALSE\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = GetExact (EFI_SECURE_BOOT_MODE_NAME, &gEfiGlobalVariableGuid,\r
-             &Settings->SecureBoot, sizeof Settings->SecureBoot, FALSE);\r
+  Status = GetExact (\r
+             EFI_SECURE_BOOT_MODE_NAME,\r
+             &gEfiGlobalVariableGuid,\r
+             &Settings->SecureBoot,\r
+             sizeof Settings->SecureBoot,\r
+             FALSE\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = GetExact (EFI_SECURE_BOOT_ENABLE_NAME,\r
-             &gEfiSecureBootEnableDisableGuid, &Settings->SecureBootEnable,\r
-             sizeof Settings->SecureBootEnable, TRUE);\r
+  Status = GetExact (\r
+             EFI_SECURE_BOOT_ENABLE_NAME,\r
+             &gEfiSecureBootEnableDisableGuid,\r
+             &Settings->SecureBootEnable,\r
+             sizeof Settings->SecureBootEnable,\r
+             TRUE\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = GetExact (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid,\r
-             &Settings->CustomMode, sizeof Settings->CustomMode, FALSE);\r
+  Status = GetExact (\r
+             EFI_CUSTOM_MODE_NAME,\r
+             &gEfiCustomModeEnableGuid,\r
+             &Settings->CustomMode,\r
+             sizeof Settings->CustomMode,\r
+             FALSE\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = GetExact (EFI_VENDOR_KEYS_VARIABLE_NAME, &gEfiGlobalVariableGuid,\r
-             &Settings->VendorKeys, sizeof Settings->VendorKeys, FALSE);\r
+  Status = GetExact (\r
+             EFI_VENDOR_KEYS_VARIABLE_NAME,\r
+             &gEfiGlobalVariableGuid,\r
+             &Settings->VendorKeys,\r
+             sizeof Settings->VendorKeys,\r
+             FALSE\r
+             );\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Print the contents of a SETTINGS structure to the UEFI console.\r
 \r
@@ -508,33 +580,38 @@ GetSettings (
 STATIC\r
 VOID\r
 PrintSettings (\r
-  IN CONST SETTINGS *Settings\r
+  IN CONST SETTINGS  *Settings\r
   )\r
 {\r
-  AsciiPrint ("info: SetupMode=%d SecureBoot=%d SecureBootEnable=%d "\r
-    "CustomMode=%d VendorKeys=%d\n", Settings->SetupMode, Settings->SecureBoot,\r
-    Settings->SecureBootEnable, Settings->CustomMode, Settings->VendorKeys);\r
+  AsciiPrint (\r
+    "info: SetupMode=%d SecureBoot=%d SecureBootEnable=%d "\r
+    "CustomMode=%d VendorKeys=%d\n",\r
+    Settings->SetupMode,\r
+    Settings->SecureBoot,\r
+    Settings->SecureBootEnable,\r
+    Settings->CustomMode,\r
+    Settings->VendorKeys\r
+    );\r
 }\r
 \r
-\r
 /**\r
   Entry point function of this shell application.\r
 **/\r
 INTN\r
 EFIAPI\r
 ShellAppMain (\r
-  IN UINTN  Argc,\r
-  IN CHAR16 **Argv\r
+  IN UINTN   Argc,\r
+  IN CHAR16  **Argv\r
   )\r
 {\r
-  INTN       RetVal;\r
-  EFI_STATUS Status;\r
-  SETTINGS   Settings;\r
-  UINT8      *PkKek1;\r
-  UINTN      SizeOfPkKek1;\r
-  BOOLEAN    NoDefault;\r
-\r
-  if (Argc == 2 && StrCmp (Argv[1], L"--no-default") == 0) {\r
+  INTN        RetVal;\r
+  EFI_STATUS  Status;\r
+  SETTINGS    Settings;\r
+  UINT8       *PkKek1;\r
+  UINTN       SizeOfPkKek1;\r
+  BOOLEAN     NoDefault;\r
+\r
+  if ((Argc == 2) && (StrCmp (Argv[1], L"--no-default") == 0)) {\r
     NoDefault = TRUE;\r
   } else {\r
     NoDefault = FALSE;\r
@@ -552,6 +629,7 @@ ShellAppMain (
   if (EFI_ERROR (Status)) {\r
     return RetVal;\r
   }\r
+\r
   PrintSettings (&Settings);\r
 \r
   if (Settings.SetupMode != 1) {\r
@@ -563,7 +641,7 @@ ShellAppMain (
   // Set PkKek1 and SizeOfPkKek1 to suppress incorrect compiler/analyzer\r
   // warnings.\r
   //\r
-  PkKek1 = NULL;\r
+  PkKek1       = NULL;\r
   SizeOfPkKek1 = 0;\r
 \r
   //\r
@@ -581,13 +659,21 @@ ShellAppMain (
   //\r
   if (Settings.CustomMode != CUSTOM_SECURE_BOOT_MODE) {\r
     Settings.CustomMode = CUSTOM_SECURE_BOOT_MODE;\r
-    Status = gRT->SetVariable (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid,\r
-                    (EFI_VARIABLE_NON_VOLATILE |\r
-                     EFI_VARIABLE_BOOTSERVICE_ACCESS),\r
-                    sizeof Settings.CustomMode, &Settings.CustomMode);\r
+    Status              = gRT->SetVariable (\r
+                                 EFI_CUSTOM_MODE_NAME,\r
+                                 &gEfiCustomModeEnableGuid,\r
+                                 (EFI_VARIABLE_NON_VOLATILE |\r
+                                  EFI_VARIABLE_BOOTSERVICE_ACCESS),\r
+                                 sizeof Settings.CustomMode,\r
+                                 &Settings.CustomMode\r
+                                 );\r
     if (EFI_ERROR (Status)) {\r
-      AsciiPrint ("error: SetVariable(\"%s\", %g): %r\n", EFI_CUSTOM_MODE_NAME,\r
-        &gEfiCustomModeEnableGuid, Status);\r
+      AsciiPrint (\r
+        "error: SetVariable(\"%s\", %g): %r\n",\r
+        EFI_CUSTOM_MODE_NAME,\r
+        &gEfiCustomModeEnableGuid,\r
+        Status\r
+        );\r
       goto FreePkKek1;\r
     }\r
   }\r
@@ -600,17 +686,26 @@ ShellAppMain (
                EFI_IMAGE_SECURITY_DATABASE,\r
                &gEfiImageSecurityDatabaseGuid,\r
                &gEfiCertX509Guid,\r
-               PkKek1, SizeOfPkKek1, &gEfiCallerIdGuid,\r
-               NULL);\r
+               PkKek1,\r
+               SizeOfPkKek1,\r
+               &gEfiCallerIdGuid,\r
+               NULL\r
+               );\r
   } else {\r
     Status = EnrollListOfCerts (\r
                EFI_IMAGE_SECURITY_DATABASE,\r
                &gEfiImageSecurityDatabaseGuid,\r
                &gEfiCertX509Guid,\r
-               mMicrosoftPca,    mSizeOfMicrosoftPca,    &gMicrosoftVendorGuid,\r
-               mMicrosoftUefiCa, mSizeOfMicrosoftUefiCa, &gMicrosoftVendorGuid,\r
-               NULL);\r
+               mMicrosoftPca,\r
+               mSizeOfMicrosoftPca,\r
+               &gMicrosoftVendorGuid,\r
+               mMicrosoftUefiCa,\r
+               mSizeOfMicrosoftUefiCa,\r
+               &gMicrosoftVendorGuid,\r
+               NULL\r
+               );\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     goto FreePkKek1;\r
   }\r
@@ -622,8 +717,11 @@ ShellAppMain (
              EFI_IMAGE_SECURITY_DATABASE1,\r
              &gEfiImageSecurityDatabaseGuid,\r
              &gEfiCertSha256Guid,\r
-             mSha256OfDevNull, mSizeOfSha256OfDevNull, &gEfiCallerIdGuid,\r
-             NULL);\r
+             mSha256OfDevNull,\r
+             mSizeOfSha256OfDevNull,\r
+             &gEfiCallerIdGuid,\r
+             NULL\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreePkKek1;\r
   }\r
@@ -636,17 +734,26 @@ ShellAppMain (
                EFI_KEY_EXCHANGE_KEY_NAME,\r
                &gEfiGlobalVariableGuid,\r
                &gEfiCertX509Guid,\r
-               PkKek1, SizeOfPkKek1, &gEfiCallerIdGuid,\r
-               NULL);\r
+               PkKek1,\r
+               SizeOfPkKek1,\r
+               &gEfiCallerIdGuid,\r
+               NULL\r
+               );\r
   } else {\r
     Status = EnrollListOfCerts (\r
                EFI_KEY_EXCHANGE_KEY_NAME,\r
                &gEfiGlobalVariableGuid,\r
                &gEfiCertX509Guid,\r
-               PkKek1,        SizeOfPkKek1,        &gEfiCallerIdGuid,\r
-               mMicrosoftKek, mSizeOfMicrosoftKek, &gMicrosoftVendorGuid,\r
-               NULL);\r
+               PkKek1,\r
+               SizeOfPkKek1,\r
+               &gEfiCallerIdGuid,\r
+               mMicrosoftKek,\r
+               mSizeOfMicrosoftKek,\r
+               &gMicrosoftVendorGuid,\r
+               NULL\r
+               );\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     goto FreePkKek1;\r
   }\r
@@ -658,8 +765,11 @@ ShellAppMain (
              EFI_PLATFORM_KEY_NAME,\r
              &gEfiGlobalVariableGuid,\r
              &gEfiCertX509Guid,\r
-             PkKek1, SizeOfPkKek1, &gEfiGlobalVariableGuid,\r
-             NULL);\r
+             PkKek1,\r
+             SizeOfPkKek1,\r
+             &gEfiGlobalVariableGuid,\r
+             NULL\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreePkKek1;\r
   }\r
@@ -669,12 +779,20 @@ ShellAppMain (
   // signatures.\r
   //\r
   Settings.CustomMode = STANDARD_SECURE_BOOT_MODE;\r
-  Status = gRT->SetVariable (EFI_CUSTOM_MODE_NAME, &gEfiCustomModeEnableGuid,\r
-                  EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
-                  sizeof Settings.CustomMode, &Settings.CustomMode);\r
+  Status              = gRT->SetVariable (\r
+                               EFI_CUSTOM_MODE_NAME,\r
+                               &gEfiCustomModeEnableGuid,\r
+                               EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
+                               sizeof Settings.CustomMode,\r
+                               &Settings.CustomMode\r
+                               );\r
   if (EFI_ERROR (Status)) {\r
-    AsciiPrint ("error: SetVariable(\"%s\", %g): %r\n", EFI_CUSTOM_MODE_NAME,\r
-      &gEfiCustomModeEnableGuid, Status);\r
+    AsciiPrint (\r
+      "error: SetVariable(\"%s\", %g): %r\n",\r
+      EFI_CUSTOM_MODE_NAME,\r
+      &gEfiCustomModeEnableGuid,\r
+      Status\r
+      );\r
     goto FreePkKek1;\r
   }\r
 \r
@@ -713,11 +831,13 @@ ShellAppMain (
   if (EFI_ERROR (Status)) {\r
     goto FreePkKek1;\r
   }\r
+\r
   PrintSettings (&Settings);\r
 \r
-  if (Settings.SetupMode != 0 || Settings.SecureBoot != 1 ||\r
-      Settings.SecureBootEnable != 1 || Settings.CustomMode != 0 ||\r
-      Settings.VendorKeys != 0) {\r
+  if ((Settings.SetupMode != 0) || (Settings.SecureBoot != 1) ||\r
+      (Settings.SecureBootEnable != 1) || (Settings.CustomMode != 0) ||\r
+      (Settings.VendorKeys != 0))\r
+  {\r
     AsciiPrint ("error: unexpected\n");\r
     goto FreePkKek1;\r
   }\r
index 8e61f0a77b90c8701480f3db129a86fb8e05755a..56da9c71d6396ad6dc399507ea057bca7930a70d 100644 (file)
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  EFI_TIME TimeStamp;\r
+  EFI_TIME    TimeStamp;\r
 \r
   //\r
   // dwLength covers data below\r
   //\r
-  UINT32   dwLength;\r
-  UINT16   wRevision;\r
-  UINT16   wCertificateType;\r
-  EFI_GUID CertType;\r
+  UINT32      dwLength;\r
+  UINT16      wRevision;\r
+  UINT16      wCertificateType;\r
+  EFI_GUID    CertType;\r
 } SINGLE_HEADER;\r
 \r
 typedef struct {\r
   //\r
   // SignatureListSize covers data below\r
   //\r
-  EFI_GUID SignatureType;\r
-  UINT32   SignatureListSize;\r
-  UINT32   SignatureHeaderSize; // constant 0\r
-  UINT32   SignatureSize;\r
+  EFI_GUID    SignatureType;\r
+  UINT32      SignatureListSize;\r
+  UINT32      SignatureHeaderSize; // constant 0\r
+  UINT32      SignatureSize;\r
 \r
   //\r
   // SignatureSize covers data below\r
   //\r
-  EFI_GUID SignatureOwner;\r
+  EFI_GUID    SignatureOwner;\r
 \r
   //\r
   // X.509 certificate follows\r
@@ -106,33 +106,31 @@ typedef struct {
 } REPEATING_HEADER;\r
 #pragma pack ()\r
 \r
-\r
 //\r
 // A structure that collects the values of UEFI variables related to Secure\r
 // Boot.\r
 //\r
 typedef struct {\r
-  UINT8 SetupMode;\r
-  UINT8 SecureBoot;\r
-  UINT8 SecureBootEnable;\r
-  UINT8 CustomMode;\r
-  UINT8 VendorKeys;\r
+  UINT8    SetupMode;\r
+  UINT8    SecureBoot;\r
+  UINT8    SecureBootEnable;\r
+  UINT8    CustomMode;\r
+  UINT8    VendorKeys;\r
 } SETTINGS;\r
 \r
-\r
 //\r
 // Refer to "AuthData.c" for details on the following objects.\r
 //\r
-extern CONST UINT8 mMicrosoftKek[];\r
-extern CONST UINTN mSizeOfMicrosoftKek;\r
+extern CONST UINT8  mMicrosoftKek[];\r
+extern CONST UINTN  mSizeOfMicrosoftKek;\r
 \r
-extern CONST UINT8 mMicrosoftPca[];\r
-extern CONST UINTN mSizeOfMicrosoftPca;\r
+extern CONST UINT8  mMicrosoftPca[];\r
+extern CONST UINTN  mSizeOfMicrosoftPca;\r
 \r
-extern CONST UINT8 mMicrosoftUefiCa[];\r
-extern CONST UINTN mSizeOfMicrosoftUefiCa;\r
+extern CONST UINT8  mMicrosoftUefiCa[];\r
+extern CONST UINTN  mSizeOfMicrosoftUefiCa;\r
 \r
-extern CONST UINT8 mSha256OfDevNull[];\r
-extern CONST UINTN mSizeOfSha256OfDevNull;\r
+extern CONST UINT8  mSha256OfDevNull[];\r
+extern CONST UINTN  mSizeOfSha256OfDevNull;\r
 \r
 #endif /* ENROLL_DEFAULT_KEYS_H_ */\r
index 56d00edb7ce9b807fc447b24b44922c90371e444..98828e0b262b1f50765d4d21246425358119b4b2 100644 (file)
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT32 Type;\r
-  UINT64 ChildBase;\r
-  UINT64 CpuBase;\r
-  UINT64 Size;\r
+  UINT32    Type;\r
+  UINT64    ChildBase;\r
+  UINT64    CpuBase;\r
+  UINT64    Size;\r
 } DTB_PCI_HOST_RANGE_RECORD;\r
 #pragma pack ()\r
 \r
-#define DTB_PCI_HOST_RANGE_RELOCATABLE  BIT31\r
-#define DTB_PCI_HOST_RANGE_PREFETCHABLE BIT30\r
-#define DTB_PCI_HOST_RANGE_ALIASED      BIT29\r
-#define DTB_PCI_HOST_RANGE_MMIO32       BIT25\r
-#define DTB_PCI_HOST_RANGE_MMIO64       (BIT25 | BIT24)\r
-#define DTB_PCI_HOST_RANGE_IO           BIT24\r
-#define DTB_PCI_HOST_RANGE_TYPEMASK     (BIT31 | BIT30 | BIT29 | BIT25 | BIT24)\r
+#define DTB_PCI_HOST_RANGE_RELOCATABLE   BIT31\r
+#define DTB_PCI_HOST_RANGE_PREFETCHABLE  BIT30\r
+#define DTB_PCI_HOST_RANGE_ALIASED       BIT29\r
+#define DTB_PCI_HOST_RANGE_MMIO32        BIT25\r
+#define DTB_PCI_HOST_RANGE_MMIO64        (BIT25 | BIT24)\r
+#define DTB_PCI_HOST_RANGE_IO            BIT24\r
+#define DTB_PCI_HOST_RANGE_TYPEMASK      (BIT31 | BIT30 | BIT29 | BIT25 | BIT24)\r
 \r
 STATIC\r
 EFI_STATUS\r
 MapGcdMmioSpace (\r
-  IN    UINT64    Base,\r
-  IN    UINT64    Size\r
+  IN    UINT64  Base,\r
+  IN    UINT64  Size\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-\r
-  Status = gDS->AddMemorySpace (EfiGcdMemoryTypeMemoryMappedIo, Base, Size,\r
-                  EFI_MEMORY_UC);\r
+  EFI_STATUS  Status;\r
+\r
+  Status = gDS->AddMemorySpace (\r
+                  EfiGcdMemoryTypeMemoryMappedIo,\r
+                  Base,\r
+                  Size,\r
+                  EFI_MEMORY_UC\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "%a: failed to add GCD memory space for region [0x%Lx+0x%Lx)\n",\r
-      __FUNCTION__, Base, Size));\r
+      __FUNCTION__,\r
+      Base,\r
+      Size\r
+      ));\r
     return Status;\r
   }\r
 \r
   Status = gDS->SetMemorySpaceAttributes (Base, Size, EFI_MEMORY_UC);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "%a: failed to set memory space attributes for region [0x%Lx+0x%Lx)\n",\r
-      __FUNCTION__, Base, Size));\r
+      __FUNCTION__,\r
+      Base,\r
+      Size\r
+      ));\r
   }\r
+\r
   return Status;\r
 }\r
 \r
 STATIC\r
 EFI_STATUS\r
 ProcessPciHost (\r
-  OUT  UINT64    *IoBase,\r
-  OUT  UINT64    *IoSize,\r
-  OUT  UINT64    *Mmio32Base,\r
-  OUT  UINT64    *Mmio32Size,\r
-  OUT  UINT64    *Mmio64Base,\r
-  OUT  UINT64    *Mmio64Size,\r
-  OUT  UINT32    *BusMin,\r
-  OUT  UINT32    *BusMax\r
+  OUT  UINT64  *IoBase,\r
+  OUT  UINT64  *IoSize,\r
+  OUT  UINT64  *Mmio32Base,\r
+  OUT  UINT64  *Mmio32Size,\r
+  OUT  UINT64  *Mmio64Base,\r
+  OUT  UINT64  *Mmio64Size,\r
+  OUT  UINT32  *BusMin,\r
+  OUT  UINT32  *BusMax\r
   )\r
 {\r
-  FDT_CLIENT_PROTOCOL         *FdtClient;\r
-  INT32                       Node;\r
-  UINT64                      ConfigBase, ConfigSize;\r
-  CONST VOID                  *Prop;\r
-  UINT32                      Len;\r
-  UINT32                      RecordIdx;\r
-  EFI_STATUS                  Status;\r
-  UINT64                      IoTranslation;\r
-  UINT64                      Mmio32Translation;\r
-  UINT64                      Mmio64Translation;\r
+  FDT_CLIENT_PROTOCOL  *FdtClient;\r
+  INT32                Node;\r
+  UINT64               ConfigBase, ConfigSize;\r
+  CONST VOID           *Prop;\r
+  UINT32               Len;\r
+  UINT32               RecordIdx;\r
+  EFI_STATUS           Status;\r
+  UINT64               IoTranslation;\r
+  UINT64               Mmio32Translation;\r
+  UINT64               Mmio64Translation;\r
 \r
   //\r
   // The following output arguments are initialized only in\r
   // order to suppress '-Werror=maybe-uninitialized' warnings\r
   // *incorrectly* emitted by some gcc versions.\r
   //\r
-  *IoBase = 0;\r
+  *IoBase     = 0;\r
   *Mmio32Base = 0;\r
   *Mmio64Base = MAX_UINT64;\r
-  *BusMin = 0;\r
-  *BusMax = 0;\r
+  *BusMin     = 0;\r
+  *BusMax     = 0;\r
 \r
   //\r
   // *IoSize, *Mmio##Size and IoTranslation are initialized to zero because the\r
   // logic below requires it. However, since they are also affected by the issue\r
   // reported above, they are initialized early.\r
   //\r
-  *IoSize = 0;\r
-  *Mmio32Size = 0;\r
-  *Mmio64Size = 0;\r
+  *IoSize       = 0;\r
+  *Mmio32Size   = 0;\r
+  *Mmio64Size   = 0;\r
   IoTranslation = 0;\r
 \r
-  Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,\r
-                  (VOID **)&FdtClient);\r
+  Status = gBS->LocateProtocol (\r
+                  &gFdtClientProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&FdtClient\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = FdtClient->FindCompatibleNode (FdtClient, "pci-host-ecam-generic",\r
-                        &Node);\r
+  Status = FdtClient->FindCompatibleNode (\r
+                        FdtClient,\r
+                        "pci-host-ecam-generic",\r
+                        &Node\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_INFO,\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
       "%a: No 'pci-host-ecam-generic' compatible DT node found\n",\r
-      __FUNCTION__));\r
+      __FUNCTION__\r
+      ));\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -134,15 +155,22 @@ ProcessPciHost (
     // A DT can legally describe multiple PCI host bridges, but we are not\r
     // equipped to deal with that. So assert that there is only one.\r
     //\r
-    Status = FdtClient->FindNextCompatibleNode (FdtClient,\r
-                          "pci-host-ecam-generic", Node, &Tmp);\r
+    Status = FdtClient->FindNextCompatibleNode (\r
+                          FdtClient,\r
+                          "pci-host-ecam-generic",\r
+                          Node,\r
+                          &Tmp\r
+                          );\r
     ASSERT (Status == EFI_NOT_FOUND);\r
-  );\r
+    );\r
 \r
   Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg", &Prop, &Len);\r
-  if (EFI_ERROR (Status) || Len != 2 * sizeof (UINT64)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: 'reg' property not found or invalid\n",\r
-      __FUNCTION__));\r
+  if (EFI_ERROR (Status) || (Len != 2 * sizeof (UINT64))) {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: 'reg' property not found or invalid\n",\r
+      __FUNCTION__\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
@@ -155,13 +183,22 @@ ProcessPciHost (
   //\r
   // Fetch the bus range (note: inclusive).\r
   //\r
-  Status = FdtClient->GetNodeProperty (FdtClient, Node, "bus-range", &Prop,\r
-                        &Len);\r
-  if (EFI_ERROR (Status) || Len != 2 * sizeof (UINT32)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: 'bus-range' not found or invalid\n",\r
-      __FUNCTION__));\r
+  Status = FdtClient->GetNodeProperty (\r
+                        FdtClient,\r
+                        Node,\r
+                        "bus-range",\r
+                        &Prop,\r
+                        &Len\r
+                        );\r
+  if (EFI_ERROR (Status) || (Len != 2 * sizeof (UINT32))) {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: 'bus-range' not found or invalid\n",\r
+      __FUNCTION__\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
+\r
   *BusMin = SwapBytes32 (((CONST UINT32 *)Prop)[0]);\r
   *BusMax = SwapBytes32 (((CONST UINT32 *)Prop)[1]);\r
 \r
@@ -169,10 +206,14 @@ ProcessPciHost (
   // Sanity check: the config space must accommodate all 4K register bytes of\r
   // all 8 functions of all 32 devices of all buses.\r
   //\r
-  if (*BusMax < *BusMin || *BusMax - *BusMin == MAX_UINT32 ||\r
-      DivU64x32 (ConfigSize, SIZE_4KB * 8 * 32) < *BusMax - *BusMin + 1) {\r
-    DEBUG ((DEBUG_ERROR, "%a: invalid 'bus-range' and/or 'reg'\n",\r
-      __FUNCTION__));\r
+  if ((*BusMax < *BusMin) || (*BusMax - *BusMin == MAX_UINT32) ||\r
+      (DivU64x32 (ConfigSize, SIZE_4KB * 8 * 32) < *BusMax - *BusMin + 1))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: invalid 'bus-range' and/or 'reg'\n",\r
+      __FUNCTION__\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
@@ -180,66 +221,84 @@ ProcessPciHost (
   // Iterate over "ranges".\r
   //\r
   Status = FdtClient->GetNodeProperty (FdtClient, Node, "ranges", &Prop, &Len);\r
-  if (EFI_ERROR (Status) || Len == 0 ||\r
-      Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) {\r
+  if (EFI_ERROR (Status) || (Len == 0) ||\r
+      (Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0))\r
+  {\r
     DEBUG ((DEBUG_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
   for (RecordIdx = 0; RecordIdx < Len / sizeof (DTB_PCI_HOST_RANGE_RECORD);\r
-       ++RecordIdx) {\r
-    CONST DTB_PCI_HOST_RANGE_RECORD *Record;\r
+       ++RecordIdx)\r
+  {\r
+    CONST DTB_PCI_HOST_RANGE_RECORD  *Record;\r
 \r
     Record = (CONST DTB_PCI_HOST_RANGE_RECORD *)Prop + RecordIdx;\r
     switch (SwapBytes32 (Record->Type) & DTB_PCI_HOST_RANGE_TYPEMASK) {\r
-    case DTB_PCI_HOST_RANGE_IO:\r
-      *IoBase = SwapBytes64 (Record->ChildBase);\r
-      *IoSize = SwapBytes64 (Record->Size);\r
-      IoTranslation = SwapBytes64 (Record->CpuBase) - *IoBase;\r
-\r
-      ASSERT (PcdGet64 (PcdPciIoTranslation) == IoTranslation);\r
-      break;\r
-\r
-    case DTB_PCI_HOST_RANGE_MMIO32:\r
-      *Mmio32Base = SwapBytes64 (Record->ChildBase);\r
-      *Mmio32Size = SwapBytes64 (Record->Size);\r
-      Mmio32Translation = SwapBytes64 (Record->CpuBase) - *Mmio32Base;\r
-\r
-      if (*Mmio32Base > MAX_UINT32 || *Mmio32Size > MAX_UINT32 ||\r
-          *Mmio32Base + *Mmio32Size > SIZE_4GB) {\r
-        DEBUG ((DEBUG_ERROR, "%a: MMIO32 space invalid\n", __FUNCTION__));\r
-        return EFI_PROTOCOL_ERROR;\r
-      }\r
-\r
-      ASSERT (PcdGet64 (PcdPciMmio32Translation) == Mmio32Translation);\r
-\r
-      if (Mmio32Translation != 0) {\r
-        DEBUG ((DEBUG_ERROR, "%a: unsupported nonzero MMIO32 translation "\r
-          "0x%Lx\n", __FUNCTION__, Mmio32Translation));\r
-        return EFI_UNSUPPORTED;\r
-      }\r
-\r
-      break;\r
-\r
-    case DTB_PCI_HOST_RANGE_MMIO64:\r
-      *Mmio64Base = SwapBytes64 (Record->ChildBase);\r
-      *Mmio64Size = SwapBytes64 (Record->Size);\r
-      Mmio64Translation = SwapBytes64 (Record->CpuBase) - *Mmio64Base;\r
-\r
-      ASSERT (PcdGet64 (PcdPciMmio64Translation) == Mmio64Translation);\r
-\r
-      if (Mmio64Translation != 0) {\r
-        DEBUG ((DEBUG_ERROR, "%a: unsupported nonzero MMIO64 translation "\r
-          "0x%Lx\n", __FUNCTION__, Mmio64Translation));\r
-        return EFI_UNSUPPORTED;\r
-      }\r
-\r
-      break;\r
+      case DTB_PCI_HOST_RANGE_IO:\r
+        *IoBase       = SwapBytes64 (Record->ChildBase);\r
+        *IoSize       = SwapBytes64 (Record->Size);\r
+        IoTranslation = SwapBytes64 (Record->CpuBase) - *IoBase;\r
+\r
+        ASSERT (PcdGet64 (PcdPciIoTranslation) == IoTranslation);\r
+        break;\r
+\r
+      case DTB_PCI_HOST_RANGE_MMIO32:\r
+        *Mmio32Base       = SwapBytes64 (Record->ChildBase);\r
+        *Mmio32Size       = SwapBytes64 (Record->Size);\r
+        Mmio32Translation = SwapBytes64 (Record->CpuBase) - *Mmio32Base;\r
+\r
+        if ((*Mmio32Base > MAX_UINT32) || (*Mmio32Size > MAX_UINT32) ||\r
+            (*Mmio32Base + *Mmio32Size > SIZE_4GB))\r
+        {\r
+          DEBUG ((DEBUG_ERROR, "%a: MMIO32 space invalid\n", __FUNCTION__));\r
+          return EFI_PROTOCOL_ERROR;\r
+        }\r
+\r
+        ASSERT (PcdGet64 (PcdPciMmio32Translation) == Mmio32Translation);\r
+\r
+        if (Mmio32Translation != 0) {\r
+          DEBUG ((\r
+            DEBUG_ERROR,\r
+            "%a: unsupported nonzero MMIO32 translation "\r
+            "0x%Lx\n",\r
+            __FUNCTION__,\r
+            Mmio32Translation\r
+            ));\r
+          return EFI_UNSUPPORTED;\r
+        }\r
+\r
+        break;\r
+\r
+      case DTB_PCI_HOST_RANGE_MMIO64:\r
+        *Mmio64Base       = SwapBytes64 (Record->ChildBase);\r
+        *Mmio64Size       = SwapBytes64 (Record->Size);\r
+        Mmio64Translation = SwapBytes64 (Record->CpuBase) - *Mmio64Base;\r
+\r
+        ASSERT (PcdGet64 (PcdPciMmio64Translation) == Mmio64Translation);\r
+\r
+        if (Mmio64Translation != 0) {\r
+          DEBUG ((\r
+            DEBUG_ERROR,\r
+            "%a: unsupported nonzero MMIO64 translation "\r
+            "0x%Lx\n",\r
+            __FUNCTION__,\r
+            Mmio64Translation\r
+            ));\r
+          return EFI_UNSUPPORTED;\r
+        }\r
+\r
+        break;\r
     }\r
   }\r
-  if (*IoSize == 0 || *Mmio32Size == 0) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a space empty\n", __FUNCTION__,\r
-      (*IoSize == 0) ? "IO" : "MMIO32"));\r
+\r
+  if ((*IoSize == 0) || (*Mmio32Size == 0)) {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a space empty\n",\r
+      __FUNCTION__,\r
+      (*IoSize == 0) ? "IO" : "MMIO32"\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
@@ -249,10 +308,23 @@ ProcessPciHost (
   //\r
   ASSERT (PcdGet64 (PcdPciExpressBaseAddress) == ConfigBase);\r
 \r
-  DEBUG ((DEBUG_INFO, "%a: Config[0x%Lx+0x%Lx) Bus[0x%x..0x%x] "\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: Config[0x%Lx+0x%Lx) Bus[0x%x..0x%x] "\r
     "Io[0x%Lx+0x%Lx)@0x%Lx Mem32[0x%Lx+0x%Lx)@0x0 Mem64[0x%Lx+0x%Lx)@0x0\n",\r
-    __FUNCTION__, ConfigBase, ConfigSize, *BusMin, *BusMax, *IoBase, *IoSize,\r
-    IoTranslation, *Mmio32Base, *Mmio32Size, *Mmio64Base, *Mmio64Size));\r
+    __FUNCTION__,\r
+    ConfigBase,\r
+    ConfigSize,\r
+    *BusMin,\r
+    *BusMax,\r
+    *IoBase,\r
+    *IoSize,\r
+    IoTranslation,\r
+    *Mmio32Base,\r
+    *Mmio32Size,\r
+    *Mmio64Base,\r
+    *Mmio64Size\r
+    ));\r
 \r
   // Map the ECAM space in the GCD memory map\r
   Status = MapGcdMmioSpace (ConfigBase, ConfigSize);\r
@@ -284,21 +356,21 @@ ProcessPciHost (
 PCI_ROOT_BRIDGE *\r
 EFIAPI\r
 PciHostBridgeGetRootBridges (\r
-  UINTN *Count\r
+  UINTN  *Count\r
   )\r
 {\r
-  UINT64                   IoBase, IoSize;\r
-  UINT64                   Mmio32Base, Mmio32Size;\r
-  UINT64                   Mmio64Base, Mmio64Size;\r
-  UINT32                   BusMin, BusMax;\r
-  EFI_STATUS               Status;\r
-  UINT64                   Attributes;\r
-  UINT64                   AllocationAttributes;\r
-  PCI_ROOT_BRIDGE_APERTURE Io;\r
-  PCI_ROOT_BRIDGE_APERTURE Mem;\r
-  PCI_ROOT_BRIDGE_APERTURE MemAbove4G;\r
-  PCI_ROOT_BRIDGE_APERTURE PMem;\r
-  PCI_ROOT_BRIDGE_APERTURE PMemAbove4G;\r
+  UINT64                    IoBase, IoSize;\r
+  UINT64                    Mmio32Base, Mmio32Size;\r
+  UINT64                    Mmio64Base, Mmio64Size;\r
+  UINT32                    BusMin, BusMax;\r
+  EFI_STATUS                Status;\r
+  UINT64                    Attributes;\r
+  UINT64                    AllocationAttributes;\r
+  PCI_ROOT_BRIDGE_APERTURE  Io;\r
+  PCI_ROOT_BRIDGE_APERTURE  Mem;\r
+  PCI_ROOT_BRIDGE_APERTURE  MemAbove4G;\r
+  PCI_ROOT_BRIDGE_APERTURE  PMem;\r
+  PCI_ROOT_BRIDGE_APERTURE  PMemAbove4G;\r
 \r
   if (PcdGet64 (PcdPciExpressBaseAddress) == 0) {\r
     DEBUG ((DEBUG_INFO, "%a: PCI host bridge not present\n", __FUNCTION__));\r
@@ -307,11 +379,23 @@ PciHostBridgeGetRootBridges (
     return NULL;\r
   }\r
 \r
-  Status = ProcessPciHost (&IoBase, &IoSize, &Mmio32Base, &Mmio32Size,\r
-             &Mmio64Base, &Mmio64Size, &BusMin, &BusMax);\r
+  Status = ProcessPciHost (\r
+             &IoBase,\r
+             &IoSize,\r
+             &Mmio32Base,\r
+             &Mmio32Size,\r
+             &Mmio64Base,\r
+             &Mmio64Size,\r
+             &BusMin,\r
+             &BusMax\r
+             );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: failed to discover PCI host bridge: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: failed to discover PCI host bridge: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     *Count = 0;\r
     return NULL;\r
   }\r
@@ -322,21 +406,21 @@ PciHostBridgeGetRootBridges (
   ZeroMem (&PMem, sizeof (PMem));\r
   ZeroMem (&PMemAbove4G, sizeof (PMemAbove4G));\r
 \r
-  Attributes           = EFI_PCI_ATTRIBUTE_ISA_IO_16 |\r
-                         EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |\r
-                         EFI_PCI_ATTRIBUTE_VGA_IO_16  |\r
-                         EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16;\r
+  Attributes = EFI_PCI_ATTRIBUTE_ISA_IO_16 |\r
+               EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |\r
+               EFI_PCI_ATTRIBUTE_VGA_IO_16  |\r
+               EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16;\r
 \r
   AllocationAttributes = EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM;\r
 \r
-  Io.Base              = IoBase;\r
-  Io.Limit             = IoBase + IoSize - 1;\r
-  Mem.Base             = Mmio32Base;\r
-  Mem.Limit            = Mmio32Base + Mmio32Size - 1;\r
+  Io.Base   = IoBase;\r
+  Io.Limit  = IoBase + IoSize - 1;\r
+  Mem.Base  = Mmio32Base;\r
+  Mem.Limit = Mmio32Base + Mmio32Size - 1;\r
 \r
   if (sizeof (UINTN) == sizeof (UINT64)) {\r
-    MemAbove4G.Base    = Mmio64Base;\r
-    MemAbove4G.Limit   = Mmio64Base + Mmio64Size - 1;\r
+    MemAbove4G.Base  = Mmio64Base;\r
+    MemAbove4G.Limit = Mmio64Base + Mmio64Size - 1;\r
     if (Mmio64Size > 0) {\r
       AllocationAttributes |= EFI_PCI_HOST_BRIDGE_MEM64_DECODE;\r
     }\r
@@ -347,32 +431,32 @@ PciHostBridgeGetRootBridges (
     // BARs unless they are allocated below 4 GB. So ignore the range above\r
     // 4 GB in this case.\r
     //\r
-    MemAbove4G.Base    = MAX_UINT64;\r
-    MemAbove4G.Limit   = 0;\r
+    MemAbove4G.Base  = MAX_UINT64;\r
+    MemAbove4G.Limit = 0;\r
   }\r
 \r
   //\r
   // No separate ranges for prefetchable and non-prefetchable BARs\r
   //\r
-  PMem.Base            = MAX_UINT64;\r
-  PMem.Limit           = 0;\r
-  PMemAbove4G.Base     = MAX_UINT64;\r
-  PMemAbove4G.Limit    = 0;\r
+  PMem.Base         = MAX_UINT64;\r
+  PMem.Limit        = 0;\r
+  PMemAbove4G.Base  = MAX_UINT64;\r
+  PMemAbove4G.Limit = 0;\r
 \r
   return PciHostBridgeUtilityGetRootBridges (\r
-    Count,\r
-    Attributes,\r
-    AllocationAttributes,\r
-    TRUE,\r
-    FALSE,\r
-    BusMin,\r
-    BusMax,\r
-    &Io,\r
-    &Mem,\r
-    &MemAbove4G,\r
-    &PMem,\r
-    &PMemAbove4G\r
-    );\r
+           Count,\r
+           Attributes,\r
+           AllocationAttributes,\r
+           TRUE,\r
+           FALSE,\r
+           BusMin,\r
+           BusMax,\r
+           &Io,\r
+           &Mem,\r
+           &MemAbove4G,\r
+           &PMem,\r
+           &PMemAbove4G\r
+           );\r
 }\r
 \r
 /**\r
@@ -385,8 +469,8 @@ PciHostBridgeGetRootBridges (
 VOID\r
 EFIAPI\r
 PciHostBridgeFreeRootBridges (\r
-  PCI_ROOT_BRIDGE *Bridges,\r
-  UINTN           Count\r
+  PCI_ROOT_BRIDGE  *Bridges,\r
+  UINTN            Count\r
   )\r
 {\r
   PciHostBridgeUtilityFreeRootBridges (Bridges, Count);\r
@@ -409,8 +493,8 @@ PciHostBridgeFreeRootBridges (
 VOID\r
 EFIAPI\r
 PciHostBridgeResourceConflict (\r
-  EFI_HANDLE                        HostBridgeHandle,\r
-  VOID                              *Configuration\r
+  EFI_HANDLE  HostBridgeHandle,\r
+  VOID        *Configuration\r
   )\r
 {\r
   PciHostBridgeUtilityResourceConflict (Configuration);\r
index 8dd8fc9b3d8920fdb8c25ff8160269e18804e0a7..b5a6718146f8179bfa0e12f9965014d8797906e1 100644 (file)
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT32 Type;\r
-  UINT64 ChildBase;\r
-  UINT64 CpuBase;\r
-  UINT64 Size;\r
+  UINT32    Type;\r
+  UINT64    ChildBase;\r
+  UINT64    CpuBase;\r
+  UINT64    Size;\r
 } DTB_PCI_HOST_RANGE_RECORD;\r
 #pragma pack ()\r
 \r
-#define DTB_PCI_HOST_RANGE_RELOCATABLE  BIT31\r
-#define DTB_PCI_HOST_RANGE_PREFETCHABLE BIT30\r
-#define DTB_PCI_HOST_RANGE_ALIASED      BIT29\r
-#define DTB_PCI_HOST_RANGE_MMIO32       BIT25\r
-#define DTB_PCI_HOST_RANGE_MMIO64       (BIT25 | BIT24)\r
-#define DTB_PCI_HOST_RANGE_IO           BIT24\r
-#define DTB_PCI_HOST_RANGE_TYPEMASK     (BIT31 | BIT30 | BIT29 | BIT25 | BIT24)\r
+#define DTB_PCI_HOST_RANGE_RELOCATABLE   BIT31\r
+#define DTB_PCI_HOST_RANGE_PREFETCHABLE  BIT30\r
+#define DTB_PCI_HOST_RANGE_ALIASED       BIT29\r
+#define DTB_PCI_HOST_RANGE_MMIO32        BIT25\r
+#define DTB_PCI_HOST_RANGE_MMIO64        (BIT25 | BIT24)\r
+#define DTB_PCI_HOST_RANGE_IO            BIT24\r
+#define DTB_PCI_HOST_RANGE_TYPEMASK      (BIT31 | BIT30 | BIT29 | BIT25 | BIT24)\r
 \r
 STATIC\r
 RETURN_STATUS\r
 GetPciIoTranslation (\r
-  IN  FDT_CLIENT_PROTOCOL *FdtClient,\r
-  IN  INT32               Node,\r
-  OUT UINT64              *IoTranslation\r
+  IN  FDT_CLIENT_PROTOCOL  *FdtClient,\r
+  IN  INT32                Node,\r
+  OUT UINT64               *IoTranslation\r
   )\r
 {\r
-  UINT32        RecordIdx;\r
-  CONST VOID    *Prop;\r
-  UINT32        Len;\r
-  EFI_STATUS    Status;\r
-  UINT64        IoBase;\r
+  UINT32      RecordIdx;\r
+  CONST VOID  *Prop;\r
+  UINT32      Len;\r
+  EFI_STATUS  Status;\r
+  UINT64      IoBase;\r
 \r
   //\r
   // Iterate over "ranges".\r
   //\r
   Status = FdtClient->GetNodeProperty (FdtClient, Node, "ranges", &Prop, &Len);\r
-  if (EFI_ERROR (Status) || Len == 0 ||\r
-      Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) {\r
+  if (EFI_ERROR (Status) || (Len == 0) ||\r
+      (Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0))\r
+  {\r
     DEBUG ((DEBUG_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__));\r
     return RETURN_PROTOCOL_ERROR;\r
   }\r
 \r
   for (RecordIdx = 0; RecordIdx < Len / sizeof (DTB_PCI_HOST_RANGE_RECORD);\r
-       ++RecordIdx) {\r
-    CONST DTB_PCI_HOST_RANGE_RECORD *Record;\r
-    UINT32                          Type;\r
+       ++RecordIdx)\r
+  {\r
+    CONST DTB_PCI_HOST_RANGE_RECORD  *Record;\r
+    UINT32                           Type;\r
 \r
     Record = (CONST DTB_PCI_HOST_RANGE_RECORD *)Prop + RecordIdx;\r
-    Type = SwapBytes32 (Record->Type) & DTB_PCI_HOST_RANGE_TYPEMASK;\r
+    Type   = SwapBytes32 (Record->Type) & DTB_PCI_HOST_RANGE_TYPEMASK;\r
     if (Type == DTB_PCI_HOST_RANGE_IO) {\r
-      IoBase = SwapBytes64 (Record->ChildBase);\r
+      IoBase         = SwapBytes64 (Record->ChildBase);\r
       *IoTranslation = SwapBytes64 (Record->CpuBase) - IoBase;\r
 \r
       return RETURN_SUCCESS;\r
     }\r
   }\r
+\r
   return RETURN_NOT_FOUND;\r
 }\r
 \r
@@ -84,15 +87,15 @@ FdtPciPcdProducerLibConstructor (
   VOID\r
   )\r
 {\r
-  UINT64              PciExpressBaseAddress;\r
-  FDT_CLIENT_PROTOCOL *FdtClient;\r
-  CONST UINT64        *Reg;\r
-  UINT32              RegSize;\r
-  EFI_STATUS          Status;\r
-  INT32               Node;\r
-  RETURN_STATUS       RetStatus;\r
-  UINT64              IoTranslation;\r
-  RETURN_STATUS       PcdStatus;\r
+  UINT64               PciExpressBaseAddress;\r
+  FDT_CLIENT_PROTOCOL  *FdtClient;\r
+  CONST UINT64         *Reg;\r
+  UINT32               RegSize;\r
+  EFI_STATUS           Status;\r
+  INT32                Node;\r
+  RETURN_STATUS        RetStatus;\r
+  UINT64               IoTranslation;\r
+  RETURN_STATUS        PcdStatus;\r
 \r
   PciExpressBaseAddress = PcdGet64 (PcdPciExpressBaseAddress);\r
   if (PciExpressBaseAddress != MAX_UINT64) {\r
@@ -106,38 +109,51 @@ FdtPciPcdProducerLibConstructor (
     return EFI_SUCCESS;\r
   }\r
 \r
-  Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,\r
-                  (VOID **)&FdtClient);\r
+  Status = gBS->LocateProtocol (\r
+                  &gFdtClientProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&FdtClient\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   PciExpressBaseAddress = 0;\r
-  Status = FdtClient->FindCompatibleNode (FdtClient, "pci-host-ecam-generic",\r
-                        &Node);\r
+  Status                = FdtClient->FindCompatibleNode (\r
+                                       FdtClient,\r
+                                       "pci-host-ecam-generic",\r
+                                       &Node\r
+                                       );\r
 \r
   if (!EFI_ERROR (Status)) {\r
-    Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg",\r
-                          (CONST VOID **)&Reg, &RegSize);\r
-\r
-    if (!EFI_ERROR (Status) && RegSize == 2 * sizeof (UINT64)) {\r
+    Status = FdtClient->GetNodeProperty (\r
+                          FdtClient,\r
+                          Node,\r
+                          "reg",\r
+                          (CONST VOID **)&Reg,\r
+                          &RegSize\r
+                          );\r
+\r
+    if (!EFI_ERROR (Status) && (RegSize == 2 * sizeof (UINT64))) {\r
       PciExpressBaseAddress = SwapBytes64 (*Reg);\r
 \r
       PcdStatus = PcdSetBoolS (PcdPciDisableBusEnumeration, FALSE);\r
       ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
       IoTranslation = 0;\r
-      RetStatus = GetPciIoTranslation (FdtClient, Node, &IoTranslation);\r
+      RetStatus     = GetPciIoTranslation (FdtClient, Node, &IoTranslation);\r
       if (!RETURN_ERROR (RetStatus)) {\r
-          PcdStatus = PcdSet64S (PcdPciIoTranslation, IoTranslation);\r
-          ASSERT_RETURN_ERROR (PcdStatus);\r
+        PcdStatus = PcdSet64S (PcdPciIoTranslation, IoTranslation);\r
+        ASSERT_RETURN_ERROR (PcdStatus);\r
       } else {\r
         //\r
         // Support for I/O BARs is not mandatory, and so it does not make sense\r
         // to abort in the general case. So leave it up to the actual driver to\r
         // complain about this if it wants to, and just issue a warning here.\r
         //\r
-        DEBUG ((DEBUG_WARN,\r
+        DEBUG ((\r
+          DEBUG_WARN,\r
           "%a: 'pci-host-ecam-generic' device encountered with no I/O range\n",\r
-          __FUNCTION__));\r
+          __FUNCTION__\r
+          ));\r
       }\r
     }\r
   }\r
index e2ae706127f2ab3285e3a447006504e9b73f3815..87bc8b6827a2ef617f61091fff39b2ad2d01dbd0 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 InitializeHighMemDxe (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  FDT_CLIENT_PROTOCOL               *FdtClient;\r
-  EFI_CPU_ARCH_PROTOCOL             *Cpu;\r
-  EFI_STATUS                        Status, FindNodeStatus;\r
-  INT32                             Node;\r
-  CONST UINT32                      *Reg;\r
-  UINT32                            RegSize;\r
-  UINTN                             AddressCells, SizeCells;\r
-  UINT64                            CurBase;\r
-  UINT64                            CurSize;\r
-  UINT64                            Attributes;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR   GcdDescriptor;\r
-\r
-  Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,\r
-                  (VOID **)&FdtClient);\r
+  FDT_CLIENT_PROTOCOL              *FdtClient;\r
+  EFI_CPU_ARCH_PROTOCOL            *Cpu;\r
+  EFI_STATUS                       Status, FindNodeStatus;\r
+  INT32                            Node;\r
+  CONST UINT32                     *Reg;\r
+  UINT32                           RegSize;\r
+  UINTN                            AddressCells, SizeCells;\r
+  UINT64                           CurBase;\r
+  UINT64                           CurSize;\r
+  UINT64                           Attributes;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  GcdDescriptor;\r
+\r
+  Status = gBS->LocateProtocol (\r
+                  &gFdtClientProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&FdtClient\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL,\r
-                  (VOID **)&Cpu);\r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiCpuArchProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&Cpu\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   // Check for memory node and add the memory spaces except the lowest one\r
   //\r
-  for (FindNodeStatus = FdtClient->FindMemoryNodeReg (FdtClient, &Node,\r
-                                     (CONST VOID **) &Reg, &AddressCells,\r
-                                     &SizeCells, &RegSize);\r
+  for (FindNodeStatus = FdtClient->FindMemoryNodeReg (\r
+                                     FdtClient,\r
+                                     &Node,\r
+                                     (CONST VOID **)&Reg,\r
+                                     &AddressCells,\r
+                                     &SizeCells,\r
+                                     &RegSize\r
+                                     );\r
        !EFI_ERROR (FindNodeStatus);\r
-       FindNodeStatus = FdtClient->FindNextMemoryNodeReg (FdtClient, Node,\r
-                                     &Node, (CONST VOID **) &Reg, &AddressCells,\r
-                                     &SizeCells, &RegSize)) {\r
+       FindNodeStatus = FdtClient->FindNextMemoryNodeReg (\r
+                                     FdtClient,\r
+                                     Node,\r
+                                     &Node,\r
+                                     (CONST VOID **)&Reg,\r
+                                     &AddressCells,\r
+                                     &SizeCells,\r
+                                     &RegSize\r
+                                     ))\r
+  {\r
     ASSERT (AddressCells <= 2);\r
     ASSERT (SizeCells <= 2);\r
 \r
@@ -62,36 +80,60 @@ InitializeHighMemDxe (
       if (AddressCells > 1) {\r
         CurBase = (CurBase << 32) | SwapBytes32 (*Reg++);\r
       }\r
+\r
       CurSize = SwapBytes32 (*Reg++);\r
       if (SizeCells > 1) {\r
         CurSize = (CurSize << 32) | SwapBytes32 (*Reg++);\r
       }\r
+\r
       RegSize -= (AddressCells + SizeCells) * sizeof (UINT32);\r
 \r
       Status = gDS->GetMemorySpaceDescriptor (CurBase, &GcdDescriptor);\r
       if (EFI_ERROR (Status)) {\r
-        DEBUG ((DEBUG_WARN,\r
+        DEBUG ((\r
+          DEBUG_WARN,\r
           "%a: Region 0x%lx - 0x%lx not found in the GCD memory space map\n",\r
-          __FUNCTION__, CurBase, CurBase + CurSize - 1));\r
-          continue;\r
+          __FUNCTION__,\r
+          CurBase,\r
+          CurBase + CurSize - 1\r
+          ));\r
+        continue;\r
       }\r
+\r
       if (GcdDescriptor.GcdMemoryType == EfiGcdMemoryTypeNonExistent) {\r
-        Status = gDS->AddMemorySpace (EfiGcdMemoryTypeSystemMemory, CurBase,\r
-                        CurSize, EFI_MEMORY_WB);\r
+        Status = gDS->AddMemorySpace (\r
+                        EfiGcdMemoryTypeSystemMemory,\r
+                        CurBase,\r
+                        CurSize,\r
+                        EFI_MEMORY_WB\r
+                        );\r
 \r
         if (EFI_ERROR (Status)) {\r
-          DEBUG ((DEBUG_ERROR,\r
+          DEBUG ((\r
+            DEBUG_ERROR,\r
             "%a: Failed to add System RAM @ 0x%lx - 0x%lx (%r)\n",\r
-            __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));\r
+            __FUNCTION__,\r
+            CurBase,\r
+            CurBase + CurSize - 1,\r
+            Status\r
+            ));\r
           continue;\r
         }\r
 \r
-        Status = gDS->SetMemorySpaceAttributes (CurBase, CurSize,\r
-                        EFI_MEMORY_WB);\r
+        Status = gDS->SetMemorySpaceAttributes (\r
+                        CurBase,\r
+                        CurSize,\r
+                        EFI_MEMORY_WB\r
+                        );\r
         if (EFI_ERROR (Status)) {\r
-          DEBUG ((DEBUG_WARN,\r
+          DEBUG ((\r
+            DEBUG_WARN,\r
             "%a: gDS->SetMemorySpaceAttributes() failed on region 0x%lx - 0x%lx (%r)\n",\r
-            __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));\r
+            __FUNCTION__,\r
+            CurBase,\r
+            CurBase + CurSize - 1,\r
+            Status\r
+            ));\r
         }\r
 \r
         //\r
@@ -107,19 +149,30 @@ InitializeHighMemDxe (
         //\r
         Attributes = EFI_MEMORY_WB;\r
         if ((PcdGet64 (PcdDxeNxMemoryProtectionPolicy) &\r
-             (1U << (UINT32)EfiConventionalMemory)) != 0) {\r
+             (1U << (UINT32)EfiConventionalMemory)) != 0)\r
+        {\r
           Attributes |= EFI_MEMORY_XP;\r
         }\r
 \r
         Status = Cpu->SetMemoryAttributes (Cpu, CurBase, CurSize, Attributes);\r
 \r
         if (EFI_ERROR (Status)) {\r
-          DEBUG ((DEBUG_ERROR,\r
+          DEBUG ((\r
+            DEBUG_ERROR,\r
             "%a: Failed to set System RAM @ 0x%lx - 0x%lx attribute (%r)\n",\r
-            __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));\r
+            __FUNCTION__,\r
+            CurBase,\r
+            CurBase + CurSize - 1,\r
+            Status\r
+            ));\r
         } else {\r
-          DEBUG ((DEBUG_INFO, "%a: Add System RAM @ 0x%lx - 0x%lx\n",\r
-            __FUNCTION__, CurBase, CurBase + CurSize - 1));\r
+          DEBUG ((\r
+            DEBUG_INFO,\r
+            "%a: Add System RAM @ 0x%lx - 0x%lx\n",\r
+            __FUNCTION__,\r
+            CurBase,\r
+            CurBase + CurSize - 1\r
+            ));\r
         }\r
       }\r
     }\r
index fdef5f166afb1c74a667781cdfaa4f4546fde42d..619740e6e708806478fa7331dc8de2965d7ada65 100644 (file)
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH                  Vendor;\r
-  UINT64                              PhysBase;\r
-  EFI_DEVICE_PATH_PROTOCOL            End;\r
+  VENDOR_DEVICE_PATH          Vendor;\r
+  UINT64                      PhysBase;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } VIRTIO_TRANSPORT_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 InitializeVirtioFdtDxe (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS                     Status, FindNodeStatus;\r
-  FDT_CLIENT_PROTOCOL            *FdtClient;\r
-  INT32                          Node;\r
-  CONST UINT64                   *Reg;\r
-  UINT32                         RegSize;\r
-  VIRTIO_TRANSPORT_DEVICE_PATH   *DevicePath;\r
-  EFI_HANDLE                     Handle;\r
-  UINT64                         RegBase;\r
-\r
-  Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,\r
-                  (VOID **)&FdtClient);\r
+  EFI_STATUS                    Status, FindNodeStatus;\r
+  FDT_CLIENT_PROTOCOL           *FdtClient;\r
+  INT32                         Node;\r
+  CONST UINT64                  *Reg;\r
+  UINT32                        RegSize;\r
+  VIRTIO_TRANSPORT_DEVICE_PATH  *DevicePath;\r
+  EFI_HANDLE                    Handle;\r
+  UINT64                        RegBase;\r
+\r
+  Status = gBS->LocateProtocol (\r
+                  &gFdtClientProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&FdtClient\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  for (FindNodeStatus = FdtClient->FindCompatibleNode (FdtClient,\r
-                                     "virtio,mmio", &Node);\r
+  for (FindNodeStatus = FdtClient->FindCompatibleNode (\r
+                                     FdtClient,\r
+                                     "virtio,mmio",\r
+                                     &Node\r
+                                     );\r
        !EFI_ERROR (FindNodeStatus);\r
-       FindNodeStatus = FdtClient->FindNextCompatibleNode (FdtClient,\r
-                                     "virtio,mmio", Node, &Node)) {\r
-\r
-    Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg",\r
-                          (CONST VOID **)&Reg, &RegSize);\r
+       FindNodeStatus = FdtClient->FindNextCompatibleNode (\r
+                                     FdtClient,\r
+                                     "virtio,mmio",\r
+                                     Node,\r
+                                     &Node\r
+                                     ))\r
+  {\r
+    Status = FdtClient->GetNodeProperty (\r
+                          FdtClient,\r
+                          Node,\r
+                          "reg",\r
+                          (CONST VOID **)&Reg,\r
+                          &RegSize\r
+                          );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n",\r
-        __FUNCTION__, Status));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: GetNodeProperty () failed (Status == %r)\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       continue;\r
     }\r
 \r
@@ -67,11 +86,12 @@ InitializeVirtioFdtDxe (
     //\r
     // Create a unique device path for this transport on the fly\r
     //\r
-    RegBase = SwapBytes64 (*Reg);\r
+    RegBase    = SwapBytes64 (*Reg);\r
     DevicePath = (VIRTIO_TRANSPORT_DEVICE_PATH *)CreateDeviceNode (\r
-                                  HARDWARE_DEVICE_PATH,\r
-                                  HW_VENDOR_DP,\r
-                                  sizeof (VIRTIO_TRANSPORT_DEVICE_PATH));\r
+                                                   HARDWARE_DEVICE_PATH,\r
+                                                   HW_VENDOR_DP,\r
+                                                   sizeof (VIRTIO_TRANSPORT_DEVICE_PATH)\r
+                                                   );\r
     if (DevicePath == NULL) {\r
       DEBUG ((DEBUG_ERROR, "%a: Out of memory\n", __FUNCTION__));\r
       continue;\r
@@ -79,39 +99,62 @@ InitializeVirtioFdtDxe (
 \r
     CopyGuid (&DevicePath->Vendor.Guid, &gVirtioMmioTransportGuid);\r
     DevicePath->PhysBase = RegBase;\r
-    SetDevicePathNodeLength (&DevicePath->Vendor,\r
-      sizeof (*DevicePath) - sizeof (DevicePath->End));\r
+    SetDevicePathNodeLength (\r
+      &DevicePath->Vendor,\r
+      sizeof (*DevicePath) - sizeof (DevicePath->End)\r
+      );\r
     SetDevicePathEndNode (&DevicePath->End);\r
 \r
     Handle = NULL;\r
-    Status = gBS->InstallProtocolInterface (&Handle,\r
-                     &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                     DevicePath);\r
+    Status = gBS->InstallProtocolInterface (\r
+                    &Handle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    EFI_NATIVE_INTERFACE,\r
+                    DevicePath\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: Failed to install the EFI_DEVICE_PATH "\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Failed to install the EFI_DEVICE_PATH "\r
         "protocol on a new handle (Status == %r)\n",\r
-        __FUNCTION__, Status));\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       FreePool (DevicePath);\r
       continue;\r
     }\r
 \r
     Status = VirtioMmioInstallDevice (RegBase, Handle);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: Failed to install VirtIO transport @ 0x%Lx "\r
-        "on handle %p (Status == %r)\n", __FUNCTION__, RegBase,\r
-        Handle, Status));\r
-\r
-      Status = gBS->UninstallProtocolInterface (Handle,\r
-                      &gEfiDevicePathProtocolGuid, DevicePath);\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Failed to install VirtIO transport @ 0x%Lx "\r
+        "on handle %p (Status == %r)\n",\r
+        __FUNCTION__,\r
+        RegBase,\r
+        Handle,\r
+        Status\r
+        ));\r
+\r
+      Status = gBS->UninstallProtocolInterface (\r
+                      Handle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      DevicePath\r
+                      );\r
       ASSERT_EFI_ERROR (Status);\r
       FreePool (DevicePath);\r
       continue;\r
     }\r
   }\r
 \r
-  if (EFI_ERROR (FindNodeStatus) && FindNodeStatus != EFI_NOT_FOUND) {\r
-     DEBUG ((DEBUG_ERROR, "%a: Error occurred while iterating DT nodes "\r
-       "(FindNodeStatus == %r)\n", __FUNCTION__, FindNodeStatus));\r
+  if (EFI_ERROR (FindNodeStatus) && (FindNodeStatus != EFI_NOT_FOUND)) {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: Error occurred while iterating DT nodes "\r
+      "(FindNodeStatus == %r)\n",\r
+      __FUNCTION__,\r
+      FindNodeStatus\r
+      ));\r
   }\r
 \r
   return EFI_SUCCESS;\r
index 7026fc5b089ffa07e0ee9a5655804c6fc90e54ac..b935573539634339155513aa68bf024c394b70fe 100644 (file)
@@ -1,4 +1,4 @@
- /** @file\r
+/** @file\r
    UEFI Configuration Table for exposing the SEV Launch Secret location to UEFI\r
    applications (boot loaders).\r
 \r
   }\r
 \r
 typedef struct {\r
-  UINT64 Base;\r
-  UINT64 Size;\r
+  UINT64    Base;\r
+  UINT64    Size;\r
 } CONFIDENTIAL_COMPUTING_SECRET_LOCATION;\r
 \r
-extern EFI_GUID gConfidentialComputingSecretGuid;\r
+extern EFI_GUID  gConfidentialComputingSecretGuid;\r
 \r
 #endif // SEV_LAUNCH_SECRET_H_\r
index db7a326c3194a2acd9dd153d0fcee058cb6c153a..0462f725882ef16c83ff8a567ae1e95f4fa133b0 100644 (file)
@@ -50,6 +50,6 @@
     { 0xbd, 0x60, 0x28, 0xf4, 0xe7, 0x8f, 0x78, 0x4b }, \\r
   }\r
 \r
-extern EFI_GUID gMicrosoftVendorGuid;\r
+extern EFI_GUID  gMicrosoftVendorGuid;\r
 \r
 #endif /* MICROSOFT_VENDOR_H_ */\r
index e05d2fe021b7b9b2b932c880fefb79dc703285b1..b039a4745414dc80603ecfd28509f31b2a8776f2 100644 (file)
@@ -40,6 +40,6 @@
     { 0x81, 0xd3, 0x5b, 0xb9, 0x71, 0x5f, 0x97, 0x27 }, \\r
   }\r
 \r
-extern EFI_GUID gOvmfPkKek1AppPrefixGuid;\r
+extern EFI_GUID  gOvmfPkKek1AppPrefixGuid;\r
 \r
 #endif /* OVMF_PK_KEK1_APP_PREFIX_H_ */\r
index 19b3936cf9c246f17e88563ab19a3353f19a992a..4bf0d8a089a536559052ee6326a8a85a369982ff 100644 (file)
@@ -13,6 +13,6 @@
 #define OVMF_PLATFORM_CONFIG_GUID \\r
 {0x7235c51c, 0x0c80, 0x4cab, {0x87, 0xac, 0x3b, 0x08, 0x4a, 0x63, 0x04, 0xb1}}\r
 \r
-extern EFI_GUID gOvmfPlatformConfigGuid;\r
+extern EFI_GUID  gOvmfPlatformConfigGuid;\r
 \r
 #endif\r
index 225c3c494613c5fc25e3f85095d2ac77ec208a21..fa64e4e3f5cb572e3eaf1fa576fb71fb1c988609 100644 (file)
@@ -13,6 +13,6 @@
 #define QEMU_KERNEL_LOADER_FS_MEDIA_GUID \\r
   {0x1428f772, 0xb64a, 0x441e, {0xb8, 0xc3, 0x9e, 0xbd, 0xd7, 0xf8, 0x93, 0xc7}}\r
 \r
-extern EFI_GUID gQemuKernelLoaderFsMediaGuid;\r
+extern EFI_GUID  gQemuKernelLoaderFsMediaGuid;\r
 \r
 #endif\r
index b0102ec053c7c28e60bf9f645f348b6ece19929d..74d59bb089f82b7f2d37859f68bdfd7e0feb3ca6 100644 (file)
@@ -14,6 +14,6 @@
 #define QEMU_RAMFB_GUID \\r
 {0x557423a1, 0x63ab, 0x406c, {0xbe, 0x7e, 0x91, 0xcd, 0xbc, 0x08, 0xc4, 0x57}}\r
 \r
-extern EFI_GUID gQemuRamfbGuid;\r
+extern EFI_GUID  gQemuRamfbGuid;\r
 \r
 #endif\r
index b85f8743c662b43cbc10cfdf4732287536e9a302..e4542d645f4adbf7443b402cb2b703c27f2acb5d 100644 (file)
@@ -22,6 +22,6 @@
     { 0x90, 0x42, 0xf2, 0x6e, 0x47, 0x97, 0xee, 0x69 }, \\r
   }\r
 \r
-extern EFI_GUID gRootBridgesConnectedEventGroupGuid;\r
+extern EFI_GUID  gRootBridgesConnectedEventGroupGuid;\r
 \r
 #endif\r
index 91e1f13910f84c3a6b6d5a51e08d67546ca6c7af..280700d4045d03b6fefdade626010b751dd4b924 100644 (file)
@@ -14,6 +14,6 @@
 #define VIRTIO_MMIO_TRANSPORT_GUID \\r
 {0x837dca9e, 0xe874, 0x4d82, {0xb2, 0x9a, 0x23, 0xfe, 0x0e, 0x23, 0xd1, 0xe2}}\r
 \r
-extern EFI_GUID gVirtioMmioTransportGuid;\r
+extern EFI_GUID  gVirtioMmioTransportGuid;\r
 \r
 #endif\r
index 932f6cf7fe886a50baf177aaee86958ef701451f..e17de76fea6108f9032d785dd5764e0044d0a879 100644 (file)
@@ -13,6 +13,6 @@
 #define XENBUS_ROOT_DEVICE_GUID \\r
 {0xa732241f, 0x383d, 0x4d9c, {0x8a, 0xe1, 0x8e, 0x09, 0x83, 0x75, 0x89, 0xd7}}\r
 \r
-extern EFI_GUID gXenBusRootDeviceGuid;\r
+extern EFI_GUID  gXenBusRootDeviceGuid;\r
 \r
 #endif\r
index 25743b388400bcce282f43c7fd6b96411961c4d3..a8f6a36f1cbb8c6a0e57bde8b392fb1c6e539a6c 100644 (file)
@@ -16,21 +16,21 @@ typedef struct {
   ///\r
   /// Beginning of the hypercall page.\r
   ///\r
-  VOID *HyperPages;\r
+  VOID      *HyperPages;\r
   ///\r
   /// Hypervisor major version.\r
   ///\r
-  UINT16 VersionMajor;\r
+  UINT16    VersionMajor;\r
   ///\r
   /// Hypervisor minor version.\r
   ///\r
-  UINT16 VersionMinor;\r
+  UINT16    VersionMinor;\r
   ///\r
   /// Pointer to the RSDP found in the hvm_start_info provided to a PVH guest\r
   ///\r
-  VOID *RsdpPvh;\r
+  VOID      *RsdpPvh;\r
 } EFI_XEN_INFO;\r
 \r
-extern EFI_GUID gEfiXenInfoGuid;\r
+extern EFI_GUID  gEfiXenInfoGuid;\r
 \r
 #endif\r
index ab8f2b0729b4eb7668b91d7a1c1dc53f752b53c8..c22d301d47c7cf9583aaab5fbab62721a5dfe870 100644 (file)
@@ -11,8 +11,8 @@
 #ifndef __BHYVE_H__\r
 #define __BHYVE_H__\r
 \r
-#define BHYVE_ACPI_TIMER_IO_ADDR 0x408\r
+#define BHYVE_ACPI_TIMER_IO_ADDR  0x408\r
 \r
-#define BHYVE_PM_REG 0x404\r
+#define BHYVE_PM_REG  0x404\r
 \r
 #endif // __BHYVE_H__\r
index 1fa0956d2c39c39ae849a2426e069b83384d088d..e41be5af3c6c5779e9a49ae50f9484dec6348a1c 100644 (file)
@@ -7,7 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #ifndef __E820_H__\r
 #define __E820_H__\r
 \r
@@ -21,17 +20,17 @@ typedef enum {
 } EFI_ACPI_MEMORY_TYPE;\r
 \r
 typedef struct {\r
-  UINT64                BaseAddr;\r
-  UINT64                Length;\r
-  EFI_ACPI_MEMORY_TYPE  Type;\r
+  UINT64                  BaseAddr;\r
+  UINT64                  Length;\r
+  EFI_ACPI_MEMORY_TYPE    Type;\r
 } EFI_E820_ENTRY64;\r
 \r
 typedef struct {\r
-  UINT32                BassAddrLow;\r
-  UINT32                BaseAddrHigh;\r
-  UINT32                LengthLow;\r
-  UINT32                LengthHigh;\r
-  EFI_ACPI_MEMORY_TYPE  Type;\r
+  UINT32                  BassAddrLow;\r
+  UINT32                  BaseAddrHigh;\r
+  UINT32                  LengthLow;\r
+  UINT32                  LengthHigh;\r
+  EFI_ACPI_MEMORY_TYPE    Type;\r
 } EFI_E820_ENTRY;\r
 \r
 #pragma pack()\r
index 99778d1537dab557db39a30fb6f4241cd74c7283..ad5dbaa4145302892bfe5241ffaf715f25c7ac8c 100644 (file)
 // Device offsets and constants\r
 //\r
 \r
-#define LSI_LOGIC_PCI_VENDOR_ID 0x1000\r
-#define LSI_53C1030_PCI_DEVICE_ID 0x0030\r
-#define LSI_SAS1068_PCI_DEVICE_ID 0x0054\r
-#define LSI_SAS1068E_PCI_DEVICE_ID 0x0058\r
+#define LSI_LOGIC_PCI_VENDOR_ID     0x1000\r
+#define LSI_53C1030_PCI_DEVICE_ID   0x0030\r
+#define LSI_SAS1068_PCI_DEVICE_ID   0x0054\r
+#define LSI_SAS1068E_PCI_DEVICE_ID  0x0058\r
 \r
-#define MPT_REG_DOORBELL  0x00\r
-#define MPT_REG_WRITE_SEQ 0x04\r
-#define MPT_REG_HOST_DIAG 0x08\r
-#define MPT_REG_TEST      0x0c\r
-#define MPT_REG_DIAG_DATA 0x10\r
-#define MPT_REG_DIAG_ADDR 0x14\r
-#define MPT_REG_ISTATUS   0x30\r
-#define MPT_REG_IMASK     0x34\r
-#define MPT_REG_REQ_Q     0x40\r
-#define MPT_REG_REP_Q     0x44\r
+#define MPT_REG_DOORBELL   0x00\r
+#define MPT_REG_WRITE_SEQ  0x04\r
+#define MPT_REG_HOST_DIAG  0x08\r
+#define MPT_REG_TEST       0x0c\r
+#define MPT_REG_DIAG_DATA  0x10\r
+#define MPT_REG_DIAG_ADDR  0x14\r
+#define MPT_REG_ISTATUS    0x30\r
+#define MPT_REG_IMASK      0x34\r
+#define MPT_REG_REQ_Q      0x40\r
+#define MPT_REG_REP_Q      0x44\r
 \r
-#define MPT_DOORBELL_RESET     0x40\r
-#define MPT_DOORBELL_HANDSHAKE 0x42\r
+#define MPT_DOORBELL_RESET      0x40\r
+#define MPT_DOORBELL_HANDSHAKE  0x42\r
 \r
-#define MPT_IMASK_DOORBELL 0x01\r
-#define MPT_IMASK_REPLY    0x08\r
+#define MPT_IMASK_DOORBELL  0x01\r
+#define MPT_IMASK_REPLY     0x08\r
 \r
-#define MPT_MESSAGE_HDR_FUNCTION_SCSI_IO_REQUEST 0x00\r
-#define MPT_MESSAGE_HDR_FUNCTION_IOC_INIT        0x02\r
+#define MPT_MESSAGE_HDR_FUNCTION_SCSI_IO_REQUEST  0x00\r
+#define MPT_MESSAGE_HDR_FUNCTION_IOC_INIT         0x02\r
 \r
-#define MPT_SG_ENTRY_TYPE_SIMPLE 0x01\r
+#define MPT_SG_ENTRY_TYPE_SIMPLE  0x01\r
 \r
-#define MPT_IOC_WHOINIT_ROM_BIOS 0x02\r
+#define MPT_IOC_WHOINIT_ROM_BIOS  0x02\r
 \r
-#define MPT_SCSIIO_REQUEST_CONTROL_TXDIR_NONE  (0x00 << 24)\r
-#define MPT_SCSIIO_REQUEST_CONTROL_TXDIR_WRITE (0x01 << 24)\r
-#define MPT_SCSIIO_REQUEST_CONTROL_TXDIR_READ  (0x02 << 24)\r
+#define MPT_SCSIIO_REQUEST_CONTROL_TXDIR_NONE   (0x00 << 24)\r
+#define MPT_SCSIIO_REQUEST_CONTROL_TXDIR_WRITE  (0x01 << 24)\r
+#define MPT_SCSIIO_REQUEST_CONTROL_TXDIR_READ   (0x02 << 24)\r
 \r
-#define MPT_SCSI_IOCSTATUS_SUCCESS          0x0000\r
-#define MPT_SCSI_IOCSTATUS_DEVICE_NOT_THERE 0x0043\r
-#define MPT_SCSI_IOCSTATUS_DATA_OVERRUN     0x0044\r
-#define MPT_SCSI_IOCSTATUS_DATA_UNDERRUN    0x0045\r
+#define MPT_SCSI_IOCSTATUS_SUCCESS           0x0000\r
+#define MPT_SCSI_IOCSTATUS_DEVICE_NOT_THERE  0x0043\r
+#define MPT_SCSI_IOCSTATUS_DATA_OVERRUN      0x0044\r
+#define MPT_SCSI_IOCSTATUS_DATA_UNDERRUN     0x0045\r
 \r
 //\r
 // Device structures\r
@@ -107,18 +107,18 @@ typedef struct {
 } MPT_SCSI_IO_REQUEST;\r
 \r
 typedef struct {\r
-  UINT32    Length:             24;\r
-  UINT32    EndOfList:          1;\r
-  UINT32    Is64BitAddress:     1;\r
+  UINT32    Length             :             24;\r
+  UINT32    EndOfList          :          1;\r
+  UINT32    Is64BitAddress     :     1;\r
   //\r
   // True when the buffer contains data to be transfered. Otherwise it's the\r
   // destination buffer\r
   //\r
-  UINT32    BufferContainsData: 1;\r
-  UINT32    LocalAddress:       1;\r
-  UINT32    ElementType:        2;\r
-  UINT32    EndOfBuffer:        1;\r
-  UINT32    LastElement:        1;\r
+  UINT32    BufferContainsData : 1;\r
+  UINT32    LocalAddress       :       1;\r
+  UINT32    ElementType        :        2;\r
+  UINT32    EndOfBuffer        :        1;\r
+  UINT32    LastElement        :        1;\r
   UINT64    DataBufferAddress;\r
 } MPT_SG_ENTRY_SIMPLE;\r
 \r
@@ -142,19 +142,19 @@ typedef struct {
 } MPT_SCSI_IO_REPLY;\r
 \r
 typedef struct {\r
-  MPT_SCSI_IO_REQUEST Header;\r
-  MPT_SG_ENTRY_SIMPLE Sg;\r
+  MPT_SCSI_IO_REQUEST    Header;\r
+  MPT_SG_ENTRY_SIMPLE    Sg;\r
 } MPT_SCSI_REQUEST_WITH_SG;\r
 #pragma pack ()\r
 \r
 typedef union {\r
-  MPT_SCSI_IO_REPLY        Data;\r
-  UINT64                   Uint64; // 8 byte alignment required by HW\r
+  MPT_SCSI_IO_REPLY    Data;\r
+  UINT64               Uint64;     // 8 byte alignment required by HW\r
 } MPT_SCSI_IO_REPLY_ALIGNED;\r
 \r
 typedef union {\r
-  MPT_SCSI_REQUEST_WITH_SG Data;\r
-  UINT64                   Uint64; // 8 byte alignment required by HW\r
+  MPT_SCSI_REQUEST_WITH_SG    Data;\r
+  UINT64                      Uint64; // 8 byte alignment required by HW\r
 } MPT_SCSI_REQUEST_ALIGNED;\r
 \r
 #endif // __FUSION_MPT_SCSI_H__\r
index 3973ff0a95b48f1f4924dd397744313ad8c73aa7..b4c374c920485977b8353e465ce87746de3654e9 100644 (file)
 //\r
 // Host Bridge Device ID (DID) value for I440FX\r
 //\r
-#define INTEL_82441_DEVICE_ID 0x1237\r
+#define INTEL_82441_DEVICE_ID  0x1237\r
 \r
 //\r
 // B/D/F/Type: 0/0/0/PCI\r
 //\r
-#define PMC_REGISTER_PIIX4(Offset) PCI_LIB_ADDRESS (0, 0, 0, (Offset))\r
+#define PMC_REGISTER_PIIX4(Offset)  PCI_LIB_ADDRESS (0, 0, 0, (Offset))\r
 \r
-#define PIIX4_PAM0              0x59\r
-#define PIIX4_PAM1              0x5A\r
-#define PIIX4_PAM2              0x5B\r
-#define PIIX4_PAM3              0x5C\r
-#define PIIX4_PAM4              0x5D\r
-#define PIIX4_PAM5              0x5E\r
-#define PIIX4_PAM6              0x5F\r
+#define PIIX4_PAM0  0x59\r
+#define PIIX4_PAM1  0x5A\r
+#define PIIX4_PAM2  0x5B\r
+#define PIIX4_PAM3  0x5C\r
+#define PIIX4_PAM4  0x5D\r
+#define PIIX4_PAM5  0x5E\r
+#define PIIX4_PAM6  0x5F\r
 \r
 //\r
 // B/D/F/Type: 0/1/3/PCI\r
 //\r
-#define POWER_MGMT_REGISTER_PIIX4(Offset) PCI_LIB_ADDRESS (0, 1, 3, (Offset))\r
+#define POWER_MGMT_REGISTER_PIIX4(Offset)  PCI_LIB_ADDRESS (0, 1, 3, (Offset))\r
 \r
-#define PIIX4_PMBA             0x40\r
-#define PIIX4_PMBA_MASK          (BIT15 | BIT14 | BIT13 | BIT12 | BIT11 | \\r
+#define PIIX4_PMBA       0x40\r
+#define PIIX4_PMBA_MASK  (BIT15 | BIT14 | BIT13 | BIT12 | BIT11 |         \\r
                                   BIT10 | BIT9  | BIT8  | BIT7  | BIT6)\r
 \r
-#define PIIX4_PMREGMISC        0x80\r
-#define PIIX4_PMREGMISC_PMIOSE   BIT0\r
+#define PIIX4_PMREGMISC         0x80\r
+#define PIIX4_PMREGMISC_PMIOSE  BIT0\r
 \r
 //\r
 // IO ports\r
 //\r
-#define PIIX4_CPU_HOTPLUG_BASE 0xAF00\r
+#define PIIX4_CPU_HOTPLUG_BASE  0xAF00\r
 \r
 #endif\r
index 149ff328e06c6a26aba007c9f88f22993b9e118d..e70557a933572b299dd57ef76faa5dd4edb92674 100644 (file)
 //\r
 typedef union {\r
   struct {\r
-    UINT8  BitB:1;\r
-    UINT8  BitX:1;\r
-    UINT8  BitR:1;\r
-    UINT8  BitW:1;\r
-    UINT8  Rex:4;\r
+    UINT8    BitB : 1;\r
+    UINT8    BitX : 1;\r
+    UINT8    BitR : 1;\r
+    UINT8    BitW : 1;\r
+    UINT8    Rex  : 4;\r
   } Bits;\r
 \r
-  UINT8  Uint8;\r
+  UINT8    Uint8;\r
 } INSTRUCTION_REX_PREFIX;\r
 \r
 //\r
@@ -32,12 +32,12 @@ typedef union {
 //\r
 typedef union {\r
   struct {\r
-    UINT8  Rm:3;\r
-    UINT8  Reg:3;\r
-    UINT8  Mod:2;\r
+    UINT8    Rm  : 3;\r
+    UINT8    Reg : 3;\r
+    UINT8    Mod : 2;\r
   } Bits;\r
 \r
-  UINT8  Uint8;\r
+  UINT8    Uint8;\r
 } INSTRUCTION_MODRM;\r
 \r
 //\r
@@ -45,28 +45,28 @@ typedef union {
 //\r
 typedef union {\r
   struct {\r
-    UINT8  Base:3;\r
-    UINT8  Index:3;\r
-    UINT8  Scale:2;\r
+    UINT8    Base  : 3;\r
+    UINT8    Index : 3;\r
+    UINT8    Scale : 2;\r
   } Bits;\r
 \r
-  UINT8  Uint8;\r
+  UINT8    Uint8;\r
 } INSTRUCTION_SIB;\r
 \r
 //\r
 // Legacy Instruction Prefixes\r
 //\r
-#define OVERRIDE_SEGMENT_CS          0x2E\r
-#define OVERRIDE_SEGMENT_DS          0x3E\r
-#define OVERRIDE_SEGMENT_ES          0x26\r
-#define OVERRIDE_SEGMENT_SS          0x36\r
-#define OVERRIDE_SEGMENT_FS          0x64\r
-#define OVERRIDE_SEGMENT_GS          0x65\r
-#define OVERRIDE_OPERAND_SIZE        0x66\r
-#define OVERRIDE_ADDRESS_SIZE        0x67\r
-#define LOCK_PREFIX                  0xF0\r
-#define REPNZ_PREFIX                 0xF2\r
-#define REPZ_PREFIX                  0xF3\r
+#define OVERRIDE_SEGMENT_CS    0x2E\r
+#define OVERRIDE_SEGMENT_DS    0x3E\r
+#define OVERRIDE_SEGMENT_ES    0x26\r
+#define OVERRIDE_SEGMENT_SS    0x36\r
+#define OVERRIDE_SEGMENT_FS    0x64\r
+#define OVERRIDE_SEGMENT_GS    0x65\r
+#define OVERRIDE_OPERAND_SIZE  0x66\r
+#define OVERRIDE_ADDRESS_SIZE  0x67\r
+#define LOCK_PREFIX            0xF0\r
+#define REPNZ_PREFIX           0xF2\r
+#define REPZ_PREFIX            0xF3\r
 \r
 //\r
 // REX Prefixes\r
@@ -78,6 +78,6 @@ typedef union {
 //\r
 // Two-byte Opcode Flag\r
 //\r
-#define TWO_BYTE_OPCODE_ESCAPE       0x0F\r
+#define TWO_BYTE_OPCODE_ESCAPE  0x0F\r
 \r
 #endif\r
index 38360a68b259cb347ed405878ba436feaf4b207a..7568d585a96fa6dd40598f732b20d405bb39676d 100644 (file)
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT8  Signature[4];\r
-  UINT16 VesaVersion;\r
-  UINT32 OemNameAddress;\r
-  UINT32 Capabilities;\r
-  UINT32 ModeListAddress;\r
-  UINT16 VideoMem64K;\r
-  UINT16 OemSoftwareVersion;\r
-  UINT32 VendorNameAddress;\r
-  UINT32 ProductNameAddress;\r
-  UINT32 ProductRevAddress;\r
+  UINT8     Signature[4];\r
+  UINT16    VesaVersion;\r
+  UINT32    OemNameAddress;\r
+  UINT32    Capabilities;\r
+  UINT32    ModeListAddress;\r
+  UINT16    VideoMem64K;\r
+  UINT16    OemSoftwareVersion;\r
+  UINT32    VendorNameAddress;\r
+  UINT32    ProductNameAddress;\r
+  UINT32    ProductRevAddress;\r
 } VBE_INFO_BASE;\r
 \r
 typedef struct {\r
-  VBE_INFO_BASE  Base;\r
-  UINT8          Buffer[256 - sizeof (VBE_INFO_BASE)];\r
+  VBE_INFO_BASE    Base;\r
+  UINT8            Buffer[256 - sizeof (VBE_INFO_BASE)];\r
 } VBE_INFO;\r
 \r
 typedef struct {\r
-  UINT16 ModeAttr;\r
-  UINT8  WindowAAttr;\r
-  UINT8  WindowBAttr;\r
-  UINT16 WindowGranularityKB;\r
-  UINT16 WindowSizeKB;\r
-  UINT16 WindowAStartSegment;\r
-  UINT16 WindowBStartSegment;\r
-  UINT32 WindowPositioningAddress;\r
-  UINT16 BytesPerScanLine;\r
-\r
-  UINT16 Width;\r
-  UINT16 Height;\r
-  UINT8  CharCellWidth;\r
-  UINT8  CharCellHeight;\r
-  UINT8  NumPlanes;\r
-  UINT8  BitsPerPixel;\r
-  UINT8  NumBanks;\r
-  UINT8  MemoryModel;\r
-  UINT8  BankSizeKB;\r
-  UINT8  NumImagePagesLessOne;\r
-  UINT8  Vbe3;\r
-\r
-  UINT8  RedMaskSize;\r
-  UINT8  RedMaskPos;\r
-  UINT8  GreenMaskSize;\r
-  UINT8  GreenMaskPos;\r
-  UINT8  BlueMaskSize;\r
-  UINT8  BlueMaskPos;\r
-  UINT8  ReservedMaskSize;\r
-  UINT8  ReservedMaskPos;\r
-  UINT8  DirectColorModeInfo;\r
-\r
-  UINT32 LfbAddress;\r
-  UINT32 OffScreenAddress;\r
-  UINT16 OffScreenSizeKB;\r
-\r
-  UINT16 BytesPerScanLineLinear;\r
-  UINT8  NumImagesLessOneBanked;\r
-  UINT8  NumImagesLessOneLinear;\r
-  UINT8  RedMaskSizeLinear;\r
-  UINT8  RedMaskPosLinear;\r
-  UINT8  GreenMaskSizeLinear;\r
-  UINT8  GreenMaskPosLinear;\r
-  UINT8  BlueMaskSizeLinear;\r
-  UINT8  BlueMaskPosLinear;\r
-  UINT8  ReservedMaskSizeLinear;\r
-  UINT8  ReservedMaskPosLinear;\r
-  UINT32 MaxPixelClockHz;\r
-  UINT8  Reserved[190];\r
+  UINT16    ModeAttr;\r
+  UINT8     WindowAAttr;\r
+  UINT8     WindowBAttr;\r
+  UINT16    WindowGranularityKB;\r
+  UINT16    WindowSizeKB;\r
+  UINT16    WindowAStartSegment;\r
+  UINT16    WindowBStartSegment;\r
+  UINT32    WindowPositioningAddress;\r
+  UINT16    BytesPerScanLine;\r
+\r
+  UINT16    Width;\r
+  UINT16    Height;\r
+  UINT8     CharCellWidth;\r
+  UINT8     CharCellHeight;\r
+  UINT8     NumPlanes;\r
+  UINT8     BitsPerPixel;\r
+  UINT8     NumBanks;\r
+  UINT8     MemoryModel;\r
+  UINT8     BankSizeKB;\r
+  UINT8     NumImagePagesLessOne;\r
+  UINT8     Vbe3;\r
+\r
+  UINT8     RedMaskSize;\r
+  UINT8     RedMaskPos;\r
+  UINT8     GreenMaskSize;\r
+  UINT8     GreenMaskPos;\r
+  UINT8     BlueMaskSize;\r
+  UINT8     BlueMaskPos;\r
+  UINT8     ReservedMaskSize;\r
+  UINT8     ReservedMaskPos;\r
+  UINT8     DirectColorModeInfo;\r
+\r
+  UINT32    LfbAddress;\r
+  UINT32    OffScreenAddress;\r
+  UINT16    OffScreenSizeKB;\r
+\r
+  UINT16    BytesPerScanLineLinear;\r
+  UINT8     NumImagesLessOneBanked;\r
+  UINT8     NumImagesLessOneLinear;\r
+  UINT8     RedMaskSizeLinear;\r
+  UINT8     RedMaskPosLinear;\r
+  UINT8     GreenMaskSizeLinear;\r
+  UINT8     GreenMaskPosLinear;\r
+  UINT8     BlueMaskSizeLinear;\r
+  UINT8     BlueMaskPosLinear;\r
+  UINT8     ReservedMaskSizeLinear;\r
+  UINT8     ReservedMaskPosLinear;\r
+  UINT32    MaxPixelClockHz;\r
+  UINT8     Reserved[190];\r
 } VBE_MODE_INFO;\r
 \r
 typedef struct {\r
-  UINT16 ModeAttr;\r
-  UINT8  WindowAAttr;\r
-  UINT8  WindowBAttr;\r
-  UINT16 WindowGranularityKB;\r
-  UINT16 WindowSizeKB;\r
-  UINT16 WindowAStartSegment;\r
-  UINT16 WindowBStartSegment;\r
-  UINT32 WindowPositioningAddress;\r
-  UINT16 BytesPerScanLine;\r
-\r
-  UINT16 Width;\r
-  UINT16 Height;\r
-  UINT8  CharCellWidth;\r
-  UINT8  CharCellHeight;\r
-  UINT8  NumPlanes;\r
-  UINT8  BitsPerPixel;\r
-  UINT8  NumBanks;\r
-  UINT8  MemoryModel;\r
-  UINT8  BankSizeKB;\r
-  UINT8  NumImagePagesLessOne;\r
-  UINT8  Vbe3;\r
-\r
-  UINT8  RedMaskSize;\r
-  UINT8  RedMaskPos;\r
-  UINT8  GreenMaskSize;\r
-  UINT8  GreenMaskPos;\r
-  UINT8  BlueMaskSize;\r
-  UINT8  BlueMaskPos;\r
-  UINT8  ReservedMaskSize;\r
-  UINT8  ReservedMaskPos;\r
-  UINT8  DirectColorModeInfo;\r
-\r
-  UINT32 LfbAddress;\r
-  UINT32 OffScreenAddress;\r
-  UINT16 OffScreenSizeKB;\r
+  UINT16    ModeAttr;\r
+  UINT8     WindowAAttr;\r
+  UINT8     WindowBAttr;\r
+  UINT16    WindowGranularityKB;\r
+  UINT16    WindowSizeKB;\r
+  UINT16    WindowAStartSegment;\r
+  UINT16    WindowBStartSegment;\r
+  UINT32    WindowPositioningAddress;\r
+  UINT16    BytesPerScanLine;\r
+\r
+  UINT16    Width;\r
+  UINT16    Height;\r
+  UINT8     CharCellWidth;\r
+  UINT8     CharCellHeight;\r
+  UINT8     NumPlanes;\r
+  UINT8     BitsPerPixel;\r
+  UINT8     NumBanks;\r
+  UINT8     MemoryModel;\r
+  UINT8     BankSizeKB;\r
+  UINT8     NumImagePagesLessOne;\r
+  UINT8     Vbe3;\r
+\r
+  UINT8     RedMaskSize;\r
+  UINT8     RedMaskPos;\r
+  UINT8     GreenMaskSize;\r
+  UINT8     GreenMaskPos;\r
+  UINT8     BlueMaskSize;\r
+  UINT8     BlueMaskPos;\r
+  UINT8     ReservedMaskSize;\r
+  UINT8     ReservedMaskPos;\r
+  UINT8     DirectColorModeInfo;\r
+\r
+  UINT32    LfbAddress;\r
+  UINT32    OffScreenAddress;\r
+  UINT16    OffScreenSizeKB;\r
 } VBE2_MODE_INFO;\r
 #pragma pack ()\r
 \r
index aa00ddaf418595526f2156e30bca51ee2d6c9464..08d0fcab442da9c10d4be10739b920183dc44cfe 100644 (file)
 #ifndef __LINUX_BZIMAGE_H__\r
 #define __LINUX_BZIMAGE_H__\r
 \r
-#define BOOTSIG                        0x1FE\r
-#define SETUP_HDR              0x53726448      /* 0x53726448 == "HdrS" */\r
+#define BOOTSIG    0x1FE\r
+#define SETUP_HDR  0x53726448                   /* 0x53726448 == "HdrS" */\r
 \r
-#define E820_RAM               1\r
-#define E820_RESERVED          2\r
-#define E820_ACPI              3\r
-#define E820_NVS               4\r
-#define E820_UNUSABLE          5\r
+#define E820_RAM       1\r
+#define E820_RESERVED  2\r
+#define E820_ACPI      3\r
+#define E820_NVS       4\r
+#define E820_UNUSABLE  5\r
 \r
 #pragma pack(1)\r
 \r
 struct setup_header {\r
-       UINT8 setup_secs;       /* Sectors for setup code */\r
-       UINT16 root_flags;\r
-       UINT32 sys_size;\r
-       UINT16 ram_size;\r
-       UINT16 video_mode;\r
-       UINT16 root_dev;\r
-       UINT16 signature;       /* Boot signature */\r
-       UINT16 jump;\r
-       UINT32 header;\r
-       UINT16 version;\r
-       UINT16 su_switch;\r
-       UINT16 setup_seg;\r
-       UINT16 start_sys;\r
-       UINT16 kernel_ver;\r
-       UINT8 loader_id;\r
-       UINT8 load_flags;\r
-       UINT16 movesize;\r
-       UINT32 code32_start;    /* Start of code loaded high */\r
-       UINT32 ramdisk_start;   /* Start of initial ramdisk */\r
-       UINT32 ramdisk_len;     /* Length of initial ramdisk */\r
-       UINT32 bootsect_kludge;\r
-       UINT16 heap_end;\r
-       UINT8 ext_loader_ver;  /* Extended boot loader version */\r
-       UINT8 ext_loader_type; /* Extended boot loader ID */\r
-       UINT32 cmd_line_ptr;   /* 32-bit pointer to the kernel command line */\r
-       UINT32 ramdisk_max;    /* Highest legal initrd address */\r
-       UINT32 kernel_alignment; /* Physical addr alignment required for kernel */\r
-       UINT8 relocatable_kernel; /* Whether kernel is relocatable or not */\r
-       UINT8 min_alignment;\r
-       UINT16 xloadflags;\r
-       UINT32 cmdline_size;\r
-       UINT32 hardware_subarch;\r
-       UINT64 hardware_subarch_data;\r
-       UINT32 payload_offset;\r
-       UINT32 payload_length;\r
-       UINT64 setup_data;\r
-       UINT64 pref_address;\r
-       UINT32 init_size;\r
-       UINT32 handover_offset;\r
+  UINT8     setup_secs;         /* Sectors for setup code */\r
+  UINT16    root_flags;\r
+  UINT32    sys_size;\r
+  UINT16    ram_size;\r
+  UINT16    video_mode;\r
+  UINT16    root_dev;\r
+  UINT16    signature;          /* Boot signature */\r
+  UINT16    jump;\r
+  UINT32    header;\r
+  UINT16    version;\r
+  UINT16    su_switch;\r
+  UINT16    setup_seg;\r
+  UINT16    start_sys;\r
+  UINT16    kernel_ver;\r
+  UINT8     loader_id;\r
+  UINT8     load_flags;\r
+  UINT16    movesize;\r
+  UINT32    code32_start;       /* Start of code loaded high */\r
+  UINT32    ramdisk_start;      /* Start of initial ramdisk */\r
+  UINT32    ramdisk_len;        /* Length of initial ramdisk */\r
+  UINT32    bootsect_kludge;\r
+  UINT16    heap_end;\r
+  UINT8     ext_loader_ver;     /* Extended boot loader version */\r
+  UINT8     ext_loader_type;    /* Extended boot loader ID */\r
+  UINT32    cmd_line_ptr;       /* 32-bit pointer to the kernel command line */\r
+  UINT32    ramdisk_max;        /* Highest legal initrd address */\r
+  UINT32    kernel_alignment;   /* Physical addr alignment required for kernel */\r
+  UINT8     relocatable_kernel; /* Whether kernel is relocatable or not */\r
+  UINT8     min_alignment;\r
+  UINT16    xloadflags;\r
+  UINT32    cmdline_size;\r
+  UINT32    hardware_subarch;\r
+  UINT64    hardware_subarch_data;\r
+  UINT32    payload_offset;\r
+  UINT32    payload_length;\r
+  UINT64    setup_data;\r
+  UINT64    pref_address;\r
+  UINT32    init_size;\r
+  UINT32    handover_offset;\r
 };\r
 \r
 struct efi_info {\r
-       UINT32 efi_loader_signature;\r
-       UINT32 efi_systab;\r
-       UINT32 efi_memdesc_size;\r
-       UINT32 efi_memdesc_version;\r
-       UINT32 efi_memmap;\r
-       UINT32 efi_memmap_size;\r
-       UINT32 efi_systab_hi;\r
-       UINT32 efi_memmap_hi;\r
+  UINT32    efi_loader_signature;\r
+  UINT32    efi_systab;\r
+  UINT32    efi_memdesc_size;\r
+  UINT32    efi_memdesc_version;\r
+  UINT32    efi_memmap;\r
+  UINT32    efi_memmap_size;\r
+  UINT32    efi_systab_hi;\r
+  UINT32    efi_memmap_hi;\r
 };\r
 \r
 struct e820_entry {\r
-       UINT64 addr;            /* start of memory segment */\r
-       UINT64 size;            /* size of memory segment */\r
-       UINT32 type;            /* type of memory segment */\r
+  UINT64    addr;               /* start of memory segment */\r
+  UINT64    size;               /* size of memory segment */\r
+  UINT32    type;               /* type of memory segment */\r
 };\r
 \r
 struct screen_info {\r
-        UINT8  orig_x;           /* 0x00 */\r
-        UINT8  orig_y;           /* 0x01 */\r
-        UINT16 ext_mem_k;        /* 0x02 */\r
-        UINT16 orig_video_page;  /* 0x04 */\r
-        UINT8  orig_video_mode;  /* 0x06 */\r
-        UINT8  orig_video_cols;  /* 0x07 */\r
-        UINT8  flags;            /* 0x08 */\r
-        UINT8  unused2;          /* 0x09 */\r
-        UINT16 orig_video_ega_bx;/* 0x0a */\r
-        UINT16 unused3;          /* 0x0c */\r
-        UINT8  orig_video_lines; /* 0x0e */\r
-        UINT8  orig_video_isVGA; /* 0x0f */\r
-        UINT16 orig_video_points;/* 0x10 */\r
-\r
-       /* VESA graphic mode -- linear frame buffer */\r
-        UINT16 lfb_width;        /* 0x12 */\r
-        UINT16 lfb_height;       /* 0x14 */\r
-        UINT16 lfb_depth;        /* 0x16 */\r
-        UINT32 lfb_base;         /* 0x18 */\r
-        UINT32 lfb_size;         /* 0x1c */\r
-        UINT16 cl_magic, cl_offset; /* 0x20 */\r
-       UINT16 lfb_linelength;   /* 0x24 */\r
-        UINT8  red_size;         /* 0x26 */\r
-        UINT8  red_pos;          /* 0x27 */\r
-        UINT8  green_size;       /* 0x28 */\r
-       UINT8  green_pos;        /* 0x29 */\r
-        UINT8  blue_size;        /* 0x2a */\r
-       UINT8  blue_pos;         /* 0x2b */\r
-        UINT8  rsvd_size;        /* 0x2c */\r
-        UINT8  rsvd_pos;         /* 0x2d */\r
-        UINT16 vesapm_seg;       /* 0x2e */\r
-       UINT16 vesapm_off;       /* 0x30 */\r
-        UINT16 pages;            /* 0x32 */\r
-        UINT16 vesa_attributes;  /* 0x34 */\r
-        UINT32 capabilities;     /* 0x36 */\r
-        UINT8  _reserved[6];     /* 0x3a */\r
+  UINT8     orig_x;              /* 0x00 */\r
+  UINT8     orig_y;              /* 0x01 */\r
+  UINT16    ext_mem_k;           /* 0x02 */\r
+  UINT16    orig_video_page;     /* 0x04 */\r
+  UINT8     orig_video_mode;     /* 0x06 */\r
+  UINT8     orig_video_cols;     /* 0x07 */\r
+  UINT8     flags;               /* 0x08 */\r
+  UINT8     unused2;             /* 0x09 */\r
+  UINT16    orig_video_ega_bx;   /* 0x0a */\r
+  UINT16    unused3;             /* 0x0c */\r
+  UINT8     orig_video_lines;    /* 0x0e */\r
+  UINT8     orig_video_isVGA;    /* 0x0f */\r
+  UINT16    orig_video_points;   /* 0x10 */\r
+\r
+  /* VESA graphic mode -- linear frame buffer */\r
+  UINT16    lfb_width;           /* 0x12 */\r
+  UINT16    lfb_height;          /* 0x14 */\r
+  UINT16    lfb_depth;           /* 0x16 */\r
+  UINT32    lfb_base;            /* 0x18 */\r
+  UINT32    lfb_size;            /* 0x1c */\r
+  UINT16    cl_magic, cl_offset; /* 0x20 */\r
+  UINT16    lfb_linelength;      /* 0x24 */\r
+  UINT8     red_size;            /* 0x26 */\r
+  UINT8     red_pos;             /* 0x27 */\r
+  UINT8     green_size;          /* 0x28 */\r
+  UINT8     green_pos;           /* 0x29 */\r
+  UINT8     blue_size;           /* 0x2a */\r
+  UINT8     blue_pos;            /* 0x2b */\r
+  UINT8     rsvd_size;           /* 0x2c */\r
+  UINT8     rsvd_pos;            /* 0x2d */\r
+  UINT16    vesapm_seg;          /* 0x2e */\r
+  UINT16    vesapm_off;          /* 0x30 */\r
+  UINT16    pages;               /* 0x32 */\r
+  UINT16    vesa_attributes;     /* 0x34 */\r
+  UINT32    capabilities;        /* 0x36 */\r
+  UINT8     _reserved[6];        /* 0x3a */\r
 };\r
 \r
 struct boot_params {\r
-       struct screen_info screen_info;\r
-       UINT8 apm_bios_info[0x14];\r
-       UINT8 _pad2[4];\r
-       UINT64 tboot_addr;\r
-       UINT8 ist_info[0x10];\r
-       UINT8 _pad3[16];\r
-       UINT8 hd0_info[16];\r
-       UINT8 hd1_info[16];\r
-       UINT8 sys_desc_table[0x10];\r
-       UINT8 olpc_ofw_header[0x10];\r
-       UINT8 _pad4[128];\r
-       UINT8 edid_info[0x80];\r
-       struct efi_info efi_info;\r
-       UINT32 alt_mem_k;\r
-       UINT32 scratch;\r
-       UINT8 e820_entries;\r
-       UINT8 eddbuf_entries;\r
-       UINT8 edd_mbr_sig_buf_entries;\r
-       UINT8 _pad6[6];\r
-       struct setup_header hdr;\r
-       UINT8 _pad7[0x290-0x1f1-sizeof(struct setup_header)];\r
-       UINT32 edd_mbr_sig_buffer[16];\r
-       struct e820_entry e820_map[128];\r
-       UINT8 _pad8[48];\r
-       UINT8 eddbuf[0x1ec];\r
-       UINT8 _pad9[276];\r
+  struct screen_info     screen_info;\r
+  UINT8                  apm_bios_info[0x14];\r
+  UINT8                  _pad2[4];\r
+  UINT64                 tboot_addr;\r
+  UINT8                  ist_info[0x10];\r
+  UINT8                  _pad3[16];\r
+  UINT8                  hd0_info[16];\r
+  UINT8                  hd1_info[16];\r
+  UINT8                  sys_desc_table[0x10];\r
+  UINT8                  olpc_ofw_header[0x10];\r
+  UINT8                  _pad4[128];\r
+  UINT8                  edid_info[0x80];\r
+  struct efi_info        efi_info;\r
+  UINT32                 alt_mem_k;\r
+  UINT32                 scratch;\r
+  UINT8                  e820_entries;\r
+  UINT8                  eddbuf_entries;\r
+  UINT8                  edd_mbr_sig_buf_entries;\r
+  UINT8                  _pad6[6];\r
+  struct setup_header    hdr;\r
+  UINT8                  _pad7[0x290-0x1f1-sizeof (struct setup_header)];\r
+  UINT32                 edd_mbr_sig_buffer[16];\r
+  struct e820_entry      e820_map[128];\r
+  UINT8                  _pad8[48];\r
+  UINT8                  eddbuf[0x1ec];\r
+  UINT8                  _pad9[276];\r
 };\r
 \r
 typedef struct {\r
-       UINT16 limit;\r
-       UINT64 *base;\r
+  UINT16    limit;\r
+  UINT64    *base;\r
 } dt_addr_t;\r
 \r
 #pragma pack()\r
 \r
-extern EFI_STATUS setup_graphics(struct boot_params *buf);\r
+extern EFI_STATUS\r
+setup_graphics (\r
+  struct boot_params  *buf\r
+  );\r
 \r
 #endif /* __LINUX_BZIMAGE_H__ */\r
index 01d75323cdbcdc3427cc55c0d5e79eef81078b68..affff53889cc6e7bafab44bcae44e234bf62b7be 100644 (file)
 //\r
 // Device ID\r
 //\r
-#define LSI_LOGIC_PCI_VENDOR_ID   0x1000\r
-#define LSI_53C895A_PCI_DEVICE_ID 0x0012\r
+#define LSI_LOGIC_PCI_VENDOR_ID    0x1000\r
+#define LSI_53C895A_PCI_DEVICE_ID  0x0012\r
 \r
 //\r
 // LSI 53C895A Registers\r
 //\r
-#define LSI_REG_DSTAT             0x0C\r
-#define LSI_REG_ISTAT0            0x14\r
-#define LSI_REG_DSP               0x2C\r
-#define LSI_REG_SIST0             0x42\r
-#define LSI_REG_SIST1             0x43\r
-#define LSI_REG_CSBC              0xDC\r
+#define LSI_REG_DSTAT   0x0C\r
+#define LSI_REG_ISTAT0  0x14\r
+#define LSI_REG_DSP     0x2C\r
+#define LSI_REG_SIST0   0x42\r
+#define LSI_REG_SIST1   0x43\r
+#define LSI_REG_CSBC    0xDC\r
 \r
 //\r
 // The status bits for DMA Status (DSTAT)\r
 //\r
-#define LSI_DSTAT_IID             BIT0\r
-#define LSI_DSTAT_R               BIT1\r
-#define LSI_DSTAT_SIR             BIT2\r
-#define LSI_DSTAT_SSI             BIT3\r
-#define LSI_DSTAT_ABRT            BIT4\r
-#define LSI_DSTAT_BF              BIT5\r
-#define LSI_DSTAT_MDPE            BIT6\r
-#define LSI_DSTAT_DFE             BIT7\r
+#define LSI_DSTAT_IID   BIT0\r
+#define LSI_DSTAT_R     BIT1\r
+#define LSI_DSTAT_SIR   BIT2\r
+#define LSI_DSTAT_SSI   BIT3\r
+#define LSI_DSTAT_ABRT  BIT4\r
+#define LSI_DSTAT_BF    BIT5\r
+#define LSI_DSTAT_MDPE  BIT6\r
+#define LSI_DSTAT_DFE   BIT7\r
 \r
 //\r
 // The status bits for Interrupt Status Zero (ISTAT0)\r
 //\r
-#define LSI_ISTAT0_DIP            BIT0\r
-#define LSI_ISTAT0_SIP            BIT1\r
-#define LSI_ISTAT0_INTF           BIT2\r
-#define LSI_ISTAT0_CON            BIT3\r
-#define LSI_ISTAT0_SEM            BIT4\r
-#define LSI_ISTAT0_SIGP           BIT5\r
-#define LSI_ISTAT0_SRST           BIT6\r
-#define LSI_ISTAT0_ABRT           BIT7\r
+#define LSI_ISTAT0_DIP   BIT0\r
+#define LSI_ISTAT0_SIP   BIT1\r
+#define LSI_ISTAT0_INTF  BIT2\r
+#define LSI_ISTAT0_CON   BIT3\r
+#define LSI_ISTAT0_SEM   BIT4\r
+#define LSI_ISTAT0_SIGP  BIT5\r
+#define LSI_ISTAT0_SRST  BIT6\r
+#define LSI_ISTAT0_ABRT  BIT7\r
 \r
 //\r
 // The status bits for SCSI Interrupt Status Zero (SIST0)\r
 //\r
-#define LSI_SIST0_PAR             BIT0\r
-#define LSI_SIST0_RST             BIT1\r
-#define LSI_SIST0_UDC             BIT2\r
-#define LSI_SIST0_SGE             BIT3\r
-#define LSI_SIST0_RSL             BIT4\r
-#define LSI_SIST0_SEL             BIT5\r
-#define LSI_SIST0_CMP             BIT6\r
-#define LSI_SIST0_MA              BIT7\r
+#define LSI_SIST0_PAR  BIT0\r
+#define LSI_SIST0_RST  BIT1\r
+#define LSI_SIST0_UDC  BIT2\r
+#define LSI_SIST0_SGE  BIT3\r
+#define LSI_SIST0_RSL  BIT4\r
+#define LSI_SIST0_SEL  BIT5\r
+#define LSI_SIST0_CMP  BIT6\r
+#define LSI_SIST0_MA   BIT7\r
 \r
 //\r
 // The status bits for SCSI Interrupt Status One (SIST1)\r
 //\r
-#define LSI_SIST1_HTH             BIT0\r
-#define LSI_SIST1_GEN             BIT1\r
-#define LSI_SIST1_STO             BIT2\r
-#define LSI_SIST1_R3              BIT3\r
-#define LSI_SIST1_SBMC            BIT4\r
-#define LSI_SIST1_R5              BIT5\r
-#define LSI_SIST1_R6              BIT6\r
-#define LSI_SIST1_R7              BIT7\r
+#define LSI_SIST1_HTH   BIT0\r
+#define LSI_SIST1_GEN   BIT1\r
+#define LSI_SIST1_STO   BIT2\r
+#define LSI_SIST1_R3    BIT3\r
+#define LSI_SIST1_SBMC  BIT4\r
+#define LSI_SIST1_R5    BIT5\r
+#define LSI_SIST1_R6    BIT6\r
+#define LSI_SIST1_R7    BIT7\r
 \r
 //\r
 // LSI 53C895A Script Instructions\r
 //\r
-#define LSI_INS_TYPE_BLK          0x00000000\r
-#define LSI_INS_TYPE_IO           BIT30\r
-#define LSI_INS_TYPE_TC           BIT31\r
-\r
-#define LSI_INS_BLK_SCSIP_DAT_OUT 0x00000000\r
-#define LSI_INS_BLK_SCSIP_DAT_IN  BIT24\r
-#define LSI_INS_BLK_SCSIP_CMD     BIT25\r
-#define LSI_INS_BLK_SCSIP_STAT    (BIT24 | BIT25)\r
-#define LSI_INS_BLK_SCSIP_MSG_OUT (BIT25 | BIT26)\r
-#define LSI_INS_BLK_SCSIP_MSG_IN  (BIT24 | BIT25 | BIT26)\r
-\r
-#define LSI_INS_IO_OPC_SEL        0x00000000\r
-#define LSI_INS_IO_OPC_WAIT_RESEL BIT28\r
-\r
-#define LSI_INS_TC_CP             BIT17\r
-#define LSI_INS_TC_JMP            BIT19\r
-#define LSI_INS_TC_RA             BIT23\r
-\r
-#define LSI_INS_TC_OPC_JMP        0x00000000\r
-#define LSI_INS_TC_OPC_INT        (BIT27 | BIT28)\r
+#define LSI_INS_TYPE_BLK  0x00000000\r
+#define LSI_INS_TYPE_IO   BIT30\r
+#define LSI_INS_TYPE_TC   BIT31\r
+\r
+#define LSI_INS_BLK_SCSIP_DAT_OUT  0x00000000\r
+#define LSI_INS_BLK_SCSIP_DAT_IN   BIT24\r
+#define LSI_INS_BLK_SCSIP_CMD      BIT25\r
+#define LSI_INS_BLK_SCSIP_STAT     (BIT24 | BIT25)\r
+#define LSI_INS_BLK_SCSIP_MSG_OUT  (BIT25 | BIT26)\r
+#define LSI_INS_BLK_SCSIP_MSG_IN   (BIT24 | BIT25 | BIT26)\r
+\r
+#define LSI_INS_IO_OPC_SEL         0x00000000\r
+#define LSI_INS_IO_OPC_WAIT_RESEL  BIT28\r
+\r
+#define LSI_INS_TC_CP   BIT17\r
+#define LSI_INS_TC_JMP  BIT19\r
+#define LSI_INS_TC_RA   BIT23\r
+\r
+#define LSI_INS_TC_OPC_JMP  0x00000000\r
+#define LSI_INS_TC_OPC_INT  (BIT27 | BIT28)\r
 \r
 #define LSI_INS_TC_SCSIP_DAT_OUT  0x00000000\r
 #define LSI_INS_TC_SCSIP_MSG_IN   (BIT24 | BIT25 | BIT26)\r
index ae0c2e53117b32bf86c9e84b6d4c881fb2e21698..4f669766c46b360e5bf637549138500c1c823d43 100644 (file)
@@ -4,16 +4,17 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
+\r
 #ifndef __MICROVM_H__\r
 #define __MICROVM_H__\r
 \r
-#define MICROVM_PSEUDO_DEVICE_ID 0xfff1\r
+#define MICROVM_PSEUDO_DEVICE_ID  0xfff1\r
 \r
 /* generic event device */\r
-#define MICROVM_GED_MMIO_BASE         0xfea00000\r
-#define MICROVM_GED_MMIO_BASE_REGS    (MICROVM_GED_MMIO_BASE + 0x200)\r
-#define MICROVM_ACPI_GED_REG_SLEEP_CTL     0x00\r
-#define MICROVM_ACPI_GED_REG_RESET         0x02\r
-#define MICROVM_ACPI_GED_RESET_VALUE       0x42\r
+#define MICROVM_GED_MMIO_BASE           0xfea00000\r
+#define MICROVM_GED_MMIO_BASE_REGS      (MICROVM_GED_MMIO_BASE + 0x200)\r
+#define MICROVM_ACPI_GED_REG_SLEEP_CTL  0x00\r
+#define MICROVM_ACPI_GED_REG_RESET      0x02\r
+#define MICROVM_ACPI_GED_RESET_VALUE    0x42\r
 \r
 #endif // __MICROVM_H__\r
index 5e797eeea8ef76dd5573bc6de0e5073f9ab40194..a75b3fcfe7fe0dbcf8aff3d832d5c1b245daaa4e 100644 (file)
 \r
 typedef union {\r
   struct {\r
-    UINT64  Present:1;                // 0 = Not present in memory,\r
-                                      //   1 = Present in memory\r
-    UINT64  ReadWrite:1;              // 0 = Read-Only, 1= Read/Write\r
-    UINT64  UserSupervisor:1;         // 0 = Supervisor, 1=User\r
-    UINT64  WriteThrough:1;           // 0 = Write-Back caching,\r
-                                      //   1 = Write-Through caching\r
-    UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
-    UINT64  Accessed:1;               // 0 = Not accessed,\r
-                                      //   1 = Accessed (set by CPU)\r
-    UINT64  Reserved:1;               // Reserved\r
-    UINT64  MustBeZero:2;             // Must Be Zero\r
-    UINT64  Available:3;              // Available for use by system software\r
-    UINT64  PageTableBaseAddress:40;  // Page Table Base Address\r
-    UINT64  AvabilableHigh:11;        // Available for use by system software\r
-    UINT64  Nx:1;                     // No Execute bit\r
+    UINT64    Present              : 1;  // 0 = Not present in memory,\r
+                                         //   1 = Present in memory\r
+    UINT64    ReadWrite            : 1;  // 0 = Read-Only, 1= Read/Write\r
+    UINT64    UserSupervisor       : 1;  // 0 = Supervisor, 1=User\r
+    UINT64    WriteThrough         : 1;  // 0 = Write-Back caching,\r
+                                         //   1 = Write-Through caching\r
+    UINT64    CacheDisabled        : 1;  // 0 = Cached, 1=Non-Cached\r
+    UINT64    Accessed             : 1;  // 0 = Not accessed,\r
+                                         //   1 = Accessed (set by CPU)\r
+    UINT64    Reserved             : 1;  // Reserved\r
+    UINT64    MustBeZero           : 2;  // Must Be Zero\r
+    UINT64    Available            : 3;  // Available for use by system software\r
+    UINT64    PageTableBaseAddress : 40; // Page Table Base Address\r
+    UINT64    AvabilableHigh       : 11; // Available for use by system software\r
+    UINT64    Nx                   : 1;  // No Execute bit\r
   } Bits;\r
   UINT64    Uint64;\r
 } PAGE_MAP_AND_DIRECTORY_POINTER;\r
@@ -49,25 +49,25 @@ typedef union {
 //\r
 typedef union {\r
   struct {\r
-    UINT64  Present:1;                // 0 = Not present in memory,\r
-                                      //   1 = Present in memory\r
-    UINT64  ReadWrite:1;              // 0 = Read-Only, 1= Read/Write\r
-    UINT64  UserSupervisor:1;         // 0 = Supervisor, 1=User\r
-    UINT64  WriteThrough:1;           // 0 = Write-Back caching,\r
-                                      //   1 = Write-Through caching\r
-    UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
-    UINT64  Accessed:1;               // 0 = Not accessed,\r
-                                      //   1 = Accessed (set by CPU)\r
-    UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by\r
-                                      //   processor on access to page\r
-    UINT64  PAT:1;                    //\r
-    UINT64  Global:1;                 // 0 = Not global page, 1 = global page\r
-                                      //   TLB not cleared on CR3 write\r
-    UINT64  Available:3;              // Available for use by system software\r
-    UINT64  PageTableBaseAddress:40;  // Page Table Base Address\r
-    UINT64  AvabilableHigh:11;        // Available for use by system software\r
-    UINT64  Nx:1;                     // 0 = Execute Code,\r
-                                      //   1 = No Code Execution\r
+    UINT64    Present              : 1;  // 0 = Not present in memory,\r
+                                         //   1 = Present in memory\r
+    UINT64    ReadWrite            : 1;  // 0 = Read-Only, 1= Read/Write\r
+    UINT64    UserSupervisor       : 1;  // 0 = Supervisor, 1=User\r
+    UINT64    WriteThrough         : 1;  // 0 = Write-Back caching,\r
+                                         //   1 = Write-Through caching\r
+    UINT64    CacheDisabled        : 1;  // 0 = Cached, 1=Non-Cached\r
+    UINT64    Accessed             : 1;  // 0 = Not accessed,\r
+                                         //   1 = Accessed (set by CPU)\r
+    UINT64    Dirty                : 1;  // 0 = Not Dirty, 1 = written by\r
+                                         //   processor on access to page\r
+    UINT64    PAT                  : 1;  //\r
+    UINT64    Global               : 1;  // 0 = Not global page, 1 = global page\r
+                                         //   TLB not cleared on CR3 write\r
+    UINT64    Available            : 3;  // Available for use by system software\r
+    UINT64    PageTableBaseAddress : 40; // Page Table Base Address\r
+    UINT64    AvabilableHigh       : 11; // Available for use by system software\r
+    UINT64    Nx                   : 1;  // 0 = Execute Code,\r
+                                         //   1 = No Code Execution\r
   } Bits;\r
   UINT64    Uint64;\r
 } PAGE_TABLE_4K_ENTRY;\r
@@ -77,27 +77,27 @@ typedef union {
 //\r
 typedef union {\r
   struct {\r
-    UINT64  Present:1;                // 0 = Not present in memory,\r
-                                      //   1 = Present in memory\r
-    UINT64  ReadWrite:1;              // 0 = Read-Only, 1= Read/Write\r
-    UINT64  UserSupervisor:1;         // 0 = Supervisor, 1=User\r
-    UINT64  WriteThrough:1;           // 0 = Write-Back caching,\r
-                                      //   1=Write-Through caching\r
-    UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
-    UINT64  Accessed:1;               // 0 = Not accessed,\r
-                                      //   1 = Accessed (set by CPU)\r
-    UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by\r
-                                      //   processor on access to page\r
-    UINT64  MustBe1:1;                // Must be 1\r
-    UINT64  Global:1;                 // 0 = Not global page, 1 = global page\r
-                                      //   TLB not cleared on CR3 write\r
-    UINT64  Available:3;              // Available for use by system software\r
-    UINT64  PAT:1;                    //\r
-    UINT64  MustBeZero:8;             // Must be zero;\r
-    UINT64  PageTableBaseAddress:31;  // Page Table Base Address\r
-    UINT64  AvabilableHigh:11;        // Available for use by system software\r
-    UINT64  Nx:1;                     // 0 = Execute Code,\r
-                                      //   1 = No Code Execution\r
+    UINT64    Present              : 1;  // 0 = Not present in memory,\r
+                                         //   1 = Present in memory\r
+    UINT64    ReadWrite            : 1;  // 0 = Read-Only, 1= Read/Write\r
+    UINT64    UserSupervisor       : 1;  // 0 = Supervisor, 1=User\r
+    UINT64    WriteThrough         : 1;  // 0 = Write-Back caching,\r
+                                         //   1=Write-Through caching\r
+    UINT64    CacheDisabled        : 1;  // 0 = Cached, 1=Non-Cached\r
+    UINT64    Accessed             : 1;  // 0 = Not accessed,\r
+                                         //   1 = Accessed (set by CPU)\r
+    UINT64    Dirty                : 1;  // 0 = Not Dirty, 1 = written by\r
+                                         //   processor on access to page\r
+    UINT64    MustBe1              : 1;  // Must be 1\r
+    UINT64    Global               : 1;  // 0 = Not global page, 1 = global page\r
+                                         //   TLB not cleared on CR3 write\r
+    UINT64    Available            : 3;  // Available for use by system software\r
+    UINT64    PAT                  : 1;  //\r
+    UINT64    MustBeZero           : 8;  // Must be zero;\r
+    UINT64    PageTableBaseAddress : 31; // Page Table Base Address\r
+    UINT64    AvabilableHigh       : 11; // Available for use by system software\r
+    UINT64    Nx                   : 1;  // 0 = Execute Code,\r
+                                         //   1 = No Code Execution\r
   } Bits;\r
   UINT64    Uint64;\r
 } PAGE_TABLE_ENTRY;\r
@@ -107,55 +107,55 @@ typedef union {
 //\r
 typedef union {\r
   struct {\r
-    UINT64  Present:1;                // 0 = Not present in memory,\r
-                                      //   1 = Present in memory\r
-    UINT64  ReadWrite:1;              // 0 = Read-Only, 1= Read/Write\r
-    UINT64  UserSupervisor:1;         // 0 = Supervisor, 1=User\r
-    UINT64  WriteThrough:1;           // 0 = Write-Back caching,\r
-                                      //   1 = Write-Through caching\r
-    UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached\r
-    UINT64  Accessed:1;               // 0 = Not accessed,\r
-                                      //   1 = Accessed (set by CPU)\r
-    UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by\r
-                                      //   processor on access to page\r
-    UINT64  MustBe1:1;                // Must be 1\r
-    UINT64  Global:1;                 // 0 = Not global page, 1 = global page\r
-                                      //   TLB not cleared on CR3 write\r
-    UINT64  Available:3;              // Available for use by system software\r
-    UINT64  PAT:1;                    //\r
-    UINT64  MustBeZero:17;            // Must be zero;\r
-    UINT64  PageTableBaseAddress:22;  // Page Table Base Address\r
-    UINT64  AvabilableHigh:11;        // Available for use by system software\r
-    UINT64  Nx:1;                     // 0 = Execute Code,\r
-                                      //   1 = No Code Execution\r
+    UINT64    Present              : 1;  // 0 = Not present in memory,\r
+                                         //   1 = Present in memory\r
+    UINT64    ReadWrite            : 1;  // 0 = Read-Only, 1= Read/Write\r
+    UINT64    UserSupervisor       : 1;  // 0 = Supervisor, 1=User\r
+    UINT64    WriteThrough         : 1;  // 0 = Write-Back caching,\r
+                                         //   1 = Write-Through caching\r
+    UINT64    CacheDisabled        : 1;  // 0 = Cached, 1=Non-Cached\r
+    UINT64    Accessed             : 1;  // 0 = Not accessed,\r
+                                         //   1 = Accessed (set by CPU)\r
+    UINT64    Dirty                : 1;  // 0 = Not Dirty, 1 = written by\r
+                                         //   processor on access to page\r
+    UINT64    MustBe1              : 1;  // Must be 1\r
+    UINT64    Global               : 1;  // 0 = Not global page, 1 = global page\r
+                                         //   TLB not cleared on CR3 write\r
+    UINT64    Available            : 3;  // Available for use by system software\r
+    UINT64    PAT                  : 1;  //\r
+    UINT64    MustBeZero           : 17; // Must be zero;\r
+    UINT64    PageTableBaseAddress : 22; // Page Table Base Address\r
+    UINT64    AvabilableHigh       : 11; // Available for use by system software\r
+    UINT64    Nx                   : 1;  // 0 = Execute Code,\r
+                                         //   1 = No Code Execution\r
   } Bits;\r
   UINT64    Uint64;\r
 } PAGE_TABLE_1G_ENTRY;\r
 \r
 #pragma pack()\r
 \r
-#define IA32_PG_P                   BIT0\r
-#define IA32_PG_RW                  BIT1\r
-#define IA32_PG_PS                  BIT7\r
+#define IA32_PG_P   BIT0\r
+#define IA32_PG_RW  BIT1\r
+#define IA32_PG_PS  BIT7\r
 \r
-#define PAGING_PAE_INDEX_MASK       0x1FF\r
+#define PAGING_PAE_INDEX_MASK  0x1FF\r
 \r
-#define PAGING_4K_ADDRESS_MASK_64   0x000FFFFFFFFFF000ull\r
-#define PAGING_2M_ADDRESS_MASK_64   0x000FFFFFFFE00000ull\r
-#define PAGING_1G_ADDRESS_MASK_64   0x000FFFFFC0000000ull\r
+#define PAGING_4K_ADDRESS_MASK_64  0x000FFFFFFFFFF000ull\r
+#define PAGING_2M_ADDRESS_MASK_64  0x000FFFFFFFE00000ull\r
+#define PAGING_1G_ADDRESS_MASK_64  0x000FFFFFC0000000ull\r
 \r
-#define PAGING_L1_ADDRESS_SHIFT     12\r
-#define PAGING_L2_ADDRESS_SHIFT     21\r
-#define PAGING_L3_ADDRESS_SHIFT     30\r
-#define PAGING_L4_ADDRESS_SHIFT     39\r
+#define PAGING_L1_ADDRESS_SHIFT  12\r
+#define PAGING_L2_ADDRESS_SHIFT  21\r
+#define PAGING_L3_ADDRESS_SHIFT  30\r
+#define PAGING_L4_ADDRESS_SHIFT  39\r
 \r
-#define PAGING_PML4E_NUMBER         4\r
+#define PAGING_PML4E_NUMBER  4\r
 \r
-#define PAGETABLE_ENTRY_MASK        ((1UL << 9) - 1)\r
-#define PML4_OFFSET(x)              ( (x >> 39) & PAGETABLE_ENTRY_MASK)\r
-#define PDP_OFFSET(x)               ( (x >> 30) & PAGETABLE_ENTRY_MASK)\r
-#define PDE_OFFSET(x)               ( (x >> 21) & PAGETABLE_ENTRY_MASK)\r
-#define PTE_OFFSET(x)               ( (x >> 12) & PAGETABLE_ENTRY_MASK)\r
-#define PAGING_1G_ADDRESS_MASK_64   0x000FFFFFC0000000ull\r
+#define PAGETABLE_ENTRY_MASK  ((1UL << 9) - 1)\r
+#define PML4_OFFSET(x)  ( (x >> 39) & PAGETABLE_ENTRY_MASK)\r
+#define PDP_OFFSET(x)   ( (x >> 30) & PAGETABLE_ENTRY_MASK)\r
+#define PDE_OFFSET(x)   ( (x >> 21) & PAGETABLE_ENTRY_MASK)\r
+#define PTE_OFFSET(x)   ( (x >> 12) & PAGETABLE_ENTRY_MASK)\r
+#define PAGING_1G_ADDRESS_MASK_64  0x000FFFFFC0000000ull\r
 \r
 #endif\r
index a4d6634f3ba0f8c4f97d8007310b12a3783214e5..70ed91ddb3e9db4dd2dec7d70bafc83237c5ff5f 100644 (file)
 // Device offsets and constants\r
 //\r
 \r
-#define PCI_VENDOR_ID_VMWARE            (0x15ad)\r
-#define PCI_DEVICE_ID_VMWARE_PVSCSI     (0x07c0)\r
+#define PCI_VENDOR_ID_VMWARE         (0x15ad)\r
+#define PCI_DEVICE_ID_VMWARE_PVSCSI  (0x07c0)\r
 \r
 //\r
 // CDB (Command Descriptor Block) with size above this constant\r
 // should be considered out-of-band\r
 //\r
-#define PVSCSI_CDB_MAX_SIZE         (16)\r
+#define PVSCSI_CDB_MAX_SIZE  (16)\r
 \r
 typedef enum {\r
-  PvScsiRegOffsetCommand           =    0x0,\r
-  PvScsiRegOffsetCommandData       =    0x4,\r
-  PvScsiRegOffsetCommandStatus     =    0x8,\r
-  PvScsiRegOffsetLastSts0          =  0x100,\r
-  PvScsiRegOffsetLastSts1          =  0x104,\r
-  PvScsiRegOffsetLastSts2          =  0x108,\r
-  PvScsiRegOffsetLastSts3          =  0x10c,\r
-  PvScsiRegOffsetIntrStatus        = 0x100c,\r
-  PvScsiRegOffsetIntrMask          = 0x2010,\r
-  PvScsiRegOffsetKickNonRwIo       = 0x3014,\r
-  PvScsiRegOffsetDebug             = 0x3018,\r
-  PvScsiRegOffsetKickRwIo          = 0x4018,\r
+  PvScsiRegOffsetCommand       =    0x0,\r
+  PvScsiRegOffsetCommandData   =    0x4,\r
+  PvScsiRegOffsetCommandStatus =    0x8,\r
+  PvScsiRegOffsetLastSts0      =  0x100,\r
+  PvScsiRegOffsetLastSts1      =  0x104,\r
+  PvScsiRegOffsetLastSts2      =  0x108,\r
+  PvScsiRegOffsetLastSts3      =  0x10c,\r
+  PvScsiRegOffsetIntrStatus    = 0x100c,\r
+  PvScsiRegOffsetIntrMask      = 0x2010,\r
+  PvScsiRegOffsetKickNonRwIo   = 0x3014,\r
+  PvScsiRegOffsetDebug         = 0x3018,\r
+  PvScsiRegOffsetKickRwIo      = 0x4018,\r
 } PVSCSI_BAR0_OFFSETS;\r
 \r
 //\r
 // Define Interrupt-Status register flags\r
 //\r
-#define PVSCSI_INTR_CMPL_0      BIT0\r
-#define PVSCSI_INTR_CMPL_1      BIT1\r
-#define PVSCSI_INTR_CMPL_MASK   (PVSCSI_INTR_CMPL_0 | PVSCSI_INTR_CMPL_1)\r
+#define PVSCSI_INTR_CMPL_0     BIT0\r
+#define PVSCSI_INTR_CMPL_1     BIT1\r
+#define PVSCSI_INTR_CMPL_MASK  (PVSCSI_INTR_CMPL_0 | PVSCSI_INTR_CMPL_1)\r
 \r
 typedef enum {\r
-  PvScsiCmdFirst               = 0,\r
-  PvScsiCmdAdapterReset        = 1,\r
-  PvScsiCmdIssueScsi           = 2,\r
-  PvScsiCmdSetupRings          = 3,\r
-  PvScsiCmdResetBus            = 4,\r
-  PvScsiCmdResetDevice         = 5,\r
-  PvScsiCmdAbortCmd            = 6,\r
-  PvScsiCmdConfig              = 7,\r
-  PvScsiCmdSetupMsgRing        = 8,\r
-  PvScsiCmdDeviceUnplug        = 9,\r
-  PvScsiCmdLast                = 10\r
+  PvScsiCmdFirst        = 0,\r
+  PvScsiCmdAdapterReset = 1,\r
+  PvScsiCmdIssueScsi    = 2,\r
+  PvScsiCmdSetupRings   = 3,\r
+  PvScsiCmdResetBus     = 4,\r
+  PvScsiCmdResetDevice  = 5,\r
+  PvScsiCmdAbortCmd     = 6,\r
+  PvScsiCmdConfig       = 7,\r
+  PvScsiCmdSetupMsgRing = 8,\r
+  PvScsiCmdDeviceUnplug = 9,\r
+  PvScsiCmdLast         = 10\r
 } PVSCSI_COMMANDS;\r
 \r
-#define PVSCSI_SETUP_RINGS_MAX_NUM_PAGES    (32)\r
+#define PVSCSI_SETUP_RINGS_MAX_NUM_PAGES  (32)\r
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT32 ReqRingNumPages;\r
-  UINT32 CmpRingNumPages;\r
-  UINT64 RingsStatePPN;\r
-  UINT64 ReqRingPPNs[PVSCSI_SETUP_RINGS_MAX_NUM_PAGES];\r
-  UINT64 CmpRingPPNs[PVSCSI_SETUP_RINGS_MAX_NUM_PAGES];\r
+  UINT32    ReqRingNumPages;\r
+  UINT32    CmpRingNumPages;\r
+  UINT64    RingsStatePPN;\r
+  UINT64    ReqRingPPNs[PVSCSI_SETUP_RINGS_MAX_NUM_PAGES];\r
+  UINT64    CmpRingPPNs[PVSCSI_SETUP_RINGS_MAX_NUM_PAGES];\r
 } PVSCSI_CMD_DESC_SETUP_RINGS;\r
 #pragma pack ()\r
 \r
@@ -77,52 +77,52 @@ typedef struct {
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT32 ReqProdIdx;\r
-  UINT32 ReqConsIdx;\r
-  UINT32 ReqNumEntriesLog2;\r
+  UINT32    ReqProdIdx;\r
+  UINT32    ReqConsIdx;\r
+  UINT32    ReqNumEntriesLog2;\r
 \r
-  UINT32 CmpProdIdx;\r
-  UINT32 CmpConsIdx;\r
-  UINT32 CmpNumEntriesLog2;\r
+  UINT32    CmpProdIdx;\r
+  UINT32    CmpConsIdx;\r
+  UINT32    CmpNumEntriesLog2;\r
 \r
-  UINT8  Pad[104];\r
+  UINT8     Pad[104];\r
 \r
-  UINT32 MsgProdIdx;\r
-  UINT32 MsgConsIdx;\r
-  UINT32 MsgNumEntriesLog2;\r
+  UINT32    MsgProdIdx;\r
+  UINT32    MsgConsIdx;\r
+  UINT32    MsgNumEntriesLog2;\r
 } PVSCSI_RINGS_STATE;\r
 #pragma pack ()\r
 \r
 //\r
 // Define PVSCSI request descriptor tags\r
 //\r
-#define PVSCSI_SIMPLE_QUEUE_TAG            (0x20)\r
+#define PVSCSI_SIMPLE_QUEUE_TAG  (0x20)\r
 \r
 //\r
 // Define PVSCSI request descriptor flags\r
 //\r
-#define PVSCSI_FLAG_CMD_WITH_SG_LIST       BIT0\r
-#define PVSCSI_FLAG_CMD_OUT_OF_BAND_CDB    BIT1\r
-#define PVSCSI_FLAG_CMD_DIR_NONE           BIT2\r
-#define PVSCSI_FLAG_CMD_DIR_TOHOST         BIT3\r
-#define PVSCSI_FLAG_CMD_DIR_TODEVICE       BIT4\r
+#define PVSCSI_FLAG_CMD_WITH_SG_LIST     BIT0\r
+#define PVSCSI_FLAG_CMD_OUT_OF_BAND_CDB  BIT1\r
+#define PVSCSI_FLAG_CMD_DIR_NONE         BIT2\r
+#define PVSCSI_FLAG_CMD_DIR_TOHOST       BIT3\r
+#define PVSCSI_FLAG_CMD_DIR_TODEVICE     BIT4\r
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT64 Context;\r
-  UINT64 DataAddr;\r
-  UINT64 DataLen;\r
-  UINT64 SenseAddr;\r
-  UINT32 SenseLen;\r
-  UINT32 Flags;\r
-  UINT8  Cdb[16];\r
-  UINT8  CdbLen;\r
-  UINT8  Lun[8];\r
-  UINT8  Tag;\r
-  UINT8  Bus;\r
-  UINT8  Target;\r
-  UINT8  VcpuHint;\r
-  UINT8  Unused[59];\r
+  UINT64    Context;\r
+  UINT64    DataAddr;\r
+  UINT64    DataLen;\r
+  UINT64    SenseAddr;\r
+  UINT32    SenseLen;\r
+  UINT32    Flags;\r
+  UINT8     Cdb[16];\r
+  UINT8     CdbLen;\r
+  UINT8     Lun[8];\r
+  UINT8     Tag;\r
+  UINT8     Bus;\r
+  UINT8     Target;\r
+  UINT8     VcpuHint;\r
+  UINT8     Unused[59];\r
 } PVSCSI_RING_REQ_DESC;\r
 #pragma pack ()\r
 \r
@@ -130,56 +130,56 @@ typedef struct {
 // Host adapter status/error codes\r
 //\r
 typedef enum {\r
-  PvScsiBtStatSuccess       = 0x00,  // CCB complete normally with no errors\r
+  PvScsiBtStatSuccess                        = 0x00, // CCB complete normally with no errors\r
   PvScsiBtStatLinkedCommandCompleted         = 0x0a,\r
   PvScsiBtStatLinkedCommandCompletedWithFlag = 0x0b,\r
-  PvScsiBtStatDataUnderrun  = 0x0c,\r
-  PvScsiBtStatSelTimeout    = 0x11,  // SCSI selection timeout\r
-  PvScsiBtStatDatarun       = 0x12,  // Data overrun/underrun\r
-  PvScsiBtStatBusFree       = 0x13,  // Unexpected bus free\r
-  PvScsiBtStatInvPhase      = 0x14,  //\r
-                                     // Invalid bus phase or sequence requested\r
-                                     // by target\r
-                                     //\r
-  PvScsiBtStatLunMismatch   = 0x17,  //\r
-                                     // Linked CCB has different LUN from first\r
-                                     // CCB\r
-                                     //\r
-  PvScsiBtStatSensFailed    = 0x1b,  // Auto request sense failed\r
-  PvScsiBtStatTagReject     = 0x1c,  //\r
-                                     // SCSI II tagged queueing message rejected\r
-                                     // by target\r
-                                     //\r
-  PvScsiBtStatBadMsg        = 0x1d,  //\r
-                                     // Unsupported message received by the host\r
-                                     // adapter\r
-                                     //\r
-  PvScsiBtStatHaHardware    = 0x20,  // Host adapter hardware failed\r
-  PvScsiBtStatNoResponse    = 0x21,  //\r
-                                     // Target did not respond to SCSI ATN sent\r
-                                     // a SCSI RST\r
-                                     //\r
-  PvScsiBtStatSentRst       = 0x22,  // Host adapter asserted a SCSI RST\r
-  PvScsiBtStatRecvRst       = 0x23,  // Other SCSI devices asserted a SCSI RST\r
-  PvScsiBtStatDisconnect    = 0x24,  //\r
-                                     // Target device reconnected improperly\r
-                                     // (w/o tag)\r
-                                     //\r
-  PvScsiBtStatBusReset      = 0x25,  // Host adapter issued BUS device reset\r
-  PvScsiBtStatAbortQueue    = 0x26,  // Abort queue generated\r
-  PvScsiBtStatHaSoftware    = 0x27,  // Host adapter software error\r
-  PvScsiBtStatHaTimeout     = 0x30,  // Host adapter hardware timeout error\r
-  PvScsiBtStatScsiParity    = 0x34,  // SCSI parity error detected\r
+  PvScsiBtStatDataUnderrun                   = 0x0c,\r
+  PvScsiBtStatSelTimeout                     = 0x11, // SCSI selection timeout\r
+  PvScsiBtStatDatarun                        = 0x12, // Data overrun/underrun\r
+  PvScsiBtStatBusFree                        = 0x13, // Unexpected bus free\r
+  PvScsiBtStatInvPhase                       = 0x14, //\r
+                                                     // Invalid bus phase or sequence requested\r
+                                                     // by target\r
+                                                     //\r
+  PvScsiBtStatLunMismatch = 0x17,                    //\r
+                                                     // Linked CCB has different LUN from first\r
+                                                     // CCB\r
+                                                     //\r
+  PvScsiBtStatSensFailed = 0x1b,                     // Auto request sense failed\r
+  PvScsiBtStatTagReject  = 0x1c,                     //\r
+                                                     // SCSI II tagged queueing message rejected\r
+                                                     // by target\r
+                                                     //\r
+  PvScsiBtStatBadMsg = 0x1d,                         //\r
+                                                     // Unsupported message received by the host\r
+                                                     // adapter\r
+                                                     //\r
+  PvScsiBtStatHaHardware = 0x20,                     // Host adapter hardware failed\r
+  PvScsiBtStatNoResponse = 0x21,                     //\r
+                                                     // Target did not respond to SCSI ATN sent\r
+                                                     // a SCSI RST\r
+                                                     //\r
+  PvScsiBtStatSentRst    = 0x22,                     // Host adapter asserted a SCSI RST\r
+  PvScsiBtStatRecvRst    = 0x23,                     // Other SCSI devices asserted a SCSI RST\r
+  PvScsiBtStatDisconnect = 0x24,                     //\r
+                                                     // Target device reconnected improperly\r
+                                                     // (w/o tag)\r
+                                                     //\r
+  PvScsiBtStatBusReset   = 0x25,                     // Host adapter issued BUS device reset\r
+  PvScsiBtStatAbortQueue = 0x26,                     // Abort queue generated\r
+  PvScsiBtStatHaSoftware = 0x27,                     // Host adapter software error\r
+  PvScsiBtStatHaTimeout  = 0x30,                     // Host adapter hardware timeout error\r
+  PvScsiBtStatScsiParity = 0x34,                     // SCSI parity error detected\r
 } PVSCSI_HOST_BUS_ADAPTER_STATUS;\r
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT64 Context;\r
-  UINT64 DataLen;\r
-  UINT32 SenseLen;\r
-  UINT16 HostStatus;\r
-  UINT16 ScsiStatus;\r
-  UINT32 Pad[2];\r
+  UINT64    Context;\r
+  UINT64    DataLen;\r
+  UINT32    SenseLen;\r
+  UINT16    HostStatus;\r
+  UINT16    ScsiStatus;\r
+  UINT32    Pad[2];\r
 } PVSCSI_RING_CMP_DESC;\r
 #pragma pack ()\r
 \r
index 73db4b59a1112840b0fdf9d3210412fe869d19db..db828d31b35db53a1de328aa6091257ce18da84b 100644 (file)
 //\r
 // Host Bridge Device ID (DID) value for Q35/MCH\r
 //\r
-#define INTEL_Q35_MCH_DEVICE_ID 0x29C0\r
+#define INTEL_Q35_MCH_DEVICE_ID  0x29C0\r
 \r
 //\r
 // B/D/F/Type: 0/0/0/PCI\r
 //\r
-#define DRAMC_REGISTER_Q35(Offset) PCI_LIB_ADDRESS (0, 0, 0, (Offset))\r
-\r
-#define MCH_EXT_TSEG_MB           0x50\r
-#define MCH_EXT_TSEG_MB_QUERY       0xFFFF\r
-\r
-#define MCH_GGC                   0x52\r
-#define MCH_GGC_IVD                 BIT1\r
-\r
-#define MCH_PCIEXBAR_LOW          0x60\r
-#define MCH_PCIEXBAR_LOWMASK        0x0FFFFFFF\r
-#define MCH_PCIEXBAR_BUS_FF         0\r
-#define MCH_PCIEXBAR_EN             BIT0\r
-\r
-#define MCH_PCIEXBAR_HIGH         0x64\r
-#define MCH_PCIEXBAR_HIGHMASK       0xFFFFFFF0\r
-\r
-#define MCH_PAM0                  0x90\r
-#define MCH_PAM1                  0x91\r
-#define MCH_PAM2                  0x92\r
-#define MCH_PAM3                  0x93\r
-#define MCH_PAM4                  0x94\r
-#define MCH_PAM5                  0x95\r
-#define MCH_PAM6                  0x96\r
-\r
-#define MCH_DEFAULT_SMBASE_CTL    0x9C\r
-#define MCH_DEFAULT_SMBASE_QUERY    0xFF\r
-#define MCH_DEFAULT_SMBASE_IN_RAM   0x01\r
-#define MCH_DEFAULT_SMBASE_LCK      0x02\r
-#define MCH_DEFAULT_SMBASE_SIZE     SIZE_128KB\r
-\r
-#define MCH_SMRAM                 0x9D\r
-#define MCH_SMRAM_D_LCK             BIT4\r
-#define MCH_SMRAM_G_SMRAME          BIT3\r
-\r
-#define MCH_ESMRAMC               0x9E\r
-#define MCH_ESMRAMC_H_SMRAME        BIT7\r
-#define MCH_ESMRAMC_E_SMERR         BIT6\r
-#define MCH_ESMRAMC_SM_CACHE        BIT5\r
-#define MCH_ESMRAMC_SM_L1           BIT4\r
-#define MCH_ESMRAMC_SM_L2           BIT3\r
-#define MCH_ESMRAMC_TSEG_EXT        (BIT2 | BIT1)\r
-#define MCH_ESMRAMC_TSEG_8MB        BIT2\r
-#define MCH_ESMRAMC_TSEG_2MB        BIT1\r
-#define MCH_ESMRAMC_TSEG_1MB        0\r
-#define MCH_ESMRAMC_TSEG_MASK       (BIT2 | BIT1)\r
-#define MCH_ESMRAMC_T_EN            BIT0\r
-\r
-#define MCH_GBSM                  0xA4\r
-#define MCH_GBSM_MB_SHIFT           20\r
-\r
-#define MCH_BGSM                  0xA8\r
-#define MCH_BGSM_MB_SHIFT           20\r
-\r
-#define MCH_TSEGMB                0xAC\r
-#define MCH_TSEGMB_MB_SHIFT         20\r
-\r
-#define MCH_TOLUD                 0xB0\r
-#define MCH_TOLUD_MB_SHIFT          4\r
+#define DRAMC_REGISTER_Q35(Offset)  PCI_LIB_ADDRESS (0, 0, 0, (Offset))\r
+\r
+#define MCH_EXT_TSEG_MB        0x50\r
+#define MCH_EXT_TSEG_MB_QUERY  0xFFFF\r
+\r
+#define MCH_GGC      0x52\r
+#define MCH_GGC_IVD  BIT1\r
+\r
+#define MCH_PCIEXBAR_LOW      0x60\r
+#define MCH_PCIEXBAR_LOWMASK  0x0FFFFFFF\r
+#define MCH_PCIEXBAR_BUS_FF   0\r
+#define MCH_PCIEXBAR_EN       BIT0\r
+\r
+#define MCH_PCIEXBAR_HIGH      0x64\r
+#define MCH_PCIEXBAR_HIGHMASK  0xFFFFFFF0\r
+\r
+#define MCH_PAM0  0x90\r
+#define MCH_PAM1  0x91\r
+#define MCH_PAM2  0x92\r
+#define MCH_PAM3  0x93\r
+#define MCH_PAM4  0x94\r
+#define MCH_PAM5  0x95\r
+#define MCH_PAM6  0x96\r
+\r
+#define MCH_DEFAULT_SMBASE_CTL     0x9C\r
+#define MCH_DEFAULT_SMBASE_QUERY   0xFF\r
+#define MCH_DEFAULT_SMBASE_IN_RAM  0x01\r
+#define MCH_DEFAULT_SMBASE_LCK     0x02\r
+#define MCH_DEFAULT_SMBASE_SIZE    SIZE_128KB\r
+\r
+#define MCH_SMRAM           0x9D\r
+#define MCH_SMRAM_D_LCK     BIT4\r
+#define MCH_SMRAM_G_SMRAME  BIT3\r
+\r
+#define MCH_ESMRAMC            0x9E\r
+#define MCH_ESMRAMC_H_SMRAME   BIT7\r
+#define MCH_ESMRAMC_E_SMERR    BIT6\r
+#define MCH_ESMRAMC_SM_CACHE   BIT5\r
+#define MCH_ESMRAMC_SM_L1      BIT4\r
+#define MCH_ESMRAMC_SM_L2      BIT3\r
+#define MCH_ESMRAMC_TSEG_EXT   (BIT2 | BIT1)\r
+#define MCH_ESMRAMC_TSEG_8MB   BIT2\r
+#define MCH_ESMRAMC_TSEG_2MB   BIT1\r
+#define MCH_ESMRAMC_TSEG_1MB   0\r
+#define MCH_ESMRAMC_TSEG_MASK  (BIT2 | BIT1)\r
+#define MCH_ESMRAMC_T_EN       BIT0\r
+\r
+#define MCH_GBSM           0xA4\r
+#define MCH_GBSM_MB_SHIFT  20\r
+\r
+#define MCH_BGSM           0xA8\r
+#define MCH_BGSM_MB_SHIFT  20\r
+\r
+#define MCH_TSEGMB           0xAC\r
+#define MCH_TSEGMB_MB_SHIFT  20\r
+\r
+#define MCH_TOLUD           0xB0\r
+#define MCH_TOLUD_MB_SHIFT  4\r
 \r
 //\r
 // B/D/F/Type: 0/0x1f/0/PCI\r
 #define POWER_MGMT_REGISTER_Q35_EFI_PCI_ADDRESS(Offset) \\r
   EFI_PCI_ADDRESS (0, 0x1f, 0, (Offset))\r
 \r
-#define ICH9_PMBASE               0x40\r
-#define ICH9_PMBASE_MASK            (BIT15 | BIT14 | BIT13 | BIT12 | BIT11 | \\r
+#define ICH9_PMBASE       0x40\r
+#define ICH9_PMBASE_MASK  (BIT15 | BIT14 | BIT13 | BIT12 | BIT11 |           \\r
                                      BIT10 | BIT9  | BIT8  | BIT7)\r
 \r
-#define ICH9_ACPI_CNTL            0x44\r
-#define ICH9_ACPI_CNTL_ACPI_EN      BIT7\r
+#define ICH9_ACPI_CNTL          0x44\r
+#define ICH9_ACPI_CNTL_ACPI_EN  BIT7\r
 \r
-#define ICH9_GEN_PMCON_1          0xA0\r
-#define ICH9_GEN_PMCON_1_SMI_LOCK   BIT4\r
+#define ICH9_GEN_PMCON_1           0xA0\r
+#define ICH9_GEN_PMCON_1_SMI_LOCK  BIT4\r
 \r
-#define ICH9_RCBA                 0xF0\r
-#define ICH9_RCBA_EN                BIT0\r
+#define ICH9_RCBA     0xF0\r
+#define ICH9_RCBA_EN  BIT0\r
 \r
 //\r
 // IO ports\r
 //\r
 #define ICH9_APM_CNT              0xB2\r
-#define ICH9_APM_CNT_CPU_HOTPLUG    0x04\r
+#define ICH9_APM_CNT_CPU_HOTPLUG  0x04\r
 #define ICH9_APM_STS              0xB3\r
 \r
-#define ICH9_CPU_HOTPLUG_BASE 0x0CD8\r
+#define ICH9_CPU_HOTPLUG_BASE  0x0CD8\r
 \r
 //\r
 // IO ports relative to PMBASE\r
 //\r
-#define ICH9_PMBASE_OFS_SMI_EN 0x30\r
-#define ICH9_SMI_EN_APMC_EN      BIT5\r
-#define ICH9_SMI_EN_GBL_SMI_EN   BIT0\r
+#define ICH9_PMBASE_OFS_SMI_EN  0x30\r
+#define ICH9_SMI_EN_APMC_EN     BIT5\r
+#define ICH9_SMI_EN_GBL_SMI_EN  BIT0\r
 \r
-#define ICH9_ROOT_COMPLEX_BASE 0xFED1C000\r
+#define ICH9_ROOT_COMPLEX_BASE  0xFED1C000\r
 \r
 #endif\r
index d0e83102c13fc62c33340bace2449c5ad4baa49c..1b7c6c8df37f6981a9a8fe20ea5def080550033d 100644 (file)
 //   register,\r
 // - followed by distinguished bitmasks or values in the register.\r
 //\r
-#define QEMU_CPUHP_R_CMD_DATA2               0x0\r
+#define QEMU_CPUHP_R_CMD_DATA2  0x0\r
 \r
-#define QEMU_CPUHP_R_CPU_STAT                0x4\r
-#define QEMU_CPUHP_STAT_ENABLED                BIT0\r
-#define QEMU_CPUHP_STAT_INSERT                 BIT1\r
-#define QEMU_CPUHP_STAT_REMOVE                 BIT2\r
-#define QEMU_CPUHP_STAT_EJECT                  BIT3\r
-#define QEMU_CPUHP_STAT_FW_REMOVE              BIT4\r
+#define QEMU_CPUHP_R_CPU_STAT      0x4\r
+#define QEMU_CPUHP_STAT_ENABLED    BIT0\r
+#define QEMU_CPUHP_STAT_INSERT     BIT1\r
+#define QEMU_CPUHP_STAT_REMOVE     BIT2\r
+#define QEMU_CPUHP_STAT_EJECT      BIT3\r
+#define QEMU_CPUHP_STAT_FW_REMOVE  BIT4\r
 \r
-#define QEMU_CPUHP_RW_CMD_DATA               0x8\r
+#define QEMU_CPUHP_RW_CMD_DATA  0x8\r
 \r
-#define QEMU_CPUHP_W_CPU_SEL                 0x0\r
+#define QEMU_CPUHP_W_CPU_SEL  0x0\r
 \r
-#define QEMU_CPUHP_W_CMD                     0x5\r
-#define QEMU_CPUHP_CMD_GET_PENDING             0x0\r
-#define QEMU_CPUHP_CMD_GET_ARCH_ID             0x3\r
+#define QEMU_CPUHP_W_CMD            0x5\r
+#define QEMU_CPUHP_CMD_GET_PENDING  0x0\r
+#define QEMU_CPUHP_CMD_GET_ARCH_ID  0x3\r
 \r
 #endif // QEMU_CPU_HOTPLUG_H_\r
index 7969aba3ca61c0b43890853594b924c9295fbc8c..9adf158c22a5904130d0b53cbfc989e4e3d90405 100644 (file)
 // The size, in bytes, of names of firmware configuration files, including at\r
 // least one terminating NUL byte.\r
 //\r
-#define QEMU_FW_CFG_FNAME_SIZE 56\r
+#define QEMU_FW_CFG_FNAME_SIZE  56\r
 \r
 //\r
 // If the following bit is set in the UINT32 fw_cfg revision / feature bitmap\r
 // -- read from key 0x0001 with the basic IO Port or MMIO method --, then the\r
 // DMA interface is available.\r
 //\r
-#define FW_CFG_F_DMA BIT1\r
+#define FW_CFG_F_DMA  BIT1\r
 \r
 //\r
 // Macros for the FW_CFG_DMA_ACCESS.Control bitmap (in native encoding).\r
 //\r
-#define FW_CFG_DMA_CTL_ERROR  BIT0\r
-#define FW_CFG_DMA_CTL_READ   BIT1\r
-#define FW_CFG_DMA_CTL_SKIP   BIT2\r
-#define FW_CFG_DMA_CTL_SELECT BIT3\r
-#define FW_CFG_DMA_CTL_WRITE  BIT4\r
+#define FW_CFG_DMA_CTL_ERROR   BIT0\r
+#define FW_CFG_DMA_CTL_READ    BIT1\r
+#define FW_CFG_DMA_CTL_SKIP    BIT2\r
+#define FW_CFG_DMA_CTL_SELECT  BIT3\r
+#define FW_CFG_DMA_CTL_WRITE   BIT4\r
 \r
 //\r
 // The fw_cfg registers can be found at these IO Ports, on the IO-mapped\r
 // platforms (Ia32 and X64).\r
 //\r
-#define FW_CFG_IO_SELECTOR    0x510\r
-#define FW_CFG_IO_DATA        0x511\r
-#define FW_CFG_IO_DMA_ADDRESS 0x514\r
+#define FW_CFG_IO_SELECTOR     0x510\r
+#define FW_CFG_IO_DATA         0x511\r
+#define FW_CFG_IO_DMA_ADDRESS  0x514\r
 \r
 //\r
 // Numerically defined keys.\r
 //\r
 typedef enum {\r
-  QemuFwCfgItemSignature            = 0x0000,\r
-  QemuFwCfgItemInterfaceVersion     = 0x0001,\r
-  QemuFwCfgItemSystemUuid           = 0x0002,\r
-  QemuFwCfgItemRamSize              = 0x0003,\r
-  QemuFwCfgItemGraphicsEnabled      = 0x0004,\r
-  QemuFwCfgItemSmpCpuCount          = 0x0005,\r
-  QemuFwCfgItemMachineId            = 0x0006,\r
-  QemuFwCfgItemKernelAddress        = 0x0007,\r
-  QemuFwCfgItemKernelSize           = 0x0008,\r
-  QemuFwCfgItemKernelCommandLine    = 0x0009,\r
-  QemuFwCfgItemInitrdAddress        = 0x000a,\r
-  QemuFwCfgItemInitrdSize           = 0x000b,\r
-  QemuFwCfgItemBootDevice           = 0x000c,\r
-  QemuFwCfgItemNumaData             = 0x000d,\r
-  QemuFwCfgItemBootMenu             = 0x000e,\r
-  QemuFwCfgItemMaximumCpuCount      = 0x000f,\r
-  QemuFwCfgItemKernelEntry          = 0x0010,\r
-  QemuFwCfgItemKernelData           = 0x0011,\r
-  QemuFwCfgItemInitrdData           = 0x0012,\r
-  QemuFwCfgItemCommandLineAddress   = 0x0013,\r
-  QemuFwCfgItemCommandLineSize      = 0x0014,\r
-  QemuFwCfgItemCommandLineData      = 0x0015,\r
-  QemuFwCfgItemKernelSetupAddress   = 0x0016,\r
-  QemuFwCfgItemKernelSetupSize      = 0x0017,\r
-  QemuFwCfgItemKernelSetupData      = 0x0018,\r
-  QemuFwCfgItemFileDir              = 0x0019,\r
-\r
-  QemuFwCfgItemX86AcpiTables        = 0x8000,\r
-  QemuFwCfgItemX86SmbiosTables      = 0x8001,\r
-  QemuFwCfgItemX86Irq0Override      = 0x8002,\r
-  QemuFwCfgItemX86E820Table         = 0x8003,\r
-  QemuFwCfgItemX86HpetData          = 0x8004,\r
+  QemuFwCfgItemSignature          = 0x0000,\r
+  QemuFwCfgItemInterfaceVersion   = 0x0001,\r
+  QemuFwCfgItemSystemUuid         = 0x0002,\r
+  QemuFwCfgItemRamSize            = 0x0003,\r
+  QemuFwCfgItemGraphicsEnabled    = 0x0004,\r
+  QemuFwCfgItemSmpCpuCount        = 0x0005,\r
+  QemuFwCfgItemMachineId          = 0x0006,\r
+  QemuFwCfgItemKernelAddress      = 0x0007,\r
+  QemuFwCfgItemKernelSize         = 0x0008,\r
+  QemuFwCfgItemKernelCommandLine  = 0x0009,\r
+  QemuFwCfgItemInitrdAddress      = 0x000a,\r
+  QemuFwCfgItemInitrdSize         = 0x000b,\r
+  QemuFwCfgItemBootDevice         = 0x000c,\r
+  QemuFwCfgItemNumaData           = 0x000d,\r
+  QemuFwCfgItemBootMenu           = 0x000e,\r
+  QemuFwCfgItemMaximumCpuCount    = 0x000f,\r
+  QemuFwCfgItemKernelEntry        = 0x0010,\r
+  QemuFwCfgItemKernelData         = 0x0011,\r
+  QemuFwCfgItemInitrdData         = 0x0012,\r
+  QemuFwCfgItemCommandLineAddress = 0x0013,\r
+  QemuFwCfgItemCommandLineSize    = 0x0014,\r
+  QemuFwCfgItemCommandLineData    = 0x0015,\r
+  QemuFwCfgItemKernelSetupAddress = 0x0016,\r
+  QemuFwCfgItemKernelSetupSize    = 0x0017,\r
+  QemuFwCfgItemKernelSetupData    = 0x0018,\r
+  QemuFwCfgItemFileDir            = 0x0019,\r
 \r
+  QemuFwCfgItemX86AcpiTables   = 0x8000,\r
+  QemuFwCfgItemX86SmbiosTables = 0x8001,\r
+  QemuFwCfgItemX86Irq0Override = 0x8002,\r
+  QemuFwCfgItemX86E820Table    = 0x8003,\r
+  QemuFwCfgItemX86HpetData     = 0x8004,\r
 } FIRMWARE_CONFIG_ITEM;\r
 \r
 //\r
@@ -89,9 +88,9 @@ typedef enum {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT32 Control;\r
-  UINT32 Length;\r
-  UINT64 Address;\r
+  UINT32    Control;\r
+  UINT32    Length;\r
+  UINT64    Address;\r
 } FW_CFG_DMA_ACCESS;\r
 #pragma pack ()\r
 \r
index 5782a23c4398ea96a46308cf94322636f7eff8d0..cf953c448b3adfa6601e59e6c3913886523a6539 100644 (file)
@@ -16,7 +16,7 @@
 //\r
 // The types and the documentation reflects the SeaBIOS interface.\r
 //\r
-#define QEMU_LOADER_FNAME_SIZE QEMU_FW_CFG_FNAME_SIZE\r
+#define QEMU_LOADER_FNAME_SIZE  QEMU_FW_CFG_FNAME_SIZE\r
 \r
 typedef enum {\r
   QemuLoaderCmdAllocate = 1,\r
@@ -36,9 +36,9 @@ typedef enum {
 // allocated in the zone specified by Zone, aligned at a multiple of Alignment.\r
 //\r
 typedef struct {\r
-  UINT8  File[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
-  UINT32 Alignment;                    // power of two\r
-  UINT8  Zone;                         // QEMU_LOADER_ALLOC_ZONE values\r
+  UINT8     File[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
+  UINT32    Alignment;                    // power of two\r
+  UINT8     Zone;                         // QEMU_LOADER_ALLOC_ZONE values\r
 } QEMU_LOADER_ALLOCATE;\r
 \r
 //\r
@@ -49,10 +49,10 @@ typedef struct {
 // been placed (when QemuLoaderCmdAllocate has been executed for PointeeFile).\r
 //\r
 typedef struct {\r
-  UINT8  PointerFile[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
-  UINT8  PointeeFile[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
-  UINT32 PointerOffset;\r
-  UINT8  PointerSize;                         // one of 1, 2, 4, 8\r
+  UINT8     PointerFile[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
+  UINT8     PointeeFile[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
+  UINT32    PointerOffset;\r
+  UINT8     PointerSize;                      // one of 1, 2, 4, 8\r
 } QEMU_LOADER_ADD_POINTER;\r
 \r
 //\r
@@ -61,10 +61,10 @@ typedef struct {
 // UINT8 result at ResultOffset in the same File.\r
 //\r
 typedef struct {\r
-  UINT8  File[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
-  UINT32 ResultOffset;\r
-  UINT32 Start;\r
-  UINT32 Length;\r
+  UINT8     File[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
+  UINT32    ResultOffset;\r
+  UINT32    Start;\r
+  UINT32    Length;\r
 } QEMU_LOADER_ADD_CHECKSUM;\r
 \r
 //\r
@@ -84,21 +84,21 @@ typedef struct {
 // field.\r
 //\r
 typedef struct {\r
-  UINT8  PointerFile[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
-  UINT8  PointeeFile[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
-  UINT32 PointerOffset;\r
-  UINT32 PointeeOffset;\r
-  UINT8  PointerSize;                         // one of 1, 2, 4, 8\r
+  UINT8     PointerFile[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
+  UINT8     PointeeFile[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated\r
+  UINT32    PointerOffset;\r
+  UINT32    PointeeOffset;\r
+  UINT8     PointerSize;                      // one of 1, 2, 4, 8\r
 } QEMU_LOADER_WRITE_POINTER;\r
 \r
 typedef struct {\r
-  UINT32 Type;                             // QEMU_LOADER_COMMAND_TYPE values\r
+  UINT32    Type;                          // QEMU_LOADER_COMMAND_TYPE values\r
   union {\r
-    QEMU_LOADER_ALLOCATE      Allocate;\r
-    QEMU_LOADER_ADD_POINTER   AddPointer;\r
-    QEMU_LOADER_ADD_CHECKSUM  AddChecksum;\r
-    QEMU_LOADER_WRITE_POINTER WritePointer;\r
-    UINT8                     Padding[124];\r
+    QEMU_LOADER_ALLOCATE         Allocate;\r
+    QEMU_LOADER_ADD_POINTER      AddPointer;\r
+    QEMU_LOADER_ADD_CHECKSUM     AddChecksum;\r
+    QEMU_LOADER_WRITE_POINTER    WritePointer;\r
+    UINT8                        Padding[124];\r
   } Command;\r
 } QEMU_LOADER_ENTRY;\r
 #pragma pack ()\r
index e4fc5df26e5056611b18601a9e079975f023f186..a70b99fccf2c7007a27756541e235d193a22c559 100644 (file)
 // The hints apply to PCI Bridges whose PCI_DEVICE_INDEPENDENT_REGION.VendorId\r
 // equals the following value.\r
 //\r
-#define QEMU_PCI_BRIDGE_VENDOR_ID_REDHAT 0x1B36\r
+#define QEMU_PCI_BRIDGE_VENDOR_ID_REDHAT  0x1B36\r
 \r
 //\r
 // Common capability header for all hints.\r
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  EFI_PCI_CAPABILITY_VENDOR_HDR VendorHdr;\r
-  UINT8                         Type;\r
+  EFI_PCI_CAPABILITY_VENDOR_HDR    VendorHdr;\r
+  UINT8                            Type;\r
 } QEMU_PCI_BRIDGE_CAPABILITY_HDR;\r
 #pragma pack ()\r
 \r
 //\r
 // Values defined for QEMU_PCI_BRIDGE_CAPABILITY_HDR.Type.\r
 //\r
-#define QEMU_PCI_BRIDGE_CAPABILITY_TYPE_RESOURCE_RESERVATION 0x01\r
+#define QEMU_PCI_BRIDGE_CAPABILITY_TYPE_RESOURCE_RESERVATION  0x01\r
 \r
 //\r
 // PCI Resource Reservation structure for when\r
@@ -42,12 +42,12 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  QEMU_PCI_BRIDGE_CAPABILITY_HDR BridgeHdr;\r
-  UINT32                         BusNumbers;\r
-  UINT64                         Io;\r
-  UINT32                         NonPrefetchable32BitMmio;\r
-  UINT32                         Prefetchable32BitMmio;\r
-  UINT64                         Prefetchable64BitMmio;\r
+  QEMU_PCI_BRIDGE_CAPABILITY_HDR    BridgeHdr;\r
+  UINT32                            BusNumbers;\r
+  UINT64                            Io;\r
+  UINT32                            NonPrefetchable32BitMmio;\r
+  UINT32                            Prefetchable32BitMmio;\r
+  UINT64                            Prefetchable64BitMmio;\r
 } QEMU_PCI_BRIDGE_CAPABILITY_RESOURCE_RESERVATION;\r
 #pragma pack ()\r
 \r
index a43e2547bddd4fb8800da72b44863aaf4aac37f6..1a269e6ad86fff7f892de09323f5157d431c7c02 100644 (file)
 //\r
 // whether function is blocked by BIOS settings; bits 0, 1, 2\r
 //\r
-#define QEMU_TPM_PPI_FUNC_NOT_IMPLEMENTED     (0 << 0)\r
-#define QEMU_TPM_PPI_FUNC_BIOS_ONLY           (1 << 0)\r
-#define QEMU_TPM_PPI_FUNC_BLOCKED             (2 << 0)\r
-#define QEMU_TPM_PPI_FUNC_ALLOWED_USR_REQ     (3 << 0)\r
-#define QEMU_TPM_PPI_FUNC_ALLOWED_USR_NOT_REQ (4 << 0)\r
-#define QEMU_TPM_PPI_FUNC_MASK                (7 << 0)\r
+#define QEMU_TPM_PPI_FUNC_NOT_IMPLEMENTED      (0 << 0)\r
+#define QEMU_TPM_PPI_FUNC_BIOS_ONLY            (1 << 0)\r
+#define QEMU_TPM_PPI_FUNC_BLOCKED              (2 << 0)\r
+#define QEMU_TPM_PPI_FUNC_ALLOWED_USR_REQ      (3 << 0)\r
+#define QEMU_TPM_PPI_FUNC_ALLOWED_USR_NOT_REQ  (4 << 0)\r
+#define QEMU_TPM_PPI_FUNC_MASK                 (7 << 0)\r
 \r
 //\r
 // The following structure is shared between firmware and ACPI.\r
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT8  Func[256];           // func\r
-  UINT8  In;                  // ppin\r
-  UINT32 Ip;                  // ppip\r
-  UINT32 Response;            // pprp\r
-  UINT32 Request;             // pprq\r
-  UINT32 RequestParameter;    // pprm\r
-  UINT32 LastRequest;         // lppr\r
-  UINT32 FRet;                // fret\r
-  UINT8  Res1[0x40];          // res1\r
-  UINT8  NextStep;            // next_step\r
+  UINT8     Func[256];        // func\r
+  UINT8     In;               // ppin\r
+  UINT32    Ip;               // ppip\r
+  UINT32    Response;         // pprp\r
+  UINT32    Request;          // pprq\r
+  UINT32    RequestParameter; // pprm\r
+  UINT32    LastRequest;      // lppr\r
+  UINT32    FRet;             // fret\r
+  UINT8     Res1[0x40];       // res1\r
+  UINT8     NextStep;         // next_step\r
 } QEMU_TPM_PPI;\r
 #pragma pack ()\r
 \r
@@ -47,15 +47,15 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT32 PpiAddress;\r
-  UINT8  TpmVersion;\r
-  UINT8  PpiVersion;\r
+  UINT32    PpiAddress;\r
+  UINT8     TpmVersion;\r
+  UINT8     PpiVersion;\r
 } QEMU_FWCFG_TPM_CONFIG;\r
 #pragma pack ()\r
 \r
-#define QEMU_TPM_VERSION_UNSPEC    0\r
-#define QEMU_TPM_VERSION_1_2       1\r
-#define QEMU_TPM_VERSION_2         2\r
+#define QEMU_TPM_VERSION_UNSPEC  0\r
+#define QEMU_TPM_VERSION_1_2     1\r
+#define QEMU_TPM_VERSION_2       2\r
 \r
 #define QEMU_TPM_PPI_VERSION_NONE  0\r
 #define QEMU_TPM_PPI_VERSION_1_30  1\r
index fe886d223ea79f065174f63cdfc100c5145ee41d..e06f87db79d3c0e0d2e726a20518be986a5d2737 100644 (file)
@@ -32,9 +32,8 @@
 //\r
 // Virtio IDs\r
 //\r
-#define VIRTIO_VENDOR_ID                    0x1AF4\r
-#define VIRTIO_MMIO_MAGIC                   0x74726976 // "virt"\r
-\r
+#define VIRTIO_VENDOR_ID   0x1AF4\r
+#define VIRTIO_MMIO_MAGIC  0x74726976                  // "virt"\r
 \r
 //\r
 // VirtIo Device Specific Configuration Offsets\r
 //\r
 // PCI VirtIo Header Offsets\r
 //\r
-#define VIRTIO_PCI_OFFSET_DEVICE_FEATURES           0x00\r
-#define VIRTIO_PCI_OFFSET_GUEST_FEATURES            0x04\r
-#define VIRTIO_PCI_OFFSET_QUEUE_ADDRESS             0x08\r
-#define VIRTIO_PCI_OFFSET_QUEUE_SIZE                0x0C\r
-#define VIRTIO_PCI_OFFSET_QUEUE_SELECT              0x0E\r
-#define VIRTIO_PCI_OFFSET_QUEUE_NOTIFY              0x10\r
-#define VIRTIO_PCI_OFFSET_QUEUE_DEVICE_STATUS       0x12\r
-#define VIRTIO_PCI_OFFSET_QUEUE_DEVICE_ISR          0x13\r
+#define VIRTIO_PCI_OFFSET_DEVICE_FEATURES      0x00\r
+#define VIRTIO_PCI_OFFSET_GUEST_FEATURES       0x04\r
+#define VIRTIO_PCI_OFFSET_QUEUE_ADDRESS        0x08\r
+#define VIRTIO_PCI_OFFSET_QUEUE_SIZE           0x0C\r
+#define VIRTIO_PCI_OFFSET_QUEUE_SELECT         0x0E\r
+#define VIRTIO_PCI_OFFSET_QUEUE_NOTIFY         0x10\r
+#define VIRTIO_PCI_OFFSET_QUEUE_DEVICE_STATUS  0x12\r
+#define VIRTIO_PCI_OFFSET_QUEUE_DEVICE_ISR     0x13\r
 \r
 //\r
 // MMIO VirtIo Header Offsets\r
 //\r
-#define VIRTIO_MMIO_OFFSET_MAGIC                    0x00\r
-#define VIRTIO_MMIO_OFFSET_VERSION                  0x04\r
-#define VIRTIO_MMIO_OFFSET_DEVICE_ID                0x08\r
-#define VIRTIO_MMIO_OFFSET_VENDOR_ID                0x0C\r
-#define VIRTIO_MMIO_OFFSET_HOST_FEATURES            0x10\r
-#define VIRTIO_MMIO_OFFSET_HOST_FEATURES_SEL        0x14\r
-#define VIRTIO_MMIO_OFFSET_GUEST_FEATURES           0x20\r
-#define VIRTIO_MMIO_OFFSET_GUEST_FEATURES_SEL       0x24\r
-#define VIRTIO_MMIO_OFFSET_GUEST_PAGE_SIZE          0x28\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_SEL                0x30\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_NUM_MAX            0x34\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_NUM                0x38\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_ALIGN              0x3C\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_PFN                0x40\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_NOTIFY             0x50\r
-#define VIRTIO_MMIO_OFFSET_INTERRUPT_STATUS         0x60\r
-#define VIRTIO_MMIO_OFFSET_INTERRUPT_ACK            0x64\r
-#define VIRTIO_MMIO_OFFSET_STATUS                   0x70\r
+#define VIRTIO_MMIO_OFFSET_MAGIC               0x00\r
+#define VIRTIO_MMIO_OFFSET_VERSION             0x04\r
+#define VIRTIO_MMIO_OFFSET_DEVICE_ID           0x08\r
+#define VIRTIO_MMIO_OFFSET_VENDOR_ID           0x0C\r
+#define VIRTIO_MMIO_OFFSET_HOST_FEATURES       0x10\r
+#define VIRTIO_MMIO_OFFSET_HOST_FEATURES_SEL   0x14\r
+#define VIRTIO_MMIO_OFFSET_GUEST_FEATURES      0x20\r
+#define VIRTIO_MMIO_OFFSET_GUEST_FEATURES_SEL  0x24\r
+#define VIRTIO_MMIO_OFFSET_GUEST_PAGE_SIZE     0x28\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_SEL           0x30\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_NUM_MAX       0x34\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_NUM           0x38\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_ALIGN         0x3C\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_PFN           0x40\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_NOTIFY        0x50\r
+#define VIRTIO_MMIO_OFFSET_INTERRUPT_STATUS    0x60\r
+#define VIRTIO_MMIO_OFFSET_INTERRUPT_ACK       0x64\r
+#define VIRTIO_MMIO_OFFSET_STATUS              0x70\r
 \r
 //\r
 // Data in the communication area is defined as packed and accessed as\r
 //\r
 // virtio-0.9.5, 2.3.4 Available Ring\r
 //\r
-#define VRING_AVAIL_F_NO_INTERRUPT BIT0\r
+#define VRING_AVAIL_F_NO_INTERRUPT  BIT0\r
 \r
 typedef struct {\r
-  volatile UINT16 *Flags;\r
-  volatile UINT16 *Idx;\r
+  volatile UINT16    *Flags;\r
+  volatile UINT16    *Idx;\r
 \r
-  volatile UINT16 *Ring;      // QueueSize elements\r
-  volatile UINT16 *UsedEvent; // unused as per negotiation\r
+  volatile UINT16    *Ring;      // QueueSize elements\r
+  volatile UINT16    *UsedEvent; // unused as per negotiation\r
 } VRING_AVAIL;\r
 \r
-\r
 //\r
 // virtio-0.9.5, 2.3.5 Used Ring\r
 //\r
-#define VRING_USED_F_NO_NOTIFY BIT0\r
+#define VRING_USED_F_NO_NOTIFY  BIT0\r
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT32 Id;\r
-  UINT32 Len;\r
+  UINT32    Id;\r
+  UINT32    Len;\r
 } VRING_USED_ELEM;\r
 #pragma pack()\r
 \r
 typedef struct {\r
-  volatile UINT16          *Flags;\r
-  volatile UINT16          *Idx;\r
-  volatile VRING_USED_ELEM *UsedElem;   // QueueSize elements\r
-  volatile UINT16          *AvailEvent; // unused as per negotiation\r
+  volatile UINT16             *Flags;\r
+  volatile UINT16             *Idx;\r
+  volatile VRING_USED_ELEM    *UsedElem;   // QueueSize elements\r
+  volatile UINT16             *AvailEvent; // unused as per negotiation\r
 } VRING_USED;\r
 \r
-\r
 //\r
 // virtio-0.9.5, 2.3.2 Descriptor Table\r
 //\r
-#define VRING_DESC_F_NEXT     BIT0 // more descriptors in this request\r
-#define VRING_DESC_F_WRITE    BIT1 // buffer to be written *by the host*\r
-#define VRING_DESC_F_INDIRECT BIT2 // unused\r
+#define VRING_DESC_F_NEXT      BIT0 // more descriptors in this request\r
+#define VRING_DESC_F_WRITE     BIT1 // buffer to be written *by the host*\r
+#define VRING_DESC_F_INDIRECT  BIT2 // unused\r
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT64 Addr;\r
-  UINT32 Len;\r
-  UINT16 Flags;\r
-  UINT16 Next;\r
+  UINT64    Addr;\r
+  UINT32    Len;\r
+  UINT16    Flags;\r
+  UINT16    Next;\r
 } VRING_DESC;\r
 #pragma pack()\r
 \r
 typedef struct {\r
-  UINTN               NumPages;\r
-  VOID                *Base;     // deallocate only this field\r
-  volatile VRING_DESC *Desc;     // QueueSize elements\r
-  VRING_AVAIL         Avail;\r
-  VRING_USED          Used;\r
-  UINT16              QueueSize;\r
+  UINTN                  NumPages;\r
+  VOID                   *Base;  // deallocate only this field\r
+  volatile VRING_DESC    *Desc;  // QueueSize elements\r
+  VRING_AVAIL            Avail;\r
+  VRING_USED             Used;\r
+  UINT16                 QueueSize;\r
 } VRING;\r
 \r
 //\r
 // virtio-0.9.5, 2.2.2.1 Device Status\r
 //\r
-#define VSTAT_ACK       BIT0\r
-#define VSTAT_DRIVER    BIT1\r
-#define VSTAT_DRIVER_OK BIT2\r
-#define VSTAT_FAILED    BIT7\r
+#define VSTAT_ACK        BIT0\r
+#define VSTAT_DRIVER     BIT1\r
+#define VSTAT_DRIVER_OK  BIT2\r
+#define VSTAT_FAILED     BIT7\r
 \r
 //\r
 // virtio-0.9.5, Appendix B: Reserved (Device-Independent) Feature Bits\r
 //\r
-#define VIRTIO_F_NOTIFY_ON_EMPTY    BIT24\r
-#define VIRTIO_F_RING_INDIRECT_DESC BIT28\r
-#define VIRTIO_F_RING_EVENT_IDX     BIT29\r
-\r
+#define VIRTIO_F_NOTIFY_ON_EMPTY     BIT24\r
+#define VIRTIO_F_RING_INDIRECT_DESC  BIT28\r
+#define VIRTIO_F_RING_EVENT_IDX      BIT29\r
 \r
 #endif // _VIRTIO_0_9_5_H_\r
index 9c0ed5ed24831c5a8baed6450786b78637623744..372015a0f59431b04406078d6db0b6ab1aacaac0 100644 (file)
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT8      Mac[6];\r
-  UINT16     LinkStatus;\r
+  UINT8     Mac[6];\r
+  UINT16    LinkStatus;\r
 } VIRTIO_NET_CONFIG;\r
 #pragma pack()\r
 \r
-#define OFFSET_OF_VNET(Field) OFFSET_OF (VIRTIO_NET_CONFIG, Field)\r
-#define SIZE_OF_VNET(Field)   (sizeof ((VIRTIO_NET_CONFIG *) 0)->Field)\r
+#define OFFSET_OF_VNET(Field)  OFFSET_OF (VIRTIO_NET_CONFIG, Field)\r
+#define SIZE_OF_VNET(Field)    (sizeof ((VIRTIO_NET_CONFIG *) 0)->Field)\r
 \r
 //\r
 // Queue Identifiers\r
 //\r
-#define VIRTIO_NET_Q_RX 0\r
-#define VIRTIO_NET_Q_TX 1\r
+#define VIRTIO_NET_Q_RX  0\r
+#define VIRTIO_NET_Q_TX  1\r
 \r
 //\r
 // Feature Bits\r
 //\r
-#define VIRTIO_NET_F_CSUM           BIT0  // host to checksum outgoing packets\r
-#define VIRTIO_NET_F_GUEST_CSUM     BIT1  // guest to checksum incoming packets\r
-#define VIRTIO_NET_F_MAC            BIT5  // MAC available to guest\r
-#define VIRTIO_NET_F_GSO            BIT6  // deprecated\r
-#define VIRTIO_NET_F_GUEST_TSO4     BIT7  // guest can receive TSOv4\r
-#define VIRTIO_NET_F_GUEST_TSO6     BIT8  // guest can receive TSOv6\r
-#define VIRTIO_NET_F_GUEST_ECN      BIT9  // guest can receive TSO with ECN\r
-#define VIRTIO_NET_F_GUEST_UFO      BIT10 // guest can receive UFO\r
-#define VIRTIO_NET_F_HOST_TSO4      BIT11 // host can receive TSOv4\r
-#define VIRTIO_NET_F_HOST_TSO6      BIT12 // host can receive TSOv6\r
-#define VIRTIO_NET_F_HOST_ECN       BIT13 // host can receive TSO with ECN\r
-#define VIRTIO_NET_F_HOST_UFO       BIT14 // host can receive UFO\r
-#define VIRTIO_NET_F_MRG_RXBUF      BIT15 // guest can merge receive buffers\r
-#define VIRTIO_NET_F_STATUS         BIT16 // link status available to guest\r
-#define VIRTIO_NET_F_CTRL_VQ        BIT17 // control channel available\r
-#define VIRTIO_NET_F_CTRL_RX        BIT18 // control channel RX mode support\r
-#define VIRTIO_NET_F_CTRL_VLAN      BIT19 // control channel VLAN filtering\r
-#define VIRTIO_NET_F_GUEST_ANNOUNCE BIT21 // guest can send gratuitous pkts\r
+#define VIRTIO_NET_F_CSUM            BIT0  // host to checksum outgoing packets\r
+#define VIRTIO_NET_F_GUEST_CSUM      BIT1  // guest to checksum incoming packets\r
+#define VIRTIO_NET_F_MAC             BIT5  // MAC available to guest\r
+#define VIRTIO_NET_F_GSO             BIT6  // deprecated\r
+#define VIRTIO_NET_F_GUEST_TSO4      BIT7  // guest can receive TSOv4\r
+#define VIRTIO_NET_F_GUEST_TSO6      BIT8  // guest can receive TSOv6\r
+#define VIRTIO_NET_F_GUEST_ECN       BIT9  // guest can receive TSO with ECN\r
+#define VIRTIO_NET_F_GUEST_UFO       BIT10 // guest can receive UFO\r
+#define VIRTIO_NET_F_HOST_TSO4       BIT11 // host can receive TSOv4\r
+#define VIRTIO_NET_F_HOST_TSO6       BIT12 // host can receive TSOv6\r
+#define VIRTIO_NET_F_HOST_ECN        BIT13 // host can receive TSO with ECN\r
+#define VIRTIO_NET_F_HOST_UFO        BIT14 // host can receive UFO\r
+#define VIRTIO_NET_F_MRG_RXBUF       BIT15 // guest can merge receive buffers\r
+#define VIRTIO_NET_F_STATUS          BIT16 // link status available to guest\r
+#define VIRTIO_NET_F_CTRL_VQ         BIT17 // control channel available\r
+#define VIRTIO_NET_F_CTRL_RX         BIT18 // control channel RX mode support\r
+#define VIRTIO_NET_F_CTRL_VLAN       BIT19 // control channel VLAN filtering\r
+#define VIRTIO_NET_F_GUEST_ANNOUNCE  BIT21 // guest can send gratuitous pkts\r
 \r
 //\r
 // Packet Header\r
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT8  Flags;\r
-  UINT8  GsoType;\r
-  UINT16 HdrLen;\r
-  UINT16 GsoSize;\r
-  UINT16 CsumStart;\r
-  UINT16 CsumOffset;\r
+  UINT8     Flags;\r
+  UINT8     GsoType;\r
+  UINT16    HdrLen;\r
+  UINT16    GsoSize;\r
+  UINT16    CsumStart;\r
+  UINT16    CsumOffset;\r
 } VIRTIO_NET_REQ;\r
 #pragma pack()\r
 \r
 //\r
 // Bits in VIRTIO_NET_REQ.Flags\r
 //\r
-#define VIRTIO_NET_HDR_F_NEEDS_CSUM BIT0\r
+#define VIRTIO_NET_HDR_F_NEEDS_CSUM  BIT0\r
 \r
 //\r
 // Types/Bits for VIRTIO_NET_REQ.GsoType\r
 //\r
-#define VIRTIO_NET_HDR_GSO_NONE  0x00\r
-#define VIRTIO_NET_HDR_GSO_TCPV4 0x01\r
-#define VIRTIO_NET_HDR_GSO_UDP   0x03\r
-#define VIRTIO_NET_HDR_GSO_TCPV6 0x04\r
-#define VIRTIO_NET_HDR_GSO_ECN   BIT7\r
+#define VIRTIO_NET_HDR_GSO_NONE   0x00\r
+#define VIRTIO_NET_HDR_GSO_TCPV4  0x01\r
+#define VIRTIO_NET_HDR_GSO_UDP    0x03\r
+#define VIRTIO_NET_HDR_GSO_TCPV6  0x04\r
+#define VIRTIO_NET_HDR_GSO_ECN    BIT7\r
 \r
 //\r
 // Link Status Bits in VIRTIO_NET_CONFIG.LinkStatus\r
 //\r
-#define VIRTIO_NET_S_LINK_UP  BIT0\r
-#define VIRTIO_NET_S_ANNOUNCE BIT1\r
+#define VIRTIO_NET_S_LINK_UP   BIT0\r
+#define VIRTIO_NET_S_ANNOUNCE  BIT1\r
 \r
 #endif // _VIRTIO_0_9_5_NET_H_\r
index a1712247e05423c98643ec121020ef97c2a03efc..c47bcbd41ab77dd5247016f19c10fbd829c2bd29 100644 (file)
 //\r
 // Subsystem Device IDs (to be) introduced in VirtIo 1.0\r
 //\r
-#define VIRTIO_SUBSYSTEM_GPU_DEVICE         16\r
+#define VIRTIO_SUBSYSTEM_GPU_DEVICE  16\r
 //\r
 // Subsystem Device IDs from the VirtIo spec at git commit 87fa6b5d8155;\r
 // <https://github.com/oasis-tcs/virtio-spec/tree/87fa6b5d8155>.\r
 //\r
-#define VIRTIO_SUBSYSTEM_FILESYSTEM         26\r
+#define VIRTIO_SUBSYSTEM_FILESYSTEM  26\r
 \r
 //\r
 // Structures for parsing the VirtIo 1.0 specific PCI capabilities from the\r
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  EFI_PCI_CAPABILITY_VENDOR_HDR VendorHdr;\r
-  UINT8  ConfigType; // Identifies the specific VirtIo 1.0 config structure\r
-  UINT8  Bar;        // The BAR that contains the structure\r
-  UINT8  Padding[3];\r
-  UINT32 Offset;     // Offset within Bar until the start of the structure\r
-  UINT32 Length;     // Length of the structure\r
+  EFI_PCI_CAPABILITY_VENDOR_HDR    VendorHdr;\r
+  UINT8                            ConfigType; // Identifies the specific VirtIo 1.0 config structure\r
+  UINT8                            Bar;        // The BAR that contains the structure\r
+  UINT8                            Padding[3];\r
+  UINT32                           Offset; // Offset within Bar until the start of the structure\r
+  UINT32                           Length; // Length of the structure\r
 } VIRTIO_PCI_CAP;\r
 #pragma pack ()\r
 \r
 //\r
 // Values for the VIRTIO_PCI_CAP.ConfigType field\r
 //\r
-#define VIRTIO_PCI_CAP_COMMON_CFG 1 // Common configuration\r
-#define VIRTIO_PCI_CAP_NOTIFY_CFG 2 // Notifications\r
-#define VIRTIO_PCI_CAP_DEVICE_CFG 4 // Device specific configuration\r
+#define VIRTIO_PCI_CAP_COMMON_CFG  1 // Common configuration\r
+#define VIRTIO_PCI_CAP_NOTIFY_CFG  2 // Notifications\r
+#define VIRTIO_PCI_CAP_DEVICE_CFG  4 // Device specific configuration\r
 \r
 //\r
 // Structure pointed-to by Bar and Offset in VIRTIO_PCI_CAP when ConfigType is\r
@@ -51,46 +51,46 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT32 DeviceFeatureSelect;\r
-  UINT32 DeviceFeature;\r
-  UINT32 DriverFeatureSelect;\r
-  UINT32 DriverFeature;\r
-  UINT16 MsixConfig;\r
-  UINT16 NumQueues;\r
-  UINT8  DeviceStatus;\r
-  UINT8  ConfigGeneration;\r
-  UINT16 QueueSelect;\r
-  UINT16 QueueSize;\r
-  UINT16 QueueMsixVector;\r
-  UINT16 QueueEnable;\r
-  UINT16 QueueNotifyOff;\r
-  UINT64 QueueDesc;\r
-  UINT64 QueueAvail;\r
-  UINT64 QueueUsed;\r
+  UINT32    DeviceFeatureSelect;\r
+  UINT32    DeviceFeature;\r
+  UINT32    DriverFeatureSelect;\r
+  UINT32    DriverFeature;\r
+  UINT16    MsixConfig;\r
+  UINT16    NumQueues;\r
+  UINT8     DeviceStatus;\r
+  UINT8     ConfigGeneration;\r
+  UINT16    QueueSelect;\r
+  UINT16    QueueSize;\r
+  UINT16    QueueMsixVector;\r
+  UINT16    QueueEnable;\r
+  UINT16    QueueNotifyOff;\r
+  UINT64    QueueDesc;\r
+  UINT64    QueueAvail;\r
+  UINT64    QueueUsed;\r
 } VIRTIO_PCI_COMMON_CFG;\r
 #pragma pack ()\r
 \r
 //\r
 // VirtIo 1.0 device status bits\r
 //\r
-#define VSTAT_FEATURES_OK BIT3\r
+#define VSTAT_FEATURES_OK  BIT3\r
 \r
 //\r
 // VirtIo 1.0 reserved (device-independent) feature bits\r
 //\r
-#define VIRTIO_F_VERSION_1      BIT32\r
-#define VIRTIO_F_IOMMU_PLATFORM BIT33\r
+#define VIRTIO_F_VERSION_1       BIT32\r
+#define VIRTIO_F_IOMMU_PLATFORM  BIT33\r
 \r
 //\r
 // MMIO VirtIo Header Offsets\r
 //\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_READY                0x44\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_DESC_LO              0x80\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_DESC_HI              0x84\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_LO             0x90\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_HI             0x94\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_USED_LO              0xa0\r
-#define VIRTIO_MMIO_OFFSET_QUEUE_USED_HI              0xa4\r
-#define VIRTIO_MMIO_OFFSET_CONFIG_GENERATION          0xfc\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_READY        0x44\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_DESC_LO      0x80\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_DESC_HI      0x84\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_LO     0x90\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_HI     0x94\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_USED_LO      0xa0\r
+#define VIRTIO_MMIO_OFFSET_QUEUE_USED_HI      0xa4\r
+#define VIRTIO_MMIO_OFFSET_CONFIG_GENERATION  0xfc\r
 \r
 #endif // _VIRTIO_1_0_H_\r
index 69dcaca46541f202d1111b7ea8a19b86e5390ebc..4efb9164087c5585edd6ef287a26031e6c6eb26e 100644 (file)
@@ -18,8 +18,8 @@
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VIRTIO_NET_REQ V0_9_5;\r
-  UINT16         NumBuffers;\r
+  VIRTIO_NET_REQ    V0_9_5;\r
+  UINT16            NumBuffers;\r
 } VIRTIO_1_0_NET_REQ;\r
 #pragma pack ()\r
 \r
index 23da619d77a971d707f3551beb1a7b5a06f59c50..7a904975c314902848f57a4819623950b51f3adf 100644 (file)
 \r
 #include <IndustryStandard/Virtio.h>\r
 \r
-\r
 //\r
 // virtio-0.9.5, Appendix D: Block Device\r
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT8  PhysicalBlockExp; // # of logical blocks per physical block (log2)\r
-  UINT8  AlignmentOffset;  // offset of first aligned logical block\r
-  UINT16 MinIoSize;        // suggested minimum I/O size in blocks\r
-  UINT32 OptIoSize;        // optimal (suggested maximum) I/O size in blocks\r
+  UINT8     PhysicalBlockExp; // # of logical blocks per physical block (log2)\r
+  UINT8     AlignmentOffset;  // offset of first aligned logical block\r
+  UINT16    MinIoSize;        // suggested minimum I/O size in blocks\r
+  UINT32    OptIoSize;        // optimal (suggested maximum) I/O size in blocks\r
 } VIRTIO_BLK_TOPOLOGY;\r
 \r
 typedef struct {\r
-  UINT64              Capacity;\r
-  UINT32              SizeMax;\r
-  UINT32              SegMax;\r
-  UINT16              Cylinders;\r
-  UINT8               Heads;\r
-  UINT8               Sectors;\r
-  UINT32              BlkSize;\r
-  VIRTIO_BLK_TOPOLOGY Topology;\r
+  UINT64                 Capacity;\r
+  UINT32                 SizeMax;\r
+  UINT32                 SegMax;\r
+  UINT16                 Cylinders;\r
+  UINT8                  Heads;\r
+  UINT8                  Sectors;\r
+  UINT32                 BlkSize;\r
+  VIRTIO_BLK_TOPOLOGY    Topology;\r
 } VIRTIO_BLK_CONFIG;\r
 #pragma pack()\r
 \r
-#define OFFSET_OF_VBLK(Field) OFFSET_OF (VIRTIO_BLK_CONFIG, Field)\r
-#define SIZE_OF_VBLK(Field)   (sizeof ((VIRTIO_BLK_CONFIG *) 0)->Field)\r
+#define OFFSET_OF_VBLK(Field)  OFFSET_OF (VIRTIO_BLK_CONFIG, Field)\r
+#define SIZE_OF_VBLK(Field)    (sizeof ((VIRTIO_BLK_CONFIG *) 0)->Field)\r
 \r
-#define VIRTIO_BLK_F_BARRIER  BIT0\r
-#define VIRTIO_BLK_F_SIZE_MAX BIT1\r
-#define VIRTIO_BLK_F_SEG_MAX  BIT2\r
-#define VIRTIO_BLK_F_GEOMETRY BIT4\r
-#define VIRTIO_BLK_F_RO       BIT5\r
-#define VIRTIO_BLK_F_BLK_SIZE BIT6  // treated as "logical block size" in\r
+#define VIRTIO_BLK_F_BARRIER   BIT0\r
+#define VIRTIO_BLK_F_SIZE_MAX  BIT1\r
+#define VIRTIO_BLK_F_SEG_MAX   BIT2\r
+#define VIRTIO_BLK_F_GEOMETRY  BIT4\r
+#define VIRTIO_BLK_F_RO        BIT5\r
+#define VIRTIO_BLK_F_BLK_SIZE  BIT6 // treated as "logical block size" in\r
                                     // practice; actual host side\r
                                     // implementation negotiates "optimal"\r
                                     // block size separately, via\r
                                     // VIRTIO_BLK_F_TOPOLOGY\r
-#define VIRTIO_BLK_F_SCSI     BIT7\r
-#define VIRTIO_BLK_F_FLUSH    BIT9  // identical to "write cache enabled"\r
-#define VIRTIO_BLK_F_TOPOLOGY BIT10 // information on optimal I/O alignment\r
+#define VIRTIO_BLK_F_SCSI      BIT7\r
+#define VIRTIO_BLK_F_FLUSH     BIT9  // identical to "write cache enabled"\r
+#define VIRTIO_BLK_F_TOPOLOGY  BIT10 // information on optimal I/O alignment\r
 \r
 //\r
 // We keep the status byte separate from the rest of the virtio-blk request\r
@@ -62,22 +61,22 @@ typedef struct {
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT32 Type;\r
-  UINT32 IoPrio;\r
-  UINT64 Sector;\r
+  UINT32    Type;\r
+  UINT32    IoPrio;\r
+  UINT64    Sector;\r
 } VIRTIO_BLK_REQ;\r
 #pragma pack()\r
 \r
-#define VIRTIO_BLK_T_IN           0x00000000\r
-#define VIRTIO_BLK_T_OUT          0x00000001\r
-#define VIRTIO_BLK_T_SCSI_CMD     0x00000002\r
-#define VIRTIO_BLK_T_SCSI_CMD_OUT 0x00000003\r
-#define VIRTIO_BLK_T_FLUSH        0x00000004\r
-#define VIRTIO_BLK_T_FLUSH_OUT    0x00000005\r
-#define VIRTIO_BLK_T_BARRIER      BIT31\r
+#define VIRTIO_BLK_T_IN            0x00000000\r
+#define VIRTIO_BLK_T_OUT           0x00000001\r
+#define VIRTIO_BLK_T_SCSI_CMD      0x00000002\r
+#define VIRTIO_BLK_T_SCSI_CMD_OUT  0x00000003\r
+#define VIRTIO_BLK_T_FLUSH         0x00000004\r
+#define VIRTIO_BLK_T_FLUSH_OUT     0x00000005\r
+#define VIRTIO_BLK_T_BARRIER       BIT31\r
 \r
-#define VIRTIO_BLK_S_OK           0x00\r
-#define VIRTIO_BLK_S_IOERR        0x01\r
-#define VIRTIO_BLK_S_UNSUPP       0x02\r
+#define VIRTIO_BLK_S_OK      0x00\r
+#define VIRTIO_BLK_S_IOERR   0x01\r
+#define VIRTIO_BLK_S_UNSUPP  0x02\r
 \r
 #endif // _VIRTIO_BLK_H_\r
index dee437ec0d3987ac486d5951548a4b3d00c458d4..dbcb62f6caf27b945eb3b0d6286f1e1485927e01 100644 (file)
 //\r
 // Lowest numbered queue for sending normal priority requests.\r
 //\r
-#define VIRTIO_FS_REQUEST_QUEUE 1\r
+#define VIRTIO_FS_REQUEST_QUEUE  1\r
 \r
 //\r
 // Number of bytes in the "VIRTIO_FS_CONFIG.Tag" field.\r
 //\r
-#define VIRTIO_FS_TAG_BYTES 36\r
+#define VIRTIO_FS_TAG_BYTES  36\r
 \r
 //\r
 // Device configuration layout.\r
@@ -40,12 +40,12 @@ typedef struct {
   // encoded bytes take up the entire Tag field, then there is no NUL\r
   // terminator.\r
   //\r
-  UINT8 Tag[VIRTIO_FS_TAG_BYTES];\r
+  UINT8     Tag[VIRTIO_FS_TAG_BYTES];\r
   //\r
   // The total number of request virtqueues exposed by the device (i.e.,\r
   // excluding the "hiprio" queue).\r
   //\r
-  UINT32 NumReqQueues;\r
+  UINT32    NumReqQueues;\r
 } VIRTIO_FS_CONFIG;\r
 #pragma pack ()\r
 \r
@@ -74,56 +74,56 @@ typedef struct {
 // interface version 7.32.\r
 //\r
 #define VIRTIO_FS_FUSE_MAJOR  7\r
-#define VIRTIO_FS_FUSE_MINOR 31\r
+#define VIRTIO_FS_FUSE_MINOR  31\r
 \r
 //\r
 // The inode number of the root directory.\r
 //\r
-#define VIRTIO_FS_FUSE_ROOT_DIR_NODE_ID 1\r
+#define VIRTIO_FS_FUSE_ROOT_DIR_NODE_ID  1\r
 \r
 //\r
 // Distinguished errno values.\r
 //\r
-#define VIRTIO_FS_FUSE_ERRNO_ENOENT (-2)\r
+#define VIRTIO_FS_FUSE_ERRNO_ENOENT  (-2)\r
 \r
 //\r
 // File mode bitmasks.\r
 //\r
-#define VIRTIO_FS_FUSE_MODE_TYPE_MASK 0170000u\r
-#define VIRTIO_FS_FUSE_MODE_TYPE_REG  0100000u\r
-#define VIRTIO_FS_FUSE_MODE_TYPE_DIR  0040000u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_RWXU 0000700u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_RUSR 0000400u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_WUSR 0000200u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_XUSR 0000100u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_RWXG 0000070u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_RGRP 0000040u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_WGRP 0000020u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_XGRP 0000010u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_RWXO 0000007u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_ROTH 0000004u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_WOTH 0000002u\r
-#define VIRTIO_FS_FUSE_MODE_PERM_XOTH 0000001u\r
+#define VIRTIO_FS_FUSE_MODE_TYPE_MASK  0170000u\r
+#define VIRTIO_FS_FUSE_MODE_TYPE_REG   0100000u\r
+#define VIRTIO_FS_FUSE_MODE_TYPE_DIR   0040000u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_RWXU  0000700u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_RUSR  0000400u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_WUSR  0000200u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_XUSR  0000100u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_RWXG  0000070u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_RGRP  0000040u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_WGRP  0000020u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_XGRP  0000010u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_RWXO  0000007u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_ROTH  0000004u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_WOTH  0000002u\r
+#define VIRTIO_FS_FUSE_MODE_PERM_XOTH  0000001u\r
 \r
 //\r
 // Flags for VirtioFsFuseOpSetAttr, in the VIRTIO_FS_FUSE_SETATTR_REQUEST.Valid\r
 // field.\r
 //\r
-#define VIRTIO_FS_FUSE_SETATTR_REQ_F_MODE  BIT0\r
-#define VIRTIO_FS_FUSE_SETATTR_REQ_F_SIZE  BIT3\r
-#define VIRTIO_FS_FUSE_SETATTR_REQ_F_ATIME BIT4\r
-#define VIRTIO_FS_FUSE_SETATTR_REQ_F_MTIME BIT5\r
+#define VIRTIO_FS_FUSE_SETATTR_REQ_F_MODE   BIT0\r
+#define VIRTIO_FS_FUSE_SETATTR_REQ_F_SIZE   BIT3\r
+#define VIRTIO_FS_FUSE_SETATTR_REQ_F_ATIME  BIT4\r
+#define VIRTIO_FS_FUSE_SETATTR_REQ_F_MTIME  BIT5\r
 \r
 //\r
 // Flags for VirtioFsFuseOpOpen.\r
 //\r
-#define VIRTIO_FS_FUSE_OPEN_REQ_F_RDONLY 0\r
-#define VIRTIO_FS_FUSE_OPEN_REQ_F_RDWR   2\r
+#define VIRTIO_FS_FUSE_OPEN_REQ_F_RDONLY  0\r
+#define VIRTIO_FS_FUSE_OPEN_REQ_F_RDWR    2\r
 \r
 //\r
 // Flags for VirtioFsFuseOpInit.\r
 //\r
-#define VIRTIO_FS_FUSE_INIT_REQ_F_DO_READDIRPLUS BIT13\r
+#define VIRTIO_FS_FUSE_INIT_REQ_F_DO_READDIRPLUS  BIT13\r
 \r
 /**\r
   Macro for calculating the size of a directory stream entry.\r
@@ -156,7 +156,7 @@ typedef struct {
 //\r
 // Flags for VirtioFsFuseOpRename2.\r
 //\r
-#define VIRTIO_FS_FUSE_RENAME2_REQ_F_NOREPLACE BIT0\r
+#define VIRTIO_FS_FUSE_RENAME2_REQ_F_NOREPLACE  BIT0\r
 \r
 //\r
 // FUSE operation codes.\r
@@ -190,20 +190,20 @@ typedef enum {
 // Request-response headers common to all request types.\r
 //\r
 typedef struct {\r
-  UINT32 Len;\r
-  UINT32 Opcode;\r
-  UINT64 Unique;\r
-  UINT64 NodeId;\r
-  UINT32 Uid;\r
-  UINT32 Gid;\r
-  UINT32 Pid;\r
-  UINT32 Padding;\r
+  UINT32    Len;\r
+  UINT32    Opcode;\r
+  UINT64    Unique;\r
+  UINT64    NodeId;\r
+  UINT32    Uid;\r
+  UINT32    Gid;\r
+  UINT32    Pid;\r
+  UINT32    Padding;\r
 } VIRTIO_FS_FUSE_REQUEST;\r
 \r
 typedef struct {\r
-  UINT32 Len;\r
-  INT32  Error;\r
-  UINT64 Unique;\r
+  UINT32    Len;\r
+  INT32     Error;\r
+  UINT64    Unique;\r
 } VIRTIO_FS_FUSE_RESPONSE;\r
 \r
 //\r
@@ -213,12 +213,12 @@ typedef struct {
 // an inode.\r
 //\r
 typedef struct {\r
-  UINT64 NodeId;\r
-  UINT64 Generation;\r
-  UINT64 EntryValid;\r
-  UINT64 AttrValid;\r
-  UINT32 EntryValidNsec;\r
-  UINT32 AttrValidNsec;\r
+  UINT64    NodeId;\r
+  UINT64    Generation;\r
+  UINT64    EntryValid;\r
+  UINT64    AttrValid;\r
+  UINT32    EntryValidNsec;\r
+  UINT32    AttrValidNsec;\r
 } VIRTIO_FS_FUSE_NODE_RESPONSE;\r
 \r
 //\r
@@ -227,29 +227,29 @@ typedef struct {
 // an inode.\r
 //\r
 typedef struct {\r
-  UINT64 Ino;\r
-  UINT64 Size;\r
-  UINT64 Blocks;\r
-  UINT64 Atime;\r
-  UINT64 Mtime;\r
-  UINT64 Ctime;\r
-  UINT32 AtimeNsec;\r
-  UINT32 MtimeNsec;\r
-  UINT32 CtimeNsec;\r
-  UINT32 Mode;\r
-  UINT32 Nlink;\r
-  UINT32 Uid;\r
-  UINT32 Gid;\r
-  UINT32 Rdev;\r
-  UINT32 Blksize;\r
-  UINT32 Padding;\r
+  UINT64    Ino;\r
+  UINT64    Size;\r
+  UINT64    Blocks;\r
+  UINT64    Atime;\r
+  UINT64    Mtime;\r
+  UINT64    Ctime;\r
+  UINT32    AtimeNsec;\r
+  UINT32    MtimeNsec;\r
+  UINT32    CtimeNsec;\r
+  UINT32    Mode;\r
+  UINT32    Nlink;\r
+  UINT32    Uid;\r
+  UINT32    Gid;\r
+  UINT32    Rdev;\r
+  UINT32    Blksize;\r
+  UINT32    Padding;\r
 } VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE;\r
 \r
 //\r
 // Header for VirtioFsFuseOpForget.\r
 //\r
 typedef struct {\r
-  UINT64 NumberOfLookups;\r
+  UINT64    NumberOfLookups;\r
 } VIRTIO_FS_FUSE_FORGET_REQUEST;\r
 \r
 //\r
@@ -257,169 +257,169 @@ typedef struct {
 // for VirtioFsFuseOpSetAttr).\r
 //\r
 typedef struct {\r
-  UINT32 GetAttrFlags;\r
-  UINT32 Dummy;\r
-  UINT64 FileHandle;\r
+  UINT32    GetAttrFlags;\r
+  UINT32    Dummy;\r
+  UINT64    FileHandle;\r
 } VIRTIO_FS_FUSE_GETATTR_REQUEST;\r
 \r
 typedef struct {\r
-  UINT64 AttrValid;\r
-  UINT32 AttrValidNsec;\r
-  UINT32 Dummy;\r
+  UINT64    AttrValid;\r
+  UINT32    AttrValidNsec;\r
+  UINT32    Dummy;\r
 } VIRTIO_FS_FUSE_GETATTR_RESPONSE;\r
 \r
 //\r
 // Header for VirtioFsFuseOpSetAttr.\r
 //\r
 typedef struct {\r
-  UINT32 Valid;\r
-  UINT32 Padding;\r
-  UINT64 FileHandle;\r
-  UINT64 Size;\r
-  UINT64 LockOwner;\r
-  UINT64 Atime;\r
-  UINT64 Mtime;\r
-  UINT64 Ctime;\r
-  UINT32 AtimeNsec;\r
-  UINT32 MtimeNsec;\r
-  UINT32 CtimeNsec;\r
-  UINT32 Mode;\r
-  UINT32 Unused4;\r
-  UINT32 Uid;\r
-  UINT32 Gid;\r
-  UINT32 Unused5;\r
+  UINT32    Valid;\r
+  UINT32    Padding;\r
+  UINT64    FileHandle;\r
+  UINT64    Size;\r
+  UINT64    LockOwner;\r
+  UINT64    Atime;\r
+  UINT64    Mtime;\r
+  UINT64    Ctime;\r
+  UINT32    AtimeNsec;\r
+  UINT32    MtimeNsec;\r
+  UINT32    CtimeNsec;\r
+  UINT32    Mode;\r
+  UINT32    Unused4;\r
+  UINT32    Uid;\r
+  UINT32    Gid;\r
+  UINT32    Unused5;\r
 } VIRTIO_FS_FUSE_SETATTR_REQUEST;\r
 \r
 //\r
 // Header for VirtioFsFuseOpMkDir.\r
 //\r
 typedef struct {\r
-  UINT32 Mode;\r
-  UINT32 Umask;\r
+  UINT32    Mode;\r
+  UINT32    Umask;\r
 } VIRTIO_FS_FUSE_MKDIR_REQUEST;\r
 \r
 //\r
 // Headers for VirtioFsFuseOpOpen and VirtioFsFuseOpOpenDir.\r
 //\r
 typedef struct {\r
-  UINT32 Flags;\r
-  UINT32 Unused;\r
+  UINT32    Flags;\r
+  UINT32    Unused;\r
 } VIRTIO_FS_FUSE_OPEN_REQUEST;\r
 \r
 typedef struct {\r
-  UINT64 FileHandle;\r
-  UINT32 OpenFlags;\r
-  UINT32 Padding;\r
+  UINT64    FileHandle;\r
+  UINT32    OpenFlags;\r
+  UINT32    Padding;\r
 } VIRTIO_FS_FUSE_OPEN_RESPONSE;\r
 \r
 //\r
 // Header for VirtioFsFuseOpRead and VirtioFsFuseOpReadDirPlus.\r
 //\r
 typedef struct {\r
-  UINT64 FileHandle;\r
-  UINT64 Offset;\r
-  UINT32 Size;\r
-  UINT32 ReadFlags;\r
-  UINT64 LockOwner;\r
-  UINT32 Flags;\r
-  UINT32 Padding;\r
+  UINT64    FileHandle;\r
+  UINT64    Offset;\r
+  UINT32    Size;\r
+  UINT32    ReadFlags;\r
+  UINT64    LockOwner;\r
+  UINT32    Flags;\r
+  UINT32    Padding;\r
 } VIRTIO_FS_FUSE_READ_REQUEST;\r
 \r
 //\r
 // Headers for VirtioFsFuseOpWrite.\r
 //\r
 typedef struct {\r
-  UINT64 FileHandle;\r
-  UINT64 Offset;\r
-  UINT32 Size;\r
-  UINT32 WriteFlags;\r
-  UINT64 LockOwner;\r
-  UINT32 Flags;\r
-  UINT32 Padding;\r
+  UINT64    FileHandle;\r
+  UINT64    Offset;\r
+  UINT32    Size;\r
+  UINT32    WriteFlags;\r
+  UINT64    LockOwner;\r
+  UINT32    Flags;\r
+  UINT32    Padding;\r
 } VIRTIO_FS_FUSE_WRITE_REQUEST;\r
 \r
 typedef struct {\r
-  UINT32 Size;\r
-  UINT32 Padding;\r
+  UINT32    Size;\r
+  UINT32    Padding;\r
 } VIRTIO_FS_FUSE_WRITE_RESPONSE;\r
 \r
 //\r
 // Header for VirtioFsFuseOpStatFs.\r
 //\r
 typedef struct {\r
-  UINT64 Blocks;\r
-  UINT64 Bfree;\r
-  UINT64 Bavail;\r
-  UINT64 Files;\r
-  UINT64 Ffree;\r
-  UINT32 Bsize;\r
-  UINT32 Namelen;\r
-  UINT32 Frsize;\r
-  UINT32 Padding;\r
-  UINT32 Spare[6];\r
+  UINT64    Blocks;\r
+  UINT64    Bfree;\r
+  UINT64    Bavail;\r
+  UINT64    Files;\r
+  UINT64    Ffree;\r
+  UINT32    Bsize;\r
+  UINT32    Namelen;\r
+  UINT32    Frsize;\r
+  UINT32    Padding;\r
+  UINT32    Spare[6];\r
 } VIRTIO_FS_FUSE_STATFS_RESPONSE;\r
 \r
 //\r
 // Header for VirtioFsFuseOpRelease and VirtioFsFuseOpReleaseDir.\r
 //\r
 typedef struct {\r
-  UINT64 FileHandle;\r
-  UINT32 Flags;\r
-  UINT32 ReleaseFlags;\r
-  UINT64 LockOwner;\r
+  UINT64    FileHandle;\r
+  UINT32    Flags;\r
+  UINT32    ReleaseFlags;\r
+  UINT64    LockOwner;\r
 } VIRTIO_FS_FUSE_RELEASE_REQUEST;\r
 \r
 //\r
 // Header for VirtioFsFuseOpFsync and VirtioFsFuseOpFsyncDir.\r
 //\r
 typedef struct {\r
-  UINT64 FileHandle;\r
-  UINT32 FsyncFlags;\r
-  UINT32 Padding;\r
+  UINT64    FileHandle;\r
+  UINT32    FsyncFlags;\r
+  UINT32    Padding;\r
 } VIRTIO_FS_FUSE_FSYNC_REQUEST;\r
 \r
 //\r
 // Header for VirtioFsFuseOpFlush.\r
 //\r
 typedef struct {\r
-  UINT64 FileHandle;\r
-  UINT32 Unused;\r
-  UINT32 Padding;\r
-  UINT64 LockOwner;\r
+  UINT64    FileHandle;\r
+  UINT32    Unused;\r
+  UINT32    Padding;\r
+  UINT64    LockOwner;\r
 } VIRTIO_FS_FUSE_FLUSH_REQUEST;\r
 \r
 //\r
 // Headers for VirtioFsFuseOpInit.\r
 //\r
 typedef struct {\r
-  UINT32 Major;\r
-  UINT32 Minor;\r
-  UINT32 MaxReadahead;\r
-  UINT32 Flags;\r
+  UINT32    Major;\r
+  UINT32    Minor;\r
+  UINT32    MaxReadahead;\r
+  UINT32    Flags;\r
 } VIRTIO_FS_FUSE_INIT_REQUEST;\r
 \r
 typedef struct {\r
-  UINT32 Major;\r
-  UINT32 Minor;\r
-  UINT32 MaxReadahead;\r
-  UINT32 Flags;\r
-  UINT16 MaxBackground;\r
-  UINT16 CongestionThreshold;\r
-  UINT32 MaxWrite;\r
-  UINT32 TimeGran;\r
-  UINT16 MaxPages;\r
-  UINT16 MapAlignment;\r
-  UINT32 Unused[8];\r
+  UINT32    Major;\r
+  UINT32    Minor;\r
+  UINT32    MaxReadahead;\r
+  UINT32    Flags;\r
+  UINT16    MaxBackground;\r
+  UINT16    CongestionThreshold;\r
+  UINT32    MaxWrite;\r
+  UINT32    TimeGran;\r
+  UINT16    MaxPages;\r
+  UINT16    MapAlignment;\r
+  UINT32    Unused[8];\r
 } VIRTIO_FS_FUSE_INIT_RESPONSE;\r
 \r
 //\r
 // Header for VirtioFsFuseOpCreate.\r
 //\r
 typedef struct {\r
-  UINT32 Flags;\r
-  UINT32 Mode;\r
-  UINT32 Umask;\r
-  UINT32 Padding;\r
+  UINT32    Flags;\r
+  UINT32    Mode;\r
+  UINT32    Umask;\r
+  UINT32    Padding;\r
 } VIRTIO_FS_FUSE_CREATE_REQUEST;\r
 \r
 //\r
@@ -433,21 +433,21 @@ typedef struct {
 // sizes.\r
 //\r
 typedef struct {\r
-  VIRTIO_FS_FUSE_NODE_RESPONSE       NodeResp;\r
-  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE AttrResp;\r
-  UINT64                             NodeId;\r
-  UINT64                             CookieForNextEntry;\r
-  UINT32                             Namelen;\r
-  UINT32                             Type;\r
+  VIRTIO_FS_FUSE_NODE_RESPONSE          NodeResp;\r
+  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE    AttrResp;\r
+  UINT64                                NodeId;\r
+  UINT64                                CookieForNextEntry;\r
+  UINT32                                Namelen;\r
+  UINT32                                Type;\r
 } VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE;\r
 \r
 //\r
 // Header for VirtioFsFuseOpRename2.\r
 //\r
 typedef struct {\r
-  UINT64 NewDir;\r
-  UINT32 Flags;\r
-  UINT32 Padding;\r
+  UINT64    NewDir;\r
+  UINT32    Flags;\r
+  UINT32    Padding;\r
 } VIRTIO_FS_FUSE_RENAME2_REQUEST;\r
 #pragma pack ()\r
 \r
index b0094a5ac628123964247f772993f475f7621545..12559ccef5b101c788f630c1892c65e81c43493b 100644 (file)
@@ -26,7 +26,7 @@
 //\r
 // Queue number for sending control commands.\r
 //\r
-#define VIRTIO_GPU_CONTROL_QUEUE 0\r
+#define VIRTIO_GPU_CONTROL_QUEUE  0\r
 \r
 //\r
 // Command and response types.\r
@@ -37,8 +37,8 @@ typedef enum {
   //\r
   // - create/release a host-side 2D resource,\r
   //\r
-  VirtioGpuCmdResourceCreate2d      = 0x0101,\r
-  VirtioGpuCmdResourceUnref         = 0x0102,\r
+  VirtioGpuCmdResourceCreate2d = 0x0101,\r
+  VirtioGpuCmdResourceUnref    = 0x0102,\r
   //\r
   // - attach/detach guest RAM to/from a host-side 2D resource,\r
   //\r
@@ -47,7 +47,7 @@ typedef enum {
   //\r
   // - assign/unassign a host-side 2D resource to/from a scanout ("head").\r
   //\r
-  VirtioGpuCmdSetScanout            = 0x0103,\r
+  VirtioGpuCmdSetScanout = 0x0103,\r
 \r
   //\r
   // Commands related to drawing:\r
@@ -55,22 +55,22 @@ typedef enum {
   // - transfer a guest RAM update to the host-side 2D resource (does not imply\r
   //   host display refresh),\r
   //\r
-  VirtioGpuCmdTransferToHost2d      = 0x0105,\r
+  VirtioGpuCmdTransferToHost2d = 0x0105,\r
   //\r
   // - trigger a host display refresh from the 2D resource.\r
   //\r
-  VirtioGpuCmdResourceFlush         = 0x0104,\r
+  VirtioGpuCmdResourceFlush = 0x0104,\r
 \r
   //\r
   // Success code for all of the above commands.\r
   //\r
-  VirtioGpuRespOkNodata             = 0x1100,\r
+  VirtioGpuRespOkNodata = 0x1100,\r
 } VIRTIO_GPU_CONTROL_TYPE;\r
 \r
 //\r
 // Common request/response header.\r
 //\r
-#define VIRTIO_GPU_FLAG_FENCE BIT0\r
+#define VIRTIO_GPU_FLAG_FENCE  BIT0\r
 \r
 #pragma pack (1)\r
 typedef struct {\r
@@ -78,20 +78,20 @@ typedef struct {
   // The guest sets Type to VirtioGpuCmd* in the requests. The host sets Type\r
   // to VirtioGpuResp* in the responses.\r
   //\r
-  UINT32 Type;\r
+  UINT32    Type;\r
 \r
   //\r
   // Fencing forces the host to complete the command before producing a\r
   // response.\r
   //\r
-  UINT32 Flags;\r
-  UINT64 FenceId;\r
+  UINT32    Flags;\r
+  UINT64    FenceId;\r
 \r
   //\r
   // Unused.\r
   //\r
-  UINT32 CtxId;\r
-  UINT32 Padding;\r
+  UINT32    CtxId;\r
+  UINT32    Padding;\r
 } VIRTIO_GPU_CONTROL_HEADER;\r
 #pragma pack ()\r
 \r
@@ -100,10 +100,10 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT32 X;\r
-  UINT32 Y;\r
-  UINT32 Width;\r
-  UINT32 Height;\r
+  UINT32    X;\r
+  UINT32    Y;\r
+  UINT32    Width;\r
+  UINT32    Height;\r
 } VIRTIO_GPU_RECTANGLE;\r
 #pragma pack ()\r
 \r
@@ -119,11 +119,11 @@ typedef enum {
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  VIRTIO_GPU_CONTROL_HEADER Header;\r
-  UINT32                    ResourceId; // note: 0 is invalid\r
-  UINT32                    Format;     // from VIRTIO_GPU_FORMATS\r
-  UINT32                    Width;\r
-  UINT32                    Height;\r
+  VIRTIO_GPU_CONTROL_HEADER    Header;\r
+  UINT32                       ResourceId; // note: 0 is invalid\r
+  UINT32                       Format;     // from VIRTIO_GPU_FORMATS\r
+  UINT32                       Width;\r
+  UINT32                       Height;\r
 } VIRTIO_GPU_RESOURCE_CREATE_2D;\r
 #pragma pack ()\r
 \r
@@ -132,9 +132,9 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VIRTIO_GPU_CONTROL_HEADER Header;\r
-  UINT32                    ResourceId;\r
-  UINT32                    Padding;\r
+  VIRTIO_GPU_CONTROL_HEADER    Header;\r
+  UINT32                       ResourceId;\r
+  UINT32                       Padding;\r
 } VIRTIO_GPU_RESOURCE_UNREF;\r
 #pragma pack ()\r
 \r
@@ -146,16 +146,16 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT64 Addr;\r
-  UINT32 Length;\r
-  UINT32 Padding;\r
+  UINT64    Addr;\r
+  UINT32    Length;\r
+  UINT32    Padding;\r
 } VIRTIO_GPU_MEM_ENTRY;\r
 \r
 typedef struct {\r
-  VIRTIO_GPU_CONTROL_HEADER Header;\r
-  UINT32                    ResourceId;\r
-  UINT32                    NrEntries;  // number of entries: constant 1\r
-  VIRTIO_GPU_MEM_ENTRY      Entry;\r
+  VIRTIO_GPU_CONTROL_HEADER    Header;\r
+  UINT32                       ResourceId;\r
+  UINT32                       NrEntries; // number of entries: constant 1\r
+  VIRTIO_GPU_MEM_ENTRY         Entry;\r
 } VIRTIO_GPU_RESOURCE_ATTACH_BACKING;\r
 #pragma pack ()\r
 \r
@@ -164,9 +164,9 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VIRTIO_GPU_CONTROL_HEADER Header;\r
-  UINT32                    ResourceId;\r
-  UINT32                    Padding;\r
+  VIRTIO_GPU_CONTROL_HEADER    Header;\r
+  UINT32                       ResourceId;\r
+  UINT32                       Padding;\r
 } VIRTIO_GPU_RESOURCE_DETACH_BACKING;\r
 #pragma pack ()\r
 \r
@@ -175,10 +175,10 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VIRTIO_GPU_CONTROL_HEADER Header;\r
-  VIRTIO_GPU_RECTANGLE      Rectangle;\r
-  UINT32                    ScanoutId;\r
-  UINT32                    ResourceId;\r
+  VIRTIO_GPU_CONTROL_HEADER    Header;\r
+  VIRTIO_GPU_RECTANGLE         Rectangle;\r
+  UINT32                       ScanoutId;\r
+  UINT32                       ResourceId;\r
 } VIRTIO_GPU_SET_SCANOUT;\r
 #pragma pack ()\r
 \r
@@ -187,11 +187,11 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VIRTIO_GPU_CONTROL_HEADER Header;\r
-  VIRTIO_GPU_RECTANGLE      Rectangle;\r
-  UINT64                    Offset;\r
-  UINT32                    ResourceId;\r
-  UINT32                    Padding;\r
+  VIRTIO_GPU_CONTROL_HEADER    Header;\r
+  VIRTIO_GPU_RECTANGLE         Rectangle;\r
+  UINT64                       Offset;\r
+  UINT32                       ResourceId;\r
+  UINT32                       Padding;\r
 }  VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D;\r
 #pragma pack ()\r
 \r
@@ -200,10 +200,10 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VIRTIO_GPU_CONTROL_HEADER Header;\r
-  VIRTIO_GPU_RECTANGLE      Rectangle;\r
-  UINT32                    ResourceId;\r
-  UINT32                    Padding;\r
+  VIRTIO_GPU_CONTROL_HEADER    Header;\r
+  VIRTIO_GPU_RECTANGLE         Rectangle;\r
+  UINT32                       ResourceId;\r
+  UINT32                       Padding;\r
 } VIRTIO_GPU_RESOURCE_FLUSH;\r
 #pragma pack ()\r
 \r
index 7969d41c1b8928ce377d9192da2e6753b349b13b..2a097bd0ec6c0383f423f4cdd3174a45151584b5 100644 (file)
 \r
 #include <IndustryStandard/Virtio.h>\r
 \r
-\r
 //\r
 // virtio-0.9.5, Appendix I: SCSI Host Device\r
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT32     NumQueues;\r
-  UINT32     SegMax;\r
-  UINT32     MaxSectors;\r
-  UINT32     CmdPerLun;\r
-  UINT32     EventInfoSize;\r
-  UINT32     SenseSize;\r
-  UINT32     CdbSize;\r
-  UINT16     MaxChannel;\r
-  UINT16     MaxTarget;\r
-  UINT32     MaxLun;\r
+  UINT32    NumQueues;\r
+  UINT32    SegMax;\r
+  UINT32    MaxSectors;\r
+  UINT32    CmdPerLun;\r
+  UINT32    EventInfoSize;\r
+  UINT32    SenseSize;\r
+  UINT32    CdbSize;\r
+  UINT16    MaxChannel;\r
+  UINT16    MaxTarget;\r
+  UINT32    MaxLun;\r
 } VIRTIO_SCSI_CONFIG;\r
 #pragma pack()\r
 \r
-#define OFFSET_OF_VSCSI(Field) OFFSET_OF (VIRTIO_SCSI_CONFIG, Field)\r
-#define SIZE_OF_VSCSI(Field)   (sizeof ((VIRTIO_SCSI_CONFIG *) 0)->Field)\r
+#define OFFSET_OF_VSCSI(Field)  OFFSET_OF (VIRTIO_SCSI_CONFIG, Field)\r
+#define SIZE_OF_VSCSI(Field)    (sizeof ((VIRTIO_SCSI_CONFIG *) 0)->Field)\r
 \r
-#define VIRTIO_SCSI_F_INOUT   BIT0\r
-#define VIRTIO_SCSI_F_HOTPLUG BIT1\r
+#define VIRTIO_SCSI_F_INOUT    BIT0\r
+#define VIRTIO_SCSI_F_HOTPLUG  BIT1\r
 \r
 //\r
 // We expect these maximum sizes from the host. Also we force the CdbLength and\r
 // SenseDataLength parameters of EFI_EXT_SCSI_PASS_THRU_PROTOCOL.PassThru() not\r
 // to exceed these limits. See UEFI 2.3.1 errata C 14.7.\r
 //\r
-#define VIRTIO_SCSI_CDB_SIZE   32\r
-#define VIRTIO_SCSI_SENSE_SIZE 96\r
+#define VIRTIO_SCSI_CDB_SIZE    32\r
+#define VIRTIO_SCSI_SENSE_SIZE  96\r
 \r
 //\r
 // We pass the dynamically sized buffers ("dataout", "datain") in separate ring\r
@@ -53,41 +52,41 @@ typedef struct {
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT8  Lun[8];\r
-  UINT64 Id;\r
-  UINT8  TaskAttr;\r
-  UINT8  Prio;\r
-  UINT8  Crn;\r
-  UINT8  Cdb[VIRTIO_SCSI_CDB_SIZE];\r
+  UINT8     Lun[8];\r
+  UINT64    Id;\r
+  UINT8     TaskAttr;\r
+  UINT8     Prio;\r
+  UINT8     Crn;\r
+  UINT8     Cdb[VIRTIO_SCSI_CDB_SIZE];\r
 } VIRTIO_SCSI_REQ;\r
 \r
 typedef struct {\r
-  UINT32 SenseLen;\r
-  UINT32 Residual;\r
-  UINT16 StatusQualifier;\r
-  UINT8  Status;\r
-  UINT8  Response;\r
-  UINT8  Sense[VIRTIO_SCSI_SENSE_SIZE];\r
+  UINT32    SenseLen;\r
+  UINT32    Residual;\r
+  UINT16    StatusQualifier;\r
+  UINT8     Status;\r
+  UINT8     Response;\r
+  UINT8     Sense[VIRTIO_SCSI_SENSE_SIZE];\r
 } VIRTIO_SCSI_RESP;\r
 #pragma pack()\r
 \r
 //\r
 // selector of first virtio queue usable for request transfer\r
 //\r
-#define VIRTIO_SCSI_REQUEST_QUEUE 2\r
+#define VIRTIO_SCSI_REQUEST_QUEUE  2\r
 \r
 //\r
 // host response codes\r
 //\r
-#define VIRTIO_SCSI_S_OK                0\r
-#define VIRTIO_SCSI_S_OVERRUN           1\r
-#define VIRTIO_SCSI_S_ABORTED           2\r
-#define VIRTIO_SCSI_S_BAD_TARGET        3\r
-#define VIRTIO_SCSI_S_RESET             4\r
-#define VIRTIO_SCSI_S_BUSY              5\r
-#define VIRTIO_SCSI_S_TRANSPORT_FAILURE 6\r
-#define VIRTIO_SCSI_S_TARGET_FAILURE    7\r
-#define VIRTIO_SCSI_S_NEXUS_FAILURE     8\r
-#define VIRTIO_SCSI_S_FAILURE           9\r
+#define VIRTIO_SCSI_S_OK                 0\r
+#define VIRTIO_SCSI_S_OVERRUN            1\r
+#define VIRTIO_SCSI_S_ABORTED            2\r
+#define VIRTIO_SCSI_S_BAD_TARGET         3\r
+#define VIRTIO_SCSI_S_RESET              4\r
+#define VIRTIO_SCSI_S_BUSY               5\r
+#define VIRTIO_SCSI_S_TRANSPORT_FAILURE  6\r
+#define VIRTIO_SCSI_S_TARGET_FAILURE     7\r
+#define VIRTIO_SCSI_S_NEXUS_FAILURE      8\r
+#define VIRTIO_SCSI_S_FAILURE            9\r
 \r
 #endif // _VIRTIO_SCSI_H_\r
index 36338d063a9da4000651a27c572b99b10e37acf2..dd3d21118e7f08dedac17ce24235e552acd2aaa3 100644 (file)
  *   at Documentation/devicetree/bindings/arm/xen.txt.\r
  */\r
 \r
-#define XEN_HYPERCALL_TAG   0xEA1\r
+#define XEN_HYPERCALL_TAG  0xEA1\r
 \r
-#define uint64_aligned_t UINT64 __attribute__((aligned(8)))\r
+#define uint64_aligned_t  UINT64 __attribute__((aligned(8)))\r
 \r
 #ifndef __ASSEMBLY__\r
 #define ___DEFINE_XEN_GUEST_HANDLE(name, type)                  \\r
 #define __DEFINE_XEN_GUEST_HANDLE(name, type) \\r
     ___DEFINE_XEN_GUEST_HANDLE(name, type);   \\r
     ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type)\r
-#define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)\r
-#define __XEN_GUEST_HANDLE(name)        __guest_handle_64_ ## name\r
-#define XEN_GUEST_HANDLE(name)          __XEN_GUEST_HANDLE(name)\r
+#define DEFINE_XEN_GUEST_HANDLE(name)  __DEFINE_XEN_GUEST_HANDLE(name, name)\r
+#define __XEN_GUEST_HANDLE(name)       __guest_handle_64_ ## name\r
+#define XEN_GUEST_HANDLE(name)         __XEN_GUEST_HANDLE(name)\r
 /* this is going to be changed on 64 bit */\r
-#define XEN_GUEST_HANDLE_PARAM(name)    __guest_handle_ ## name\r
+#define XEN_GUEST_HANDLE_PARAM(name)  __guest_handle_ ## name\r
 #define set_xen_guest_handle_raw(hnd, val)                  \\r
     do {                                                    \\r
         typeof(&(hnd)) _sxghr_tmp = &(hnd);                 \\r
         _sxghr_tmp->q = 0;                                  \\r
         _sxghr_tmp->p = val;                                \\r
     } while ( 0 )\r
-#ifdef __XEN_TOOLS__\r
+  #ifdef __XEN_TOOLS__\r
 #define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)\r
-#endif\r
-#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)\r
+  #endif\r
+#define set_xen_guest_handle(hnd, val)  set_xen_guest_handle_raw(hnd, val)\r
 \r
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\r
+  #if defined (__GNUC__) && !defined (__STRICT_ANSI__)\r
 /* Anonymous union includes both 32- and 64-bit names (e.g., r0/x0). */\r
-# define __DECL_REG(n64, n32) union {          \\r
+#define __DECL_REG(n64, n32)  union {          \\r
         UINT64 n64;                          \\r
         UINT32 n32;                          \\r
     }\r
-#else\r
+  #else\r
 /* Non-gcc sources must always use the proper 64-bit name (e.g., x0). */\r
-#define __DECL_REG(n64, n32) UINT64 n64\r
-#endif\r
-\r
-struct vcpu_guest_core_regs\r
-{\r
-    /*         Aarch64       Aarch32 */\r
-    __DECL_REG(x0,           r0_usr);\r
-    __DECL_REG(x1,           r1_usr);\r
-    __DECL_REG(x2,           r2_usr);\r
-    __DECL_REG(x3,           r3_usr);\r
-    __DECL_REG(x4,           r4_usr);\r
-    __DECL_REG(x5,           r5_usr);\r
-    __DECL_REG(x6,           r6_usr);\r
-    __DECL_REG(x7,           r7_usr);\r
-    __DECL_REG(x8,           r8_usr);\r
-    __DECL_REG(x9,           r9_usr);\r
-    __DECL_REG(x10,          r10_usr);\r
-    __DECL_REG(x11,          r11_usr);\r
-    __DECL_REG(x12,          r12_usr);\r
-\r
-    __DECL_REG(x13,          sp_usr);\r
-    __DECL_REG(x14,          lr_usr);\r
-\r
-    __DECL_REG(x15,          __unused_sp_hyp);\r
-\r
-    __DECL_REG(x16,          lr_irq);\r
-    __DECL_REG(x17,          sp_irq);\r
-\r
-    __DECL_REG(x18,          lr_svc);\r
-    __DECL_REG(x19,          sp_svc);\r
-\r
-    __DECL_REG(x20,          lr_abt);\r
-    __DECL_REG(x21,          sp_abt);\r
-\r
-    __DECL_REG(x22,          lr_und);\r
-    __DECL_REG(x23,          sp_und);\r
-\r
-    __DECL_REG(x24,          r8_fiq);\r
-    __DECL_REG(x25,          r9_fiq);\r
-    __DECL_REG(x26,          r10_fiq);\r
-    __DECL_REG(x27,          r11_fiq);\r
-    __DECL_REG(x28,          r12_fiq);\r
-\r
-    __DECL_REG(x29,          sp_fiq);\r
-    __DECL_REG(x30,          lr_fiq);\r
-\r
-    /* Return address and mode */\r
-    __DECL_REG(pc64,         pc32);             /* ELR_EL2 */\r
-    UINT32 cpsr;                              /* SPSR_EL2 */\r
-\r
-    union {\r
-        UINT32 spsr_el1;       /* AArch64 */\r
-        UINT32 spsr_svc;       /* AArch32 */\r
-    };\r
-\r
-    /* AArch32 guests only */\r
-    UINT32 spsr_fiq, spsr_irq, spsr_und, spsr_abt;\r
-\r
-    /* AArch64 guests only */\r
-    UINT64 sp_el0;\r
-    UINT64 sp_el1, elr_el1;\r
+#define __DECL_REG(n64, n32)  UINT64 n64\r
+  #endif\r
+\r
+struct vcpu_guest_core_regs {\r
+  /*         Aarch64       Aarch32 */\r
+  __DECL_REG (x0, r0_usr);\r
+  __DECL_REG (x1, r1_usr);\r
+  __DECL_REG (x2, r2_usr);\r
+  __DECL_REG (x3, r3_usr);\r
+  __DECL_REG (x4, r4_usr);\r
+  __DECL_REG (x5, r5_usr);\r
+  __DECL_REG (x6, r6_usr);\r
+  __DECL_REG (x7, r7_usr);\r
+  __DECL_REG (x8, r8_usr);\r
+  __DECL_REG (x9, r9_usr);\r
+  __DECL_REG (x10, r10_usr);\r
+  __DECL_REG (x11, r11_usr);\r
+  __DECL_REG (x12, r12_usr);\r
+\r
+  __DECL_REG (x13, sp_usr);\r
+  __DECL_REG (x14, lr_usr);\r
+\r
+  __DECL_REG (x15, __unused_sp_hyp);\r
+\r
+  __DECL_REG (x16, lr_irq);\r
+  __DECL_REG (x17, sp_irq);\r
+\r
+  __DECL_REG (x18, lr_svc);\r
+  __DECL_REG (x19, sp_svc);\r
+\r
+  __DECL_REG (x20, lr_abt);\r
+  __DECL_REG (x21, sp_abt);\r
+\r
+  __DECL_REG (x22, lr_und);\r
+  __DECL_REG (x23, sp_und);\r
+\r
+  __DECL_REG (x24, r8_fiq);\r
+  __DECL_REG (x25, r9_fiq);\r
+  __DECL_REG (x26, r10_fiq);\r
+  __DECL_REG (x27, r11_fiq);\r
+  __DECL_REG (x28, r12_fiq);\r
+\r
+  __DECL_REG (x29, sp_fiq);\r
+  __DECL_REG (x30, lr_fiq);\r
+\r
+  /* Return address and mode */\r
+  __DECL_REG (pc64, pc32);                    /* ELR_EL2 */\r
+  UINT32    cpsr;                             /* SPSR_EL2 */\r
+\r
+  union {\r
+    UINT32    spsr_el1;        /* AArch64 */\r
+    UINT32    spsr_svc;        /* AArch32 */\r
+  };\r
+\r
+  /* AArch32 guests only */\r
+  UINT32    spsr_fiq, spsr_irq, spsr_und, spsr_abt;\r
+\r
+  /* AArch64 guests only */\r
+  UINT64    sp_el0;\r
+  UINT64    sp_el1, elr_el1;\r
 };\r
+\r
 typedef struct vcpu_guest_core_regs vcpu_guest_core_regs_t;\r
-DEFINE_XEN_GUEST_HANDLE(vcpu_guest_core_regs_t);\r
+DEFINE_XEN_GUEST_HANDLE (vcpu_guest_core_regs_t);\r
 \r
-#undef __DECL_REG\r
+  #undef __DECL_REG\r
 \r
 typedef UINT64 xen_pfn_t;\r
-#define PRI_xen_pfn PRIx64\r
+#define PRI_xen_pfn  PRIx64\r
 \r
 /* Maximum number of virtual CPUs in legacy multi-processor guests. */\r
 /* Only one. All other VCPUS must use VCPUOP_register_vcpu_info */\r
-#define XEN_LEGACY_MAX_VCPUS 1\r
+#define XEN_LEGACY_MAX_VCPUS  1\r
 \r
 typedef UINT64 xen_ulong_t;\r
-#define PRI_xen_ulong PRIx64\r
+#define PRI_xen_ulong  PRIx64\r
 \r
-#if defined(__XEN__) || defined(__XEN_TOOLS__)\r
+  #if defined (__XEN__) || defined (__XEN_TOOLS__)\r
 struct vcpu_guest_context {\r
-#define _VGCF_online                   0\r
-#define VGCF_online                    (1<<_VGCF_online)\r
-    UINT32 flags;                         /* VGCF_* */\r
+  #define _VGCF_online  0\r
+  #define VGCF_online   (1<<_VGCF_online)\r
+  UINT32                         flags;   /* VGCF_* */\r
 \r
-    struct vcpu_guest_core_regs user_regs;  /* Core CPU registers */\r
+  struct vcpu_guest_core_regs    user_regs; /* Core CPU registers */\r
 \r
-    UINT32 sctlr;\r
-    UINT64 ttbcr, ttbr0, ttbr1;\r
+  UINT32                         sctlr;\r
+  UINT64                         ttbcr, ttbr0, ttbr1;\r
 };\r
+\r
 typedef struct vcpu_guest_context vcpu_guest_context_t;\r
-DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);\r
-#endif\r
+DEFINE_XEN_GUEST_HANDLE (vcpu_guest_context_t);\r
+  #endif\r
 \r
 struct arch_vcpu_info {\r
 };\r
+\r
 typedef struct arch_vcpu_info arch_vcpu_info_t;\r
 \r
 struct arch_shared_info {\r
 };\r
+\r
 typedef struct arch_shared_info arch_shared_info_t;\r
-typedef UINT64 xen_callback_t;\r
+typedef UINT64                  xen_callback_t;\r
 \r
 #endif\r
 \r
-#if defined(__XEN__) || defined(__XEN_TOOLS__)\r
+#if defined (__XEN__) || defined (__XEN_TOOLS__)\r
 \r
 /* PSR bits (CPSR, SPSR)*/\r
 \r
@@ -314,30 +317,30 @@ typedef UINT64 xen_callback_t;
 #define PSR_JAZELLE     (1<<24)       /* Jazelle Mode */\r
 \r
 /* 32 bit modes */\r
-#define PSR_MODE_USR 0x10\r
-#define PSR_MODE_FIQ 0x11\r
-#define PSR_MODE_IRQ 0x12\r
-#define PSR_MODE_SVC 0x13\r
-#define PSR_MODE_MON 0x16\r
-#define PSR_MODE_ABT 0x17\r
-#define PSR_MODE_HYP 0x1a\r
-#define PSR_MODE_UND 0x1b\r
-#define PSR_MODE_SYS 0x1f\r
+#define PSR_MODE_USR  0x10\r
+#define PSR_MODE_FIQ  0x11\r
+#define PSR_MODE_IRQ  0x12\r
+#define PSR_MODE_SVC  0x13\r
+#define PSR_MODE_MON  0x16\r
+#define PSR_MODE_ABT  0x17\r
+#define PSR_MODE_HYP  0x1a\r
+#define PSR_MODE_UND  0x1b\r
+#define PSR_MODE_SYS  0x1f\r
 \r
 /* 64 bit modes */\r
-#define PSR_MODE_BIT  0x10 /* Set iff AArch32 */\r
-#define PSR_MODE_EL3h 0x0d\r
-#define PSR_MODE_EL3t 0x0c\r
-#define PSR_MODE_EL2h 0x09\r
-#define PSR_MODE_EL2t 0x08\r
-#define PSR_MODE_EL1h 0x05\r
-#define PSR_MODE_EL1t 0x04\r
-#define PSR_MODE_EL0t 0x00\r
+#define PSR_MODE_BIT   0x10/* Set iff AArch32 */\r
+#define PSR_MODE_EL3h  0x0d\r
+#define PSR_MODE_EL3t  0x0c\r
+#define PSR_MODE_EL2h  0x09\r
+#define PSR_MODE_EL2t  0x08\r
+#define PSR_MODE_EL1h  0x05\r
+#define PSR_MODE_EL1t  0x04\r
+#define PSR_MODE_EL0t  0x00\r
 \r
 #define PSR_GUEST32_INIT  (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC)\r
-#define PSR_GUEST64_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h)\r
+#define PSR_GUEST64_INIT  (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h)\r
 \r
-#define SCTLR_GUEST_INIT    0x00c50078\r
+#define SCTLR_GUEST_INIT  0x00c50078\r
 \r
 /*\r
  * Virtual machine platform (memory layout, interrupts)\r
@@ -354,56 +357,56 @@ typedef UINT64 xen_callback_t;
  */\r
 \r
 /* vGIC v2 mappings */\r
-#define GUEST_GICD_BASE   0x03001000ULL\r
-#define GUEST_GICD_SIZE   0x00001000ULL\r
-#define GUEST_GICC_BASE   0x03002000ULL\r
-#define GUEST_GICC_SIZE   0x00000100ULL\r
+#define GUEST_GICD_BASE  0x03001000ULL\r
+#define GUEST_GICD_SIZE  0x00001000ULL\r
+#define GUEST_GICC_BASE  0x03002000ULL\r
+#define GUEST_GICC_SIZE  0x00000100ULL\r
 \r
 /* vGIC v3 mappings */\r
-#define GUEST_GICV3_GICD_BASE      0x03001000ULL\r
-#define GUEST_GICV3_GICD_SIZE      0x00010000ULL\r
+#define GUEST_GICV3_GICD_BASE  0x03001000ULL\r
+#define GUEST_GICV3_GICD_SIZE  0x00010000ULL\r
 \r
 #define GUEST_GICV3_RDIST_STRIDE   0x20000ULL\r
 #define GUEST_GICV3_RDIST_REGIONS  1\r
 \r
-#define GUEST_GICV3_GICR0_BASE     0x03020000ULL    /* vCPU0 - vCPU7 */\r
-#define GUEST_GICV3_GICR0_SIZE     0x00100000ULL\r
+#define GUEST_GICV3_GICR0_BASE  0x03020000ULL       /* vCPU0 - vCPU7 */\r
+#define GUEST_GICV3_GICR0_SIZE  0x00100000ULL\r
 \r
 /* 16MB == 4096 pages reserved for guest to use as a region to map its\r
  * grant table in.\r
  */\r
-#define GUEST_GNTTAB_BASE 0x38000000ULL\r
-#define GUEST_GNTTAB_SIZE 0x01000000ULL\r
+#define GUEST_GNTTAB_BASE  0x38000000ULL\r
+#define GUEST_GNTTAB_SIZE  0x01000000ULL\r
 \r
 #define GUEST_MAGIC_BASE  0x39000000ULL\r
 #define GUEST_MAGIC_SIZE  0x01000000ULL\r
 \r
-#define GUEST_RAM_BANKS   2\r
+#define GUEST_RAM_BANKS  2\r
 \r
-#define GUEST_RAM0_BASE   0x40000000ULL /* 3GB of low RAM @ 1GB */\r
-#define GUEST_RAM0_SIZE   0xc0000000ULL\r
+#define GUEST_RAM0_BASE  0x40000000ULL  /* 3GB of low RAM @ 1GB */\r
+#define GUEST_RAM0_SIZE  0xc0000000ULL\r
 \r
-#define GUEST_RAM1_BASE   0x0200000000ULL /* 1016GB of RAM @ 8GB */\r
-#define GUEST_RAM1_SIZE   0xfe00000000ULL\r
+#define GUEST_RAM1_BASE  0x0200000000ULL  /* 1016GB of RAM @ 8GB */\r
+#define GUEST_RAM1_SIZE  0xfe00000000ULL\r
 \r
-#define GUEST_RAM_BASE    GUEST_RAM0_BASE /* Lowest RAM address */\r
+#define GUEST_RAM_BASE  GUEST_RAM0_BASE   /* Lowest RAM address */\r
 /* Largest amount of actual RAM, not including holes */\r
-#define GUEST_RAM_MAX     (GUEST_RAM0_SIZE + GUEST_RAM1_SIZE)\r
+#define GUEST_RAM_MAX  (GUEST_RAM0_SIZE + GUEST_RAM1_SIZE)\r
 /* Suitable for e.g. const uint64_t ramfoo[] = GUEST_RAM_BANK_FOOS; */\r
-#define GUEST_RAM_BANK_BASES   { GUEST_RAM0_BASE, GUEST_RAM1_BASE }\r
-#define GUEST_RAM_BANK_SIZES   { GUEST_RAM0_SIZE, GUEST_RAM1_SIZE }\r
+#define GUEST_RAM_BANK_BASES  { GUEST_RAM0_BASE, GUEST_RAM1_BASE }\r
+#define GUEST_RAM_BANK_SIZES  { GUEST_RAM0_SIZE, GUEST_RAM1_SIZE }\r
 \r
 /* Interrupts */\r
-#define GUEST_TIMER_VIRT_PPI    27\r
-#define GUEST_TIMER_PHYS_S_PPI  29\r
-#define GUEST_TIMER_PHYS_NS_PPI 30\r
-#define GUEST_EVTCHN_PPI        31\r
+#define GUEST_TIMER_VIRT_PPI     27\r
+#define GUEST_TIMER_PHYS_S_PPI   29\r
+#define GUEST_TIMER_PHYS_NS_PPI  30\r
+#define GUEST_EVTCHN_PPI         31\r
 \r
 /* PSCI functions */\r
-#define PSCI_cpu_suspend 0\r
-#define PSCI_cpu_off     1\r
-#define PSCI_cpu_on      2\r
-#define PSCI_migrate     3\r
+#define PSCI_cpu_suspend  0\r
+#define PSCI_cpu_off      1\r
+#define PSCI_cpu_on       2\r
+#define PSCI_migrate      3\r
 \r
 #endif\r
 \r
index 15708d6dd54b1c76495e3d4a6459c2f9440294f0..1922415de83f7a53f66335eeb3c0d503a7a6043b 100644 (file)
@@ -84,7 +84,7 @@
  *             of the structure must check that memmap_entries is non-zero\r
  *             before trying to read the memory map.\r
  */\r
-#define XEN_HVM_START_MAGIC_VALUE 0x336ec578\r
+#define XEN_HVM_START_MAGIC_VALUE  0x336ec578\r
 \r
 /*\r
  * The values used in the type field of the memory map table entries are\r
  * represent the layout described there using C types.\r
  */\r
 struct hvm_start_info {\r
-    UINT32 magic;             /* Contains the magic value 0x336ec578       */\r
+  UINT32    magic;            /* Contains the magic value 0x336ec578       */\r
                               /* ("xEn3" with the 0x80 bit of the "E" set).*/\r
-    UINT32 version;           /* Version of this structure.                */\r
-    UINT32 flags;             /* SIF_xxx flags.                            */\r
-    UINT32 nr_modules;        /* Number of modules passed to the kernel.   */\r
-    UINT64 modlist_paddr;     /* Physical address of an array of           */\r
+  UINT32    version;          /* Version of this structure.                */\r
+  UINT32    flags;            /* SIF_xxx flags.                            */\r
+  UINT32    nr_modules;       /* Number of modules passed to the kernel.   */\r
+  UINT64    modlist_paddr;    /* Physical address of an array of           */\r
                               /* hvm_modlist_entry.                        */\r
-    UINT64 cmdline_paddr;     /* Physical address of the command line.     */\r
-    UINT64 rsdp_paddr;        /* Physical address of the RSDP ACPI data    */\r
+  UINT64    cmdline_paddr;    /* Physical address of the command line.     */\r
+  UINT64    rsdp_paddr;       /* Physical address of the RSDP ACPI data    */\r
                               /* structure.                                */\r
-    /* All following fields only present in version 1 and newer */\r
-    UINT64 memmap_paddr;      /* Physical address of an array of           */\r
+  /* All following fields only present in version 1 and newer */\r
+  UINT64    memmap_paddr;     /* Physical address of an array of           */\r
                               /* hvm_memmap_table_entry.                   */\r
-    UINT32 memmap_entries;    /* Number of entries in the memmap table.    */\r
+  UINT32    memmap_entries;   /* Number of entries in the memmap table.    */\r
                               /* Value will be zero if there is no memory  */\r
                               /* map being provided.                       */\r
-    UINT32 reserved;          /* Must be zero.                             */\r
+  UINT32    reserved;         /* Must be zero.                             */\r
 };\r
 \r
 struct hvm_modlist_entry {\r
-    UINT64 paddr;             /* Physical address of the module.           */\r
-    UINT64 size;              /* Size of the module in bytes.              */\r
-    UINT64 cmdline_paddr;     /* Physical address of the command line.     */\r
-    UINT64 reserved;\r
+  UINT64    paddr;            /* Physical address of the module.           */\r
+  UINT64    size;             /* Size of the module in bytes.              */\r
+  UINT64    cmdline_paddr;    /* Physical address of the command line.     */\r
+  UINT64    reserved;\r
 };\r
 \r
 struct hvm_memmap_table_entry {\r
-    UINT64 addr;              /* Base address of the memory region         */\r
-    UINT64 size;              /* Size of the memory region in bytes        */\r
-    UINT32 type;              /* Mapping type                              */\r
-    UINT32 reserved;          /* Must be zero for Version 1.               */\r
+  UINT64    addr;             /* Base address of the memory region         */\r
+  UINT64    size;             /* Size of the memory region in bytes        */\r
+  UINT32    type;             /* Mapping type                              */\r
+  UINT32    reserved;         /* Must be zero for Version 1.               */\r
 };\r
 \r
 #endif /* __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ */\r
index 0314877f0b8a642f3a286a8b9ec03417e1a4bd98..caa4df5e809ccb4c8104b61561abb8e60cc6a879 100644 (file)
 #ifndef __ASSEMBLY__\r
 \r
 struct arch_vcpu_info {\r
-    UINTN cr2;\r
-    UINTN pad[5]; /* sizeof(vcpu_info_t) == 64 */\r
+  UINTN    cr2;\r
+  UINTN    pad[5]; /* sizeof(vcpu_info_t) == 64 */\r
 };\r
+\r
 typedef struct arch_vcpu_info arch_vcpu_info_t;\r
 \r
 #endif /* !__ASSEMBLY__ */\r
index c8f54c5746def832d1c67346bf63c737cb79998c..76027b361c618b4459d3388c36bf634c4abd9480 100644 (file)
 #ifndef __ASSEMBLY__\r
 \r
 struct arch_vcpu_info {\r
-    UINTN cr2;\r
-    UINTN pad; /* sizeof(vcpu_info_t) == 64 */\r
+  UINTN    cr2;\r
+  UINTN    pad; /* sizeof(vcpu_info_t) == 64 */\r
 };\r
+\r
 typedef struct arch_vcpu_info arch_vcpu_info_t;\r
 \r
 #endif /* !__ASSEMBLY__ */\r
index 3c07c59f38311257b2e76923c0ae59994cf1b583..ecf2047ee8c2fa7b07777a34242844e7ce95f554 100644 (file)
 #define __XEN_PUBLIC_ARCH_X86_XEN_H__\r
 \r
 /* Structural guest handles introduced in 0x00030201. */\r
-#if __XEN_INTERFACE_VERSION__ >= 0x00030201\r
+  #if __XEN_INTERFACE_VERSION__ >= 0x00030201\r
 #define ___DEFINE_XEN_GUEST_HANDLE(name, type) \\r
     typedef struct { type *p; } __guest_handle_ ## name\r
-#else\r
+  #else\r
 #define ___DEFINE_XEN_GUEST_HANDLE(name, type) \\r
     typedef type * __guest_handle_ ## name\r
-#endif\r
+  #endif\r
 \r
 /*\r
  * XEN_GUEST_HANDLE represents a guest pointer, when passed as a field\r
 #define __DEFINE_XEN_GUEST_HANDLE(name, type) \\r
     ___DEFINE_XEN_GUEST_HANDLE(name, type);   \\r
     ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type)\r
-#define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)\r
-#define __XEN_GUEST_HANDLE(name)        __guest_handle_ ## name\r
-#define XEN_GUEST_HANDLE(name)          __XEN_GUEST_HANDLE(name)\r
-#define XEN_GUEST_HANDLE_PARAM(name)    XEN_GUEST_HANDLE(name)\r
+#define DEFINE_XEN_GUEST_HANDLE(name)       __DEFINE_XEN_GUEST_HANDLE(name, name)\r
+#define __XEN_GUEST_HANDLE(name)            __guest_handle_ ## name\r
+#define XEN_GUEST_HANDLE(name)              __XEN_GUEST_HANDLE(name)\r
+#define XEN_GUEST_HANDLE_PARAM(name)        XEN_GUEST_HANDLE(name)\r
 #define set_xen_guest_handle_raw(hnd, val)  do { (hnd).p = val; } while (0)\r
-#ifdef __XEN_TOOLS__\r
+  #ifdef __XEN_TOOLS__\r
 #define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)\r
-#endif\r
-#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)\r
+  #endif\r
+#define set_xen_guest_handle(hnd, val)  set_xen_guest_handle_raw(hnd, val)\r
 \r
-#if defined(MDE_CPU_IA32)\r
-#include "xen-x86_32.h"\r
-#elif defined(MDE_CPU_X64)\r
-#include "xen-x86_64.h"\r
-#endif\r
+  #if defined (MDE_CPU_IA32)\r
+    #include "xen-x86_32.h"\r
+  #elif defined (MDE_CPU_X64)\r
+    #include "xen-x86_64.h"\r
+  #endif\r
 \r
-#ifndef __ASSEMBLY__\r
+  #ifndef __ASSEMBLY__\r
 typedef UINTN xen_pfn_t;\r
-#define PRI_xen_pfn "lx"\r
-#endif\r
+#define PRI_xen_pfn  "lx"\r
+  #endif\r
 \r
-#define XEN_HAVE_PV_UPCALL_MASK 1\r
+#define XEN_HAVE_PV_UPCALL_MASK  1\r
 \r
 /* Maximum number of virtual CPUs in legacy multi-processor guests. */\r
-#define XEN_LEGACY_MAX_VCPUS 32\r
+#define XEN_LEGACY_MAX_VCPUS  32\r
 \r
-#ifndef __ASSEMBLY__\r
+  #ifndef __ASSEMBLY__\r
 \r
 typedef UINTN xen_ulong_t;\r
-#define PRI_xen_ulong "lx"\r
+#define PRI_xen_ulong  "lx"\r
 \r
 typedef UINT64 tsc_timestamp_t; /* RDTSC timestamp */\r
 \r
-#ifdef MDE_CPU_IA32\r
-#pragma pack(4)\r
-#endif\r
+    #ifdef MDE_CPU_IA32\r
+      #pragma pack(4)\r
+    #endif\r
 struct arch_shared_info {\r
-    UINTN max_pfn;                  /* max pfn that appears in table */\r
-    /* Frame containing list of mfns containing list of mfns containing p2m. */\r
-    xen_pfn_t     pfn_to_mfn_frame_list_list;\r
-    UINTN nmi_reason;\r
-    UINT64 pad[32];\r
+  UINTN        max_pfn;             /* max pfn that appears in table */\r
+  /* Frame containing list of mfns containing list of mfns containing p2m. */\r
+  xen_pfn_t    pfn_to_mfn_frame_list_list;\r
+  UINTN        nmi_reason;\r
+  UINT64       pad[32];\r
 };\r
+\r
 typedef struct arch_shared_info arch_shared_info_t;\r
-#ifdef MDE_CPU_IA32\r
-#pragma pack()\r
-#endif\r
+    #ifdef MDE_CPU_IA32\r
+      #pragma pack()\r
+    #endif\r
 \r
-#endif /* !__ASSEMBLY__ */\r
+  #endif /* !__ASSEMBLY__ */\r
 \r
 #endif /* __XEN_PUBLIC_ARCH_X86_XEN_H__ */\r
 \r
index 4fff5654af6614f469c2bf520801cda09811bb6c..0e2554ee30e832a164ee7eef1a380436de797346 100644 (file)
  */\r
 \r
 /* ` enum event_channel_op { // EVTCHNOP_* => struct evtchn_* */\r
-#define EVTCHNOP_close            3\r
-#define EVTCHNOP_send             4\r
-#define EVTCHNOP_alloc_unbound    6\r
+#define EVTCHNOP_close          3\r
+#define EVTCHNOP_send           4\r
+#define EVTCHNOP_alloc_unbound  6\r
 /* ` } */\r
 \r
 typedef UINT32 evtchn_port_t;\r
-DEFINE_XEN_GUEST_HANDLE(evtchn_port_t);\r
+DEFINE_XEN_GUEST_HANDLE (evtchn_port_t);\r
 \r
 /*\r
  * EVTCHNOP_alloc_unbound: Allocate a port in domain <dom> and mark as\r
@@ -61,11 +61,12 @@ DEFINE_XEN_GUEST_HANDLE(evtchn_port_t);
  *  2. <rdom> may be DOMID_SELF, allowing loopback connections.\r
  */\r
 struct evtchn_alloc_unbound {\r
-    /* IN parameters */\r
-    domid_t dom, remote_dom;\r
-    /* OUT parameters */\r
-    evtchn_port_t port;\r
+  /* IN parameters */\r
+  domid_t          dom, remote_dom;\r
+  /* OUT parameters */\r
+  evtchn_port_t    port;\r
 };\r
+\r
 typedef struct evtchn_alloc_unbound evtchn_alloc_unbound_t;\r
 \r
 /*\r
@@ -74,9 +75,10 @@ typedef struct evtchn_alloc_unbound evtchn_alloc_unbound_t;
  * (EVTCHNSTAT_unbound), awaiting a new connection.\r
  */\r
 struct evtchn_close {\r
-    /* IN parameters. */\r
-    evtchn_port_t port;\r
+  /* IN parameters. */\r
+  evtchn_port_t    port;\r
 };\r
+\r
 typedef struct evtchn_close evtchn_close_t;\r
 \r
 /*\r
@@ -84,9 +86,10 @@ typedef struct evtchn_close evtchn_close_t;
  * endpoint is <port>.\r
  */\r
 struct evtchn_send {\r
-    /* IN parameters. */\r
-    evtchn_port_t port;\r
+  /* IN parameters. */\r
+  evtchn_port_t    port;\r
 };\r
+\r
 typedef struct evtchn_send evtchn_send_t;\r
 \r
 #endif /* __XEN_PUBLIC_EVENT_CHANNEL_H__ */\r
index 54af1dbc383c5addc05d7399807f9fc965326287..b2adaec34634e5bf9c90e8584fb976430e68cbcf 100644 (file)
@@ -109,28 +109,30 @@ typedef UINT32 grant_ref_t;
  * for backwards compatibility.  New guests should use version 2.\r
  */\r
 #if __XEN_INTERFACE_VERSION__ < 0x0003020a\r
-#define grant_entry_v1 grant_entry\r
-#define grant_entry_v1_t grant_entry_t\r
+#define grant_entry_v1    grant_entry\r
+#define grant_entry_v1_t  grant_entry_t\r
 #endif\r
 struct grant_entry_v1 {\r
-    /* GTF_xxx: various type and flag information.  [XEN,GST] */\r
-    UINT16 flags;\r
-    /* The domain being granted foreign privileges. [GST] */\r
-    domid_t  domid;\r
-    /*\r
-     * GTF_permit_access: Frame that @domid is allowed to map and access. [GST]\r
-     * GTF_accept_transfer: Frame whose ownership transferred by @domid. [XEN]\r
-     */\r
-    UINT32 frame;\r
+  /* GTF_xxx: various type and flag information.  [XEN,GST] */\r
+  UINT16     flags;\r
+  /* The domain being granted foreign privileges. [GST] */\r
+  domid_t    domid;\r
+\r
+  /*\r
+   * GTF_permit_access: Frame that @domid is allowed to map and access. [GST]\r
+   * GTF_accept_transfer: Frame whose ownership transferred by @domid. [XEN]\r
+   */\r
+  UINT32     frame;\r
 };\r
+\r
 typedef struct grant_entry_v1 grant_entry_v1_t;\r
 \r
 /* The first few grant table entries will be preserved across grant table\r
  * version changes and may be pre-populated at domain creation by tools.\r
  */\r
-#define GNTTAB_NR_RESERVED_ENTRIES     8\r
-#define GNTTAB_RESERVED_CONSOLE        0\r
-#define GNTTAB_RESERVED_XENSTORE       1\r
+#define GNTTAB_NR_RESERVED_ENTRIES  8\r
+#define GNTTAB_RESERVED_CONSOLE     0\r
+#define GNTTAB_RESERVED_XENSTORE    1\r
 \r
 /*\r
  * Type of grant entry.\r
@@ -141,11 +143,11 @@ typedef struct grant_entry_v1 grant_entry_v1_t;
  *  GTF_transitive: Allow @domid to transitively access a subrange of\r
  *                  @trans_grant in @trans_domid.  No mappings are allowed.\r
  */\r
-#define GTF_invalid         (0U<<0)\r
-#define GTF_permit_access   (1U<<0)\r
-#define GTF_accept_transfer (2U<<0)\r
-#define GTF_transitive      (3U<<0)\r
-#define GTF_type_mask       (3U<<0)\r
+#define GTF_invalid          (0U<<0)\r
+#define GTF_permit_access    (1U<<0)\r
+#define GTF_accept_transfer  (2U<<0)\r
+#define GTF_transitive       (3U<<0)\r
+#define GTF_type_mask        (3U<<0)\r
 \r
 /*\r
  * Subflags for GTF_permit_access.\r
@@ -157,20 +159,20 @@ typedef struct grant_entry_v1 grant_entry_v1_t;
  *                will only be allowed to copy from the grant, and not\r
  *                map it. [GST]\r
  */\r
-#define _GTF_readonly       (2)\r
-#define GTF_readonly        (1U<<_GTF_readonly)\r
-#define _GTF_reading        (3)\r
-#define GTF_reading         (1U<<_GTF_reading)\r
-#define _GTF_writing        (4)\r
-#define GTF_writing         (1U<<_GTF_writing)\r
-#define _GTF_PWT            (5)\r
-#define GTF_PWT             (1U<<_GTF_PWT)\r
-#define _GTF_PCD            (6)\r
-#define GTF_PCD             (1U<<_GTF_PCD)\r
-#define _GTF_PAT            (7)\r
-#define GTF_PAT             (1U<<_GTF_PAT)\r
-#define _GTF_sub_page       (8)\r
-#define GTF_sub_page        (1U<<_GTF_sub_page)\r
+#define _GTF_readonly  (2)\r
+#define GTF_readonly   (1U<<_GTF_readonly)\r
+#define _GTF_reading   (3)\r
+#define GTF_reading    (1U<<_GTF_reading)\r
+#define _GTF_writing   (4)\r
+#define GTF_writing    (1U<<_GTF_writing)\r
+#define _GTF_PWT       (5)\r
+#define GTF_PWT        (1U<<_GTF_PWT)\r
+#define _GTF_PCD       (6)\r
+#define GTF_PCD        (1U<<_GTF_PCD)\r
+#define _GTF_PAT       (7)\r
+#define GTF_PAT        (1U<<_GTF_PAT)\r
+#define _GTF_sub_page  (8)\r
+#define GTF_sub_page   (1U<<_GTF_sub_page)\r
 \r
 /*\r
  * Subflags for GTF_accept_transfer:\r
@@ -182,10 +184,10 @@ typedef struct grant_entry_v1 grant_entry_v1_t;
  *      after reading GTF_transfer_committed. Xen will always write the frame\r
  *      address, followed by ORing this flag, in a timely manner.\r
  */\r
-#define _GTF_transfer_committed (2)\r
-#define GTF_transfer_committed  (1U<<_GTF_transfer_committed)\r
-#define _GTF_transfer_completed (3)\r
-#define GTF_transfer_completed  (1U<<_GTF_transfer_completed)\r
+#define _GTF_transfer_committed  (2)\r
+#define GTF_transfer_committed   (1U<<_GTF_transfer_committed)\r
+#define _GTF_transfer_completed  (3)\r
+#define GTF_transfer_completed   (1U<<_GTF_transfer_completed)\r
 \r
 /*\r
  * Version 2 grant table entries.  These fulfil the same role as\r
@@ -197,68 +199,71 @@ typedef struct grant_entry_v1 grant_entry_v1_t;
  * on the grant table version in use by the other domain.\r
  */\r
 #if __XEN_INTERFACE_VERSION__ >= 0x0003020a\r
+\r
 /*\r
  * Version 1 and version 2 grant entries share a common prefix.  The\r
  * fields of the prefix are documented as part of struct\r
  * grant_entry_v1.\r
  */\r
 struct grant_entry_header {\r
-    UINT16 flags;\r
-    domid_t  domid;\r
+  UINT16     flags;\r
+  domid_t    domid;\r
 };\r
+\r
 typedef struct grant_entry_header grant_entry_header_t;\r
 \r
 /*\r
  * Version 2 of the grant entry structure.\r
  */\r
 union grant_entry_v2 {\r
-    grant_entry_header_t hdr;\r
-\r
-    /*\r
-     * This member is used for V1-style full page grants, where either:\r
-     *\r
-     * -- hdr.type is GTF_accept_transfer, or\r
-     * -- hdr.type is GTF_permit_access and GTF_sub_page is not set.\r
-     *\r
-     * In that case, the frame field has the same semantics as the\r
-     * field of the same name in the V1 entry structure.\r
-     */\r
-    struct {\r
-        grant_entry_header_t hdr;\r
-        UINT32 pad0;\r
-        UINT64 frame;\r
-    } full_page;\r
-\r
-    /*\r
-     * If the grant type is GTF_grant_access and GTF_sub_page is set,\r
-     * @domid is allowed to access bytes [@page_off,@page_off+@length)\r
-     * in frame @frame.\r
-     */\r
-    struct {\r
-        grant_entry_header_t hdr;\r
-        UINT16 page_off;\r
-        UINT16 length;\r
-        UINT64 frame;\r
-    } sub_page;\r
-\r
-    /*\r
-     * If the grant is GTF_transitive, @domid is allowed to use the\r
-     * grant @gref in domain @trans_domid, as if it was the local\r
-     * domain.  Obviously, the transitive access must be compatible\r
-     * with the original grant.\r
-     *\r
-     * The current version of Xen does not allow transitive grants\r
-     * to be mapped.\r
-     */\r
-    struct {\r
-        grant_entry_header_t hdr;\r
-        domid_t trans_domid;\r
-        UINT16 pad0;\r
-        grant_ref_t gref;\r
-    } transitive;\r
-\r
-    UINT32 __spacer[4]; /* Pad to a power of two */\r
+  grant_entry_header_t    hdr;\r
+\r
+  /*\r
+   * This member is used for V1-style full page grants, where either:\r
+   *\r
+   * -- hdr.type is GTF_accept_transfer, or\r
+   * -- hdr.type is GTF_permit_access and GTF_sub_page is not set.\r
+   *\r
+   * In that case, the frame field has the same semantics as the\r
+   * field of the same name in the V1 entry structure.\r
+   */\r
+  struct {\r
+    grant_entry_header_t    hdr;\r
+    UINT32                  pad0;\r
+    UINT64                  frame;\r
+  } full_page;\r
+\r
+  /*\r
+   * If the grant type is GTF_grant_access and GTF_sub_page is set,\r
+   * @domid is allowed to access bytes [@page_off,@page_off+@length)\r
+   * in frame @frame.\r
+   */\r
+  struct {\r
+    grant_entry_header_t    hdr;\r
+    UINT16                  page_off;\r
+    UINT16                  length;\r
+    UINT64                  frame;\r
+  } sub_page;\r
+\r
+  /*\r
+   * If the grant is GTF_transitive, @domid is allowed to use the\r
+   * grant @gref in domain @trans_domid, as if it was the local\r
+   * domain.  Obviously, the transitive access must be compatible\r
+   * with the original grant.\r
+   *\r
+   * The current version of Xen does not allow transitive grants\r
+   * to be mapped.\r
+   */\r
+  struct {\r
+    grant_entry_header_t    hdr;\r
+    domid_t                 trans_domid;\r
+    UINT16                  pad0;\r
+    grant_ref_t             gref;\r
+  } transitive;\r
+\r
+  UINT32    __spacer[4]; /* Pad to a power of two */\r
 };\r
+\r
 typedef union grant_entry_v2 grant_entry_v2_t;\r
 \r
 typedef UINT16 grant_status_t;\r
@@ -280,8 +285,8 @@ typedef UINT16 grant_status_t;
  */\r
 \r
 /* ` enum grant_table_op { // GNTTABOP_* => struct gnttab_* */\r
-#define GNTTABOP_map_grant_ref        0\r
-#define GNTTABOP_unmap_grant_ref      1\r
+#define GNTTABOP_map_grant_ref    0\r
+#define GNTTABOP_unmap_grant_ref  1\r
 /* ` } */\r
 \r
 /*\r
@@ -307,18 +312,19 @@ typedef UINT32 grant_handle_t;
  *     to be accounted to the correct grant reference!\r
  */\r
 struct gnttab_map_grant_ref {\r
-    /* IN parameters. */\r
-    UINT64 host_addr;\r
-    UINT32 flags;               /* GNTMAP_* */\r
-    grant_ref_t ref;\r
-    domid_t  dom;\r
-    /* OUT parameters. */\r
-    INT16  status;              /* => enum grant_status */\r
-    grant_handle_t handle;\r
-    UINT64 dev_bus_addr;\r
+  /* IN parameters. */\r
+  UINT64            host_addr;\r
+  UINT32            flags;      /* GNTMAP_* */\r
+  grant_ref_t       ref;\r
+  domid_t           dom;\r
+  /* OUT parameters. */\r
+  INT16             status;     /* => enum grant_status */\r
+  grant_handle_t    handle;\r
+  UINT64            dev_bus_addr;\r
 };\r
+\r
 typedef struct gnttab_map_grant_ref gnttab_map_grant_ref_t;\r
-DEFINE_XEN_GUEST_HANDLE(gnttab_map_grant_ref_t);\r
+DEFINE_XEN_GUEST_HANDLE (gnttab_map_grant_ref_t);\r
 \r
 /*\r
  * GNTTABOP_unmap_grant_ref: Destroy one or more grant-reference mappings\r
@@ -332,74 +338,76 @@ DEFINE_XEN_GUEST_HANDLE(gnttab_map_grant_ref_t);
  *     mappings will remain in the device or host TLBs.\r
  */\r
 struct gnttab_unmap_grant_ref {\r
-    /* IN parameters. */\r
-    UINT64 host_addr;\r
-    UINT64 dev_bus_addr;\r
-    grant_handle_t handle;\r
-    /* OUT parameters. */\r
-    INT16  status;              /* => enum grant_status */\r
+  /* IN parameters. */\r
+  UINT64            host_addr;\r
+  UINT64            dev_bus_addr;\r
+  grant_handle_t    handle;\r
+  /* OUT parameters. */\r
+  INT16             status;     /* => enum grant_status */\r
 };\r
+\r
 typedef struct gnttab_unmap_grant_ref gnttab_unmap_grant_ref_t;\r
-DEFINE_XEN_GUEST_HANDLE(gnttab_unmap_grant_ref_t);\r
+DEFINE_XEN_GUEST_HANDLE (gnttab_unmap_grant_ref_t);\r
 \r
 /*\r
  * Bitfield values for gnttab_map_grant_ref.flags.\r
  */\r
- /* Map the grant entry for access by I/O devices. */\r
-#define _GNTMAP_device_map      (0)\r
-#define GNTMAP_device_map       (1<<_GNTMAP_device_map)\r
- /* Map the grant entry for access by host CPUs. */\r
-#define _GNTMAP_host_map        (1)\r
-#define GNTMAP_host_map         (1<<_GNTMAP_host_map)\r
- /* Accesses to the granted frame will be restricted to read-only access. */\r
-#define _GNTMAP_readonly        (2)\r
-#define GNTMAP_readonly         (1<<_GNTMAP_readonly)\r
- /*\r
-  * GNTMAP_host_map subflag:\r
-  *  0 => The host mapping is usable only by the guest OS.\r
-  *  1 => The host mapping is usable by guest OS + current application.\r
-  */\r
-#define _GNTMAP_application_map (3)\r
-#define GNTMAP_application_map  (1<<_GNTMAP_application_map)\r
-\r
- /*\r
-  * GNTMAP_contains_pte subflag:\r
-  *  0 => This map request contains a host virtual address.\r
-  *  1 => This map request contains the machine address of the PTE to update.\r
-  */\r
-#define _GNTMAP_contains_pte    (4)\r
-#define GNTMAP_contains_pte     (1<<_GNTMAP_contains_pte)\r
-\r
-#define _GNTMAP_can_fail        (5)\r
-#define GNTMAP_can_fail         (1<<_GNTMAP_can_fail)\r
+/* Map the grant entry for access by I/O devices. */\r
+#define _GNTMAP_device_map  (0)\r
+#define GNTMAP_device_map   (1<<_GNTMAP_device_map)\r
+/* Map the grant entry for access by host CPUs. */\r
+#define _GNTMAP_host_map  (1)\r
+#define GNTMAP_host_map   (1<<_GNTMAP_host_map)\r
+/* Accesses to the granted frame will be restricted to read-only access. */\r
+#define _GNTMAP_readonly  (2)\r
+#define GNTMAP_readonly   (1<<_GNTMAP_readonly)\r
+\r
+/*\r
+ * GNTMAP_host_map subflag:\r
+ *  0 => The host mapping is usable only by the guest OS.\r
+ *  1 => The host mapping is usable by guest OS + current application.\r
+ */\r
+#define _GNTMAP_application_map  (3)\r
+#define GNTMAP_application_map   (1<<_GNTMAP_application_map)\r
+\r
+/*\r
+ * GNTMAP_contains_pte subflag:\r
+ *  0 => This map request contains a host virtual address.\r
+ *  1 => This map request contains the machine address of the PTE to update.\r
+ */\r
+#define _GNTMAP_contains_pte  (4)\r
+#define GNTMAP_contains_pte   (1<<_GNTMAP_contains_pte)\r
+\r
+#define _GNTMAP_can_fail  (5)\r
+#define GNTMAP_can_fail   (1<<_GNTMAP_can_fail)\r
 \r
 /*\r
  * Bits to be placed in guest kernel available PTE bits (architecture\r
  * dependent; only supported when XENFEAT_gnttab_map_avail_bits is set).\r
  */\r
-#define _GNTMAP_guest_avail0    (16)\r
-#define GNTMAP_guest_avail_mask ((UINT32)~0 << _GNTMAP_guest_avail0)\r
+#define _GNTMAP_guest_avail0     (16)\r
+#define GNTMAP_guest_avail_mask  ((UINT32)~0 << _GNTMAP_guest_avail0)\r
 \r
 /*\r
  * Values for error status returns. All errors are -ve.\r
  */\r
 /* ` enum grant_status { */\r
-#define GNTST_okay             (0)  /* Normal return.                        */\r
-#define GNTST_general_error    (-1) /* General undefined error.              */\r
-#define GNTST_bad_domain       (-2) /* Unrecognised domain id.               */\r
-#define GNTST_bad_gntref       (-3) /* Unrecognised or inappropriate gntref. */\r
-#define GNTST_bad_handle       (-4) /* Unrecognised or inappropriate handle. */\r
-#define GNTST_bad_virt_addr    (-5) /* Inappropriate virtual address to map. */\r
-#define GNTST_bad_dev_addr     (-6) /* Inappropriate device address to unmap.*/\r
-#define GNTST_no_device_space  (-7) /* Out of space in I/O MMU.              */\r
-#define GNTST_permission_denied (-8) /* Not enough privilege for operation.  */\r
-#define GNTST_bad_page         (-9) /* Specified page was invalid for op.    */\r
-#define GNTST_bad_copy_arg    (-10) /* copy arguments cross page boundary.   */\r
-#define GNTST_address_too_big (-11) /* transfer page address too large.      */\r
-#define GNTST_eagain          (-12) /* Operation not done; try again.        */\r
+#define GNTST_okay               (0)   /* Normal return.                        */\r
+#define GNTST_general_error      (-1)  /* General undefined error.              */\r
+#define GNTST_bad_domain         (-2)  /* Unrecognised domain id.               */\r
+#define GNTST_bad_gntref         (-3)  /* Unrecognised or inappropriate gntref. */\r
+#define GNTST_bad_handle         (-4)  /* Unrecognised or inappropriate handle. */\r
+#define GNTST_bad_virt_addr      (-5)  /* Inappropriate virtual address to map. */\r
+#define GNTST_bad_dev_addr       (-6)  /* Inappropriate device address to unmap.*/\r
+#define GNTST_no_device_space    (-7)  /* Out of space in I/O MMU.              */\r
+#define GNTST_permission_denied  (-8)  /* Not enough privilege for operation.  */\r
+#define GNTST_bad_page           (-9)  /* Specified page was invalid for op.    */\r
+#define GNTST_bad_copy_arg       (-10) /* copy arguments cross page boundary.   */\r
+#define GNTST_address_too_big    (-11) /* transfer page address too large.      */\r
+#define GNTST_eagain             (-12) /* Operation not done; try again.        */\r
 /* ` } */\r
 \r
-#define GNTTABOP_error_msgs                   \\r
+#define GNTTABOP_error_msgs  {                  \\r
     "okay",                                     \\r
     "undefined error",                          \\r
     "unrecognised domain id",                   \\r
index 5eca23c2055a08846288395caa5f9c9c54b89bef..eb0d9a595f8b62d73b7eb4915a9236f00feda45b 100644 (file)
@@ -8,14 +8,15 @@
 #include "../xen.h"\r
 \r
 /* Get/set subcommands: extra argument == pointer to xen_hvm_param struct. */\r
-#define HVMOP_set_param           0\r
-#define HVMOP_get_param           1\r
+#define HVMOP_set_param  0\r
+#define HVMOP_get_param  1\r
 struct xen_hvm_param {\r
-    domid_t  domid;    /* IN */\r
-    UINT32 index;    /* IN */\r
-    UINT64 value;    /* IN/OUT */\r
+  domid_t    domid;  /* IN */\r
+  UINT32     index;  /* IN */\r
+  UINT64     value;  /* IN/OUT */\r
 };\r
+\r
 typedef struct xen_hvm_param xen_hvm_param_t;\r
-DEFINE_XEN_GUEST_HANDLE(xen_hvm_param_t);\r
+DEFINE_XEN_GUEST_HANDLE (xen_hvm_param_t);\r
 \r
 #endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */\r
index 15aa93e2f52b5ffc34cd49122ea968ada0aac769..19c75468fc97e5b1c8945aeecc308fa8daf4987c 100644 (file)
  *                  method is available.\r
  * If val == 0 then CPU0 event-channel notifications are not delivered.\r
  */\r
-#define HVM_PARAM_CALLBACK_IRQ 0\r
+#define HVM_PARAM_CALLBACK_IRQ  0\r
 \r
 /*\r
  * These are not used by Xen. They are here for convenience of HVM-guest\r
  * xenbus implementations.\r
  */\r
-#define HVM_PARAM_STORE_PFN    1\r
-#define HVM_PARAM_STORE_EVTCHN 2\r
+#define HVM_PARAM_STORE_PFN     1\r
+#define HVM_PARAM_STORE_EVTCHN  2\r
 \r
 #define HVM_PARAM_PAE_ENABLED  4\r
 \r
-#define HVM_PARAM_IOREQ_PFN    5\r
+#define HVM_PARAM_IOREQ_PFN  5\r
 \r
-#define HVM_PARAM_BUFIOREQ_PFN 6\r
-#define HVM_PARAM_BUFIOREQ_EVTCHN 26\r
+#define HVM_PARAM_BUFIOREQ_PFN     6\r
+#define HVM_PARAM_BUFIOREQ_EVTCHN  26\r
 \r
-#if defined(MDE_CPU_IA32) || defined(MDE_CPU_X64)\r
+#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64)\r
 \r
 /* Expose Viridian interfaces to this HVM guest? */\r
-#define HVM_PARAM_VIRIDIAN     9\r
+#define HVM_PARAM_VIRIDIAN  9\r
 \r
 #endif\r
 \r
  *   Missed interrupts are collapsed together and delivered as one 'late tick'.\r
  *   Guest time always tracks wallclock (i.e., real) time.\r
  */\r
-#define HVM_PARAM_TIMER_MODE   10\r
-#define HVMPTM_delay_for_missed_ticks    0\r
-#define HVMPTM_no_delay_for_missed_ticks 1\r
-#define HVMPTM_no_missed_ticks_pending   2\r
-#define HVMPTM_one_missed_tick_pending   3\r
+#define HVM_PARAM_TIMER_MODE              10\r
+#define HVMPTM_delay_for_missed_ticks     0\r
+#define HVMPTM_no_delay_for_missed_ticks  1\r
+#define HVMPTM_no_missed_ticks_pending    2\r
+#define HVMPTM_one_missed_tick_pending    3\r
 \r
 /* Boolean: Enable virtual HPET (high-precision event timer)? (x86-only) */\r
-#define HVM_PARAM_HPET_ENABLED 11\r
+#define HVM_PARAM_HPET_ENABLED  11\r
 \r
 /* Identity-map page directory used by Intel EPT when CR0.PG=0. */\r
-#define HVM_PARAM_IDENT_PT     12\r
+#define HVM_PARAM_IDENT_PT  12\r
 \r
 /* Device Model domain, defaults to 0. */\r
-#define HVM_PARAM_DM_DOMAIN    13\r
+#define HVM_PARAM_DM_DOMAIN  13\r
 \r
 /* ACPI S state: currently support S0 and S3 on x86. */\r
-#define HVM_PARAM_ACPI_S_STATE 14\r
+#define HVM_PARAM_ACPI_S_STATE  14\r
 \r
 /* TSS used on Intel when CR0.PE=0. */\r
-#define HVM_PARAM_VM86_TSS     15\r
+#define HVM_PARAM_VM86_TSS  15\r
 \r
 /* Boolean: Enable aligning all periodic vpts to reduce interrupts */\r
-#define HVM_PARAM_VPT_ALIGN    16\r
+#define HVM_PARAM_VPT_ALIGN  16\r
 \r
 /* Console debug shared memory ring and event channel */\r
-#define HVM_PARAM_CONSOLE_PFN    17\r
-#define HVM_PARAM_CONSOLE_EVTCHN 18\r
+#define HVM_PARAM_CONSOLE_PFN     17\r
+#define HVM_PARAM_CONSOLE_EVTCHN  18\r
 \r
 /*\r
  * Select location of ACPI PM1a and TMR control blocks. Currently two locations\r
  *        PM1A_EVT == 0xb000; PM1A_CNT == 0xb004; PM_TMR == 0xb008\r
  * You can find these address definitions in <hvm/ioreq.h>\r
  */\r
-#define HVM_PARAM_ACPI_IOPORTS_LOCATION 19\r
+#define HVM_PARAM_ACPI_IOPORTS_LOCATION  19\r
 \r
 /* Enable blocking memory events, async or sync (pause vcpu until response)\r
  * onchangeonly indicates messages only on a change of value */\r
 #define HVM_PARAM_MEMORY_EVENT_SINGLE_STEP  25\r
 #define HVM_PARAM_MEMORY_EVENT_MSR          30\r
 \r
-#define HVMPME_MODE_MASK       (3 << 0)\r
-#define HVMPME_mode_disabled   0\r
-#define HVMPME_mode_async      1\r
-#define HVMPME_mode_sync       2\r
-#define HVMPME_onchangeonly    (1 << 2)\r
+#define HVMPME_MODE_MASK      (3 << 0)\r
+#define HVMPME_mode_disabled  0\r
+#define HVMPME_mode_async     1\r
+#define HVMPME_mode_sync      2\r
+#define HVMPME_onchangeonly   (1 << 2)\r
 \r
 /* Boolean: Enable nestedhvm (hvm only) */\r
-#define HVM_PARAM_NESTEDHVM    24\r
+#define HVM_PARAM_NESTEDHVM  24\r
 \r
 /* Params for the mem event rings */\r
 #define HVM_PARAM_PAGING_RING_PFN   27\r
 #define HVM_PARAM_SHARING_RING_PFN  29\r
 \r
 /* SHUTDOWN_* action in case of a triple fault */\r
-#define HVM_PARAM_TRIPLE_FAULT_REASON 31\r
+#define HVM_PARAM_TRIPLE_FAULT_REASON  31\r
 \r
-#define HVM_NR_PARAMS          32\r
+#define HVM_NR_PARAMS  32\r
 \r
 #endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */\r
index 5939610a9616d9ea01bc0f3ac174a6c291ae0c16..8a34f9eba282b6153d56ae9633b24401e687d5b1 100644 (file)
@@ -28,9 +28,9 @@
  */\r
 \r
 #ifndef blkif_vdev_t\r
-#define blkif_vdev_t   UINT16\r
+#define blkif_vdev_t  UINT16\r
 #endif\r
-#define blkif_sector_t UINT64\r
+#define blkif_sector_t  UINT64\r
 \r
 /*\r
  * Feature and Parameter Negotiation\r
 /*\r
  * REQUEST CODES.\r
  */\r
-#define BLKIF_OP_READ              0\r
-#define BLKIF_OP_WRITE             1\r
+#define BLKIF_OP_READ   0\r
+#define BLKIF_OP_WRITE  1\r
+\r
 /*\r
  * All writes issued prior to a request with the BLKIF_OP_WRITE_BARRIER\r
  * operation code ("barrier request") must be completed prior to the\r
  *\r
  * Optional.  See "feature-barrier" XenBus node documentation above.\r
  */\r
-#define BLKIF_OP_WRITE_BARRIER     2\r
+#define BLKIF_OP_WRITE_BARRIER  2\r
+\r
 /*\r
  * Commit any uncommitted contents of the backing device's volatile cache\r
  * to stable storage.\r
  *\r
  * Optional.  See "feature-flush-cache" XenBus node documentation above.\r
  */\r
-#define BLKIF_OP_FLUSH_DISKCACHE   3\r
+#define BLKIF_OP_FLUSH_DISKCACHE  3\r
+\r
 /*\r
  * Used in SLES sources for device specific command packet\r
  * contained within the request. Reserved for that purpose.\r
  */\r
-#define BLKIF_OP_RESERVED_1        4\r
+#define BLKIF_OP_RESERVED_1  4\r
+\r
 /*\r
  * Indicate to the backend device that a region of storage is no longer in\r
  * use, and may be discarded at any time without impact to the client.  If\r
  * "discard-granularity", and "discard-secure" in the XenBus node\r
  * documentation above.\r
  */\r
-#define BLKIF_OP_DISCARD           5\r
+#define BLKIF_OP_DISCARD  5\r
 \r
 /*\r
  * Recognized if "feature-max-indirect-segments" in present in the backend\r
  * If a backend does not recognize BLKIF_OP_INDIRECT, it should *not*\r
  * create the "feature-max-indirect-segments" node!\r
  */\r
-#define BLKIF_OP_INDIRECT          6\r
+#define BLKIF_OP_INDIRECT  6\r
 \r
 /*\r
  * Maximum scatter/gather segments per request.\r
  * This is carefully chosen so that sizeof(blkif_ring_t) <= PAGE_SIZE.\r
  * NB. This could be 12 if the ring indexes weren't stored in the same page.\r
  */\r
-#define BLKIF_MAX_SEGMENTS_PER_REQUEST 11\r
+#define BLKIF_MAX_SEGMENTS_PER_REQUEST  11\r
 \r
 /*\r
  * Maximum number of indirect pages to use per request.\r
  */\r
-#define BLKIF_MAX_INDIRECT_PAGES_PER_REQUEST 8\r
+#define BLKIF_MAX_INDIRECT_PAGES_PER_REQUEST  8\r
 \r
 /*\r
  * NB. first_sect and last_sect in blkif_request_segment, as well as\r
  * 512-byte units.\r
  */\r
 struct blkif_request_segment {\r
-    grant_ref_t gref;        /* reference to I/O buffer frame        */\r
-    /* @first_sect: first sector in frame to transfer (inclusive).   */\r
-    /* @last_sect: last sector in frame to transfer (inclusive).     */\r
-    UINT8     first_sect, last_sect;\r
+  grant_ref_t    gref;       /* reference to I/O buffer frame        */\r
+  /* @first_sect: first sector in frame to transfer (inclusive).   */\r
+  /* @last_sect: last sector in frame to transfer (inclusive).     */\r
+  UINT8          first_sect, last_sect;\r
 };\r
 \r
 /*\r
  * Starting ring element for any I/O request.\r
  */\r
-#if defined(MDE_CPU_IA32)\r
+#if defined (MDE_CPU_IA32)\r
 //\r
 // pack(4) is necessary when these structs are compiled for Ia32.\r
 // Without it, the struct will have a different alignment than the one\r
 // a backend expect for a 32bit guest.\r
 //\r
-#pragma pack(4)\r
+  #pragma pack(4)\r
 #endif\r
 struct blkif_request {\r
-    UINT8        operation;    /* BLKIF_OP_???                         */\r
-    UINT8        nr_segments;  /* number of segments                   */\r
-    blkif_vdev_t   handle;       /* only for read/write requests         */\r
-    UINT64       id;           /* private guest value, echoed in resp  */\r
-    blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */\r
-    struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];\r
+  UINT8                           operation;     /* BLKIF_OP_???                         */\r
+  UINT8                           nr_segments;   /* number of segments                   */\r
+  blkif_vdev_t                    handle;        /* only for read/write requests         */\r
+  UINT64                          id;            /* private guest value, echoed in resp  */\r
+  blkif_sector_t                  sector_number; /* start sector idx on disk (r/w only)  */\r
+  struct blkif_request_segment    seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];\r
 };\r
+\r
 typedef struct blkif_request blkif_request_t;\r
 \r
 /*\r
@@ -537,58 +542,61 @@ typedef struct blkif_request blkif_request_t;
  * sizeof(struct blkif_request_discard) <= sizeof(struct blkif_request)\r
  */\r
 struct blkif_request_discard {\r
-    UINT8        operation;    /* BLKIF_OP_DISCARD                     */\r
-    UINT8        flag;         /* BLKIF_DISCARD_SECURE or zero         */\r
-#define BLKIF_DISCARD_SECURE (1<<0)  /* ignored if discard-secure=0      */\r
-    blkif_vdev_t   handle;       /* same as for read/write requests      */\r
-    UINT64       id;           /* private guest value, echoed in resp  */\r
-    blkif_sector_t sector_number;/* start sector idx on disk             */\r
-    UINT64       nr_sectors;   /* number of contiguous sectors to discard*/\r
+  UINT8             operation;         /* BLKIF_OP_DISCARD                     */\r
+  UINT8             flag;              /* BLKIF_DISCARD_SECURE or zero         */\r
+  #define BLKIF_DISCARD_SECURE  (1<<0) /* ignored if discard-secure=0      */\r
+  blkif_vdev_t      handle;            /* same as for read/write requests      */\r
+  UINT64            id;                /* private guest value, echoed in resp  */\r
+  blkif_sector_t    sector_number;     /* start sector idx on disk             */\r
+  UINT64            nr_sectors;        /* number of contiguous sectors to discard*/\r
 };\r
+\r
 typedef struct blkif_request_discard blkif_request_discard_t;\r
 \r
 struct blkif_request_indirect {\r
-    UINT8        operation;    /* BLKIF_OP_INDIRECT                    */\r
-    UINT8        indirect_op;  /* BLKIF_OP_{READ/WRITE}                */\r
-    UINT16       nr_segments;  /* number of segments                   */\r
-    UINT64       id;           /* private guest value, echoed in resp  */\r
-    blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */\r
-    blkif_vdev_t   handle;       /* same as for read/write requests      */\r
-    grant_ref_t    indirect_grefs[BLKIF_MAX_INDIRECT_PAGES_PER_REQUEST];\r
-#ifdef MDE_CPU_IA32\r
-    UINT64       pad;          /* Make it 64 byte aligned on i386      */\r
-#endif\r
+  UINT8             operation;     /* BLKIF_OP_INDIRECT                    */\r
+  UINT8             indirect_op;   /* BLKIF_OP_{READ/WRITE}                */\r
+  UINT16            nr_segments;   /* number of segments                   */\r
+  UINT64            id;            /* private guest value, echoed in resp  */\r
+  blkif_sector_t    sector_number; /* start sector idx on disk (r/w only)  */\r
+  blkif_vdev_t      handle;        /* same as for read/write requests      */\r
+  grant_ref_t       indirect_grefs[BLKIF_MAX_INDIRECT_PAGES_PER_REQUEST];\r
+ #ifdef MDE_CPU_IA32\r
+  UINT64            pad;       /* Make it 64 byte aligned on i386      */\r
+ #endif\r
 };\r
+\r
 typedef struct blkif_request_indirect blkif_request_indirect_t;\r
 \r
 struct blkif_response {\r
-    UINT64        id;              /* copied from request */\r
-    UINT8         operation;       /* copied from request */\r
-    INT16         status;          /* BLKIF_RSP_???       */\r
+  UINT64    id;                    /* copied from request */\r
+  UINT8     operation;             /* copied from request */\r
+  INT16     status;                /* BLKIF_RSP_???       */\r
 };\r
+\r
 typedef struct blkif_response blkif_response_t;\r
-#if defined(MDE_CPU_IA32)\r
-#pragma pack()\r
+#if defined (MDE_CPU_IA32)\r
+  #pragma pack()\r
 #endif\r
 \r
 /*\r
  * STATUS RETURN CODES.\r
  */\r
- /* Operation not supported (only happens on barrier writes). */\r
+/* Operation not supported (only happens on barrier writes). */\r
 #define BLKIF_RSP_EOPNOTSUPP  -2\r
- /* Operation failed for some unspecified reason (-EIO). */\r
-#define BLKIF_RSP_ERROR       -1\r
- /* Operation completed successfully. */\r
-#define BLKIF_RSP_OKAY         0\r
+/* Operation failed for some unspecified reason (-EIO). */\r
+#define BLKIF_RSP_ERROR  -1\r
+/* Operation completed successfully. */\r
+#define BLKIF_RSP_OKAY  0\r
 \r
 /*\r
  * Generate blkif ring structures and types.\r
  */\r
-DEFINE_RING_TYPES(blkif, struct blkif_request, struct blkif_response);\r
+DEFINE_RING_TYPES (blkif, struct blkif_request, struct blkif_response);\r
 \r
-#define VDISK_CDROM        0x1\r
-#define VDISK_REMOVABLE    0x2\r
-#define VDISK_READONLY     0x4\r
+#define VDISK_CDROM      0x1\r
+#define VDISK_REMOVABLE  0x2\r
+#define VDISK_READONLY   0x4\r
 \r
 #endif /* __XEN_PUBLIC_IO_BLKIF_H__ */\r
 \r
index c38d88b07aa31626493030c3ddb87e0691b6518e..bc59fdd8692a2329e40bb6cabef80bfca18f4920 100644 (file)
 \r
 typedef UINT32 XENCONS_RING_IDX;\r
 \r
-#define MASK_XENCONS_IDX(idx, ring) ((idx) & (sizeof(ring)-1))\r
+#define MASK_XENCONS_IDX(idx, ring)  ((idx) & (sizeof(ring)-1))\r
 \r
 struct xencons_interface {\r
-    char in[1024];\r
-    char out[2048];\r
-    XENCONS_RING_IDX in_cons, in_prod;\r
-    XENCONS_RING_IDX out_cons, out_prod;\r
+  char in[1024];\r
+  char                out[2048];\r
+  XENCONS_RING_IDX    in_cons, in_prod;\r
+  XENCONS_RING_IDX    out_cons, out_prod;\r
 };\r
 \r
 #endif /* __XEN_PUBLIC_IO_CONSOLE_H__ */\r
index 4303d37c30be29481e725919873d743f8d275c14..4ea3b42b981fc53aa2142d078bfa0f10373ca545 100644 (file)
@@ -7,18 +7,18 @@
 #ifndef __XEN_PROTOCOLS_H__\r
 #define __XEN_PROTOCOLS_H__\r
 \r
-#define XEN_IO_PROTO_ABI_X86_32     "x86_32-abi"\r
-#define XEN_IO_PROTO_ABI_X86_64     "x86_64-abi"\r
-#define XEN_IO_PROTO_ABI_ARM        "arm-abi"\r
+#define XEN_IO_PROTO_ABI_X86_32  "x86_32-abi"\r
+#define XEN_IO_PROTO_ABI_X86_64  "x86_64-abi"\r
+#define XEN_IO_PROTO_ABI_ARM     "arm-abi"\r
 \r
-#if defined(MDE_CPU_IA32)\r
-# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32\r
-#elif defined(MDE_CPU_X64)\r
-# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_64\r
-#elif defined(__arm__) || defined(__aarch64__)\r
-# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_ARM\r
+#if defined (MDE_CPU_IA32)\r
+#define XEN_IO_PROTO_ABI_NATIVE  XEN_IO_PROTO_ABI_X86_32\r
+#elif defined (MDE_CPU_X64)\r
+#define XEN_IO_PROTO_ABI_NATIVE  XEN_IO_PROTO_ABI_X86_64\r
+#elif defined (__arm__) || defined (__aarch64__)\r
+#define XEN_IO_PROTO_ABI_NATIVE  XEN_IO_PROTO_ABI_ARM\r
 #else\r
-error arch fixup needed here\r
+  #error arch fixup needed here\r
 #endif\r
 \r
 #endif\r
index 2fa5d20ca0face5ef8af9af32165c5b69d361ee2..d044cfb0a5dbebac538281d1546b2d6f902e6c27 100644 (file)
 #include "../xen-compat.h"\r
 \r
 #if __XEN_INTERFACE_VERSION__ < 0x00030208\r
-#define xen_mb()  mb()\r
-#define xen_rmb() rmb()\r
-#define xen_wmb() wmb()\r
+#define xen_mb()   mb()\r
+#define xen_rmb()  rmb()\r
+#define xen_wmb()  wmb()\r
 #endif\r
 \r
 typedef UINT32 RING_IDX;\r
 \r
 /* Round a 32-bit unsigned constant down to the nearest power of two. */\r
-#define __RD2(_x)  (((_x) & 0x00000002) ? 0x2                  : ((_x) & 0x1))\r
-#define __RD4(_x)  (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2    : __RD2(_x))\r
-#define __RD8(_x)  (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4    : __RD4(_x))\r
-#define __RD16(_x) (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8    : __RD8(_x))\r
-#define __RD32(_x) (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x))\r
+#define __RD2(_x)   (((_x) & 0x00000002) ? 0x2                  : ((_x) & 0x1))\r
+#define __RD4(_x)   (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2    : __RD2(_x))\r
+#define __RD8(_x)   (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4    : __RD4(_x))\r
+#define __RD16(_x)  (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8    : __RD8(_x))\r
+#define __RD32(_x)  (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x))\r
 \r
 /*\r
  * Calculate size of a shared ring, given the total available space for the\r
@@ -36,7 +36,8 @@ typedef UINT32 RING_IDX;
  */\r
 #define __CONST_RING_SIZE(_s, _sz) \\r
     (__RD32(((_sz) - offsetof(struct _s##_sring, ring)) / \\r
-           sizeof(((struct _s##_sring *)0)->ring[0])))\r
+            sizeof(((struct _s##_sring *)0)->ring[0])))\r
+\r
 /*\r
  * The same for passing in an actual pointer instead of a name tag.\r
  */\r
@@ -77,13 +78,13 @@ typedef UINT32 RING_IDX;
 \r
 #define DEFINE_RING_TYPES(__name, __req_t, __rsp_t)                     \\r
                                                                         \\r
-/* Shared ring entry */                                                 \\r
+  /* Shared ring entry */                                                 \\r
 union __name##_sring_entry {                                            \\r
     __req_t req;                                                        \\r
     __rsp_t rsp;                                                        \\r
 };                                                                      \\r
                                                                         \\r
-/* Shared ring page */                                                  \\r
+  /* Shared ring page */                                                  \\r
 struct __name##_sring {                                                 \\r
     RING_IDX req_prod, req_event;                                       \\r
     RING_IDX rsp_prod, rsp_event;                                       \\r
@@ -100,7 +101,7 @@ struct __name##_sring {                                                 \
     union __name##_sring_entry ring[1]; /* variable-length */           \\r
 };                                                                      \\r
                                                                         \\r
-/* "Front" end's private variables */                                   \\r
+  /* "Front" end's private variables */                                   \\r
 struct __name##_front_ring {                                            \\r
     RING_IDX req_prod_pvt;                                              \\r
     RING_IDX rsp_cons;                                                  \\r
@@ -108,7 +109,7 @@ struct __name##_front_ring {                                            \
     struct __name##_sring *sring;                                       \\r
 };                                                                      \\r
                                                                         \\r
-/* "Back" end's private variables */                                    \\r
+  /* "Back" end's private variables */                                    \\r
 struct __name##_back_ring {                                             \\r
     RING_IDX rsp_prod_pvt;                                              \\r
     RING_IDX req_cons;                                                  \\r
@@ -116,7 +117,7 @@ struct __name##_back_ring {                                             \
     struct __name##_sring *sring;                                       \\r
 };                                                                      \\r
                                                                         \\r
-/* Syntactic sugar */                                                   \\r
+  /* Syntactic sugar */                                                   \\r
 typedef struct __name##_sring __name##_sring_t;                         \\r
 typedef struct __name##_front_ring __name##_front_ring_t;               \\r
 typedef struct __name##_back_ring __name##_back_ring_t\r
@@ -137,21 +138,21 @@ typedef struct __name##_back_ring __name##_back_ring_t
  */\r
 \r
 /* Initialising empty rings */\r
-#define SHARED_RING_INIT(_s) do {                                       \\r
+#define SHARED_RING_INIT(_s)  do {                                      \\r
     (_s)->req_prod  = (_s)->rsp_prod  = 0;                              \\r
     (_s)->req_event = (_s)->rsp_event = 1;                              \\r
     (VOID)ZeroMem((_s)->private.pvt_pad, sizeof((_s)->private.pvt_pad)); \\r
     (VOID)ZeroMem((_s)->__pad, sizeof((_s)->__pad));                  \\r
 } while(0)\r
 \r
-#define FRONT_RING_INIT(_r, _s, __size) do {                            \\r
+#define FRONT_RING_INIT(_r, _s, __size)  do {                           \\r
     (_r)->req_prod_pvt = 0;                                             \\r
     (_r)->rsp_cons = 0;                                                 \\r
     (_r)->nr_ents = __RING_SIZE(_s, __size);                            \\r
     (_r)->sring = (_s);                                                 \\r
 } while (0)\r
 \r
-#define BACK_RING_INIT(_r, _s, __size) do {                             \\r
+#define BACK_RING_INIT(_r, _s, __size)  do {                            \\r
     (_r)->rsp_prod_pvt = 0;                                             \\r
     (_r)->req_cons = 0;                                                 \\r
     (_r)->nr_ents = __RING_SIZE(_s, __size);                            \\r
@@ -177,7 +178,7 @@ typedef struct __name##_back_ring __name##_back_ring_t
     ((_r)->sring->rsp_prod - (_r)->rsp_cons)\r
 \r
 #ifdef __GNUC__\r
-#define RING_HAS_UNCONSUMED_REQUESTS(_r) ({                             \\r
+#define RING_HAS_UNCONSUMED_REQUESTS(_r)  ({                            \\r
     UINT32 req = (_r)->sring->req_prod - (_r)->req_cons;          \\r
     UINT32 rsp = RING_SIZE(_r) -                                  \\r
         ((_r)->req_cons - (_r)->rsp_prod_pvt);                          \\r
@@ -207,12 +208,12 @@ typedef struct __name##_back_ring __name##_back_ring_t
 #define RING_REQUEST_PROD_OVERFLOW(_r, _prod)                           \\r
     (((_prod) - (_r)->rsp_prod_pvt) > RING_SIZE(_r))\r
 \r
-#define RING_PUSH_REQUESTS(_r) do {                                     \\r
+#define RING_PUSH_REQUESTS(_r)  do {                                    \\r
     xen_wmb(); /* back sees requests /before/ updated producer index */ \\r
     (_r)->sring->req_prod = (_r)->req_prod_pvt;                         \\r
 } while (0)\r
 \r
-#define RING_PUSH_RESPONSES(_r) do {                                    \\r
+#define RING_PUSH_RESPONSES(_r)  do {                                   \\r
     xen_wmb(); /* front sees resps /before/ updated producer index */   \\r
     (_r)->sring->rsp_prod = (_r)->rsp_prod_pvt;                         \\r
 } while (0)\r
@@ -247,7 +248,7 @@ typedef struct __name##_back_ring __name##_back_ring_t
  *  field appropriately.\r
  */\r
 \r
-#define RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(_r, _notify) do {           \\r
+#define RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(_r, _notify)  do {          \\r
     RING_IDX __old = (_r)->sring->req_prod;                             \\r
     RING_IDX __new = (_r)->req_prod_pvt;                                \\r
     xen_wmb(); /* back sees requests /before/ updated producer index */ \\r
@@ -257,7 +258,7 @@ typedef struct __name##_back_ring __name##_back_ring_t
                  (RING_IDX)(__new - __old));                            \\r
 } while (0)\r
 \r
-#define RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(_r, _notify) do {          \\r
+#define RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(_r, _notify)  do {         \\r
     RING_IDX __old = (_r)->sring->rsp_prod;                             \\r
     RING_IDX __new = (_r)->rsp_prod_pvt;                                \\r
     xen_wmb(); /* front sees resps /before/ updated producer index */   \\r
@@ -267,7 +268,7 @@ typedef struct __name##_back_ring __name##_back_ring_t
                  (RING_IDX)(__new - __old));                            \\r
 } while (0)\r
 \r
-#define RING_FINAL_CHECK_FOR_REQUESTS(_r, _work_to_do) do {             \\r
+#define RING_FINAL_CHECK_FOR_REQUESTS(_r, _work_to_do)  do {            \\r
     (_work_to_do) = RING_HAS_UNCONSUMED_REQUESTS(_r);                   \\r
     if (_work_to_do) break;                                             \\r
     (_r)->sring->req_event = (_r)->req_cons + 1;                        \\r
@@ -275,7 +276,7 @@ typedef struct __name##_back_ring __name##_back_ring_t
     (_work_to_do) = RING_HAS_UNCONSUMED_REQUESTS(_r);                   \\r
 } while (0)\r
 \r
-#define RING_FINAL_CHECK_FOR_RESPONSES(_r, _work_to_do) do {            \\r
+#define RING_FINAL_CHECK_FOR_RESPONSES(_r, _work_to_do)  do {           \\r
     (_work_to_do) = RING_HAS_UNCONSUMED_RESPONSES(_r);                  \\r
     if (_work_to_do) break;                                             \\r
     (_r)->sring->rsp_event = (_r)->rsp_cons + 1;                        \\r
index 80db1909e9a4a8d7d19810867d7d9d93ab6daddc..1a50619bbfb61429e771f9f2fe3afd0b48cd6acc 100644 (file)
  * layers.\r
  */\r
 enum xenbus_state {\r
-    XenbusStateUnknown       = 0,\r
+  XenbusStateUnknown = 0,\r
 \r
-    XenbusStateInitialising  = 1,\r
+  XenbusStateInitialising = 1,\r
 \r
-    /*\r
-     * InitWait: Finished early initialisation but waiting for information\r
-     * from the peer or hotplug scripts.\r
-     */\r
-    XenbusStateInitWait      = 2,\r
+  /*\r
+   * InitWait: Finished early initialisation but waiting for information\r
+   * from the peer or hotplug scripts.\r
+   */\r
+  XenbusStateInitWait = 2,\r
 \r
-    /*\r
-     * Initialised: Waiting for a connection from the peer.\r
-     */\r
-    XenbusStateInitialised   = 3,\r
+  /*\r
+   * Initialised: Waiting for a connection from the peer.\r
+   */\r
+  XenbusStateInitialised = 3,\r
 \r
-    XenbusStateConnected     = 4,\r
+  XenbusStateConnected = 4,\r
 \r
-    /*\r
-     * Closing: The device is being closed due to an error or an unplug event.\r
-     */\r
-    XenbusStateClosing       = 5,\r
+  /*\r
+   * Closing: The device is being closed due to an error or an unplug event.\r
+   */\r
+  XenbusStateClosing = 5,\r
 \r
-    XenbusStateClosed        = 6,\r
+  XenbusStateClosed = 6,\r
 \r
-    /*\r
-     * Reconfiguring: The device is being reconfigured.\r
-     */\r
-    XenbusStateReconfiguring = 7,\r
+  /*\r
+   * Reconfiguring: The device is being reconfigured.\r
+   */\r
+  XenbusStateReconfiguring = 7,\r
 \r
-    XenbusStateReconfigured  = 8\r
+  XenbusStateReconfigured = 8\r
 };\r
+\r
 typedef enum xenbus_state XenbusState;\r
 \r
 #endif /* _XEN_PUBLIC_IO_XENBUS_H */\r
index fb4e48d59182a553fbf203abd07ca40dcd2b382c..a6b75b8b22564c26b62f56090f9fdf3d5a950835 100644 (file)
 #ifndef _XS_WIRE_H\r
 #define _XS_WIRE_H\r
 \r
-enum xsd_sockmsg_type\r
-{\r
-    XS_DEBUG,\r
-    XS_DIRECTORY,\r
-    XS_READ,\r
-    XS_GET_PERMS,\r
-    XS_WATCH,\r
-    XS_UNWATCH,\r
-    XS_TRANSACTION_START,\r
-    XS_TRANSACTION_END,\r
-    XS_INTRODUCE,\r
-    XS_RELEASE,\r
-    XS_GET_DOMAIN_PATH,\r
-    XS_WRITE,\r
-    XS_MKDIR,\r
-    XS_RM,\r
-    XS_SET_PERMS,\r
-    XS_WATCH_EVENT,\r
-    XS_ERROR,\r
-    XS_IS_DOMAIN_INTRODUCED,\r
-    XS_RESUME,\r
-    XS_SET_TARGET,\r
-    XS_RESTRICT,\r
-    XS_RESET_WATCHES,\r
-\r
-    XS_INVALID = 0xffff /* Guaranteed to remain an invalid type */\r
+enum xsd_sockmsg_type {\r
+  XS_DEBUG,\r
+  XS_DIRECTORY,\r
+  XS_READ,\r
+  XS_GET_PERMS,\r
+  XS_WATCH,\r
+  XS_UNWATCH,\r
+  XS_TRANSACTION_START,\r
+  XS_TRANSACTION_END,\r
+  XS_INTRODUCE,\r
+  XS_RELEASE,\r
+  XS_GET_DOMAIN_PATH,\r
+  XS_WRITE,\r
+  XS_MKDIR,\r
+  XS_RM,\r
+  XS_SET_PERMS,\r
+  XS_WATCH_EVENT,\r
+  XS_ERROR,\r
+  XS_IS_DOMAIN_INTRODUCED,\r
+  XS_RESUME,\r
+  XS_SET_TARGET,\r
+  XS_RESTRICT,\r
+  XS_RESET_WATCHES,\r
+\r
+  XS_INVALID = 0xffff   /* Guaranteed to remain an invalid type */\r
 };\r
 \r
-#define XS_WRITE_NONE "NONE"\r
-#define XS_WRITE_CREATE "CREATE"\r
-#define XS_WRITE_CREATE_EXCL "CREATE|EXCL"\r
+#define XS_WRITE_NONE         "NONE"\r
+#define XS_WRITE_CREATE       "CREATE"\r
+#define XS_WRITE_CREATE_EXCL  "CREATE|EXCL"\r
 \r
 /* We hand errors as strings, for portability. */\r
-struct xsd_errors\r
-{\r
-    INT32 errnum;\r
-    const CHAR8 *errstring;\r
+struct xsd_errors {\r
+  INT32          errnum;\r
+  const CHAR8    *errstring;\r
 };\r
+\r
 #ifdef EINVAL\r
-#define XSD_ERROR(x) { x, #x }\r
+#define XSD_ERROR(x)  { x, #x }\r
 /* LINTED: static unused */\r
 static struct xsd_errors xsd_errors[]\r
-#if defined(__GNUC__)\r
-__attribute__((unused))\r
-#endif\r
-    = {\r
-    XSD_ERROR(EINVAL),\r
-    XSD_ERROR(EACCES),\r
-    XSD_ERROR(EEXIST),\r
-    XSD_ERROR(EISDIR),\r
-    XSD_ERROR(ENOENT),\r
-    XSD_ERROR(ENOMEM),\r
-    XSD_ERROR(ENOSPC),\r
-    XSD_ERROR(EIO),\r
-    XSD_ERROR(ENOTEMPTY),\r
-    XSD_ERROR(ENOSYS),\r
-    XSD_ERROR(EROFS),\r
-    XSD_ERROR(EBUSY),\r
-    XSD_ERROR(EAGAIN),\r
-    XSD_ERROR(EISCONN),\r
-    XSD_ERROR(E2BIG)\r
-};\r
+  #if defined (__GNUC__)\r
+__attribute__ ((unused))\r
+  #endif\r
+  = {\r
+  XSD_ERROR (EINVAL),\r
+  XSD_ERROR (EACCES),\r
+  XSD_ERROR (EEXIST),\r
+  XSD_ERROR (EISDIR),\r
+  XSD_ERROR (ENOENT),\r
+  XSD_ERROR (ENOMEM),\r
+  XSD_ERROR (ENOSPC),\r
+  XSD_ERROR (EIO),\r
+  XSD_ERROR (ENOTEMPTY),\r
+  XSD_ERROR (ENOSYS),\r
+  XSD_ERROR (EROFS),\r
+  XSD_ERROR (EBUSY),\r
+  XSD_ERROR (EAGAIN),\r
+  XSD_ERROR (EISCONN),\r
+  XSD_ERROR (E2BIG)\r
+  };\r
 #endif\r
 \r
-struct xsd_sockmsg\r
-{\r
-    UINT32 type;  /* XS_??? */\r
-    UINT32 req_id;/* Request identifier, echoed in daemon's response.  */\r
-    UINT32 tx_id; /* Transaction id (0 if not related to a transaction). */\r
-    UINT32 len;   /* Length of data following this. */\r
+struct xsd_sockmsg {\r
+  UINT32    type;   /* XS_??? */\r
+  UINT32    req_id; /* Request identifier, echoed in daemon's response.  */\r
+  UINT32    tx_id;  /* Transaction id (0 if not related to a transaction). */\r
+  UINT32    len;    /* Length of data following this. */\r
 \r
-    /* Generally followed by nul-terminated string(s). */\r
+  /* Generally followed by nul-terminated string(s). */\r
 };\r
 \r
-enum xs_watch_type\r
-{\r
-    XS_WATCH_PATH = 0,\r
-    XS_WATCH_TOKEN\r
+enum xs_watch_type {\r
+  XS_WATCH_PATH = 0,\r
+  XS_WATCH_TOKEN\r
 };\r
 \r
 /*\r
  * `incontents 150 xenstore_struct XenStore wire protocol.\r
  *\r
  * Inter-domain shared memory communications. */\r
-#define XENSTORE_RING_SIZE 1024\r
+#define XENSTORE_RING_SIZE  1024\r
 typedef UINT32 XENSTORE_RING_IDX;\r
-#define MASK_XENSTORE_IDX(idx) ((idx) & (XENSTORE_RING_SIZE-1))\r
+#define MASK_XENSTORE_IDX(idx)  ((idx) & (XENSTORE_RING_SIZE-1))\r
 struct xenstore_domain_interface {\r
-    CHAR8 req[XENSTORE_RING_SIZE]; /* Requests to xenstore daemon. */\r
-    CHAR8 rsp[XENSTORE_RING_SIZE]; /* Replies and async watch events. */\r
-    XENSTORE_RING_IDX req_cons, req_prod;\r
-    XENSTORE_RING_IDX rsp_cons, rsp_prod;\r
-    UINT32 server_features; /* Bitmap of features supported by the server */\r
-    UINT32 connection;\r
+  CHAR8                req[XENSTORE_RING_SIZE]; /* Requests to xenstore daemon. */\r
+  CHAR8                rsp[XENSTORE_RING_SIZE]; /* Replies and async watch events. */\r
+  XENSTORE_RING_IDX    req_cons, req_prod;\r
+  XENSTORE_RING_IDX    rsp_cons, rsp_prod;\r
+  UINT32               server_features; /* Bitmap of features supported by the server */\r
+  UINT32               connection;\r
 };\r
 \r
 /* Violating this is very bad.  See docs/misc/xenstore.txt. */\r
-#define XENSTORE_PAYLOAD_MAX 4096\r
+#define XENSTORE_PAYLOAD_MAX  4096\r
 \r
 /* Violating these just gets you an error back */\r
-#define XENSTORE_ABS_PATH_MAX 3072\r
-#define XENSTORE_REL_PATH_MAX 2048\r
+#define XENSTORE_ABS_PATH_MAX  3072\r
+#define XENSTORE_REL_PATH_MAX  2048\r
 \r
 /* The ability to reconnect a ring */\r
-#define XENSTORE_SERVER_FEATURE_RECONNECTION 1\r
+#define XENSTORE_SERVER_FEATURE_RECONNECTION  1\r
 \r
 /* Valid values for the connection field */\r
-#define XENSTORE_CONNECTED 0 /* the steady-state */\r
-#define XENSTORE_RECONNECT 1 /* guest has initiated a reconnect */\r
+#define XENSTORE_CONNECTED  0 /* the steady-state */\r
+#define XENSTORE_RECONNECT  1 /* guest has initiated a reconnect */\r
 \r
 #endif /* _XS_WIRE_H */\r
 \r
index 54ee4b465417128374ed9b887089999a8326cdb2..e2b209f3d7f906c5a32e8d8db48c5c5b970e5906 100644 (file)
 \r
 /* Source mapping space. */\r
 /* ` enum phys_map_space { */\r
-#define XENMAPSPACE_shared_info  0 /* shared info page */\r
-#define XENMAPSPACE_grant_table  1 /* grant table page */\r
-#define XENMAPSPACE_gmfn         2 /* GMFN */\r
-#define XENMAPSPACE_gmfn_range   3 /* GMFN range, XENMEM_add_to_physmap only. */\r
-#define XENMAPSPACE_gmfn_foreign 4 /* GMFN from another dom,\r
+#define XENMAPSPACE_shared_info   0 /* shared info page */\r
+#define XENMAPSPACE_grant_table   1 /* grant table page */\r
+#define XENMAPSPACE_gmfn          2 /* GMFN */\r
+#define XENMAPSPACE_gmfn_range    3 /* GMFN range, XENMEM_add_to_physmap only. */\r
+#define XENMAPSPACE_gmfn_foreign  4 /* GMFN from another dom,\r
                                     * XENMEM_add_to_physmap_batch only. */\r
 /* ` } */\r
 \r
  * pseudophysical address space.\r
  * arg == addr of xen_add_to_physmap_t.\r
  */\r
-#define XENMEM_add_to_physmap      7\r
+#define XENMEM_add_to_physmap  7\r
 struct xen_add_to_physmap {\r
-    /* Which domain to change the mapping for. */\r
-    domid_t domid;\r
+  /* Which domain to change the mapping for. */\r
+  domid_t        domid;\r
 \r
-    /* Number of pages to go through for gmfn_range */\r
-    UINT16    size;\r
+  /* Number of pages to go through for gmfn_range */\r
+  UINT16         size;\r
 \r
-    UINT32 space; /* => enum phys_map_space */\r
+  UINT32         space; /* => enum phys_map_space */\r
 \r
-#define XENMAPIDX_grant_table_status 0x80000000\r
+  #define XENMAPIDX_grant_table_status  0x80000000\r
 \r
-    /* Index into space being mapped. */\r
-    xen_ulong_t idx;\r
+  /* Index into space being mapped. */\r
+  xen_ulong_t    idx;\r
 \r
-    /* GPFN in domid where the source mapping page should appear. */\r
-    xen_pfn_t     gpfn;\r
+  /* GPFN in domid where the source mapping page should appear. */\r
+  xen_pfn_t      gpfn;\r
 };\r
+\r
 typedef struct xen_add_to_physmap xen_add_to_physmap_t;\r
-DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t);\r
+DEFINE_XEN_GUEST_HANDLE (xen_add_to_physmap_t);\r
 \r
 /*\r
  * Unmaps the page appearing at a particular GPFN from the specified guest's\r
  * pseudophysical address space.\r
  * arg == addr of xen_remove_from_physmap_t.\r
  */\r
-#define XENMEM_remove_from_physmap      15\r
+#define XENMEM_remove_from_physmap  15\r
 struct xen_remove_from_physmap {\r
-    /* Which domain to change the mapping for. */\r
-    domid_t domid;\r
+  /* Which domain to change the mapping for. */\r
+  domid_t      domid;\r
 \r
-    /* GPFN of the current mapping of the page. */\r
-    xen_pfn_t     gpfn;\r
+  /* GPFN of the current mapping of the page. */\r
+  xen_pfn_t    gpfn;\r
 };\r
+\r
 typedef struct xen_remove_from_physmap xen_remove_from_physmap_t;\r
-DEFINE_XEN_GUEST_HANDLE(xen_remove_from_physmap_t);\r
+DEFINE_XEN_GUEST_HANDLE (xen_remove_from_physmap_t);\r
 \r
 /*\r
  * Returns the pseudo-physical memory map as it was when the domain\r
  * was started (specified by XENMEM_set_memory_map).\r
  * arg == addr of xen_memory_map_t.\r
  */\r
-#define XENMEM_memory_map           9\r
+#define XENMEM_memory_map  9\r
 struct xen_memory_map {\r
-    /*\r
-     * On call the number of entries which can be stored in buffer. On\r
-     * return the number of entries which have been stored in\r
-     * buffer.\r
-     */\r
-    UINT32 nr_entries;\r
-\r
-    /*\r
-     * Entries in the buffer are in the same format as returned by the\r
-     * BIOS INT 0x15 EAX=0xE820 call.\r
-     */\r
-    XEN_GUEST_HANDLE(void) buffer;\r
+  /*\r
+   * On call the number of entries which can be stored in buffer. On\r
+   * return the number of entries which have been stored in\r
+   * buffer.\r
+   */\r
+  UINT32    nr_entries;\r
+\r
+  /*\r
+   * Entries in the buffer are in the same format as returned by the\r
+   * BIOS INT 0x15 EAX=0xE820 call.\r
+   */\r
+  XEN_GUEST_HANDLE (void) buffer;\r
 };\r
+\r
 typedef struct xen_memory_map xen_memory_map_t;\r
-DEFINE_XEN_GUEST_HANDLE(xen_memory_map_t);\r
+DEFINE_XEN_GUEST_HANDLE (xen_memory_map_t);\r
 \r
 #endif /* __XEN_PUBLIC_MEMORY_H__ */\r
 \r
index c77049f7964eb7c91dace5a50396bdee7e28ac06..1e9e304ced6bc9e50339ab8929c1f6a38e347c52 100644 (file)
 #ifndef __XEN_PUBLIC_XEN_COMPAT_H__\r
 #define __XEN_PUBLIC_XEN_COMPAT_H__\r
 \r
-#define __XEN_LATEST_INTERFACE_VERSION__ 0x00040400\r
+#define __XEN_LATEST_INTERFACE_VERSION__  0x00040400\r
 \r
-#if defined(__XEN__) || defined(__XEN_TOOLS__)\r
+#if defined (__XEN__) || defined (__XEN_TOOLS__)\r
 /* Xen is built with matching headers and implements the latest interface. */\r
-#define __XEN_INTERFACE_VERSION__ __XEN_LATEST_INTERFACE_VERSION__\r
-#elif !defined(__XEN_INTERFACE_VERSION__)\r
+#define __XEN_INTERFACE_VERSION__  __XEN_LATEST_INTERFACE_VERSION__\r
+#elif !defined (__XEN_INTERFACE_VERSION__)\r
 /* Guests which do not specify a version get the legacy interface. */\r
-#define __XEN_INTERFACE_VERSION__ 0x00000000\r
+#define __XEN_INTERFACE_VERSION__  0x00000000\r
 #endif\r
 \r
 #if __XEN_INTERFACE_VERSION__ > __XEN_LATEST_INTERFACE_VERSION__\r
-#error "These header files do not support the requested interface version."\r
+  #error "These header files do not support the requested interface version."\r
 #endif\r
 \r
 #endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */\r
index 79a4e212e7c2e282265cd53d485c152d3fa3f8c5..f28a1d47fc09cee5a886f1acc8061729a1588b2c 100644 (file)
 //\r
 // Xen interface version used by Tianocore\r
 //\r
-#define __XEN_INTERFACE_VERSION__ 0x00040400\r
+#define __XEN_INTERFACE_VERSION__  0x00040400\r
 \r
 #include "xen-compat.h"\r
 \r
-#if defined(MDE_CPU_IA32) || defined(MDE_CPU_X64)\r
-#include "arch-x86/xen.h"\r
-#elif defined(__arm__) || defined (__aarch64__)\r
-#include "arch-arm/xen.h"\r
+#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64)\r
+  #include "arch-x86/xen.h"\r
+#elif defined (__arm__) || defined (__aarch64__)\r
+  #include "arch-arm/xen.h"\r
 #else\r
-#error "Unsupported architecture"\r
+  #error "Unsupported architecture"\r
 #endif\r
 \r
 #ifndef __ASSEMBLY__\r
 /* Guest handles for primitive C types. */\r
-DEFINE_XEN_GUEST_HANDLE(CHAR8);\r
-__DEFINE_XEN_GUEST_HANDLE(uchar, UINT8);\r
-DEFINE_XEN_GUEST_HANDLE(INT32);\r
-__DEFINE_XEN_GUEST_HANDLE(uint,  UINT32);\r
-#if __XEN_INTERFACE_VERSION__ < 0x00040300\r
-DEFINE_XEN_GUEST_HANDLE(INTN);\r
-__DEFINE_XEN_GUEST_HANDLE(ulong, UINTN);\r
-#endif\r
-DEFINE_XEN_GUEST_HANDLE(VOID);\r
-\r
-DEFINE_XEN_GUEST_HANDLE(UINT64);\r
-DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);\r
-DEFINE_XEN_GUEST_HANDLE(xen_ulong_t);\r
+DEFINE_XEN_GUEST_HANDLE (CHAR8);\r
+__DEFINE_XEN_GUEST_HANDLE (uchar, UINT8);\r
+DEFINE_XEN_GUEST_HANDLE (INT32);\r
+__DEFINE_XEN_GUEST_HANDLE (uint, UINT32);\r
+  #if __XEN_INTERFACE_VERSION__ < 0x00040300\r
+DEFINE_XEN_GUEST_HANDLE (INTN);\r
+__DEFINE_XEN_GUEST_HANDLE (ulong, UINTN);\r
+  #endif\r
+DEFINE_XEN_GUEST_HANDLE (VOID);\r
+\r
+DEFINE_XEN_GUEST_HANDLE (UINT64);\r
+DEFINE_XEN_GUEST_HANDLE (xen_pfn_t);\r
+DEFINE_XEN_GUEST_HANDLE (xen_ulong_t);\r
 #endif\r
 \r
 /*\r
@@ -51,55 +51,55 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t);
  * ` enum hypercall_num { // __HYPERVISOR_* => HYPERVISOR_*()\r
  */\r
 \r
-#define __HYPERVISOR_set_trap_table        0\r
-#define __HYPERVISOR_mmu_update            1\r
-#define __HYPERVISOR_set_gdt               2\r
-#define __HYPERVISOR_stack_switch          3\r
-#define __HYPERVISOR_set_callbacks         4\r
-#define __HYPERVISOR_fpu_taskswitch        5\r
-#define __HYPERVISOR_sched_op_compat       /* compat since 0x00030101 */\r
-#define __HYPERVISOR_platform_op           7\r
-#define __HYPERVISOR_set_debugreg          8\r
-#define __HYPERVISOR_get_debugreg          9\r
-#define __HYPERVISOR_update_descriptor    10\r
-#define __HYPERVISOR_memory_op            12\r
-#define __HYPERVISOR_multicall            13\r
-#define __HYPERVISOR_update_va_mapping    14\r
-#define __HYPERVISOR_set_timer_op         15\r
-#define __HYPERVISOR_event_channel_op_compat 16 /* compat since 0x00030202 */\r
-#define __HYPERVISOR_xen_version          17\r
-#define __HYPERVISOR_console_io           18\r
-#define __HYPERVISOR_physdev_op_compat    19 /* compat since 0x00030202 */\r
-#define __HYPERVISOR_grant_table_op       20\r
-#define __HYPERVISOR_vm_assist            21\r
-#define __HYPERVISOR_update_va_mapping_otherdomain 22\r
-#define __HYPERVISOR_iret                 23 /* x86 only */\r
-#define __HYPERVISOR_vcpu_op              24\r
-#define __HYPERVISOR_set_segment_base     25 /* x86/64 only */\r
-#define __HYPERVISOR_mmuext_op            26\r
-#define __HYPERVISOR_xsm_op               27\r
-#define __HYPERVISOR_nmi_op               28\r
-#define __HYPERVISOR_sched_op             29\r
-#define __HYPERVISOR_callback_op          30\r
-#define __HYPERVISOR_xenoprof_op          31\r
-#define __HYPERVISOR_event_channel_op     32\r
-#define __HYPERVISOR_physdev_op           33\r
-#define __HYPERVISOR_hvm_op               34\r
-#define __HYPERVISOR_sysctl               35\r
-#define __HYPERVISOR_domctl               36\r
-#define __HYPERVISOR_kexec_op             37\r
-#define __HYPERVISOR_tmem_op              38\r
-#define __HYPERVISOR_xc_reserved_op       39 /* reserved for XenClient */\r
+#define __HYPERVISOR_set_trap_table                 0\r
+#define __HYPERVISOR_mmu_update                     1\r
+#define __HYPERVISOR_set_gdt                        2\r
+#define __HYPERVISOR_stack_switch                   3\r
+#define __HYPERVISOR_set_callbacks                  4\r
+#define __HYPERVISOR_fpu_taskswitch                 5\r
+#define __HYPERVISOR_sched_op_compat                6/* compat since 0x00030101 */\r
+#define __HYPERVISOR_platform_op                    7\r
+#define __HYPERVISOR_set_debugreg                   8\r
+#define __HYPERVISOR_get_debugreg                   9\r
+#define __HYPERVISOR_update_descriptor              10\r
+#define __HYPERVISOR_memory_op                      12\r
+#define __HYPERVISOR_multicall                      13\r
+#define __HYPERVISOR_update_va_mapping              14\r
+#define __HYPERVISOR_set_timer_op                   15\r
+#define __HYPERVISOR_event_channel_op_compat        16/* compat since 0x00030202 */\r
+#define __HYPERVISOR_xen_version                    17\r
+#define __HYPERVISOR_console_io                     18\r
+#define __HYPERVISOR_physdev_op_compat              19/* compat since 0x00030202 */\r
+#define __HYPERVISOR_grant_table_op                 20\r
+#define __HYPERVISOR_vm_assist                      21\r
+#define __HYPERVISOR_update_va_mapping_otherdomain  22\r
+#define __HYPERVISOR_iret                           23/* x86 only */\r
+#define __HYPERVISOR_vcpu_op                        24\r
+#define __HYPERVISOR_set_segment_base               25/* x86/64 only */\r
+#define __HYPERVISOR_mmuext_op                      26\r
+#define __HYPERVISOR_xsm_op                         27\r
+#define __HYPERVISOR_nmi_op                         28\r
+#define __HYPERVISOR_sched_op                       29\r
+#define __HYPERVISOR_callback_op                    30\r
+#define __HYPERVISOR_xenoprof_op                    31\r
+#define __HYPERVISOR_event_channel_op               32\r
+#define __HYPERVISOR_physdev_op                     33\r
+#define __HYPERVISOR_hvm_op                         34\r
+#define __HYPERVISOR_sysctl                         35\r
+#define __HYPERVISOR_domctl                         36\r
+#define __HYPERVISOR_kexec_op                       37\r
+#define __HYPERVISOR_tmem_op                        38\r
+#define __HYPERVISOR_xc_reserved_op                 39/* reserved for XenClient */\r
 \r
 /* Architecture-specific hypercall definitions. */\r
-#define __HYPERVISOR_arch_0               48\r
-#define __HYPERVISOR_arch_1               49\r
-#define __HYPERVISOR_arch_2               50\r
-#define __HYPERVISOR_arch_3               51\r
-#define __HYPERVISOR_arch_4               52\r
-#define __HYPERVISOR_arch_5               53\r
-#define __HYPERVISOR_arch_6               54\r
-#define __HYPERVISOR_arch_7               55\r
+#define __HYPERVISOR_arch_0  48\r
+#define __HYPERVISOR_arch_1  49\r
+#define __HYPERVISOR_arch_2  50\r
+#define __HYPERVISOR_arch_3  51\r
+#define __HYPERVISOR_arch_4  52\r
+#define __HYPERVISOR_arch_5  53\r
+#define __HYPERVISOR_arch_6  54\r
+#define __HYPERVISOR_arch_7  55\r
 \r
 /* ` } */\r
 \r
@@ -109,21 +109,21 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t);
 \r
 /* New sched_op hypercall introduced in 0x00030101. */\r
 #if __XEN_INTERFACE_VERSION__ < 0x00030101\r
-#undef __HYPERVISOR_sched_op\r
-#define __HYPERVISOR_sched_op __HYPERVISOR_sched_op_compat\r
+  #undef __HYPERVISOR_sched_op\r
+#define __HYPERVISOR_sched_op  __HYPERVISOR_sched_op_compat\r
 #endif\r
 \r
 /* New event-channel and physdev hypercalls introduced in 0x00030202. */\r
 #if __XEN_INTERFACE_VERSION__ < 0x00030202\r
-#undef __HYPERVISOR_event_channel_op\r
-#define __HYPERVISOR_event_channel_op __HYPERVISOR_event_channel_op_compat\r
-#undef __HYPERVISOR_physdev_op\r
-#define __HYPERVISOR_physdev_op __HYPERVISOR_physdev_op_compat\r
+  #undef __HYPERVISOR_event_channel_op\r
+#define __HYPERVISOR_event_channel_op  __HYPERVISOR_event_channel_op_compat\r
+  #undef __HYPERVISOR_physdev_op\r
+#define __HYPERVISOR_physdev_op  __HYPERVISOR_physdev_op_compat\r
 #endif\r
 \r
 /* New platform_op hypercall introduced in 0x00030204. */\r
 #if __XEN_INTERFACE_VERSION__ < 0x00030204\r
-#define __HYPERVISOR_dom0_op __HYPERVISOR_platform_op\r
+#define __HYPERVISOR_dom0_op  __HYPERVISOR_platform_op\r
 #endif\r
 \r
 #ifndef __ASSEMBLY__\r
@@ -131,10 +131,10 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t);
 typedef UINT16 domid_t;\r
 \r
 /* Domain ids >= DOMID_FIRST_RESERVED cannot be used for ordinary domains. */\r
-#define DOMID_FIRST_RESERVED (0x7FF0U)\r
+#define DOMID_FIRST_RESERVED  (0x7FF0U)\r
 \r
 /* DOMID_SELF is used in certain contexts to refer to oneself. */\r
-#define DOMID_SELF (0x7FF0U)\r
+#define DOMID_SELF  (0x7FF0U)\r
 \r
 /*\r
  * DOMID_IO is used to restrict page-table updates to mapping I/O memory.\r
@@ -145,7 +145,7 @@ typedef UINT16 domid_t;
  * This only makes sense in MMUEXT_SET_FOREIGNDOM, but in that context can\r
  * be specified by any calling domain.\r
  */\r
-#define DOMID_IO   (0x7FF1U)\r
+#define DOMID_IO  (0x7FF1U)\r
 \r
 /*\r
  * DOMID_XEN is used to allow privileged domains to map restricted parts of\r
@@ -160,85 +160,89 @@ typedef UINT16 domid_t;
 #define DOMID_COW  (0x7FF3U)\r
 \r
 /* DOMID_INVALID is used to identify pages with unknown owner. */\r
-#define DOMID_INVALID (0x7FF4U)\r
+#define DOMID_INVALID  (0x7FF4U)\r
 \r
 /* Idle domain. */\r
-#define DOMID_IDLE (0x7FFFU)\r
+#define DOMID_IDLE  (0x7FFFU)\r
+\r
+  #if __XEN_INTERFACE_VERSION__ < 0x00040400\r
 \r
-#if __XEN_INTERFACE_VERSION__ < 0x00040400\r
 /*\r
  * Event channel endpoints per domain (when using the 2-level ABI):\r
  *  1024 if a INTN is 32 bits; 4096 if a INTN is 64 bits.\r
  */\r
-#define NR_EVENT_CHANNELS EVTCHN_2L_NR_CHANNELS\r
-#endif\r
+#define NR_EVENT_CHANNELS  EVTCHN_2L_NR_CHANNELS\r
+  #endif\r
 \r
 struct vcpu_time_info {\r
-    /*\r
-     * Updates to the following values are preceded and followed by an\r
-     * increment of 'version'. The guest can therefore detect updates by\r
-     * looking for changes to 'version'. If the least-significant bit of\r
-     * the version number is set then an update is in progress and the guest\r
-     * must wait to read a consistent set of values.\r
-     * The correct way to interact with the version number is similar to\r
-     * Linux's seqlock: see the implementations of read_seqbegin/read_seqretry.\r
-     */\r
-    UINT32 Version;\r
-    UINT32 pad0;\r
-    UINT64 TscTimestamp;   /* TSC at last update of time vals.  */\r
-    UINT64 SystemTime;     /* Time, in nanosecs, since boot.    */\r
-    /*\r
-     * Current system time:\r
-     *   system_time +\r
-     *   ((((tsc - tsc_timestamp) << tsc_shift) * tsc_to_system_mul) >> 32)\r
-     * CPU frequency (Hz):\r
-     *   ((10^9 << 32) / tsc_to_system_mul) >> tsc_shift\r
-     */\r
-    UINT32 TscToSystemMultiplier;\r
-    INT8   TscShift;\r
-    INT8   pad1[3];\r
+  /*\r
+   * Updates to the following values are preceded and followed by an\r
+   * increment of 'version'. The guest can therefore detect updates by\r
+   * looking for changes to 'version'. If the least-significant bit of\r
+   * the version number is set then an update is in progress and the guest\r
+   * must wait to read a consistent set of values.\r
+   * The correct way to interact with the version number is similar to\r
+   * Linux's seqlock: see the implementations of read_seqbegin/read_seqretry.\r
+   */\r
+  UINT32    Version;\r
+  UINT32    pad0;\r
+  UINT64    TscTimestamp;  /* TSC at last update of time vals.  */\r
+  UINT64    SystemTime;    /* Time, in nanosecs, since boot.    */\r
+\r
+  /*\r
+   * Current system time:\r
+   *   system_time +\r
+   *   ((((tsc - tsc_timestamp) << tsc_shift) * tsc_to_system_mul) >> 32)\r
+   * CPU frequency (Hz):\r
+   *   ((10^9 << 32) / tsc_to_system_mul) >> tsc_shift\r
+   */\r
+  UINT32    TscToSystemMultiplier;\r
+  INT8      TscShift;\r
+  INT8      pad1[3];\r
 }; /* 32 bytes */\r
+\r
 typedef struct vcpu_time_info XEN_VCPU_TIME_INFO;\r
 \r
 struct vcpu_info {\r
-    /*\r
-     * 'evtchn_upcall_pending' is written non-zero by Xen to indicate\r
-     * a pending notification for a particular VCPU. It is then cleared\r
-     * by the guest OS /before/ checking for pending work, thus avoiding\r
-     * a set-and-check race. Note that the mask is only accessed by Xen\r
-     * on the CPU that is currently hosting the VCPU. This means that the\r
-     * pending and mask flags can be updated by the guest without special\r
-     * synchronisation (i.e., no need for the x86 LOCK prefix).\r
-     * This may seem suboptimal because if the pending flag is set by\r
-     * a different CPU then an IPI may be scheduled even when the mask\r
-     * is set. However, note:\r
-     *  1. The task of 'interrupt holdoff' is covered by the per-event-\r
-     *     channel mask bits. A 'noisy' event that is continually being\r
-     *     triggered can be masked at source at this very precise\r
-     *     granularity.\r
-     *  2. The main purpose of the per-VCPU mask is therefore to restrict\r
-     *     reentrant execution: whether for concurrency control, or to\r
-     *     prevent unbounded stack usage. Whatever the purpose, we expect\r
-     *     that the mask will be asserted only for short periods at a time,\r
-     *     and so the likelihood of a 'spurious' IPI is suitably small.\r
-     * The mask is read before making an event upcall to the guest: a\r
-     * non-zero mask therefore guarantees that the VCPU will not receive\r
-     * an upcall activation. The mask is cleared when the VCPU requests\r
-     * to block: this avoids wakeup-waiting races.\r
-     */\r
-    UINT8 evtchn_upcall_pending;\r
-#ifdef XEN_HAVE_PV_UPCALL_MASK\r
-    UINT8 evtchn_upcall_mask;\r
-#else /* XEN_HAVE_PV_UPCALL_MASK */\r
-    UINT8 pad0;\r
-#endif /* XEN_HAVE_PV_UPCALL_MASK */\r
-    xen_ulong_t evtchn_pending_sel;\r
-    struct arch_vcpu_info arch;\r
-    struct vcpu_time_info Time;\r
+  /*\r
+   * 'evtchn_upcall_pending' is written non-zero by Xen to indicate\r
+   * a pending notification for a particular VCPU. It is then cleared\r
+   * by the guest OS /before/ checking for pending work, thus avoiding\r
+   * a set-and-check race. Note that the mask is only accessed by Xen\r
+   * on the CPU that is currently hosting the VCPU. This means that the\r
+   * pending and mask flags can be updated by the guest without special\r
+   * synchronisation (i.e., no need for the x86 LOCK prefix).\r
+   * This may seem suboptimal because if the pending flag is set by\r
+   * a different CPU then an IPI may be scheduled even when the mask\r
+   * is set. However, note:\r
+   *  1. The task of 'interrupt holdoff' is covered by the per-event-\r
+   *     channel mask bits. A 'noisy' event that is continually being\r
+   *     triggered can be masked at source at this very precise\r
+   *     granularity.\r
+   *  2. The main purpose of the per-VCPU mask is therefore to restrict\r
+   *     reentrant execution: whether for concurrency control, or to\r
+   *     prevent unbounded stack usage. Whatever the purpose, we expect\r
+   *     that the mask will be asserted only for short periods at a time,\r
+   *     and so the likelihood of a 'spurious' IPI is suitably small.\r
+   * The mask is read before making an event upcall to the guest: a\r
+   * non-zero mask therefore guarantees that the VCPU will not receive\r
+   * an upcall activation. The mask is cleared when the VCPU requests\r
+   * to block: this avoids wakeup-waiting races.\r
+   */\r
+  UINT8                    evtchn_upcall_pending;\r
+ #ifdef XEN_HAVE_PV_UPCALL_MASK\r
+  UINT8                    evtchn_upcall_mask;\r
+ #else /* XEN_HAVE_PV_UPCALL_MASK */\r
+  UINT8                    pad0;\r
+ #endif /* XEN_HAVE_PV_UPCALL_MASK */\r
+  xen_ulong_t              evtchn_pending_sel;\r
+  struct arch_vcpu_info    arch;\r
+  struct vcpu_time_info    Time;\r
 }; /* 64 bytes (x86) */\r
-#ifndef __XEN__\r
+\r
+  #ifndef __XEN__\r
 typedef struct vcpu_info vcpu_info_t;\r
-#endif\r
+  #endif\r
 \r
 /*\r
  * `incontents 200 startofday_shared Start-of-day shared data structure\r
@@ -250,71 +254,71 @@ typedef struct vcpu_info vcpu_info_t;
  * of this structure remaining constant.\r
  */\r
 struct shared_info {\r
-    struct vcpu_info VcpuInfo[XEN_LEGACY_MAX_VCPUS];\r
-\r
-    /*\r
-     * A domain can create "event channels" on which it can send and receive\r
-     * asynchronous event notifications. There are three classes of event that\r
-     * are delivered by this mechanism:\r
-     *  1. Bi-directional inter- and intra-domain connections. Domains must\r
-     *     arrange out-of-band to set up a connection (usually by allocating\r
-     *     an unbound 'listener' port and avertising that via a storage service\r
-     *     such as xenstore).\r
-     *  2. Physical interrupts. A domain with suitable hardware-access\r
-     *     privileges can bind an event-channel port to a physical interrupt\r
-     *     source.\r
-     *  3. Virtual interrupts ('events'). A domain can bind an event-channel\r
-     *     port to a virtual interrupt source, such as the virtual-timer\r
-     *     device or the emergency console.\r
-     *\r
-     * Event channels are addressed by a "port index". Each channel is\r
-     * associated with two bits of information:\r
-     *  1. PENDING -- notifies the domain that there is a pending notification\r
-     *     to be processed. This bit is cleared by the guest.\r
-     *  2. MASK -- if this bit is clear then a 0->1 transition of PENDING\r
-     *     will cause an asynchronous upcall to be scheduled. This bit is only\r
-     *     updated by the guest. It is read-only within Xen. If a channel\r
-     *     becomes pending while the channel is masked then the 'edge' is lost\r
-     *     (i.e., when the channel is unmasked, the guest must manually handle\r
-     *     pending notifications as no upcall will be scheduled by Xen).\r
-     *\r
-     * To expedite scanning of pending notifications, any 0->1 pending\r
-     * transition on an unmasked channel causes a corresponding bit in a\r
-     * per-vcpu selector word to be set. Each bit in the selector covers a\r
-     * 'C INTN' in the PENDING bitfield array.\r
-     */\r
-    xen_ulong_t evtchn_pending[sizeof(xen_ulong_t) * 8];\r
-    xen_ulong_t evtchn_mask[sizeof(xen_ulong_t) * 8];\r
-\r
-    /*\r
-     * Wallclock time: updated only by control software. Guests should base\r
-     * their gettimeofday() syscall on this wallclock-base value.\r
-     */\r
-    UINT32 wc_version;      /* Version counter: see vcpu_time_info_t. */\r
-    UINT32 wc_sec;          /* Secs  00:00:00 UTC, Jan 1, 1970.  */\r
-    UINT32 wc_nsec;         /* Nsecs 00:00:00 UTC, Jan 1, 1970.  */\r
-\r
-    struct arch_shared_info arch;\r
-\r
+  struct vcpu_info    VcpuInfo[XEN_LEGACY_MAX_VCPUS];\r
+\r
+  /*\r
+   * A domain can create "event channels" on which it can send and receive\r
+   * asynchronous event notifications. There are three classes of event that\r
+   * are delivered by this mechanism:\r
+   *  1. Bi-directional inter- and intra-domain connections. Domains must\r
+   *     arrange out-of-band to set up a connection (usually by allocating\r
+   *     an unbound 'listener' port and avertising that via a storage service\r
+   *     such as xenstore).\r
+   *  2. Physical interrupts. A domain with suitable hardware-access\r
+   *     privileges can bind an event-channel port to a physical interrupt\r
+   *     source.\r
+   *  3. Virtual interrupts ('events'). A domain can bind an event-channel\r
+   *     port to a virtual interrupt source, such as the virtual-timer\r
+   *     device or the emergency console.\r
+   *\r
+   * Event channels are addressed by a "port index". Each channel is\r
+   * associated with two bits of information:\r
+   *  1. PENDING -- notifies the domain that there is a pending notification\r
+   *     to be processed. This bit is cleared by the guest.\r
+   *  2. MASK -- if this bit is clear then a 0->1 transition of PENDING\r
+   *     will cause an asynchronous upcall to be scheduled. This bit is only\r
+   *     updated by the guest. It is read-only within Xen. If a channel\r
+   *     becomes pending while the channel is masked then the 'edge' is lost\r
+   *     (i.e., when the channel is unmasked, the guest must manually handle\r
+   *     pending notifications as no upcall will be scheduled by Xen).\r
+   *\r
+   * To expedite scanning of pending notifications, any 0->1 pending\r
+   * transition on an unmasked channel causes a corresponding bit in a\r
+   * per-vcpu selector word to be set. Each bit in the selector covers a\r
+   * 'C INTN' in the PENDING bitfield array.\r
+   */\r
+  xen_ulong_t                evtchn_pending[sizeof (xen_ulong_t) * 8];\r
+  xen_ulong_t                evtchn_mask[sizeof (xen_ulong_t) * 8];\r
+\r
+  /*\r
+   * Wallclock time: updated only by control software. Guests should base\r
+   * their gettimeofday() syscall on this wallclock-base value.\r
+   */\r
+  UINT32                     wc_version; /* Version counter: see vcpu_time_info_t. */\r
+  UINT32                     wc_sec;     /* Secs  00:00:00 UTC, Jan 1, 1970.  */\r
+  UINT32                     wc_nsec;    /* Nsecs 00:00:00 UTC, Jan 1, 1970.  */\r
+\r
+  struct arch_shared_info    arch;\r
 };\r
-#ifndef __XEN__\r
+\r
+  #ifndef __XEN__\r
 typedef struct shared_info shared_info_t;\r
 typedef struct shared_info XEN_SHARED_INFO;\r
-#endif\r
+  #endif\r
 \r
 /* Turn a plain number into a C UINTN constant. */\r
-#define __mk_unsigned_long(x) x ## UL\r
-#define mk_unsigned_long(x) __mk_unsigned_long(x)\r
+#define __mk_unsigned_long(x)  x ## UL\r
+#define mk_unsigned_long(x)    __mk_unsigned_long(x)\r
 \r
-__DEFINE_XEN_GUEST_HANDLE(uint8,  UINT8);\r
-__DEFINE_XEN_GUEST_HANDLE(uint16, UINT16);\r
-__DEFINE_XEN_GUEST_HANDLE(uint32, UINT32);\r
-__DEFINE_XEN_GUEST_HANDLE(uint64, UINT64);\r
+__DEFINE_XEN_GUEST_HANDLE (uint8, UINT8);\r
+__DEFINE_XEN_GUEST_HANDLE (uint16, UINT16);\r
+__DEFINE_XEN_GUEST_HANDLE (uint32, UINT32);\r
+__DEFINE_XEN_GUEST_HANDLE (uint64, UINT64);\r
 \r
 #else /* __ASSEMBLY__ */\r
 \r
 /* In assembly code we cannot use C numeric constant suffixes. */\r
-#define mk_unsigned_long(x) x\r
+#define mk_unsigned_long(x)  x\r
 \r
 #endif /* !__ASSEMBLY__ */\r
 \r
index 65c01af9bf186366d01ce4fefc69a048cda846e1..7e1af27574dc4d4ed15c2038c3262af19987bfd2 100644 (file)
@@ -30,9 +30,9 @@
 EFI_STATUS\r
 EFIAPI\r
 VerifyBlob (\r
-  IN  CONST CHAR16    *BlobName,\r
-  IN  CONST VOID      *Buf,\r
-  IN  UINT32          BufSize\r
+  IN  CONST CHAR16  *BlobName,\r
+  IN  CONST VOID    *Buf,\r
+  IN  UINT32        BufSize\r
   );\r
 \r
 #endif\r
index 483f8d4b9cfc21724cd8e9fe0abbfbd03b4c935b..65f5895bfc6ba3acfda3237705754f9c8f15e89b 100644 (file)
@@ -9,7 +9,6 @@
 #ifndef __LOAD_LINUX_LIB__\r
 #define __LOAD_LINUX_LIB__\r
 \r
-\r
 /**\r
   Verifies that the kernel setup image is valid and supported.\r
   The kernel setup image should be checked before using other library\r
 EFI_STATUS\r
 EFIAPI\r
 LoadLinuxCheckKernelSetup (\r
-  IN VOID        *KernelSetup,\r
-  IN UINTN       KernelSetupSize\r
+  IN VOID   *KernelSetup,\r
+  IN UINTN  KernelSetupSize\r
   );\r
 \r
-\r
 /**\r
   Gets the initial runtime size of the Linux kernel image by examining\r
   the kernel setup image.\r
@@ -46,11 +44,10 @@ LoadLinuxCheckKernelSetup (
 UINTN\r
 EFIAPI\r
 LoadLinuxGetKernelSize (\r
-  IN VOID        *KernelSetup,\r
-  IN UINTN       KernelSize\r
+  IN VOID   *KernelSetup,\r
+  IN UINTN  KernelSize\r
   );\r
 \r
-\r
 /**\r
   Loads and boots UEFI Linux.\r
 \r
@@ -71,7 +68,6 @@ LoadLinux (
   IN OUT VOID  *KernelSetup\r
   );\r
 \r
-\r
 /**\r
   Allocates pages for the kernel setup image.\r
 \r
@@ -81,13 +77,12 @@ LoadLinux (
   @retval    !NULL - The address of the pages allocated\r
 \r
 **/\r
-VOID*\r
+VOID *\r
 EFIAPI\r
 LoadLinuxAllocateKernelSetupPages (\r
-  IN UINTN                  Pages\r
+  IN UINTN  Pages\r
   );\r
 \r
-\r
 /**\r
   Clears the uninitialised space before and after the struct setup_header\r
   in the kernel setup image. The kernel requires that these be zeroed\r
@@ -105,7 +100,7 @@ LoadLinuxAllocateKernelSetupPages (
 EFI_STATUS\r
 EFIAPI\r
 LoadLinuxInitializeKernelSetup (\r
-  IN VOID        *KernelSetup\r
+  IN VOID  *KernelSetup\r
   );\r
 \r
 /**\r
@@ -119,14 +114,13 @@ LoadLinuxInitializeKernelSetup (
   @retval    !NULL - The address of the pages allocated\r
 \r
 **/\r
-VOID*\r
+VOID *\r
 EFIAPI\r
 LoadLinuxAllocateKernelPages (\r
-  IN VOID                   *KernelSetup,\r
-  IN UINTN                  Pages\r
+  IN VOID   *KernelSetup,\r
+  IN UINTN  Pages\r
   );\r
 \r
-\r
 /**\r
   Allocates pages for the kernel command line.\r
 \r
@@ -136,13 +130,12 @@ LoadLinuxAllocateKernelPages (
   @retval    !NULL - The address of the pages allocated\r
 \r
 **/\r
-VOID*\r
+VOID *\r
 EFIAPI\r
 LoadLinuxAllocateCommandLinePages (\r
-  IN UINTN                  Pages\r
+  IN UINTN  Pages\r
   );\r
 \r
-\r
 /**\r
   Allocates pages for the initrd image.\r
 \r
@@ -153,14 +146,13 @@ LoadLinuxAllocateCommandLinePages (
   @retval    !NULL - The address of the pages allocated\r
 \r
 **/\r
-VOID*\r
+VOID *\r
 EFIAPI\r
 LoadLinuxAllocateInitrdPages (\r
-  IN VOID                   *KernelSetup,\r
-  IN UINTN                  Pages\r
+  IN VOID   *KernelSetup,\r
+  IN UINTN  Pages\r
   );\r
 \r
-\r
 /**\r
   Sets the kernel command line parameter within the setup image.\r
 \r
@@ -175,11 +167,10 @@ LoadLinuxAllocateInitrdPages (
 EFI_STATUS\r
 EFIAPI\r
 LoadLinuxSetCommandLine (\r
-  IN OUT VOID    *KernelSetup,\r
-  IN CHAR8       *CommandLine\r
+  IN OUT VOID  *KernelSetup,\r
+  IN CHAR8     *CommandLine\r
   );\r
 \r
-\r
 /**\r
   Sets the kernel initial ram disk pointer within the setup image.\r
 \r
@@ -195,11 +186,9 @@ LoadLinuxSetCommandLine (
 EFI_STATUS\r
 EFIAPI\r
 LoadLinuxSetInitrd (\r
-  IN OUT VOID    *KernelSetup,\r
-  IN VOID        *Initrd,\r
-  IN UINTN       InitrdSize\r
+  IN OUT VOID  *KernelSetup,\r
+  IN VOID      *Initrd,\r
+  IN UINTN     InitrdSize\r
   );\r
 \r
-\r
 #endif\r
-\r
index adc490e466ec139cf0908cb69462e626e4f960cf..e1ec161d21593db68b2a5818d3ffe0ecaf26da28 100644 (file)
@@ -21,7 +21,7 @@
 //   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupSize\r
 // in any FDF file using this PCD.\r
 //\r
-#define VMGEXIT_MAXIMUM_VC_COUNT   2\r
+#define VMGEXIT_MAXIMUM_VC_COUNT  2\r
 \r
 //\r
 // Per-CPU data mapping structure\r
 //   writing random data to that area.\r
 //\r
 typedef struct {\r
-  UINT32  Dr7Cached;\r
-  UINT64  Dr7;\r
+  UINT32    Dr7Cached;\r
+  UINT64    Dr7;\r
 \r
-  UINTN   VcCount;\r
-  VOID    *GhcbBackupPages;\r
+  UINTN     VcCount;\r
+  VOID      *GhcbBackupPages;\r
 } SEV_ES_PER_CPU_DATA;\r
 \r
 //\r
@@ -91,9 +91,9 @@ MemEncryptSevIsEnabled (
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevClearPageEncMask (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    NumPages\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             NumPages\r
   );\r
 \r
 /**\r
@@ -116,12 +116,11 @@ MemEncryptSevClearPageEncMask (
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevSetPageEncMask (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    NumPages\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             NumPages\r
   );\r
 \r
-\r
 /**\r
   Locate the page range that covers the initial (pre-SMBASE-relocation) SMRAM\r
   Save State Map.\r
@@ -140,8 +139,8 @@ MemEncryptSevSetPageEncMask (
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevLocateInitialSmramSaveStateMapPages (\r
-  OUT UINTN *BaseAddress,\r
-  OUT UINTN *NumberOfPages\r
+  OUT UINTN  *BaseAddress,\r
+  OUT UINTN  *NumberOfPages\r
   );\r
 \r
 /**\r
@@ -173,9 +172,9 @@ MemEncryptSevGetEncryptionMask (
 MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE\r
 EFIAPI\r
 MemEncryptSevGetAddressRangeState (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    Length\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             Length\r
   );\r
 \r
 /**\r
@@ -198,9 +197,9 @@ MemEncryptSevGetAddressRangeState (
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevClearMmioPageEncMask (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    NumPages\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             NumPages\r
   );\r
 \r
 #endif // _MEM_ENCRYPT_SEV_LIB_H_\r
index 1b924be3248ae2d990fb2715bf9c27e2eb18a3ef..c2fb5c68466e228144e2eaeccb82f77251401530 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 ConnectNvVarsToFileSystem (\r
-  IN EFI_HANDLE    FsHandle\r
+  IN EFI_HANDLE  FsHandle\r
   );\r
 \r
-\r
 /**\r
   Update non-volatile variables stored on the file system.\r
 \r
@@ -40,6 +39,4 @@ EFIAPI
 UpdateNvVarsOnFileSystem (\r
   );\r
 \r
-\r
 #endif\r
-\r
index 9f834ccb6eb8879ad03d314449c58679cdae4b06..4badb0a914f1b71c5220c2bd21cf9aa209221996 100644 (file)
@@ -50,7 +50,7 @@ typedef struct PCI_CAP_DEV PCI_CAP_DEV;
 **/\r
 typedef\r
 RETURN_STATUS\r
-(EFIAPI *PCI_CAP_DEV_READ_CONFIG) (\r
+(EFIAPI *PCI_CAP_DEV_READ_CONFIG)(\r
   IN  PCI_CAP_DEV *PciDevice,\r
   IN  UINT16      SourceOffset,\r
   OUT VOID        *DestinationBuffer,\r
@@ -85,7 +85,7 @@ RETURN_STATUS
 **/\r
 typedef\r
 RETURN_STATUS\r
-(EFIAPI *PCI_CAP_DEV_WRITE_CONFIG) (\r
+(EFIAPI *PCI_CAP_DEV_WRITE_CONFIG)(\r
   IN PCI_CAP_DEV *PciDevice,\r
   IN UINT16      DestinationOffset,\r
   IN VOID        *SourceBuffer,\r
@@ -97,8 +97,8 @@ RETURN_STATUS
 // config space accessors.\r
 //\r
 struct PCI_CAP_DEV {\r
-  PCI_CAP_DEV_READ_CONFIG  ReadConfig;\r
-  PCI_CAP_DEV_WRITE_CONFIG WriteConfig;\r
+  PCI_CAP_DEV_READ_CONFIG     ReadConfig;\r
+  PCI_CAP_DEV_WRITE_CONFIG    WriteConfig;\r
 };\r
 \r
 //\r
@@ -126,26 +126,26 @@ typedef enum {
 // Public data structure that PciCapGetInfo() fills in about a PCI_CAP object.\r
 //\r
 typedef struct {\r
-  PCI_CAP_DOMAIN Domain;\r
-  UINT16         CapId;\r
+  PCI_CAP_DOMAIN    Domain;\r
+  UINT16            CapId;\r
   //\r
   // The capability identified by Domain and CapId may have multiple instances\r
   // in config space. NumInstances provides the total count of occurrences of\r
   // the capability. It is always positive.\r
   //\r
-  UINT16 NumInstances;\r
+  UINT16            NumInstances;\r
   //\r
   // Instance is the serial number, in capabilities list traversal order (not\r
   // necessarily config space offset order), of the one capability instance\r
   // that PciCapGetInfo() is reporting about. Instance is always smaller than\r
   // NumInstances.\r
   //\r
-  UINT16 Instance;\r
+  UINT16            Instance;\r
   //\r
   // The offset in config space at which the capability header of the\r
   // capability instance starts.\r
   //\r
-  UINT16 Offset;\r
+  UINT16            Offset;\r
   //\r
   // The deduced maximum size of the capability instance, including the\r
   // capability header. This hint is an upper bound, calculated -- without\r
@@ -154,15 +154,14 @@ typedef struct {
   // capability, and (b) from the end of the config space identified by Domain,\r
   // whichever is lower.\r
   //\r
-  UINT16 MaxSizeHint;\r
+  UINT16    MaxSizeHint;\r
   //\r
   // The version number of the capability instance. Always zero when Domain is\r
   // PciCapNormal.\r
   //\r
-  UINT8 Version;\r
+  UINT8     Version;\r
 } PCI_CAP_INFO;\r
 \r
-\r
 /**\r
   Parse the capabilities lists (both normal and extended, as applicable) of a\r
   PCI device.\r
@@ -198,11 +197,10 @@ typedef struct {
 RETURN_STATUS\r
 EFIAPI\r
 PciCapListInit (\r
-  IN  PCI_CAP_DEV  *PciDevice,\r
-  OUT PCI_CAP_LIST **CapList\r
+  IN  PCI_CAP_DEV   *PciDevice,\r
+  OUT PCI_CAP_LIST  **CapList\r
   );\r
 \r
-\r
 /**\r
   Free the resources used by CapList.\r
 \r
@@ -212,10 +210,9 @@ PciCapListInit (
 VOID\r
 EFIAPI\r
 PciCapListUninit (\r
-  IN PCI_CAP_LIST *CapList\r
+  IN PCI_CAP_LIST  *CapList\r
   );\r
 \r
-\r
 /**\r
   Locate a capability instance in the parsed capabilities lists.\r
 \r
@@ -252,14 +249,13 @@ PciCapListUninit (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapListFindCap (\r
-  IN  PCI_CAP_LIST   *CapList,\r
-  IN  PCI_CAP_DOMAIN Domain,\r
-  IN  UINT16         CapId,\r
-  IN  UINT16         Instance,\r
-  OUT PCI_CAP        **Cap    OPTIONAL\r
+  IN  PCI_CAP_LIST    *CapList,\r
+  IN  PCI_CAP_DOMAIN  Domain,\r
+  IN  UINT16          CapId,\r
+  IN  UINT16          Instance,\r
+  OUT PCI_CAP         **Cap    OPTIONAL\r
   );\r
 \r
-\r
 /**\r
   Locate the first instance of the capability given by (Domain, CapId) such\r
   that the instance's Version is greater than or equal to MinVersion.\r
@@ -296,14 +292,13 @@ PciCapListFindCap (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapListFindCapVersion (\r
-  IN  PCI_CAP_LIST   *CapList,\r
-  IN  PCI_CAP_DOMAIN Domain,\r
-  IN  UINT16         CapId,\r
-  IN  UINT8          MinVersion,\r
-  OUT PCI_CAP        **Cap      OPTIONAL\r
+  IN  PCI_CAP_LIST    *CapList,\r
+  IN  PCI_CAP_DOMAIN  Domain,\r
+  IN  UINT16          CapId,\r
+  IN  UINT8           MinVersion,\r
+  OUT PCI_CAP         **Cap      OPTIONAL\r
   );\r
 \r
-\r
 /**\r
   Get information about a PCI Capability instance.\r
 \r
@@ -321,11 +316,10 @@ PciCapListFindCapVersion (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapGetInfo (\r
-  IN  PCI_CAP      *Cap,\r
-  OUT PCI_CAP_INFO *Info\r
+  IN  PCI_CAP       *Cap,\r
+  OUT PCI_CAP_INFO  *Info\r
   );\r
 \r
-\r
 /**\r
   Read a slice of a capability instance.\r
 \r
@@ -365,14 +359,13 @@ PciCapGetInfo (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapRead (\r
-  IN  PCI_CAP_DEV *PciDevice,\r
-  IN  PCI_CAP     *Cap,\r
-  IN  UINT16      SourceOffsetInCap,\r
-  OUT VOID        *DestinationBuffer,\r
-  IN  UINT16      Size\r
+  IN  PCI_CAP_DEV  *PciDevice,\r
+  IN  PCI_CAP      *Cap,\r
+  IN  UINT16       SourceOffsetInCap,\r
+  OUT VOID         *DestinationBuffer,\r
+  IN  UINT16       Size\r
   );\r
 \r
-\r
 /**\r
   Write a slice of a capability instance.\r
 \r
@@ -413,11 +406,11 @@ PciCapRead (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapWrite (\r
-  IN PCI_CAP_DEV *PciDevice,\r
-  IN PCI_CAP     *Cap,\r
-  IN UINT16      DestinationOffsetInCap,\r
-  IN VOID        *SourceBuffer,\r
-  IN UINT16      Size\r
+  IN PCI_CAP_DEV  *PciDevice,\r
+  IN PCI_CAP      *Cap,\r
+  IN UINT16       DestinationOffsetInCap,\r
+  IN VOID         *SourceBuffer,\r
+  IN UINT16       Size\r
   );\r
 \r
 #endif // __PCI_CAP_LIB_H__\r
index 9524ff3e973a00a043df661fa23b82943311d37d..1109096379169d07ad67a9d4c5b5e5292b7294c2 100644 (file)
@@ -14,7 +14,6 @@
 \r
 #include <Library/PciCapLib.h>\r
 \r
-\r
 /**\r
   Create a PCI_CAP_DEV object from an EFI_PCI_IO_PROTOCOL instance. The config\r
   space accessors are based upon EFI_PCI_IO_PROTOCOL.Pci.Read() and\r
 EFI_STATUS\r
 EFIAPI\r
 PciCapPciIoDeviceInit (\r
-  IN  EFI_PCI_IO_PROTOCOL *PciIo,\r
-  OUT PCI_CAP_DEV         **PciDevice\r
+  IN  EFI_PCI_IO_PROTOCOL  *PciIo,\r
+  OUT PCI_CAP_DEV          **PciDevice\r
   );\r
 \r
-\r
 /**\r
   Free the resources used by PciDevice.\r
 \r
@@ -46,7 +44,7 @@ PciCapPciIoDeviceInit (
 VOID\r
 EFIAPI\r
 PciCapPciIoDeviceUninit (\r
-  IN PCI_CAP_DEV *PciDevice\r
+  IN PCI_CAP_DEV  *PciDevice\r
   );\r
 \r
 #endif // __PCI_CAP_PCI_IO_LIB_H__\r
index 1c9c28e2a75ee736c425fd03339db072545c6f04..7bcfb57652a44dcc75d4ba04e2a9828cd060e88e 100644 (file)
@@ -12,7 +12,6 @@
 \r
 #include <Library/PciCapLib.h>\r
 \r
-\r
 /**\r
   Create a PCI_CAP_DEV object from the PCI Segment:Bus:Device.Function\r
   quadruplet. The config space accessors are based upon PciSegmentLib.\r
 RETURN_STATUS\r
 EFIAPI\r
 PciCapPciSegmentDeviceInit (\r
-  IN  PCI_CAP_DOMAIN MaxDomain,\r
-  IN  UINT16         Segment,\r
-  IN  UINT8          Bus,\r
-  IN  UINT8          Device,\r
-  IN  UINT8          Function,\r
-  OUT PCI_CAP_DEV    **PciDevice\r
+  IN  PCI_CAP_DOMAIN  MaxDomain,\r
+  IN  UINT16          Segment,\r
+  IN  UINT8           Bus,\r
+  IN  UINT8           Device,\r
+  IN  UINT8           Function,\r
+  OUT PCI_CAP_DEV     **PciDevice\r
   );\r
 \r
-\r
 /**\r
   Free the resources used by PciDevice.\r
 \r
@@ -70,7 +68,7 @@ PciCapPciSegmentDeviceInit (
 VOID\r
 EFIAPI\r
 PciCapPciSegmentDeviceUninit (\r
-  IN PCI_CAP_DEV *PciDevice\r
+  IN PCI_CAP_DEV  *PciDevice\r
   );\r
 \r
 #endif // __PCI_CAP_PCI_SEGMENT_LIB_H__\r
index d2dc18a1afad6c4fbac7edd3ca4aca80e3149aee..28516e4c1e54ec753fc046019bdfb0e7f54362af 100644 (file)
 #ifndef __PCI_HOST_BRIDGE_UTILITY_LIB_H__\r
 #define __PCI_HOST_BRIDGE_UTILITY_LIB_H__\r
 \r
-\r
 #include <Library/PciHostBridgeLib.h>\r
 \r
-\r
 /**\r
   Utility function to initialize a PCI_ROOT_BRIDGE structure.\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 PciHostBridgeUtilityInitRootBridge (\r
-  IN  UINT64                   Supports,\r
-  IN  UINT64                   Attributes,\r
-  IN  UINT64                   AllocAttributes,\r
-  IN  BOOLEAN                  DmaAbove4G,\r
-  IN  BOOLEAN                  NoExtendedConfigSpace,\r
-  IN  UINT8                    RootBusNumber,\r
-  IN  UINT8                    MaxSubBusNumber,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *Io,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *Mem,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *PMem,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *PMemAbove4G,\r
-  OUT PCI_ROOT_BRIDGE          *RootBus\r
+  IN  UINT64                    Supports,\r
+  IN  UINT64                    Attributes,\r
+  IN  UINT64                    AllocAttributes,\r
+  IN  BOOLEAN                   DmaAbove4G,\r
+  IN  BOOLEAN                   NoExtendedConfigSpace,\r
+  IN  UINT8                     RootBusNumber,\r
+  IN  UINT8                     MaxSubBusNumber,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *Io,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *Mem,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *MemAbove4G,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *PMem,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *PMemAbove4G,\r
+  OUT PCI_ROOT_BRIDGE           *RootBus\r
   );\r
 \r
-\r
 /**\r
   Utility function to uninitialize a PCI_ROOT_BRIDGE structure set up with\r
   PciHostBridgeUtilityInitRootBridge().\r
@@ -95,10 +92,9 @@ PciHostBridgeUtilityInitRootBridge (
 VOID\r
 EFIAPI\r
 PciHostBridgeUtilityUninitRootBridge (\r
-  IN PCI_ROOT_BRIDGE *RootBus\r
+  IN PCI_ROOT_BRIDGE  *RootBus\r
   );\r
 \r
-\r
 /**\r
   Utility function to return all the root bridge instances in an array.\r
 \r
@@ -131,21 +127,20 @@ PciHostBridgeUtilityUninitRootBridge (
 PCI_ROOT_BRIDGE *\r
 EFIAPI\r
 PciHostBridgeUtilityGetRootBridges (\r
-  OUT UINTN                    *Count,\r
-  IN  UINT64                   Attributes,\r
-  IN  UINT64                   AllocationAttributes,\r
-  IN  BOOLEAN                  DmaAbove4G,\r
-  IN  BOOLEAN                  NoExtendedConfigSpace,\r
-  IN  UINTN                    BusMin,\r
-  IN  UINTN                    BusMax,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *Io,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *Mem,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *PMem,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *PMemAbove4G\r
+  OUT UINTN                     *Count,\r
+  IN  UINT64                    Attributes,\r
+  IN  UINT64                    AllocationAttributes,\r
+  IN  BOOLEAN                   DmaAbove4G,\r
+  IN  BOOLEAN                   NoExtendedConfigSpace,\r
+  IN  UINTN                     BusMin,\r
+  IN  UINTN                     BusMax,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *Io,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *Mem,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *MemAbove4G,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *PMem,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *PMemAbove4G\r
   );\r
 \r
-\r
 /**\r
   Utility function to free root bridge instances array from\r
   PciHostBridgeUtilityGetRootBridges().\r
@@ -156,11 +151,10 @@ PciHostBridgeUtilityGetRootBridges (
 VOID\r
 EFIAPI\r
 PciHostBridgeUtilityFreeRootBridges (\r
-  IN PCI_ROOT_BRIDGE *Bridges,\r
-  IN UINTN           Count\r
+  IN PCI_ROOT_BRIDGE  *Bridges,\r
+  IN UINTN            Count\r
   );\r
 \r
-\r
 /**\r
   Utility function to inform the platform that the resource conflict happens.\r
 \r
@@ -181,5 +175,4 @@ PciHostBridgeUtilityResourceConflict (
   IN VOID  *Configuration\r
   );\r
 \r
-\r
 #endif // __PCI_HOST_BRIDGE_UTILITY_LIB_H__\r
index dc0569808cf93dfe1e3c70426d2b4775811ccdbe..9acbdc2aa7b883bebfadd7158ac716af3ea22e93 100644 (file)
 VOID\r
 EFIAPI\r
 PlatformFvbDataRead (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN        EFI_LBA                             Lba,\r
-  IN        UINTN                               Offset,\r
-  IN        UINTN                               NumBytes,\r
-  IN        UINT8                               *Buffer\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN        EFI_LBA                              Lba,\r
+  IN        UINTN                                Offset,\r
+  IN        UINTN                                NumBytes,\r
+  IN        UINT8                                *Buffer\r
   );\r
 \r
-\r
 /**\r
   This function will be called following a call to the\r
   EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Write function.\r
@@ -57,7 +56,6 @@ PlatformFvbDataWritten (
   IN        UINT8                                *Buffer\r
   );\r
 \r
-\r
 /**\r
   This function will be called following a call to the\r
   EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Erase function.\r
@@ -72,10 +70,8 @@ PlatformFvbDataWritten (
 VOID\r
 EFIAPI\r
 PlatformFvbBlocksErased (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN  VA_LIST       List\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN  VA_LIST                                    List\r
   );\r
 \r
-\r
 #endif\r
-\r
index 03dea786c9b73c8f916c1672cebe862b70b4f593..9f06439aed1e6b56150c086648b723bf365a4c0a 100644 (file)
@@ -13,7 +13,6 @@
 #include <Uefi/UefiBaseType.h>\r
 #include <Base.h>\r
 \r
-\r
 /**\r
   Connect devices based on the boot order retrieved from QEMU.\r
 \r
@@ -48,7 +47,6 @@ ConnectDevicesFromQemu (
   VOID\r
   );\r
 \r
-\r
 /**\r
 \r
   Set the boot order based on configuration retrieved from QEMU.\r
@@ -83,7 +81,6 @@ SetBootOrderFromQemu (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Calculate the number of seconds we should be showing the FrontPage progress\r
   bar for.\r
index 68002bb654e6d53bb7843f2f02367c9ebaaa0bba..2ad96c02979d4a5e540474a3a4d47ff126126e45 100644 (file)
@@ -29,7 +29,6 @@ QemuFwCfgIsAvailable (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Selects a firmware configuration item for reading.\r
 \r
@@ -42,10 +41,9 @@ QemuFwCfgIsAvailable (
 VOID\r
 EFIAPI\r
 QemuFwCfgSelectItem (\r
-  IN FIRMWARE_CONFIG_ITEM   QemuFwCfgItem\r
+  IN FIRMWARE_CONFIG_ITEM  QemuFwCfgItem\r
   );\r
 \r
-\r
 /**\r
   Reads firmware configuration bytes into a buffer\r
 \r
@@ -60,11 +58,10 @@ QemuFwCfgSelectItem (
 VOID\r
 EFIAPI\r
 QemuFwCfgReadBytes (\r
-  IN UINTN                  Size,\r
-  IN VOID                   *Buffer  OPTIONAL\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer  OPTIONAL\r
   );\r
 \r
-\r
 /**\r
   Writes firmware configuration bytes from a buffer\r
 \r
@@ -79,11 +76,10 @@ QemuFwCfgReadBytes (
 VOID\r
 EFIAPI\r
 QemuFwCfgWriteBytes (\r
-  IN UINTN                  Size,\r
-  IN VOID                   *Buffer\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer\r
   );\r
 \r
-\r
 /**\r
   Skip bytes in the firmware configuration item.\r
 \r
@@ -96,10 +92,9 @@ QemuFwCfgWriteBytes (
 VOID\r
 EFIAPI\r
 QemuFwCfgSkipBytes (\r
-  IN UINTN                  Size\r
+  IN UINTN  Size\r
   );\r
 \r
-\r
 /**\r
   Reads a UINT8 firmware configuration value\r
 \r
@@ -112,7 +107,6 @@ QemuFwCfgRead8 (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Reads a UINT16 firmware configuration value\r
 \r
@@ -125,7 +119,6 @@ QemuFwCfgRead16 (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Reads a UINT32 firmware configuration value\r
 \r
@@ -138,7 +131,6 @@ QemuFwCfgRead32 (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Reads a UINT64 firmware configuration value\r
 \r
@@ -151,7 +143,6 @@ QemuFwCfgRead64 (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Find the configuration item corresponding to the firmware configuration file.\r
 \r
@@ -174,4 +165,3 @@ QemuFwCfgFindFile (
   );\r
 \r
 #endif\r
-\r
index 4103659282b41d13e2f1bd46a724058bd4cd42ca..b6b1e30da3aaf837e8f6d9310fb0e637664fa676 100644 (file)
@@ -32,7 +32,6 @@ QemuFwCfgS3Enabled (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Prototype for the callback function that the client module provides.\r
 \r
@@ -86,12 +85,11 @@ QemuFwCfgS3Enabled (
                                 ScratchBuffer is aligned at 8 bytes.\r
 **/\r
 typedef\r
-VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) (\r
+VOID(EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION)(\r
   IN OUT VOID *Context       OPTIONAL,\r
   IN OUT VOID *ScratchBuffer\r
   );\r
 \r
-\r
 /**\r
   Install the client module's FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION callback for\r
   when the production of ACPI S3 Boot Script opcodes becomes possible.\r
@@ -152,12 +150,11 @@ VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
-  IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
-  IN OUT VOID                                 *Context           OPTIONAL,\r
-  IN     UINTN                                ScratchBufferSize\r
+  IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION  *Callback,\r
+  IN OUT VOID                                  *Context           OPTIONAL,\r
+  IN     UINTN                                 ScratchBufferSize\r
   );\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,\r
   and transfer data to it.\r
@@ -201,11 +198,10 @@ QemuFwCfgS3CallWhenBootScriptReady (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptWriteBytes (\r
-  IN INT32 FirmwareConfigItem,\r
-  IN UINTN NumberOfBytes\r
+  IN INT32  FirmwareConfigItem,\r
+  IN UINTN  NumberOfBytes\r
   );\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,\r
   and transfer data from it.\r
@@ -248,11 +244,10 @@ QemuFwCfgS3ScriptWriteBytes (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptReadBytes (\r
-  IN INT32 FirmwareConfigItem,\r
-  IN UINTN NumberOfBytes\r
+  IN INT32  FirmwareConfigItem,\r
+  IN UINTN  NumberOfBytes\r
   );\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,\r
   and increase its offset.\r
@@ -288,11 +283,10 @@ QemuFwCfgS3ScriptReadBytes (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptSkipBytes (\r
-  IN INT32 FirmwareConfigItem,\r
-  IN UINTN NumberOfBytes\r
+  IN INT32  FirmwareConfigItem,\r
+  IN UINTN  NumberOfBytes\r
   );\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that check a value in ScratchBuffer.\r
 \r
@@ -346,10 +340,10 @@ QemuFwCfgS3ScriptSkipBytes (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptCheckValue (\r
-  IN VOID   *ScratchData,\r
-  IN UINT8  ValueSize,\r
-  IN UINT64 ValueMask,\r
-  IN UINT64 Value\r
+  IN VOID    *ScratchData,\r
+  IN UINT8   ValueSize,\r
+  IN UINT64  ValueMask,\r
+  IN UINT64  Value\r
   );\r
 \r
 #endif\r
index c6062bae8770a44d108fa9f2fc42526a2cdb7a73..bcbf3bc4fc9602cdf1e36e946ff47d975931bc1a 100644 (file)
@@ -41,8 +41,8 @@
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseBool (\r
-  IN  CONST CHAR8 *FileName,\r
-  OUT BOOLEAN     *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  OUT BOOLEAN      *Value\r
   );\r
 \r
 /**\r
@@ -82,9 +82,9 @@ QemuFwCfgParseBool (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseUint8 (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  OUT UINT8       *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  OUT UINT8        *Value\r
   );\r
 \r
 //\r
@@ -96,33 +96,33 @@ QemuFwCfgParseUint8 (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseUint16 (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  OUT UINT16      *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  OUT UINT16       *Value\r
   );\r
 \r
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseUint32 (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  OUT UINT32      *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  OUT UINT32       *Value\r
   );\r
 \r
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseUint64 (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  OUT UINT64      *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  OUT UINT64       *Value\r
   );\r
 \r
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseUintn (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  OUT UINTN       *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  OUT UINTN        *Value\r
   );\r
 \r
 #endif // QEMU_FW_CFG_SIMPLE_PARSER_LIB_H_\r
index 746b74f73c40c8c3970a340494bf673e7586e8b9..f344b763a45749b72f78aaca614071f3d396eaaa 100644 (file)
@@ -37,7 +37,7 @@
 EFI_STATUS\r
 EFIAPI\r
 QemuLoadKernelImage (\r
-  OUT EFI_HANDLE          *ImageHandle\r
+  OUT EFI_HANDLE  *ImageHandle\r
   );\r
 \r
 /**\r
@@ -59,7 +59,7 @@ QemuLoadKernelImage (
 EFI_STATUS\r
 EFIAPI\r
 QemuStartKernelImage (\r
-  IN  OUT EFI_HANDLE          *ImageHandle\r
+  IN  OUT EFI_HANDLE  *ImageHandle\r
   );\r
 \r
 /**\r
@@ -78,7 +78,7 @@ QemuStartKernelImage (
 EFI_STATUS\r
 EFIAPI\r
 QemuUnloadKernelImage (\r
-  IN  EFI_HANDLE          ImageHandle\r
+  IN  EFI_HANDLE  ImageHandle\r
   );\r
 \r
 #endif\r
index 8e74b718f18844b48f71920d606e659ed97c23d7..5ca395786c2470f9c813c9728565b1581138138a 100644 (file)
@@ -9,7 +9,6 @@
 #ifndef __SERIALIZE_VARIABLES_LIB__\r
 #define __SERIALIZE_VARIABLES_LIB__\r
 \r
-\r
 /**\r
   Callback function for each variable\r
 \r
@@ -35,7 +34,6 @@ RETURN_STATUS
   IN  VOID                         *Data\r
   );\r
 \r
-\r
 /**\r
   Creates a new variable serialization instance\r
 \r
@@ -50,10 +48,9 @@ RETURN_STATUS
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesNewInstance (\r
-  OUT EFI_HANDLE                      *Handle\r
+  OUT EFI_HANDLE  *Handle\r
   );\r
 \r
-\r
 /**\r
   Free memory associated with a variable serialization instance\r
 \r
@@ -68,10 +65,9 @@ SerializeVariablesNewInstance (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesFreeInstance (\r
-  IN EFI_HANDLE Handle\r
+  IN EFI_HANDLE  Handle\r
   );\r
 \r
-\r
 /**\r
   Creates a new variable serialization instance using the given\r
   binary representation of the variables to fill the new instance\r
@@ -92,12 +88,11 @@ SerializeVariablesFreeInstance (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesNewInstanceFromBuffer (\r
-  OUT EFI_HANDLE                          *Handle,\r
-  IN  VOID                                *Buffer,\r
-  IN  UINTN                               Size\r
+  OUT EFI_HANDLE  *Handle,\r
+  IN  VOID        *Buffer,\r
+  IN  UINTN       Size\r
   );\r
 \r
-\r
 /**\r
   Iterates all variables found with RuntimeServices GetNextVariableName\r
 \r
@@ -115,11 +110,10 @@ SerializeVariablesNewInstanceFromBuffer (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesIterateSystemVariables (\r
-  IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK CallbackFunction,\r
-  IN VOID                                      *Context\r
+  IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK  CallbackFunction,\r
+  IN VOID                                       *Context\r
   );\r
 \r
-\r
 /**\r
   Iterates all variables found in the variable serialization instance\r
 \r
@@ -138,12 +132,11 @@ SerializeVariablesIterateSystemVariables (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesIterateInstanceVariables (\r
-  IN EFI_HANDLE                                Handle,\r
-  IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK CallbackFunction,\r
-  IN VOID                                      *Context\r
+  IN EFI_HANDLE                                 Handle,\r
+  IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK  CallbackFunction,\r
+  IN VOID                                       *Context\r
   );\r
 \r
-\r
 /**\r
   Sets all variables found in the variable serialization instance\r
 \r
@@ -159,10 +152,9 @@ SerializeVariablesIterateInstanceVariables (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesSetSerializedVariables (\r
-  IN EFI_HANDLE                       Handle\r
+  IN EFI_HANDLE  Handle\r
   );\r
 \r
-\r
 /**\r
   Adds a variable to the variable serialization instance\r
 \r
@@ -181,15 +173,14 @@ SerializeVariablesSetSerializedVariables (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesAddVariable (\r
-  IN EFI_HANDLE                   Handle,\r
-  IN CHAR16                       *VariableName,\r
-  IN EFI_GUID                     *VendorGuid,\r
-  IN UINT32                       Attributes,\r
-  IN UINTN                        DataSize,\r
-  IN VOID                         *Data\r
+  IN EFI_HANDLE  Handle,\r
+  IN CHAR16      *VariableName,\r
+  IN EFI_GUID    *VendorGuid,\r
+  IN UINT32      Attributes,\r
+  IN UINTN       DataSize,\r
+  IN VOID        *Data\r
   );\r
 \r
-\r
 /**\r
   Serializes the variables known to this instance into the\r
   provided buffer.\r
@@ -213,11 +204,9 @@ SerializeVariablesAddVariable (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesToBuffer (\r
-  IN     EFI_HANDLE                       Handle,\r
-  OUT    VOID                             *Buffer,\r
-  IN OUT UINTN                            *Size\r
+  IN     EFI_HANDLE  Handle,\r
+  OUT    VOID        *Buffer,\r
+  IN OUT UINTN       *Size\r
   );\r
 \r
-\r
 #endif\r
-\r
index e714ec7aee500b3828e257afcf5321cdc9b7e124..085e719b08753b3d4be7e6d7ed0fea8c287ff467 100644 (file)
@@ -16,7 +16,6 @@
 \r
 #include <IndustryStandard/Virtio.h>\r
 \r
-\r
 /**\r
 \r
   Configure a virtio ring.\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioRingInit (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN  UINT16                 QueueSize,\r
-  OUT VRING                  *Ring\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *VirtIo,\r
+  IN  UINT16                  QueueSize,\r
+  OUT VRING                   *Ring\r
   );\r
 \r
-\r
 /**\r
 \r
   Map the ring buffer so that it can be accessed equally by both guest\r
@@ -73,10 +71,10 @@ VirtioRingInit (
 EFI_STATUS\r
 EFIAPI\r
 VirtioRingMap (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN  VRING                  *Ring,\r
-  OUT UINT64                 *RingBaseShift,\r
-  OUT VOID                   **Mapping\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *VirtIo,\r
+  IN  VRING                   *Ring,\r
+  OUT UINT64                  *RingBaseShift,\r
+  OUT VOID                    **Mapping\r
   );\r
 \r
 /**\r
@@ -95,21 +93,19 @@ VirtioRingMap (
 VOID\r
 EFIAPI\r
 VirtioRingUninit (\r
-  IN     VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN OUT VRING                  *Ring\r
+  IN     VIRTIO_DEVICE_PROTOCOL  *VirtIo,\r
+  IN OUT VRING                   *Ring\r
   );\r
 \r
-\r
 //\r
 // Internal use structure for tracking the submission of a multi-descriptor\r
 // request.\r
 //\r
 typedef struct {\r
-  UINT16 HeadDescIdx;\r
-  UINT16 NextDescIdx;\r
+  UINT16    HeadDescIdx;\r
+  UINT16    NextDescIdx;\r
 } DESC_INDICES;\r
 \r
-\r
 /**\r
 \r
   Turn off interrupt notifications from the host, and prepare for appending\r
@@ -125,11 +121,10 @@ typedef struct {
 VOID\r
 EFIAPI\r
 VirtioPrepare (\r
-  IN OUT VRING        *Ring,\r
-  OUT    DESC_INDICES *Indices\r
+  IN OUT VRING         *Ring,\r
+  OUT    DESC_INDICES  *Indices\r
   );\r
 \r
-\r
 /**\r
 \r
   Append a contiguous buffer for transmission / reception via the virtio ring.\r
@@ -171,14 +166,13 @@ VirtioPrepare (
 VOID\r
 EFIAPI\r
 VirtioAppendDesc (\r
-  IN OUT VRING        *Ring,\r
-  IN     UINT64       BufferDeviceAddress,\r
-  IN     UINT32       BufferSize,\r
-  IN     UINT16       Flags,\r
-  IN OUT DESC_INDICES *Indices\r
+  IN OUT VRING         *Ring,\r
+  IN     UINT64        BufferDeviceAddress,\r
+  IN     UINT32        BufferSize,\r
+  IN     UINT16        Flags,\r
+  IN OUT DESC_INDICES  *Indices\r
   );\r
 \r
-\r
 /**\r
 \r
   Notify the host about the descriptor chain just built, and wait until the\r
@@ -209,14 +203,13 @@ VirtioAppendDesc (
 EFI_STATUS\r
 EFIAPI\r
 VirtioFlush (\r
-  IN     VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN     UINT16                 VirtQueueId,\r
-  IN OUT VRING                  *Ring,\r
-  IN     DESC_INDICES           *Indices,\r
-  OUT    UINT32                 *UsedLen    OPTIONAL\r
+  IN     VIRTIO_DEVICE_PROTOCOL  *VirtIo,\r
+  IN     UINT16                  VirtQueueId,\r
+  IN OUT VRING                   *Ring,\r
+  IN     DESC_INDICES            *Indices,\r
+  OUT    UINT32                  *UsedLen    OPTIONAL\r
   );\r
 \r
-\r
 /**\r
 \r
   Report the feature bits to the VirtIo 1.0 device that the VirtIo 1.0 driver\r
@@ -257,9 +250,9 @@ VirtioFlush (
 EFI_STATUS\r
 EFIAPI\r
 Virtio10WriteFeatures (\r
-  IN     VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN     UINT64                 Features,\r
-  IN OUT UINT8                  *DeviceStatus\r
+  IN     VIRTIO_DEVICE_PROTOCOL  *VirtIo,\r
+  IN     UINT64                  Features,\r
+  IN OUT UINT8                   *DeviceStatus\r
   );\r
 \r
 /**\r
@@ -313,4 +306,5 @@ VirtioMapAllBytesInSharedBuffer (
   OUT EFI_PHYSICAL_ADDRESS    *DeviceAddress,\r
   OUT VOID                    **Mapping\r
   );\r
+\r
 #endif // _VIRTIO_LIB_H_\r
index 2ea2830dda77ed1d548c593964a2a1807809b901..41df7741617f71728156177c8a80e510cc5d2671 100644 (file)
@@ -35,8 +35,8 @@
 **/\r
 EFI_STATUS\r
 VirtioMmioInstallDevice (\r
-  IN PHYSICAL_ADDRESS       BaseAddress,\r
-  IN EFI_HANDLE             Handle\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN EFI_HANDLE        Handle\r
   );\r
 \r
 /**\r
@@ -54,7 +54,7 @@ VirtioMmioInstallDevice (
 **/\r
 EFI_STATUS\r
 VirtioMmioUninstallDevice (\r
-  IN EFI_HANDLE             Handle\r
+  IN EFI_HANDLE  Handle\r
   );\r
 \r
 #endif // _VIRTIO_MMIO_DEVICE_LIB_H_\r
index c1491dd652b3ef14a614714246594b8c966e027d..28eee8ccac8577d015537801547835a1eb5b9d56 100644 (file)
@@ -66,7 +66,7 @@ XenHypercall2 (
 UINT64\r
 EFIAPI\r
 XenHypercallHvmGetParam (\r
-  UINT32 Index\r
+  UINT32  Index\r
   );\r
 \r
 /**\r
@@ -81,8 +81,8 @@ XenHypercallHvmGetParam (
 INTN\r
 EFIAPI\r
 XenHypercallMemoryOp (\r
-  IN     UINTN Operation,\r
-  IN OUT VOID *Arguments\r
+  IN     UINTN  Operation,\r
+  IN OUT VOID   *Arguments\r
   );\r
 \r
 /**\r
@@ -97,8 +97,8 @@ XenHypercallMemoryOp (
 INTN\r
 EFIAPI\r
 XenHypercallEventChannelOp (\r
-  IN     INTN Operation,\r
-  IN OUT VOID *Arguments\r
+  IN     INTN  Operation,\r
+  IN OUT VOID  *Arguments\r
   );\r
 \r
 #endif\r
index 3db54178bf800c904a6bf4d76837677741afe71c..072fdbf821414e13da39eca4fdb8537f97616510 100644 (file)
 **/\r
 EFI_STATUS\r
 XenIoMmioInstall (\r
-  IN OUT   EFI_HANDLE              *Handle,\r
-  IN       EFI_PHYSICAL_ADDRESS    GrantTableAddress\r
+  IN OUT   EFI_HANDLE            *Handle,\r
+  IN       EFI_PHYSICAL_ADDRESS  GrantTableAddress\r
   );\r
 \r
-\r
 /**\r
 \r
   Uninstall the XENBUS_ROOT_DEVICE_PATH and XENIO_PROTOCOL protocols\r
@@ -52,7 +51,7 @@ XenIoMmioInstall (
 **/\r
 EFI_STATUS\r
 XenIoMmioUninstall (\r
-  IN       EFI_HANDLE              Handle\r
+  IN       EFI_HANDLE  Handle\r
   );\r
 \r
 #endif\r
index 3b85593b70634dd57409f2912298080923bc76e7..de5d7663b469d95c3fca2ad7f779664df6fb009c 100644 (file)
 //\r
 // Values we program into the PM base address registers\r
 //\r
-#define PIIX4_PMBA_VALUE  0xB000\r
-#define ICH9_PMBASE_VALUE 0x0600\r
+#define PIIX4_PMBA_VALUE   0xB000\r
+#define ICH9_PMBASE_VALUE  0x0600\r
 \r
 //\r
 // Common bits in same-purpose registers\r
 //\r
-#define PMBA_RTE BIT0\r
+#define PMBA_RTE  BIT0\r
 \r
 //\r
 // Common IO ports relative to the Power Management Base Address\r
 //\r
-#define ACPI_TIMER_OFFSET 0x8\r
+#define ACPI_TIMER_OFFSET  0x8\r
 \r
 #endif\r
index 06714375526cd06d74fd16820fedc639536925e3..3f955269c4d2833dceb60f6253dd3211812760f6 100644 (file)
@@ -29,7 +29,7 @@
 **/\r
 typedef\r
 VOID\r
-(EFIAPI *CPU_HOT_EJECT_HANDLER) (\r
+(EFIAPI *CPU_HOT_EJECT_HANDLER)(\r
   IN UINTN  ProcessorNum\r
   );\r
 \r
@@ -40,21 +40,21 @@ VOID
 // QEMU CPU Selector is UINT32, so we choose an invalid value larger\r
 // than that type.\r
 //\r
-#define CPU_EJECT_QEMU_SELECTOR_INVALID       (MAX_UINT64)\r
+#define CPU_EJECT_QEMU_SELECTOR_INVALID  (MAX_UINT64)\r
 \r
 typedef struct {\r
   //\r
   // Maps ProcessorNum -> QemuSelector for pending hot-ejects\r
   //\r
-  volatile UINT64 *QemuSelectorMap;\r
+  volatile UINT64                   *QemuSelectorMap;\r
   //\r
   // Handler to do the CPU ejection\r
   //\r
-  volatile CPU_HOT_EJECT_HANDLER Handler;\r
+  volatile CPU_HOT_EJECT_HANDLER    Handler;\r
   //\r
   // Entries in the QemuSelectorMap\r
   //\r
-  UINT32 ArrayLength;\r
+  UINT32                            ArrayLength;\r
 } CPU_HOT_EJECT_DATA;\r
 \r
 #endif // CPU_HOT_EJECT_DATA_H_\r
index 6dc7226ece2bf5feccb9df5272673a68bd0d7435..233e817c069600250fbe9ab618b7ec83af2d21a1 100644 (file)
@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _EFI_LEGACY_8259_H_\r
 #define _EFI_LEGACY_8259_H_\r
 \r
-\r
 #define EFI_LEGACY_8259_PROTOCOL_GUID \\r
   { \\r
     0x38321dba, 0x4fe0, 0x4e17, {0x8a, 0xec, 0x41, 0x30, 0x55, 0xea, 0xed, 0xc1 } \\r
@@ -275,17 +274,17 @@ EFI_STATUS
 \r
 **/\r
 struct _EFI_LEGACY_8259_PROTOCOL {\r
-  EFI_LEGACY_8259_SET_VECTOR_BASE     SetVectorBase;\r
-  EFI_LEGACY_8259_GET_MASK            GetMask;\r
-  EFI_LEGACY_8259_SET_MASK            SetMask;\r
-  EFI_LEGACY_8259_SET_MODE            SetMode;\r
-  EFI_LEGACY_8259_GET_VECTOR          GetVector;\r
-  EFI_LEGACY_8259_ENABLE_IRQ          EnableIrq;\r
-  EFI_LEGACY_8259_DISABLE_IRQ         DisableIrq;\r
-  EFI_LEGACY_8259_GET_INTERRUPT_LINE  GetInterruptLine;\r
-  EFI_LEGACY_8259_END_OF_INTERRUPT    EndOfInterrupt;\r
+  EFI_LEGACY_8259_SET_VECTOR_BASE       SetVectorBase;\r
+  EFI_LEGACY_8259_GET_MASK              GetMask;\r
+  EFI_LEGACY_8259_SET_MASK              SetMask;\r
+  EFI_LEGACY_8259_SET_MODE              SetMode;\r
+  EFI_LEGACY_8259_GET_VECTOR            GetVector;\r
+  EFI_LEGACY_8259_ENABLE_IRQ            EnableIrq;\r
+  EFI_LEGACY_8259_DISABLE_IRQ           DisableIrq;\r
+  EFI_LEGACY_8259_GET_INTERRUPT_LINE    GetInterruptLine;\r
+  EFI_LEGACY_8259_END_OF_INTERRUPT      EndOfInterrupt;\r
 };\r
 \r
-extern EFI_GUID gEfiLegacy8259ProtocolGuid;\r
+extern EFI_GUID  gEfiLegacy8259ProtocolGuid;\r
 \r
 #endif\r
index 01cfd9d189b4e90136bbb403f3cd44a8bc964b0b..9adb75cc5a2b5922d50f41a172b6a56e0bdef2d3 100644 (file)
   {0xa3edc05d, 0xb618, 0x4ff6, {0x95, 0x52, 0x76, 0xd7, 0x88, 0x63, 0x43, 0xc8}}\r
 \r
 typedef struct {\r
-  VOID    *SetupBuf;\r
-  VOID    *KernelBuf;\r
-  CHAR8   *CommandLine;\r
-  VOID    *InitrdData;\r
-  UINTN   SetupSize;\r
-  UINTN   KernelInitialSize;\r
-  UINTN   InitrdSize;\r
-  UINTN   CommandLineSize;\r
+  VOID     *SetupBuf;\r
+  VOID     *KernelBuf;\r
+  CHAR8    *CommandLine;\r
+  VOID     *InitrdData;\r
+  UINTN    SetupSize;\r
+  UINTN    KernelInitialSize;\r
+  UINTN    InitrdSize;\r
+  UINTN    CommandLineSize;\r
 } OVMF_LOADED_X86_LINUX_KERNEL;\r
 \r
-extern EFI_GUID gOvmfLoadedX86LinuxKernelProtocolGuid;\r
+extern EFI_GUID  gOvmfLoadedX86LinuxKernelProtocolGuid;\r
 \r
 #endif\r
index ea560719ac8daa3e5624a3b7fa782b01229861fb..ad37f4e3f79290822dea04f27948fb50b8644cb0 100644 (file)
 //\r
 // VirtIo Specification Revision: Major[31:24].Minor[23:16].Revision[15:0]\r
 //\r
-#define VIRTIO_SPEC_REVISION(major,minor,revision) \\r
+#define VIRTIO_SPEC_REVISION(major, minor, revision) \\r
   ((((major) & 0xFF) << 24) | (((minor) & 0xFF) << 16) | ((revision) & 0xFFFF))\r
 \r
-#define VIRTIO_DEVICE_PROTOCOL_GUID \\r
+#define VIRTIO_DEVICE_PROTOCOL_GUID  {\\r
   0xfa920010, 0x6785, 0x4941, {0xb6, 0xec, 0x49, 0x8c, 0x57, 0x9f, 0x16, 0x0a }\\r
   }\r
 \r
-typedef struct _VIRTIO_DEVICE_PROTOCOL  VIRTIO_DEVICE_PROTOCOL;\r
+typedef struct _VIRTIO_DEVICE_PROTOCOL VIRTIO_DEVICE_PROTOCOL;\r
 \r
 //\r
 // VIRTIO Operation for VIRTIO_MAP_SHARED\r
@@ -72,7 +72,7 @@ typedef enum {
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_DEVICE_READ) (\r
+(EFIAPI *VIRTIO_DEVICE_READ)(\r
   IN  VIRTIO_DEVICE_PROTOCOL *This,\r
   IN  UINTN                  FieldOffset,\r
   IN  UINTN                  FieldSize,\r
@@ -103,7 +103,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_DEVICE_WRITE) (\r
+(EFIAPI *VIRTIO_DEVICE_WRITE)(\r
   IN VIRTIO_DEVICE_PROTOCOL *This,\r
   IN UINTN                  FieldOffset,\r
   IN UINTN                  FieldSize,\r
@@ -124,7 +124,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_GET_DEVICE_FEATURES) (\r
+(EFIAPI *VIRTIO_GET_DEVICE_FEATURES)(\r
   IN VIRTIO_DEVICE_PROTOCOL *This,\r
   OUT UINT64                *DeviceFeatures\r
   );\r
@@ -139,7 +139,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_SET_GUEST_FEATURES) (\r
+(EFIAPI *VIRTIO_SET_GUEST_FEATURES)(\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT64                   Features\r
   );\r
@@ -172,7 +172,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_SET_QUEUE_ADDRESS) (\r
+(EFIAPI *VIRTIO_SET_QUEUE_ADDRESS)(\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN VRING                   *Ring,\r
   IN UINT64                  RingBaseShift\r
@@ -195,7 +195,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_SET_QUEUE_SEL) (\r
+(EFIAPI *VIRTIO_SET_QUEUE_SEL)(\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                   Index\r
   );\r
@@ -214,7 +214,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_SET_QUEUE_NOTIFY) (\r
+(EFIAPI *VIRTIO_SET_QUEUE_NOTIFY)(\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                   Index\r
   );\r
@@ -239,7 +239,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_SET_QUEUE_ALIGN) (\r
+(EFIAPI *VIRTIO_SET_QUEUE_ALIGN)(\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT32                   Alignment\r
   );\r
@@ -261,7 +261,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_SET_PAGE_SIZE) (\r
+(EFIAPI *VIRTIO_SET_PAGE_SIZE)(\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT32                   PageSize\r
   );\r
@@ -284,7 +284,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_GET_QUEUE_NUM_MAX) (\r
+(EFIAPI *VIRTIO_GET_QUEUE_NUM_MAX)(\r
   IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
   OUT UINT16                  *QueueNumMax\r
   );\r
@@ -306,7 +306,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_SET_QUEUE_NUM) (\r
+(EFIAPI *VIRTIO_SET_QUEUE_NUM)(\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                   QueueSize\r
   );\r
@@ -326,7 +326,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_GET_DEVICE_STATUS) (\r
+(EFIAPI *VIRTIO_GET_DEVICE_STATUS)(\r
   IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
   OUT UINT8                   *DeviceStatus\r
   );\r
@@ -345,7 +345,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_SET_DEVICE_STATUS) (\r
+(EFIAPI *VIRTIO_SET_DEVICE_STATUS)(\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT8                   DeviceStatus\r
   );\r
@@ -434,7 +434,7 @@ VOID
 \r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *VIRTIO_MAP_SHARED) (\r
+(EFIAPI *VIRTIO_MAP_SHARED)(\r
   IN     VIRTIO_DEVICE_PROTOCOL       *This,\r
   IN     VIRTIO_MAP_OPERATION         Operation,\r
   IN     VOID                         *HostAddress,\r
@@ -476,45 +476,45 @@ struct _VIRTIO_DEVICE_PROTOCOL {
   //\r
   // VirtIo Specification Revision encoded with VIRTIO_SPEC_REVISION()\r
   //\r
-  UINT32                      Revision;\r
+  UINT32                        Revision;\r
   //\r
   // From the Virtio Spec\r
   //\r
-  INT32                       SubSystemDeviceId;\r
+  INT32                         SubSystemDeviceId;\r
 \r
-  VIRTIO_GET_DEVICE_FEATURES  GetDeviceFeatures;\r
-  VIRTIO_SET_GUEST_FEATURES   SetGuestFeatures;\r
+  VIRTIO_GET_DEVICE_FEATURES    GetDeviceFeatures;\r
+  VIRTIO_SET_GUEST_FEATURES     SetGuestFeatures;\r
 \r
-  VIRTIO_SET_QUEUE_ADDRESS    SetQueueAddress;\r
+  VIRTIO_SET_QUEUE_ADDRESS      SetQueueAddress;\r
 \r
-  VIRTIO_SET_QUEUE_SEL        SetQueueSel;\r
+  VIRTIO_SET_QUEUE_SEL          SetQueueSel;\r
 \r
-  VIRTIO_SET_QUEUE_NOTIFY     SetQueueNotify;\r
+  VIRTIO_SET_QUEUE_NOTIFY       SetQueueNotify;\r
 \r
-  VIRTIO_SET_QUEUE_ALIGN      SetQueueAlign;\r
-  VIRTIO_SET_PAGE_SIZE        SetPageSize;\r
+  VIRTIO_SET_QUEUE_ALIGN        SetQueueAlign;\r
+  VIRTIO_SET_PAGE_SIZE          SetPageSize;\r
 \r
-  VIRTIO_GET_QUEUE_NUM_MAX    GetQueueNumMax;\r
-  VIRTIO_SET_QUEUE_NUM        SetQueueNum;\r
+  VIRTIO_GET_QUEUE_NUM_MAX      GetQueueNumMax;\r
+  VIRTIO_SET_QUEUE_NUM          SetQueueNum;\r
 \r
-  VIRTIO_GET_DEVICE_STATUS    GetDeviceStatus;\r
-  VIRTIO_SET_DEVICE_STATUS    SetDeviceStatus;\r
+  VIRTIO_GET_DEVICE_STATUS      GetDeviceStatus;\r
+  VIRTIO_SET_DEVICE_STATUS      SetDeviceStatus;\r
 \r
   //\r
   // Functions to read/write Device Specific headers\r
   //\r
-  VIRTIO_DEVICE_WRITE         WriteDevice;\r
-  VIRTIO_DEVICE_READ          ReadDevice;\r
+  VIRTIO_DEVICE_WRITE           WriteDevice;\r
+  VIRTIO_DEVICE_READ            ReadDevice;\r
 \r
   //\r
   // Functions to allocate, free, map and unmap shared buffer\r
   //\r
-  VIRTIO_ALLOCATE_SHARED      AllocateSharedPages;\r
-  VIRTIO_FREE_SHARED          FreeSharedPages;\r
-  VIRTIO_MAP_SHARED           MapSharedBuffer;\r
-  VIRTIO_UNMAP_SHARED         UnmapSharedBuffer;\r
+  VIRTIO_ALLOCATE_SHARED        AllocateSharedPages;\r
+  VIRTIO_FREE_SHARED            FreeSharedPages;\r
+  VIRTIO_MAP_SHARED             MapSharedBuffer;\r
+  VIRTIO_UNMAP_SHARED           UnmapSharedBuffer;\r
 };\r
 \r
-extern EFI_GUID gVirtioDeviceProtocolGuid;\r
+extern EFI_GUID  gVirtioDeviceProtocolGuid;\r
 \r
 #endif\r
index 0dac9266280f8bb74046be3f89a7db2984995b8e..e34347fc3fccef3e4d748e00599809cc1b9d3b1e 100644 (file)
@@ -1,4 +1,3 @@
-\r
 /** @file\r
   XenBus protocol to be used between the XenBus bus driver and Xen PV devices.\r
 \r
@@ -28,12 +27,11 @@ typedef struct _XENBUS_PROTOCOL XENBUS_PROTOCOL;
 \r
 typedef enum xenbus_state XenBusState;\r
 \r
-typedef struct\r
-{\r
-  UINT32 Id;\r
+typedef struct {\r
+  UINT32    Id;\r
 } XENSTORE_TRANSACTION;\r
 \r
-#define XST_NIL ((XENSTORE_TRANSACTION *) NULL)\r
+#define XST_NIL  ((XENSTORE_TRANSACTION *) NULL)\r
 \r
 typedef enum {\r
   XENSTORE_STATUS_SUCCESS = 0,\r
@@ -55,7 +53,6 @@ typedef enum {
   XENSTORE_STATUS_E2BIG\r
 } XENSTORE_STATUS;\r
 \r
-\r
 #include <IndustryStandard/Xen/grant_table.h>\r
 #include <IndustryStandard/Xen/event_channel.h>\r
 \r
@@ -126,7 +123,7 @@ XENSTORE_STATUS
 **/\r
 typedef\r
 XENSTORE_STATUS\r
-(EFIAPI *XENBUS_XS_PRINTF) (\r
+(EFIAPI *XENBUS_XS_PRINTF)(\r
   IN XENBUS_PROTOCOL        *This,\r
   IN CONST XENSTORE_TRANSACTION *Transaction,\r
   IN CONST CHAR8            *Directory,\r
@@ -148,7 +145,7 @@ XENSTORE_STATUS
 **/\r
 typedef\r
 XENSTORE_STATUS\r
-(EFIAPI *XENBUS_XS_REMOVE) (\r
+(EFIAPI *XENBUS_XS_REMOVE)(\r
   IN XENBUS_PROTOCOL        *This,\r
   IN CONST XENSTORE_TRANSACTION *Transaction,\r
   IN CONST CHAR8            *Node\r
@@ -187,7 +184,7 @@ XENSTORE_STATUS
 **/\r
 typedef\r
 XENSTORE_STATUS\r
-(EFIAPI *XENBUS_XS_TRANSACTION_END) (\r
+(EFIAPI *XENBUS_XS_TRANSACTION_END)(\r
   IN XENBUS_PROTOCOL        *This,\r
   IN CONST XENSTORE_TRANSACTION *Transaction,\r
   IN BOOLEAN                Abort\r
@@ -256,7 +253,7 @@ EFI_STATUS
 **/\r
 typedef\r
 UINT32\r
-(EFIAPI *XENBUS_EVENT_CHANNEL_ALLOCATE) (\r
+(EFIAPI *XENBUS_EVENT_CHANNEL_ALLOCATE)(\r
   IN  XENBUS_PROTOCOL *This,\r
   IN  domid_t         DomainId,\r
   OUT evtchn_port_t   *Port\r
@@ -272,7 +269,7 @@ UINT32
 **/\r
 typedef\r
 UINT32\r
-(EFIAPI *XENBUS_EVENT_CHANNEL_NOTIFY) (\r
+(EFIAPI *XENBUS_EVENT_CHANNEL_NOTIFY)(\r
   IN XENBUS_PROTOCOL  *This,\r
   IN evtchn_port_t    Port\r
   );\r
@@ -287,7 +284,7 @@ UINT32
 **/\r
 typedef\r
 UINT32\r
-(EFIAPI *XENBUS_EVENT_CHANNEL_CLOSE) (\r
+(EFIAPI *XENBUS_EVENT_CHANNEL_CLOSE)(\r
   IN XENBUS_PROTOCOL  *This,\r
   IN evtchn_port_t    Port\r
   );\r
@@ -309,7 +306,7 @@ UINT32
 **/\r
 typedef\r
 XENSTORE_STATUS\r
-(EFIAPI *XENBUS_REGISTER_WATCH) (\r
+(EFIAPI *XENBUS_REGISTER_WATCH)(\r
   IN  XENBUS_PROTOCOL *This,\r
   IN  CONST CHAR8     *Node,\r
   OUT VOID            **Token\r
@@ -332,7 +329,7 @@ XENSTORE_STATUS
 **/\r
 typedef\r
 XENSTORE_STATUS\r
-(EFIAPI *XENBUS_REGISTER_WATCH_BACKEND) (\r
+(EFIAPI *XENBUS_REGISTER_WATCH_BACKEND)(\r
   IN  XENBUS_PROTOCOL *This,\r
   IN  CONST CHAR8     *Node,\r
   OUT VOID            **Token\r
@@ -347,7 +344,7 @@ XENSTORE_STATUS
 **/\r
 typedef\r
 VOID\r
-(EFIAPI *XENBUS_UNREGISTER_WATCH) (\r
+(EFIAPI *XENBUS_UNREGISTER_WATCH)(\r
   IN XENBUS_PROTOCOL  *This,\r
   IN VOID             *Token\r
   );\r
@@ -364,12 +361,11 @@ VOID
 **/\r
 typedef\r
 XENSTORE_STATUS\r
-(EFIAPI *XENBUS_WAIT_FOR_WATCH) (\r
+(EFIAPI *XENBUS_WAIT_FOR_WATCH)(\r
   IN XENBUS_PROTOCOL  *This,\r
   IN VOID             *Token\r
   );\r
 \r
-\r
 ///\r
 /// Protocol structure\r
 ///\r
@@ -377,34 +373,34 @@ XENSTORE_STATUS
 /// should not be used outside of the EDK II tree.\r
 ///\r
 struct _XENBUS_PROTOCOL {\r
-  XENBUS_XS_READ                XsRead;\r
-  XENBUS_XS_BACKEND_READ        XsBackendRead;\r
-  XENBUS_XS_PRINTF              XsPrintf;\r
-  XENBUS_XS_REMOVE              XsRemove;\r
-  XENBUS_XS_TRANSACTION_START   XsTransactionStart;\r
-  XENBUS_XS_TRANSACTION_END     XsTransactionEnd;\r
-  XENBUS_SET_STATE              SetState;\r
-\r
-  XENBUS_GRANT_ACCESS           GrantAccess;\r
-  XENBUS_GRANT_END_ACCESS       GrantEndAccess;\r
-\r
-  XENBUS_EVENT_CHANNEL_ALLOCATE EventChannelAllocate;\r
-  XENBUS_EVENT_CHANNEL_NOTIFY   EventChannelNotify;\r
-  XENBUS_EVENT_CHANNEL_CLOSE    EventChannelClose;\r
-\r
-  XENBUS_REGISTER_WATCH         RegisterWatch;\r
-  XENBUS_REGISTER_WATCH_BACKEND RegisterWatchBackend;\r
-  XENBUS_UNREGISTER_WATCH       UnregisterWatch;\r
-  XENBUS_WAIT_FOR_WATCH         WaitForWatch;\r
+  XENBUS_XS_READ                   XsRead;\r
+  XENBUS_XS_BACKEND_READ           XsBackendRead;\r
+  XENBUS_XS_PRINTF                 XsPrintf;\r
+  XENBUS_XS_REMOVE                 XsRemove;\r
+  XENBUS_XS_TRANSACTION_START      XsTransactionStart;\r
+  XENBUS_XS_TRANSACTION_END        XsTransactionEnd;\r
+  XENBUS_SET_STATE                 SetState;\r
+\r
+  XENBUS_GRANT_ACCESS              GrantAccess;\r
+  XENBUS_GRANT_END_ACCESS          GrantEndAccess;\r
+\r
+  XENBUS_EVENT_CHANNEL_ALLOCATE    EventChannelAllocate;\r
+  XENBUS_EVENT_CHANNEL_NOTIFY      EventChannelNotify;\r
+  XENBUS_EVENT_CHANNEL_CLOSE       EventChannelClose;\r
+\r
+  XENBUS_REGISTER_WATCH            RegisterWatch;\r
+  XENBUS_REGISTER_WATCH_BACKEND    RegisterWatchBackend;\r
+  XENBUS_UNREGISTER_WATCH          UnregisterWatch;\r
+  XENBUS_WAIT_FOR_WATCH            WaitForWatch;\r
   //\r
   // Protocol data fields\r
   //\r
-  CONST CHAR8                   *Type;\r
-  UINT16                        DeviceId;\r
-  CONST CHAR8                   *Node;\r
-  CONST CHAR8                   *Backend;\r
+  CONST CHAR8                      *Type;\r
+  UINT16                           DeviceId;\r
+  CONST CHAR8                      *Node;\r
+  CONST CHAR8                      *Backend;\r
 };\r
 \r
-extern EFI_GUID gXenBusProtocolGuid;\r
+extern EFI_GUID  gXenBusProtocolGuid;\r
 \r
 #endif\r
index f4051ca507296626b77fc833e7555ea28d70b193..ed1cc37ef10e2d58dea4cd085027e2028c674138 100644 (file)
@@ -34,9 +34,9 @@ struct _XENIO_PROTOCOL {
   //\r
   // Protocol data fields\r
   //\r
-  EFI_PHYSICAL_ADDRESS          GrantTableAddress;\r
+  EFI_PHYSICAL_ADDRESS    GrantTableAddress;\r
 };\r
 \r
-extern EFI_GUID gXenIoProtocolGuid;\r
+extern EFI_GUID  gXenIoProtocolGuid;\r
 \r
 #endif\r
index 40cf63c3e60bdd51eabb23e40843e7198e8a7a13..8ffde0548c4c0392b0a13e227c6d8e369845508f 100644 (file)
@@ -25,152 +25,152 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// 32-bit SMRAM Save State Map\r
 ///\r
 typedef struct {\r
-  UINT8   Reserved0[0x200]; // 7c00h\r
-  UINT8   Reserved1[0xf8];  // 7e00h\r
-  UINT32  SMBASE;           // 7ef8h\r
-  UINT32  SMMRevId;         // 7efch\r
-  UINT16  IORestart;        // 7f00h\r
-  UINT16  AutoHALTRestart;  // 7f02h\r
-  UINT8   Reserved2[0x9C];  // 7f08h\r
-  UINT32  IOMemAddr;        // 7fa0h\r
-  UINT32  IOMisc;           // 7fa4h\r
-  UINT32  _ES;              // 7fa8h\r
-  UINT32  _CS;              // 7fach\r
-  UINT32  _SS;              // 7fb0h\r
-  UINT32  _DS;              // 7fb4h\r
-  UINT32  _FS;              // 7fb8h\r
-  UINT32  _GS;              // 7fbch\r
-  UINT32  Reserved3;        // 7fc0h\r
-  UINT32  _TR;              // 7fc4h\r
-  UINT32  _DR7;             // 7fc8h\r
-  UINT32  _DR6;             // 7fcch\r
-  UINT32  _EAX;             // 7fd0h\r
-  UINT32  _ECX;             // 7fd4h\r
-  UINT32  _EDX;             // 7fd8h\r
-  UINT32  _EBX;             // 7fdch\r
-  UINT32  _ESP;             // 7fe0h\r
-  UINT32  _EBP;             // 7fe4h\r
-  UINT32  _ESI;             // 7fe8h\r
-  UINT32  _EDI;             // 7fech\r
-  UINT32  _EIP;             // 7ff0h\r
-  UINT32  _EFLAGS;          // 7ff4h\r
-  UINT32  _CR3;             // 7ff8h\r
-  UINT32  _CR0;             // 7ffch\r
+  UINT8     Reserved0[0x200]; // 7c00h\r
+  UINT8     Reserved1[0xf8];  // 7e00h\r
+  UINT32    SMBASE;           // 7ef8h\r
+  UINT32    SMMRevId;         // 7efch\r
+  UINT16    IORestart;        // 7f00h\r
+  UINT16    AutoHALTRestart;  // 7f02h\r
+  UINT8     Reserved2[0x9C];  // 7f08h\r
+  UINT32    IOMemAddr;        // 7fa0h\r
+  UINT32    IOMisc;           // 7fa4h\r
+  UINT32    _ES;              // 7fa8h\r
+  UINT32    _CS;              // 7fach\r
+  UINT32    _SS;              // 7fb0h\r
+  UINT32    _DS;              // 7fb4h\r
+  UINT32    _FS;              // 7fb8h\r
+  UINT32    _GS;              // 7fbch\r
+  UINT32    Reserved3;        // 7fc0h\r
+  UINT32    _TR;              // 7fc4h\r
+  UINT32    _DR7;             // 7fc8h\r
+  UINT32    _DR6;             // 7fcch\r
+  UINT32    _EAX;             // 7fd0h\r
+  UINT32    _ECX;             // 7fd4h\r
+  UINT32    _EDX;             // 7fd8h\r
+  UINT32    _EBX;             // 7fdch\r
+  UINT32    _ESP;             // 7fe0h\r
+  UINT32    _EBP;             // 7fe4h\r
+  UINT32    _ESI;             // 7fe8h\r
+  UINT32    _EDI;             // 7fech\r
+  UINT32    _EIP;             // 7ff0h\r
+  UINT32    _EFLAGS;          // 7ff4h\r
+  UINT32    _CR3;             // 7ff8h\r
+  UINT32    _CR0;             // 7ffch\r
 } QEMU_SMRAM_SAVE_STATE_MAP32;\r
 \r
 ///\r
 /// 64-bit SMRAM Save State Map\r
 ///\r
 typedef struct {\r
-  UINT8   Reserved0[0x200];  // 7c00h\r
-\r
-  UINT16  _ES;               // 7e00h\r
-  UINT16  _ESAccessRights;   // 7e02h\r
-  UINT32  _ESLimit;          // 7e04h\r
-  UINT64  _ESBase;           // 7e08h\r
-\r
-  UINT16  _CS;               // 7e10h\r
-  UINT16  _CSAccessRights;   // 7e12h\r
-  UINT32  _CSLimit;          // 7e14h\r
-  UINT64  _CSBase;           // 7e18h\r
-\r
-  UINT16  _SS;               // 7e20h\r
-  UINT16  _SSAccessRights;   // 7e22h\r
-  UINT32  _SSLimit;          // 7e24h\r
-  UINT64  _SSBase;           // 7e28h\r
-\r
-  UINT16  _DS;               // 7e30h\r
-  UINT16  _DSAccessRights;   // 7e32h\r
-  UINT32  _DSLimit;          // 7e34h\r
-  UINT64  _DSBase;           // 7e38h\r
-\r
-  UINT16  _FS;               // 7e40h\r
-  UINT16  _FSAccessRights;   // 7e42h\r
-  UINT32  _FSLimit;          // 7e44h\r
-  UINT64  _FSBase;           // 7e48h\r
-\r
-  UINT16  _GS;               // 7e50h\r
-  UINT16  _GSAccessRights;   // 7e52h\r
-  UINT32  _GSLimit;          // 7e54h\r
-  UINT64  _GSBase;           // 7e58h\r
-\r
-  UINT32  _GDTRReserved1;    // 7e60h\r
-  UINT16  _GDTRLimit;        // 7e64h\r
-  UINT16  _GDTRReserved2;    // 7e66h\r
-  UINT64  _GDTRBase;         // 7e68h\r
-\r
-  UINT16  _LDTR;             // 7e70h\r
-  UINT16  _LDTRAccessRights; // 7e72h\r
-  UINT32  _LDTRLimit;        // 7e74h\r
-  UINT64  _LDTRBase;         // 7e78h\r
-\r
-  UINT32  _IDTRReserved1;    // 7e80h\r
-  UINT16  _IDTRLimit;        // 7e84h\r
-  UINT16  _IDTRReserved2;    // 7e86h\r
-  UINT64  _IDTRBase;         // 7e88h\r
-\r
-  UINT16  _TR;               // 7e90h\r
-  UINT16  _TRAccessRights;   // 7e92h\r
-  UINT32  _TRLimit;          // 7e94h\r
-  UINT64  _TRBase;           // 7e98h\r
-\r
-  UINT64  IO_RIP;            // 7ea0h\r
-  UINT64  IO_RCX;            // 7ea8h\r
-  UINT64  IO_RSI;            // 7eb0h\r
-  UINT64  IO_RDI;            // 7eb8h\r
-  UINT32  IO_DWord;          // 7ec0h\r
-  UINT8   Reserved1[0x04];   // 7ec4h\r
-  UINT8   IORestart;         // 7ec8h\r
-  UINT8   AutoHALTRestart;   // 7ec9h\r
-  UINT8   Reserved2[0x06];   // 7ecah\r
-\r
-  UINT64  IA32_EFER;         // 7ed0h\r
-  UINT64  SVM_Guest;         // 7ed8h\r
-  UINT64  SVM_GuestVMCB;     // 7ee0h\r
-  UINT64  SVM_GuestVIntr;    // 7ee8h\r
-  UINT8   Reserved3[0x0c];   // 7ef0h\r
-\r
-  UINT32  SMMRevId;          // 7efch\r
-  UINT32  SMBASE;            // 7f00h\r
-\r
-  UINT8   Reserved4[0x1c];   // 7f04h\r
-  UINT64  SVM_GuestPAT;      // 7f20h\r
-  UINT64  SVM_HostIA32_EFER; // 7f28h\r
-  UINT64  SVM_HostCR4;       // 7f30h\r
-  UINT64  SVM_HostCR3;       // 7f38h\r
-  UINT64  SVM_HostCR0;       // 7f40h\r
-\r
-  UINT64  _CR4;              // 7f48h\r
-  UINT64  _CR3;              // 7f50h\r
-  UINT64  _CR0;              // 7f58h\r
-  UINT64  _DR7;              // 7f60h\r
-  UINT64  _DR6;              // 7f68h\r
-  UINT64  _RFLAGS;           // 7f70h\r
-  UINT64  _RIP;              // 7f78h\r
-  UINT64  _R15;              // 7f80h\r
-  UINT64  _R14;              // 7f88h\r
-  UINT64  _R13;              // 7f90h\r
-  UINT64  _R12;              // 7f98h\r
-  UINT64  _R11;              // 7fa0h\r
-  UINT64  _R10;              // 7fa8h\r
-  UINT64  _R9;               // 7fb0h\r
-  UINT64  _R8;               // 7fb8h\r
-  UINT64  _RDI;              // 7fc0h\r
-  UINT64  _RSI;              // 7fc8h\r
-  UINT64  _RBP;              // 7fd0h\r
-  UINT64  _RSP;              // 7fd8h\r
-  UINT64  _RBX;              // 7fe0h\r
-  UINT64  _RDX;              // 7fe8h\r
-  UINT64  _RCX;              // 7ff0h\r
-  UINT64  _RAX;              // 7ff8h\r
+  UINT8     Reserved0[0x200]; // 7c00h\r
+\r
+  UINT16    _ES;             // 7e00h\r
+  UINT16    _ESAccessRights; // 7e02h\r
+  UINT32    _ESLimit;        // 7e04h\r
+  UINT64    _ESBase;         // 7e08h\r
+\r
+  UINT16    _CS;             // 7e10h\r
+  UINT16    _CSAccessRights; // 7e12h\r
+  UINT32    _CSLimit;        // 7e14h\r
+  UINT64    _CSBase;         // 7e18h\r
+\r
+  UINT16    _SS;             // 7e20h\r
+  UINT16    _SSAccessRights; // 7e22h\r
+  UINT32    _SSLimit;        // 7e24h\r
+  UINT64    _SSBase;         // 7e28h\r
+\r
+  UINT16    _DS;             // 7e30h\r
+  UINT16    _DSAccessRights; // 7e32h\r
+  UINT32    _DSLimit;        // 7e34h\r
+  UINT64    _DSBase;         // 7e38h\r
+\r
+  UINT16    _FS;             // 7e40h\r
+  UINT16    _FSAccessRights; // 7e42h\r
+  UINT32    _FSLimit;        // 7e44h\r
+  UINT64    _FSBase;         // 7e48h\r
+\r
+  UINT16    _GS;             // 7e50h\r
+  UINT16    _GSAccessRights; // 7e52h\r
+  UINT32    _GSLimit;        // 7e54h\r
+  UINT64    _GSBase;         // 7e58h\r
+\r
+  UINT32    _GDTRReserved1;  // 7e60h\r
+  UINT16    _GDTRLimit;      // 7e64h\r
+  UINT16    _GDTRReserved2;  // 7e66h\r
+  UINT64    _GDTRBase;       // 7e68h\r
+\r
+  UINT16    _LDTR;             // 7e70h\r
+  UINT16    _LDTRAccessRights; // 7e72h\r
+  UINT32    _LDTRLimit;        // 7e74h\r
+  UINT64    _LDTRBase;         // 7e78h\r
+\r
+  UINT32    _IDTRReserved1;  // 7e80h\r
+  UINT16    _IDTRLimit;      // 7e84h\r
+  UINT16    _IDTRReserved2;  // 7e86h\r
+  UINT64    _IDTRBase;       // 7e88h\r
+\r
+  UINT16    _TR;             // 7e90h\r
+  UINT16    _TRAccessRights; // 7e92h\r
+  UINT32    _TRLimit;        // 7e94h\r
+  UINT64    _TRBase;         // 7e98h\r
+\r
+  UINT64    IO_RIP;          // 7ea0h\r
+  UINT64    IO_RCX;          // 7ea8h\r
+  UINT64    IO_RSI;          // 7eb0h\r
+  UINT64    IO_RDI;          // 7eb8h\r
+  UINT32    IO_DWord;        // 7ec0h\r
+  UINT8     Reserved1[0x04]; // 7ec4h\r
+  UINT8     IORestart;       // 7ec8h\r
+  UINT8     AutoHALTRestart; // 7ec9h\r
+  UINT8     Reserved2[0x06]; // 7ecah\r
+\r
+  UINT64    IA32_EFER;       // 7ed0h\r
+  UINT64    SVM_Guest;       // 7ed8h\r
+  UINT64    SVM_GuestVMCB;   // 7ee0h\r
+  UINT64    SVM_GuestVIntr;  // 7ee8h\r
+  UINT8     Reserved3[0x0c]; // 7ef0h\r
+\r
+  UINT32    SMMRevId;        // 7efch\r
+  UINT32    SMBASE;          // 7f00h\r
+\r
+  UINT8     Reserved4[0x1c];   // 7f04h\r
+  UINT64    SVM_GuestPAT;      // 7f20h\r
+  UINT64    SVM_HostIA32_EFER; // 7f28h\r
+  UINT64    SVM_HostCR4;       // 7f30h\r
+  UINT64    SVM_HostCR3;       // 7f38h\r
+  UINT64    SVM_HostCR0;       // 7f40h\r
+\r
+  UINT64    _CR4;            // 7f48h\r
+  UINT64    _CR3;            // 7f50h\r
+  UINT64    _CR0;            // 7f58h\r
+  UINT64    _DR7;            // 7f60h\r
+  UINT64    _DR6;            // 7f68h\r
+  UINT64    _RFLAGS;         // 7f70h\r
+  UINT64    _RIP;            // 7f78h\r
+  UINT64    _R15;            // 7f80h\r
+  UINT64    _R14;            // 7f88h\r
+  UINT64    _R13;            // 7f90h\r
+  UINT64    _R12;            // 7f98h\r
+  UINT64    _R11;            // 7fa0h\r
+  UINT64    _R10;            // 7fa8h\r
+  UINT64    _R9;             // 7fb0h\r
+  UINT64    _R8;             // 7fb8h\r
+  UINT64    _RDI;            // 7fc0h\r
+  UINT64    _RSI;            // 7fc8h\r
+  UINT64    _RBP;            // 7fd0h\r
+  UINT64    _RSP;            // 7fd8h\r
+  UINT64    _RBX;            // 7fe0h\r
+  UINT64    _RDX;            // 7fe8h\r
+  UINT64    _RCX;            // 7ff0h\r
+  UINT64    _RAX;            // 7ff8h\r
 } QEMU_SMRAM_SAVE_STATE_MAP64;\r
 \r
 ///\r
 /// Union of 32-bit and 64-bit SMRAM Save State Maps\r
 ///\r
 typedef union  {\r
-  QEMU_SMRAM_SAVE_STATE_MAP32  x86;\r
-  QEMU_SMRAM_SAVE_STATE_MAP64  x64;\r
+  QEMU_SMRAM_SAVE_STATE_MAP32    x86;\r
+  QEMU_SMRAM_SAVE_STATE_MAP64    x64;\r
 } QEMU_SMRAM_SAVE_STATE_MAP;\r
 \r
 #pragma pack ()\r
index 721d0f1a8d68cfc73c9549fd3d3c45761fea5d58..ce60d97aa8866d2825bafc878b928667fea45414 100644 (file)
@@ -17,7 +17,6 @@ typedef enum {
   GUEST_TYPE_NON_ENCRYPTED,\r
   GUEST_TYPE_AMD_SEV,\r
   GUEST_TYPE_INTEL_TDX,\r
-\r
 } GUEST_TYPE;\r
 \r
 //\r
@@ -31,8 +30,8 @@ typedef enum {
 //   OvmfPkg/OvmfPkg.dec\r
 //   OvmfPkg/OvmfPkgDefines.fdf.inc\r
 typedef struct _CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER {\r
-  UINT8                   GuestType;\r
-  UINT8                   Reserved1[3];\r
+  UINT8    GuestType;\r
+  UINT8    Reserved1[3];\r
 } CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER;\r
 \r
 //\r
@@ -47,26 +46,26 @@ typedef struct _CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER {
 // any changes must stay in sync with its usage.\r
 //\r
 typedef struct _SEC_SEV_ES_WORK_AREA {\r
-  UINT8    SevEsEnabled;\r
-  UINT8    Reserved1[7];\r
+  UINT8     SevEsEnabled;\r
+  UINT8     Reserved1[7];\r
 \r
-  UINT64   RandomData;\r
+  UINT64    RandomData;\r
 \r
-  UINT64   EncryptionMask;\r
+  UINT64    EncryptionMask;\r
 } SEC_SEV_ES_WORK_AREA;\r
 \r
 //\r
 // The SEV work area definition.\r
 //\r
 typedef struct _SEV_WORK_AREA {\r
-  CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER   Header;\r
+  CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER    Header;\r
 \r
-  SEC_SEV_ES_WORK_AREA                      SevEsWorkArea;\r
+  SEC_SEV_ES_WORK_AREA                       SevEsWorkArea;\r
 } SEV_WORK_AREA;\r
 \r
 typedef union {\r
-  CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER   Header;\r
-  SEV_WORK_AREA                             SevWorkArea;\r
+  CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER    Header;\r
+  SEV_WORK_AREA                              SevWorkArea;\r
 } OVMF_WORK_AREA;\r
 \r
 #endif\r
index db1532f10934b7dfb4f1018c024f88a0c0d2c010..8730874613f807753217c6db4fa10687489f74a9 100644 (file)
 //\r
 // The Legacy BIOS protocol has been located.\r
 //\r
-STATIC BOOLEAN mLegacyBiosInstalled;\r
+STATIC BOOLEAN  mLegacyBiosInstalled;\r
 \r
 //\r
 // The protocol interface this driver produces.\r
 //\r
 STATIC EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL\r
-                                                 mIncompatiblePciDeviceSupport;\r
+  mIncompatiblePciDeviceSupport;\r
 \r
 //\r
 // Configuration template for the CheckDevice() protocol member function.\r
@@ -42,24 +42,24 @@ STATIC EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR AddressSpaceDesc;\r
-  EFI_ACPI_END_TAG_DESCRIPTOR       EndDesc;\r
+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR    AddressSpaceDesc;\r
+  EFI_ACPI_END_TAG_DESCRIPTOR          EndDesc;\r
 } MMIO64_PREFERENCE;\r
 #pragma pack ()\r
 \r
-STATIC CONST MMIO64_PREFERENCE mConfiguration = {\r
+STATIC CONST MMIO64_PREFERENCE  mConfiguration = {\r
   //\r
   // AddressSpaceDesc\r
   //\r
   {\r
     ACPI_ADDRESS_SPACE_DESCRIPTOR,                 // Desc\r
     (UINT16)(                                      // Len\r
-      sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -\r
-      OFFSET_OF (\r
-        EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,\r
-        ResType\r
-        )\r
-      ),\r
+                                                   sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -\r
+                                                   OFFSET_OF (\r
+                                                     EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,\r
+                                                     ResType\r
+                                                     )\r
+                                                   ),\r
     ACPI_ADDRESS_SPACE_TYPE_MEM,                   // ResType\r
     0,                                             // GenFlag\r
     0,                                             // SpecificFlag\r
@@ -88,8 +88,7 @@ STATIC CONST MMIO64_PREFERENCE mConfiguration = {
 //\r
 // The CheckDevice() member function has been called.\r
 //\r
-STATIC BOOLEAN mCheckDeviceCalled;\r
-\r
+STATIC BOOLEAN  mCheckDeviceCalled;\r
 \r
 /**\r
   Notification callback for Legacy BIOS protocol installation.\r
@@ -103,17 +102,20 @@ STATIC
 VOID\r
 EFIAPI\r
 LegacyBiosInstalled (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  EFI_LEGACY_BIOS_PROTOCOL *LegacyBios;\r
+  EFI_STATUS                Status;\r
+  EFI_LEGACY_BIOS_PROTOCOL  *LegacyBios;\r
 \r
   ASSERT (!mCheckDeviceCalled);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid,\r
-                  NULL /* Registration */, (VOID **)&LegacyBios);\r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiLegacyBiosProtocolGuid,\r
+                  NULL /* Registration */,\r
+                  (VOID **)&LegacyBios\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return;\r
   }\r
@@ -127,7 +129,6 @@ LegacyBiosInstalled (
   ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
-\r
 /**\r
   Returns a list of ACPI resource descriptors that detail the special resource\r
   configuration requirements for an incompatible PCI device.\r
@@ -233,15 +234,20 @@ CheckDevice (
   //\r
   *Configuration = AllocateCopyPool (sizeof mConfiguration, &mConfiguration);\r
   if (*Configuration == NULL) {\r
-    DEBUG ((DEBUG_WARN,\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
       "%a: 64-bit MMIO BARs may be degraded for PCI 0x%04x:0x%04x (rev %d)\n",\r
-      __FUNCTION__, (UINT32)VendorId, (UINT32)DeviceId, (UINT8)RevisionId));\r
+      __FUNCTION__,\r
+      (UINT32)VendorId,\r
+      (UINT32)DeviceId,\r
+      (UINT8)RevisionId\r
+      ));\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Entry point for this driver.\r
 \r
@@ -257,13 +263,13 @@ CheckDevice (
 EFI_STATUS\r
 EFIAPI\r
 DriverInitialize (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  EFI_EVENT  Event;\r
-  VOID       *Registration;\r
+  EFI_STATUS  Status;\r
+  EFI_EVENT   Event;\r
+  VOID        *Registration;\r
 \r
   //\r
   // If there is no 64-bit PCI MMIO aperture, then 64-bit MMIO BARs have to be\r
@@ -307,14 +313,22 @@ DriverInitialize (
   // For breaking this order, the Legacy BIOS DXE_DRIVER would have to install\r
   // its protocol after the firmware enters BDS, which cannot happen.\r
   //\r
-  Status = gBS->CreateEvent (EVT_NOTIFY_SIGNAL, TPL_CALLBACK,\r
-                  LegacyBiosInstalled, NULL /* Context */, &Event);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  LegacyBiosInstalled,\r
+                  NULL /* Context */,\r
+                  &Event\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = gBS->RegisterProtocolNotify (&gEfiLegacyBiosProtocolGuid, Event,\r
-                  &Registration);\r
+  Status = gBS->RegisterProtocolNotify (\r
+                  &gEfiLegacyBiosProtocolGuid,\r
+                  Event,\r
+                  &Registration\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseEvent;\r
   }\r
@@ -323,9 +337,12 @@ DriverInitialize (
   ASSERT_EFI_ERROR (Status);\r
 \r
   mIncompatiblePciDeviceSupport.CheckDevice = CheckDevice;\r
-  Status = gBS->InstallMultipleProtocolInterfaces (&ImageHandle,\r
-                  &gEfiIncompatiblePciDeviceSupportProtocolGuid,\r
-                  &mIncompatiblePciDeviceSupport, NULL);\r
+  Status                                    = gBS->InstallMultipleProtocolInterfaces (\r
+                                                     &ImageHandle,\r
+                                                     &gEfiIncompatiblePciDeviceSupportProtocolGuid,\r
+                                                     &mIncompatiblePciDeviceSupport,\r
+                                                     NULL\r
+                                                     );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseEvent;\r
   }\r
@@ -334,7 +351,7 @@ DriverInitialize (
 \r
 CloseEvent:\r
   if (!mLegacyBiosInstalled) {\r
-    EFI_STATUS CloseStatus;\r
+    EFI_STATUS  CloseStatus;\r
 \r
     CloseStatus = gBS->CloseEvent (Event);\r
     ASSERT_EFI_ERROR (CloseStatus);\r
index b30628078f734238510e1f4646bc2f967e5d9b08..16b5b4eac8bc30b1a687b1c1ac00b5c9a42ddabe 100644 (file)
 \r
 #include "AmdSevIoMmu.h"\r
 \r
-#define MAP_INFO_SIG SIGNATURE_64 ('M', 'A', 'P', '_', 'I', 'N', 'F', 'O')\r
+#define MAP_INFO_SIG  SIGNATURE_64 ('M', 'A', 'P', '_', 'I', 'N', 'F', 'O')\r
 \r
 typedef struct {\r
-  UINT64                                    Signature;\r
-  LIST_ENTRY                                Link;\r
-  EDKII_IOMMU_OPERATION                     Operation;\r
-  UINTN                                     NumberOfBytes;\r
-  UINTN                                     NumberOfPages;\r
-  EFI_PHYSICAL_ADDRESS                      CryptedAddress;\r
-  EFI_PHYSICAL_ADDRESS                      PlainTextAddress;\r
+  UINT64                   Signature;\r
+  LIST_ENTRY               Link;\r
+  EDKII_IOMMU_OPERATION    Operation;\r
+  UINTN                    NumberOfBytes;\r
+  UINTN                    NumberOfPages;\r
+  EFI_PHYSICAL_ADDRESS     CryptedAddress;\r
+  EFI_PHYSICAL_ADDRESS     PlainTextAddress;\r
 } MAP_INFO;\r
 \r
 //\r
@@ -31,14 +31,14 @@ typedef struct {
 // yet torn down by IoMmuUnmap(). The list represents the full set of mappings\r
 // currently in effect.\r
 //\r
-STATIC LIST_ENTRY mMapInfos = INITIALIZE_LIST_HEAD_VARIABLE (mMapInfos);\r
+STATIC LIST_ENTRY  mMapInfos = INITIALIZE_LIST_HEAD_VARIABLE (mMapInfos);\r
 \r
-#define COMMON_BUFFER_SIG SIGNATURE_64 ('C', 'M', 'N', 'B', 'U', 'F', 'F', 'R')\r
+#define COMMON_BUFFER_SIG  SIGNATURE_64 ('C', 'M', 'N', 'B', 'U', 'F', 'F', 'R')\r
 \r
 //\r
 // ASCII names for EDKII_IOMMU_OPERATION constants, for debug logging.\r
 //\r
-STATIC CONST CHAR8 * CONST\r
+STATIC CONST CHAR8 *CONST\r
 mBusMasterOperationName[EdkiiIoMmuOperationMaximum] = {\r
   "Read",\r
   "Write",\r
@@ -58,13 +58,13 @@ mBusMasterOperationName[EdkiiIoMmuOperationMaximum] = {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT64 Signature;\r
+  UINT64    Signature;\r
 \r
   //\r
   // Always allocated from EfiBootServicesData type memory, and always\r
   // encrypted.\r
   //\r
-  VOID *StashBuffer;\r
+  VOID      *StashBuffer;\r
 \r
   //\r
   // Followed by the actual common buffer, starting at the next page.\r
@@ -105,19 +105,19 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 IoMmuMap (\r
-  IN     EDKII_IOMMU_PROTOCOL                       *This,\r
-  IN     EDKII_IOMMU_OPERATION                      Operation,\r
-  IN     VOID                                       *HostAddress,\r
-  IN OUT UINTN                                      *NumberOfBytes,\r
-  OUT    EFI_PHYSICAL_ADDRESS                       *DeviceAddress,\r
-  OUT    VOID                                       **Mapping\r
+  IN     EDKII_IOMMU_PROTOCOL   *This,\r
+  IN     EDKII_IOMMU_OPERATION  Operation,\r
+  IN     VOID                   *HostAddress,\r
+  IN OUT UINTN                  *NumberOfBytes,\r
+  OUT    EFI_PHYSICAL_ADDRESS   *DeviceAddress,\r
+  OUT    VOID                   **Mapping\r
   )\r
 {\r
-  EFI_STATUS                                        Status;\r
-  MAP_INFO                                          *MapInfo;\r
-  EFI_ALLOCATE_TYPE                                 AllocateType;\r
-  COMMON_BUFFER_HEADER                              *CommonBufferHeader;\r
-  VOID                                              *DecryptionSource;\r
+  EFI_STATUS            Status;\r
+  MAP_INFO              *MapInfo;\r
+  EFI_ALLOCATE_TYPE     AllocateType;\r
+  COMMON_BUFFER_HEADER  *CommonBufferHeader;\r
+  VOID                  *DecryptionSource;\r
 \r
   DEBUG ((\r
     DEBUG_VERBOSE,\r
@@ -131,8 +131,9 @@ IoMmuMap (
     (UINT64)((NumberOfBytes == NULL) ? 0 : *NumberOfBytes)\r
     ));\r
 \r
-  if (HostAddress == NULL || NumberOfBytes == NULL || DeviceAddress == NULL ||\r
-      Mapping == NULL) {\r
+  if ((HostAddress == NULL) || (NumberOfBytes == NULL) || (DeviceAddress == NULL) ||\r
+      (Mapping == NULL))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -150,100 +151,103 @@ IoMmuMap (
   // Initialize the MAP_INFO structure, except the PlainTextAddress field\r
   //\r
   ZeroMem (&MapInfo->Link, sizeof MapInfo->Link);\r
-  MapInfo->Signature         = MAP_INFO_SIG;\r
-  MapInfo->Operation         = Operation;\r
-  MapInfo->NumberOfBytes     = *NumberOfBytes;\r
-  MapInfo->NumberOfPages     = EFI_SIZE_TO_PAGES (MapInfo->NumberOfBytes);\r
-  MapInfo->CryptedAddress    = (UINTN)HostAddress;\r
+  MapInfo->Signature      = MAP_INFO_SIG;\r
+  MapInfo->Operation      = Operation;\r
+  MapInfo->NumberOfBytes  = *NumberOfBytes;\r
+  MapInfo->NumberOfPages  = EFI_SIZE_TO_PAGES (MapInfo->NumberOfBytes);\r
+  MapInfo->CryptedAddress = (UINTN)HostAddress;\r
 \r
   //\r
   // In the switch statement below, we point "MapInfo->PlainTextAddress" to the\r
   // plaintext buffer, according to Operation. We also set "DecryptionSource".\r
   //\r
   MapInfo->PlainTextAddress = MAX_ADDRESS;\r
-  AllocateType = AllocateAnyPages;\r
-  DecryptionSource = (VOID *)(UINTN)MapInfo->CryptedAddress;\r
+  AllocateType              = AllocateAnyPages;\r
+  DecryptionSource          = (VOID *)(UINTN)MapInfo->CryptedAddress;\r
   switch (Operation) {\r
-  //\r
-  // For BusMasterRead[64] and BusMasterWrite[64] operations, a bounce buffer\r
-  // is necessary regardless of whether the original (crypted) buffer crosses\r
-  // the 4GB limit or not -- we have to allocate a separate plaintext buffer.\r
-  // The only variable is whether the plaintext buffer should be under 4GB.\r
-  //\r
-  case EdkiiIoMmuOperationBusMasterRead:\r
-  case EdkiiIoMmuOperationBusMasterWrite:\r
-    MapInfo->PlainTextAddress = BASE_4GB - 1;\r
-    AllocateType = AllocateMaxAddress;\r
     //\r
-    // fall through\r
+    // For BusMasterRead[64] and BusMasterWrite[64] operations, a bounce buffer\r
+    // is necessary regardless of whether the original (crypted) buffer crosses\r
+    // the 4GB limit or not -- we have to allocate a separate plaintext buffer.\r
+    // The only variable is whether the plaintext buffer should be under 4GB.\r
     //\r
-  case EdkiiIoMmuOperationBusMasterRead64:\r
-  case EdkiiIoMmuOperationBusMasterWrite64:\r
+    case EdkiiIoMmuOperationBusMasterRead:\r
+    case EdkiiIoMmuOperationBusMasterWrite:\r
+      MapInfo->PlainTextAddress = BASE_4GB - 1;\r
+      AllocateType              = AllocateMaxAddress;\r
     //\r
-    // Allocate the implicit plaintext bounce buffer.\r
+    // fall through\r
     //\r
-    Status = gBS->AllocatePages (\r
-                    AllocateType,\r
-                    EfiBootServicesData,\r
-                    MapInfo->NumberOfPages,\r
-                    &MapInfo->PlainTextAddress\r
-                    );\r
-    if (EFI_ERROR (Status)) {\r
-      goto FreeMapInfo;\r
-    }\r
-    break;\r
-\r
-  //\r
-  // For BusMasterCommonBuffer[64] operations, a to-be-plaintext buffer and a\r
-  // stash buffer (for in-place decryption) have been allocated already, with\r
-  // AllocateBuffer(). We only check whether the address of the to-be-plaintext\r
-  // buffer is low enough for the requested operation.\r
-  //\r
-  case EdkiiIoMmuOperationBusMasterCommonBuffer:\r
-    if ((MapInfo->CryptedAddress > BASE_4GB) ||\r
-        (EFI_PAGES_TO_SIZE (MapInfo->NumberOfPages) >\r
-         BASE_4GB - MapInfo->CryptedAddress)) {\r
+    case EdkiiIoMmuOperationBusMasterRead64:\r
+    case EdkiiIoMmuOperationBusMasterWrite64:\r
       //\r
-      // CommonBuffer operations cannot be remapped. If the common buffer is\r
-      // above 4GB, then it is not possible to generate a mapping, so return an\r
-      // error.\r
+      // Allocate the implicit plaintext bounce buffer.\r
       //\r
-      Status = EFI_UNSUPPORTED;\r
-      goto FreeMapInfo;\r
-    }\r
-    //\r
-    // fall through\r
-    //\r
-  case EdkiiIoMmuOperationBusMasterCommonBuffer64:\r
-    //\r
-    // The buffer at MapInfo->CryptedAddress comes from AllocateBuffer().\r
-    //\r
-    MapInfo->PlainTextAddress = MapInfo->CryptedAddress;\r
-    //\r
-    // Stash the crypted data.\r
-    //\r
-    CommonBufferHeader = (COMMON_BUFFER_HEADER *)(\r
-                           (UINTN)MapInfo->CryptedAddress - EFI_PAGE_SIZE\r
-                           );\r
-    ASSERT (CommonBufferHeader->Signature == COMMON_BUFFER_SIG);\r
-    CopyMem (\r
-      CommonBufferHeader->StashBuffer,\r
-      (VOID *)(UINTN)MapInfo->CryptedAddress,\r
-      MapInfo->NumberOfBytes\r
-      );\r
+      Status = gBS->AllocatePages (\r
+                      AllocateType,\r
+                      EfiBootServicesData,\r
+                      MapInfo->NumberOfPages,\r
+                      &MapInfo->PlainTextAddress\r
+                      );\r
+      if (EFI_ERROR (Status)) {\r
+        goto FreeMapInfo;\r
+      }\r
+\r
+      break;\r
+\r
     //\r
-    // Point "DecryptionSource" to the stash buffer so that we decrypt\r
-    // it to the original location, after the switch statement.\r
+    // For BusMasterCommonBuffer[64] operations, a to-be-plaintext buffer and a\r
+    // stash buffer (for in-place decryption) have been allocated already, with\r
+    // AllocateBuffer(). We only check whether the address of the to-be-plaintext\r
+    // buffer is low enough for the requested operation.\r
     //\r
-    DecryptionSource = CommonBufferHeader->StashBuffer;\r
-    break;\r
+    case EdkiiIoMmuOperationBusMasterCommonBuffer:\r
+      if ((MapInfo->CryptedAddress > BASE_4GB) ||\r
+          (EFI_PAGES_TO_SIZE (MapInfo->NumberOfPages) >\r
+           BASE_4GB - MapInfo->CryptedAddress))\r
+      {\r
+        //\r
+        // CommonBuffer operations cannot be remapped. If the common buffer is\r
+        // above 4GB, then it is not possible to generate a mapping, so return an\r
+        // error.\r
+        //\r
+        Status = EFI_UNSUPPORTED;\r
+        goto FreeMapInfo;\r
+      }\r
 \r
-  default:\r
     //\r
-    // Operation is invalid\r
+    // fall through\r
     //\r
-    Status = EFI_INVALID_PARAMETER;\r
-    goto FreeMapInfo;\r
+    case EdkiiIoMmuOperationBusMasterCommonBuffer64:\r
+      //\r
+      // The buffer at MapInfo->CryptedAddress comes from AllocateBuffer().\r
+      //\r
+      MapInfo->PlainTextAddress = MapInfo->CryptedAddress;\r
+      //\r
+      // Stash the crypted data.\r
+      //\r
+      CommonBufferHeader = (COMMON_BUFFER_HEADER *)(\r
+                                                    (UINTN)MapInfo->CryptedAddress - EFI_PAGE_SIZE\r
+                                                    );\r
+      ASSERT (CommonBufferHeader->Signature == COMMON_BUFFER_SIG);\r
+      CopyMem (\r
+        CommonBufferHeader->StashBuffer,\r
+        (VOID *)(UINTN)MapInfo->CryptedAddress,\r
+        MapInfo->NumberOfBytes\r
+        );\r
+      //\r
+      // Point "DecryptionSource" to the stash buffer so that we decrypt\r
+      // it to the original location, after the switch statement.\r
+      //\r
+      DecryptionSource = CommonBufferHeader->StashBuffer;\r
+      break;\r
+\r
+    default:\r
+      //\r
+      // Operation is invalid\r
+      //\r
+      Status = EFI_INVALID_PARAMETER;\r
+      goto FreeMapInfo;\r
   }\r
 \r
   //\r
@@ -267,12 +271,13 @@ IoMmuMap (
   // For BusMasterCommonBuffer[64] operations, the CopyMem() below will decrypt\r
   // the original data (from the stash buffer) back to the original location.\r
   //\r
-  if (Operation == EdkiiIoMmuOperationBusMasterRead ||\r
-      Operation == EdkiiIoMmuOperationBusMasterRead64 ||\r
-      Operation == EdkiiIoMmuOperationBusMasterCommonBuffer ||\r
-      Operation == EdkiiIoMmuOperationBusMasterCommonBuffer64) {\r
+  if ((Operation == EdkiiIoMmuOperationBusMasterRead) ||\r
+      (Operation == EdkiiIoMmuOperationBusMasterRead64) ||\r
+      (Operation == EdkiiIoMmuOperationBusMasterCommonBuffer) ||\r
+      (Operation == EdkiiIoMmuOperationBusMasterCommonBuffer64))\r
+  {\r
     CopyMem (\r
-      (VOID *) (UINTN) MapInfo->PlainTextAddress,\r
+      (VOID *)(UINTN)MapInfo->PlainTextAddress,\r
       DecryptionSource,\r
       MapInfo->NumberOfBytes\r
       );\r
@@ -330,15 +335,15 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 IoMmuUnmapWorker (\r
-  IN  EDKII_IOMMU_PROTOCOL                     *This,\r
-  IN  VOID                                     *Mapping,\r
-  IN  BOOLEAN                                  MemoryMapLocked\r
+  IN  EDKII_IOMMU_PROTOCOL  *This,\r
+  IN  VOID                  *Mapping,\r
+  IN  BOOLEAN               MemoryMapLocked\r
   )\r
 {\r
-  MAP_INFO                 *MapInfo;\r
-  EFI_STATUS               Status;\r
-  COMMON_BUFFER_HEADER     *CommonBufferHeader;\r
-  VOID                     *EncryptionTarget;\r
+  MAP_INFO              *MapInfo;\r
+  EFI_STATUS            Status;\r
+  COMMON_BUFFER_HEADER  *CommonBufferHeader;\r
+  VOID                  *EncryptionTarget;\r
 \r
   DEBUG ((\r
     DEBUG_VERBOSE,\r
@@ -370,33 +375,33 @@ IoMmuUnmapWorker (
   EncryptionTarget = (VOID *)(UINTN)MapInfo->CryptedAddress;\r
 \r
   switch (MapInfo->Operation) {\r
-  case EdkiiIoMmuOperationBusMasterCommonBuffer:\r
-  case EdkiiIoMmuOperationBusMasterCommonBuffer64:\r
-    ASSERT (MapInfo->PlainTextAddress == MapInfo->CryptedAddress);\r
-\r
-    CommonBufferHeader = (COMMON_BUFFER_HEADER *)(\r
-                           (UINTN)MapInfo->PlainTextAddress - EFI_PAGE_SIZE\r
-                           );\r
-    ASSERT (CommonBufferHeader->Signature == COMMON_BUFFER_SIG);\r
-    EncryptionTarget = CommonBufferHeader->StashBuffer;\r
+    case EdkiiIoMmuOperationBusMasterCommonBuffer:\r
+    case EdkiiIoMmuOperationBusMasterCommonBuffer64:\r
+      ASSERT (MapInfo->PlainTextAddress == MapInfo->CryptedAddress);\r
+\r
+      CommonBufferHeader = (COMMON_BUFFER_HEADER *)(\r
+                                                    (UINTN)MapInfo->PlainTextAddress - EFI_PAGE_SIZE\r
+                                                    );\r
+      ASSERT (CommonBufferHeader->Signature == COMMON_BUFFER_SIG);\r
+      EncryptionTarget = CommonBufferHeader->StashBuffer;\r
     //\r
     // fall through\r
     //\r
 \r
-  case EdkiiIoMmuOperationBusMasterWrite:\r
-  case EdkiiIoMmuOperationBusMasterWrite64:\r
-    CopyMem (\r
-      EncryptionTarget,\r
-      (VOID *) (UINTN) MapInfo->PlainTextAddress,\r
-      MapInfo->NumberOfBytes\r
-      );\r
-    break;\r
+    case EdkiiIoMmuOperationBusMasterWrite:\r
+    case EdkiiIoMmuOperationBusMasterWrite64:\r
+      CopyMem (\r
+        EncryptionTarget,\r
+        (VOID *)(UINTN)MapInfo->PlainTextAddress,\r
+        MapInfo->NumberOfBytes\r
+        );\r
+      break;\r
 \r
-  default:\r
-    //\r
-    // nothing to encrypt after BusMasterRead[64] operations\r
-    //\r
-    break;\r
+    default:\r
+      //\r
+      // nothing to encrypt after BusMasterRead[64] operations\r
+      //\r
+      break;\r
   }\r
 \r
   //\r
@@ -421,8 +426,9 @@ IoMmuUnmapWorker (
   // plaintext at some point) with zeros, and then release it (unless the UEFI\r
   // memory map is locked).\r
   //\r
-  if (MapInfo->Operation == EdkiiIoMmuOperationBusMasterCommonBuffer ||\r
-      MapInfo->Operation == EdkiiIoMmuOperationBusMasterCommonBuffer64) {\r
+  if ((MapInfo->Operation == EdkiiIoMmuOperationBusMasterCommonBuffer) ||\r
+      (MapInfo->Operation == EdkiiIoMmuOperationBusMasterCommonBuffer64))\r
+  {\r
     CopyMem (\r
       (VOID *)(UINTN)MapInfo->CryptedAddress,\r
       CommonBufferHeader->StashBuffer,\r
@@ -465,8 +471,8 @@ IoMmuUnmapWorker (
 EFI_STATUS\r
 EFIAPI\r
 IoMmuUnmap (\r
-  IN  EDKII_IOMMU_PROTOCOL                     *This,\r
-  IN  VOID                                     *Mapping\r
+  IN  EDKII_IOMMU_PROTOCOL  *This,\r
+  IN  VOID                  *Mapping\r
   )\r
 {\r
   return IoMmuUnmapWorker (\r
@@ -501,19 +507,19 @@ IoMmuUnmap (
 EFI_STATUS\r
 EFIAPI\r
 IoMmuAllocateBuffer (\r
-  IN     EDKII_IOMMU_PROTOCOL                     *This,\r
-  IN     EFI_ALLOCATE_TYPE                        Type,\r
-  IN     EFI_MEMORY_TYPE                          MemoryType,\r
-  IN     UINTN                                    Pages,\r
-  IN OUT VOID                                     **HostAddress,\r
-  IN     UINT64                                   Attributes\r
+  IN     EDKII_IOMMU_PROTOCOL  *This,\r
+  IN     EFI_ALLOCATE_TYPE     Type,\r
+  IN     EFI_MEMORY_TYPE       MemoryType,\r
+  IN     UINTN                 Pages,\r
+  IN OUT VOID                  **HostAddress,\r
+  IN     UINT64                Attributes\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_PHYSICAL_ADDRESS      PhysicalAddress;\r
-  VOID                      *StashBuffer;\r
-  UINTN                     CommonBufferPages;\r
-  COMMON_BUFFER_HEADER      *CommonBufferHeader;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  PhysicalAddress;\r
+  VOID                  *StashBuffer;\r
+  UINTN                 CommonBufferPages;\r
+  COMMON_BUFFER_HEADER  *CommonBufferHeader;\r
 \r
   DEBUG ((\r
     DEBUG_VERBOSE,\r
@@ -542,8 +548,9 @@ IoMmuAllocateBuffer (
   // The only valid memory types are EfiBootServicesData and\r
   // EfiRuntimeServicesData\r
   //\r
-  if (MemoryType != EfiBootServicesData &&\r
-      MemoryType != EfiRuntimeServicesData) {\r
+  if ((MemoryType != EfiBootServicesData) &&\r
+      (MemoryType != EfiRuntimeServicesData))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -553,6 +560,7 @@ IoMmuAllocateBuffer (
   if (Pages > MAX_UINTN - 1) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   CommonBufferPages = Pages + 1;\r
 \r
   //\r
@@ -580,6 +588,7 @@ IoMmuAllocateBuffer (
     //\r
     PhysicalAddress = SIZE_4GB - 1;\r
   }\r
+\r
   Status = gBS->AllocatePages (\r
                   AllocateMaxAddress,\r
                   MemoryType,\r
@@ -591,9 +600,9 @@ IoMmuAllocateBuffer (
   }\r
 \r
   CommonBufferHeader = (VOID *)(UINTN)PhysicalAddress;\r
-  PhysicalAddress += EFI_PAGE_SIZE;\r
+  PhysicalAddress   += EFI_PAGE_SIZE;\r
 \r
-  CommonBufferHeader->Signature = COMMON_BUFFER_SIG;\r
+  CommonBufferHeader->Signature   = COMMON_BUFFER_SIG;\r
   CommonBufferHeader->StashBuffer = StashBuffer;\r
 \r
   *HostAddress = (VOID *)(UINTN)PhysicalAddress;\r
@@ -628,13 +637,13 @@ FreeStashBuffer:
 EFI_STATUS\r
 EFIAPI\r
 IoMmuFreeBuffer (\r
-  IN  EDKII_IOMMU_PROTOCOL                     *This,\r
-  IN  UINTN                                    Pages,\r
-  IN  VOID                                     *HostAddress\r
+  IN  EDKII_IOMMU_PROTOCOL  *This,\r
+  IN  UINTN                 Pages,\r
+  IN  VOID                  *HostAddress\r
   )\r
 {\r
-  UINTN                CommonBufferPages;\r
-  COMMON_BUFFER_HEADER *CommonBufferHeader;\r
+  UINTN                 CommonBufferPages;\r
+  COMMON_BUFFER_HEADER  *CommonBufferHeader;\r
 \r
   DEBUG ((\r
     DEBUG_VERBOSE,\r
@@ -644,10 +653,10 @@ IoMmuFreeBuffer (
     (UINT64)Pages\r
     ));\r
 \r
-  CommonBufferPages = Pages + 1;\r
+  CommonBufferPages  = Pages + 1;\r
   CommonBufferHeader = (COMMON_BUFFER_HEADER *)(\r
-                         (UINTN)HostAddress - EFI_PAGE_SIZE\r
-                         );\r
+                                                (UINTN)HostAddress - EFI_PAGE_SIZE\r
+                                                );\r
 \r
   //\r
   // Check the signature.\r
@@ -670,7 +679,6 @@ IoMmuFreeBuffer (
   return gBS->FreePages ((UINTN)CommonBufferHeader, CommonBufferPages);\r
 }\r
 \r
-\r
 /**\r
   Set IOMMU attribute for a system memory.\r
 \r
@@ -764,8 +772,8 @@ STATIC
 VOID\r
 EFIAPI\r
 AmdSevExitBoot (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *EventToSignal\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *EventToSignal\r
   )\r
 {\r
   //\r
@@ -816,13 +824,13 @@ STATIC
 VOID\r
 EFIAPI\r
 AmdSevUnmapAllMappings (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  LIST_ENTRY *Node;\r
-  LIST_ENTRY *NextNode;\r
-  MAP_INFO   *MapInfo;\r
+  LIST_ENTRY  *Node;\r
+  LIST_ENTRY  *NextNode;\r
+  MAP_INFO    *MapInfo;\r
 \r
   DEBUG ((DEBUG_VERBOSE, "%a\n", __FUNCTION__));\r
 \r
@@ -832,7 +840,7 @@ AmdSevUnmapAllMappings (
   //\r
   for (Node = GetFirstNode (&mMapInfos); Node != &mMapInfos; Node = NextNode) {\r
     NextNode = GetNextNode (&mMapInfos, Node);\r
-    MapInfo = CR (Node, MAP_INFO, Link, MAP_INFO_SIG);\r
+    MapInfo  = CR (Node, MAP_INFO, Link, MAP_INFO_SIG);\r
     IoMmuUnmapWorker (\r
       &mAmdSev, // This\r
       MapInfo,  // Mapping\r
@@ -889,7 +897,8 @@ AmdSevInstallIoMmuProtocol (
   Handle = NULL;\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Handle,\r
-                  &gEdkiiIoMmuProtocolGuid, &mAmdSev,\r
+                  &gEdkiiIoMmuProtocolGuid,\r
+                  &mAmdSev,\r
                   NULL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
index 13df8ba874c53151515163b957e5afd47277a9aa..bca8c14c4076a527d9ca06f59ed27e8e490af4f4 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 IoMmuDxeEntryPoint (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  EFI_HANDLE    Handle;\r
+  EFI_STATUS  Status;\r
+  EFI_HANDLE  Handle;\r
 \r
   //\r
   // When SEV is enabled, install IoMmu protocol otherwise install the\r
@@ -31,9 +31,11 @@ IoMmuDxeEntryPoint (
     Handle = NULL;\r
 \r
     Status = gBS->InstallMultipleProtocolInterfaces (\r
-                  &Handle,\r
-                  &gIoMmuAbsentProtocolGuid,\r
-                  NULL, NULL);\r
+                    &Handle,\r
+                    &gIoMmuAbsentProtocolGuid,\r
+                    NULL,\r
+                    NULL\r
+                    );\r
   }\r
 \r
   return Status;\r
index 3d73111ced9a1e3b74138ce4fc1428356248746a..13c6dcac1f4f4f4aa369aec4584aea9228549144 100644 (file)
 **/\r
 VOID\r
 InternalAcpiDelay (\r
-  IN      UINT32                    Delay\r
+  IN      UINT32  Delay\r
   )\r
 {\r
-  UINT32                            Ticks;\r
-  UINT32                            Times;\r
+  UINT32  Ticks;\r
+  UINT32  Times;\r
 \r
-  Times    = Delay >> 22;\r
-  Delay   &= BIT22 - 1;\r
+  Times  = Delay >> 22;\r
+  Delay &= BIT22 - 1;\r
   do {\r
     //\r
     // The target timer count is calculated here\r
     //\r
-    Ticks    = InternalAcpiGetTimerTick () + Delay;\r
-    Delay    = BIT22;\r
+    Ticks = InternalAcpiGetTimerTick () + Delay;\r
+    Delay = BIT22;\r
     //\r
     // Wait until time out\r
     // Delay >= 2^23 could not be handled by this function\r
@@ -68,7 +68,7 @@ InternalAcpiDelay (
 UINTN\r
 EFIAPI\r
 MicroSecondDelay (\r
-  IN      UINTN                     MicroSeconds\r
+  IN      UINTN  MicroSeconds\r
   )\r
 {\r
   InternalAcpiDelay (\r
@@ -96,7 +96,7 @@ MicroSecondDelay (
 UINTN\r
 EFIAPI\r
 NanoSecondDelay (\r
-  IN      UINTN                     NanoSeconds\r
+  IN      UINTN  NanoSeconds\r
   )\r
 {\r
   InternalAcpiDelay (\r
@@ -158,8 +158,8 @@ GetPerformanceCounter (
 UINT64\r
 EFIAPI\r
 GetPerformanceCounterProperties (\r
-  OUT      UINT64                    *StartValue   OPTIONAL,\r
-  OUT      UINT64                    *EndValue     OPTIONAL\r
+  OUT      UINT64  *StartValue   OPTIONAL,\r
+  OUT      UINT64  *EndValue     OPTIONAL\r
   )\r
 {\r
   if (StartValue != NULL) {\r
@@ -187,7 +187,7 @@ GetPerformanceCounterProperties (
 UINT64\r
 EFIAPI\r
 GetTimeInNanoSecond (\r
-  IN      UINT64                     Ticks\r
+  IN      UINT64  Ticks\r
   )\r
 {\r
   UINT64  NanoSeconds;\r
@@ -204,7 +204,7 @@ GetTimeInNanoSecond (
   // Frequency < 0x100000000, so Remainder < 0x100000000, then (Remainder * 1,000,000,000)\r
   // will not overflow 64-bit.\r
   //\r
-  NanoSeconds += DivU64x32 (MultU64x32 ((UINT64) Remainder, 1000000000u), ACPI_TIMER_FREQUENCY);\r
+  NanoSeconds += DivU64x32 (MultU64x32 ((UINT64)Remainder, 1000000000u), ACPI_TIMER_FREQUENCY);\r
 \r
   return NanoSeconds;\r
 }\r
index 7c593e8be156b9cbe63c50154155b68023f06f15..1d33c863134c62d878307beb6688daea218dd832 100644 (file)
@@ -14,7 +14,7 @@
 //\r
 // Cached ACPI Timer IO Address\r
 //\r
-STATIC UINT32 mAcpiTimerIoAddr;\r
+STATIC UINT32  mAcpiTimerIoAddr;\r
 \r
 /**\r
   The constructor function caches the ACPI tick counter address, and,\r
@@ -29,12 +29,12 @@ AcpiTimerLibConstructor (
   VOID\r
   )\r
 {\r
-  UINT16 HostBridgeDevId;\r
-  UINTN Pmba;\r
-  UINT32 PmbaAndVal;\r
-  UINT32 PmbaOrVal;\r
-  UINTN AcpiCtlReg;\r
-  UINT8 AcpiEnBit;\r
+  UINT16  HostBridgeDevId;\r
+  UINTN   Pmba;\r
+  UINT32  PmbaAndVal;\r
+  UINT32  PmbaOrVal;\r
+  UINTN   AcpiCtlReg;\r
+  UINT8   AcpiEnBit;\r
 \r
   //\r
   // Query Host Bridge DID to determine platform type\r
@@ -56,8 +56,12 @@ AcpiTimerLibConstructor (
       AcpiEnBit  = ICH9_ACPI_CNTL_ACPI_EN;\r
       break;\r
     default:\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, HostBridgeDevId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        HostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return RETURN_UNSUPPORTED;\r
   }\r
index 52f3ea2dbf16c72d6c853493e9206c21a2459392..54a288d52ff5d33c9c3506a358403c48d5b8b103 100644 (file)
@@ -27,12 +27,12 @@ AcpiTimerLibConstructor (
   VOID\r
   )\r
 {\r
-  UINT16 HostBridgeDevId;\r
-  UINTN Pmba;\r
-  UINT32 PmbaAndVal;\r
-  UINT32 PmbaOrVal;\r
-  UINTN AcpiCtlReg;\r
-  UINT8 AcpiEnBit;\r
+  UINT16  HostBridgeDevId;\r
+  UINTN   Pmba;\r
+  UINT32  PmbaAndVal;\r
+  UINT32  PmbaOrVal;\r
+  UINTN   AcpiCtlReg;\r
+  UINT8   AcpiEnBit;\r
 \r
   //\r
   // Query Host Bridge DID to determine platform type\r
@@ -54,8 +54,12 @@ AcpiTimerLibConstructor (
       AcpiEnBit  = ICH9_ACPI_CNTL_ACPI_EN;\r
       break;\r
     default:\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, HostBridgeDevId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        HostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return RETURN_UNSUPPORTED;\r
   }\r
@@ -93,8 +97,8 @@ InternalAcpiGetTimerTick (
   VOID\r
   )\r
 {\r
-  UINT16 HostBridgeDevId;\r
-  UINTN Pmba;\r
+  UINT16  HostBridgeDevId;\r
+  UINTN   Pmba;\r
 \r
   //\r
   // Query Host Bridge DID to determine platform type\r
@@ -108,8 +112,12 @@ InternalAcpiGetTimerTick (
       Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);\r
       break;\r
     default:\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, HostBridgeDevId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        HostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return 0;\r
   }\r
index 09076c0adebf45fec2ea3a9a89367c94f7845b79..01f28b29160acb0504308dd75f422614a33b7cd1 100644 (file)
@@ -15,7 +15,7 @@
 //\r
 // Cached ACPI Timer IO Address\r
 //\r
-STATIC UINT32 mAcpiTimerIoAddr;\r
+STATIC UINT32  mAcpiTimerIoAddr;\r
 \r
 /**\r
   The constructor function caches the ACPI tick counter address\r
@@ -36,8 +36,8 @@ AcpiTimerLibConstructor (
   VOID\r
   )\r
 {\r
-  UINT16 HostBridgeDevId;\r
-  UINTN Pmba;\r
+  UINT16  HostBridgeDevId;\r
+  UINTN   Pmba;\r
 \r
   //\r
   // Query Host Bridge DID to determine platform type\r
@@ -51,8 +51,12 @@ AcpiTimerLibConstructor (
       Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);\r
       break;\r
     default:\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, HostBridgeDevId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        HostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return RETURN_UNSUPPORTED;\r
   }\r
index 2816f859a0c46f2a4147e9a1a101b7356899e93a..4fee7b2ab34556b2f849d4f171d7a465f21617c2 100644 (file)
 #include <Register/Cpuid.h>\r
 #include <Uefi/UefiBaseType.h>\r
 \r
-STATIC BOOLEAN mSevStatus = FALSE;\r
-STATIC BOOLEAN mSevEsStatus = FALSE;\r
-STATIC BOOLEAN mSevStatusChecked = FALSE;\r
+STATIC BOOLEAN  mSevStatus        = FALSE;\r
+STATIC BOOLEAN  mSevEsStatus      = FALSE;\r
+STATIC BOOLEAN  mSevStatusChecked = FALSE;\r
 \r
-STATIC UINT64  mSevEncryptionMask = 0;\r
-STATIC BOOLEAN mSevEncryptionMaskSaved = FALSE;\r
+STATIC UINT64   mSevEncryptionMask      = 0;\r
+STATIC BOOLEAN  mSevEncryptionMaskSaved = FALSE;\r
 \r
 /**\r
   Reads and sets the status of SEV features.\r
@@ -137,7 +137,7 @@ MemEncryptSevGetEncryptionMask (
   )\r
 {\r
   if (!mSevEncryptionMaskSaved) {\r
-    mSevEncryptionMask = PcdGet64 (PcdPteMemoryEncryptionAddressOrMask);\r
+    mSevEncryptionMask      = PcdGet64 (PcdPteMemoryEncryptionAddressOrMask);\r
     mSevEncryptionMaskSaved = TRUE;\r
   }\r
 \r
index be260e0d10146884e9b55f05277219aee0508632..9bd66301fc08d9b3b43f7ead82c6b9971fa0eb87 100644 (file)
@@ -35,9 +35,9 @@
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevClearPageEncMask (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    NumPages\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             NumPages\r
   )\r
 {\r
   //\r
@@ -66,9 +66,9 @@ MemEncryptSevClearPageEncMask (
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevSetPageEncMask (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    NumPages\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             NumPages\r
   )\r
 {\r
   //\r
@@ -95,9 +95,9 @@ MemEncryptSevSetPageEncMask (
 MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE\r
 EFIAPI\r
 MemEncryptSevGetAddressRangeState (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    Length\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             Length\r
   )\r
 {\r
   //\r
@@ -126,9 +126,9 @@ MemEncryptSevGetAddressRangeState (
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevClearMmioPageEncMask (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    NumPages\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             NumPages\r
   )\r
 {\r
   //\r
index b4a9f464e2688e4f59fc02780076e589ff6ed89f..78ea16ae06ffb3c20773e37adbda4c84f142233c 100644 (file)
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevLocateInitialSmramSaveStateMapPages (\r
-  OUT UINTN *BaseAddress,\r
-  OUT UINTN *NumberOfPages\r
+  OUT UINTN  *BaseAddress,\r
+  OUT UINTN  *NumberOfPages\r
   )\r
 {\r
-  UINTN MapStart;\r
-  UINTN MapEnd;\r
-  UINTN MapPagesStart; // MapStart rounded down to page boundary\r
-  UINTN MapPagesEnd;   // MapEnd rounded up to page boundary\r
-  UINTN MapPagesSize;  // difference between MapPagesStart and MapPagesEnd\r
+  UINTN  MapStart;\r
+  UINTN  MapEnd;\r
+  UINTN  MapPagesStart; // MapStart rounded down to page boundary\r
+  UINTN  MapPagesEnd;   // MapEnd rounded up to page boundary\r
+  UINTN  MapPagesSize;  // difference between MapPagesStart and MapPagesEnd\r
 \r
   if (!FeaturePcdGet (PcdSmmSmramRequire)) {\r
     return RETURN_UNSUPPORTED;\r
index e2fd109d120f887f25e3aafe34470b4f75ec76c3..c4aa74a0a2dd119cf32a1963e83b61c6876d8c52 100644 (file)
 #include <Register/Cpuid.h>\r
 #include <Uefi/UefiBaseType.h>\r
 \r
-STATIC BOOLEAN mSevStatus = FALSE;\r
-STATIC BOOLEAN mSevEsStatus = FALSE;\r
-STATIC BOOLEAN mSevStatusChecked = FALSE;\r
+STATIC BOOLEAN  mSevStatus        = FALSE;\r
+STATIC BOOLEAN  mSevEsStatus      = FALSE;\r
+STATIC BOOLEAN  mSevStatusChecked = FALSE;\r
 \r
-STATIC UINT64  mSevEncryptionMask = 0;\r
-STATIC BOOLEAN mSevEncryptionMaskSaved = FALSE;\r
+STATIC UINT64   mSevEncryptionMask      = 0;\r
+STATIC BOOLEAN  mSevEncryptionMaskSaved = FALSE;\r
 \r
 /**\r
   Reads and sets the status of SEV features.\r
@@ -43,8 +43,8 @@ InternalMemEncryptSevStatus (
 \r
   ReadSevMsr = FALSE;\r
 \r
-  SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
-  if (SevEsWorkArea != NULL && SevEsWorkArea->EncryptionMask != 0) {\r
+  SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *)FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
+  if ((SevEsWorkArea != NULL) && (SevEsWorkArea->EncryptionMask != 0)) {\r
     //\r
     // The MSR has been read before, so it is safe to read it again and avoid\r
     // having to validate the CPUID information.\r
@@ -139,7 +139,7 @@ MemEncryptSevGetEncryptionMask (
   if (!mSevEncryptionMaskSaved) {\r
     SEC_SEV_ES_WORK_AREA  *SevEsWorkArea;\r
 \r
-    SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
+    SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *)FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
     if (SevEsWorkArea != NULL) {\r
       mSevEncryptionMask = SevEsWorkArea->EncryptionMask;\r
     } else {\r
index 56d8f3f3183f95236e34c3cfdc41febc6e50af10..b5b365641499bba7b872acfe5c8190de2d464f30 100644 (file)
@@ -35,8 +35,8 @@ InternalMemEncryptSevStatus (
 \r
   ReadSevMsr = FALSE;\r
 \r
-  SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
-  if (SevEsWorkArea != NULL && SevEsWorkArea->EncryptionMask != 0) {\r
+  SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *)FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
+  if ((SevEsWorkArea != NULL) && (SevEsWorkArea->EncryptionMask != 0)) {\r
     //\r
     // The MSR has been read before, so it is safe to read it again and avoid\r
     // having to validate the CPUID information.\r
@@ -74,7 +74,7 @@ MemEncryptSevEsIsEnabled (
   VOID\r
   )\r
 {\r
-  MSR_SEV_STATUS_REGISTER           Msr;\r
+  MSR_SEV_STATUS_REGISTER  Msr;\r
 \r
   Msr.Uint32 = InternalMemEncryptSevStatus ();\r
 \r
@@ -93,7 +93,7 @@ MemEncryptSevIsEnabled (
   VOID\r
   )\r
 {\r
-  MSR_SEV_STATUS_REGISTER           Msr;\r
+  MSR_SEV_STATUS_REGISTER  Msr;\r
 \r
   Msr.Uint32 = InternalMemEncryptSevStatus ();\r
 \r
@@ -115,7 +115,7 @@ MemEncryptSevGetEncryptionMask (
   SEC_SEV_ES_WORK_AREA              *SevEsWorkArea;\r
   UINT64                            EncryptionMask;\r
 \r
-  SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
+  SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *)FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
   if (SevEsWorkArea != NULL) {\r
     EncryptionMask = SevEsWorkArea->EncryptionMask;\r
   } else {\r
@@ -147,8 +147,8 @@ MemEncryptSevGetEncryptionMask (
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevLocateInitialSmramSaveStateMapPages (\r
-  OUT UINTN *BaseAddress,\r
-  OUT UINTN *NumberOfPages\r
+  OUT UINTN  *BaseAddress,\r
+  OUT UINTN  *NumberOfPages\r
   )\r
 {\r
   return RETURN_UNSUPPORTED;\r
index a57e8fd37fa7dc67deb044a27d6ac6a671f4a1a4..e7c703bb9a484a209c05a3a5e94a5e00e1134da5 100644 (file)
@@ -37,9 +37,9 @@
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevClearPageEncMask (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    NumPages\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             NumPages\r
   )\r
 {\r
   return InternalMemEncryptSevSetMemoryDecrypted (\r
@@ -69,9 +69,9 @@ MemEncryptSevClearPageEncMask (
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevSetPageEncMask (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    NumPages\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             NumPages\r
   )\r
 {\r
   return InternalMemEncryptSevSetMemoryEncrypted (\r
@@ -99,9 +99,9 @@ MemEncryptSevSetPageEncMask (
 MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE\r
 EFIAPI\r
 MemEncryptSevGetAddressRangeState (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    Length\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             Length\r
   )\r
 {\r
   return InternalMemEncryptSevGetAddressRangeState (\r
@@ -131,9 +131,9 @@ MemEncryptSevGetAddressRangeState (
 RETURN_STATUS\r
 EFIAPI\r
 MemEncryptSevClearMmioPageEncMask (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    NumPages\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             NumPages\r
   )\r
 {\r
   return InternalMemEncryptSevClearMmioPageEncMask (\r
@@ -141,5 +141,4 @@ MemEncryptSevClearMmioPageEncMask (
            BaseAddress,\r
            EFI_PAGES_TO_SIZE (NumPages)\r
            );\r
-\r
 }\r
index c696745f9d26483fbced08354f57a7493e5f653c..bbc48ff6d87903f8904ac6a93db9fbb7c2bbbb6e 100644 (file)
 \r
 #include "VirtualMemory.h"\r
 \r
-STATIC BOOLEAN mAddressEncMaskChecked = FALSE;\r
-STATIC UINT64  mAddressEncMask;\r
-STATIC PAGE_TABLE_POOL   *mPageTablePool = NULL;\r
+STATIC BOOLEAN          mAddressEncMaskChecked = FALSE;\r
+STATIC UINT64           mAddressEncMask;\r
+STATIC PAGE_TABLE_POOL  *mPageTablePool = NULL;\r
 \r
 typedef enum {\r
-   SetCBit,\r
-   ClearCBit\r
+  SetCBit,\r
+  ClearCBit\r
 } MAP_RANGE_MODE;\r
 \r
 /**\r
@@ -39,7 +39,7 @@ InternalGetMemEncryptionAddressMask (
   VOID\r
   )\r
 {\r
-  UINT64                            EncryptionMask;\r
+  UINT64  EncryptionMask;\r
 \r
   if (mAddressEncMaskChecked) {\r
     return mAddressEncMask;\r
@@ -47,7 +47,7 @@ InternalGetMemEncryptionAddressMask (
 \r
   EncryptionMask = MemEncryptSevGetEncryptionMask ();\r
 \r
-  mAddressEncMask = EncryptionMask & PAGING_1G_ADDRESS_MASK_64;\r
+  mAddressEncMask        = EncryptionMask & PAGING_1G_ADDRESS_MASK_64;\r
   mAddressEncMaskChecked = TRUE;\r
 \r
   return mAddressEncMask;\r
@@ -74,18 +74,18 @@ InternalGetMemEncryptionAddressMask (
 STATIC\r
 BOOLEAN\r
 InitializePageTablePool (\r
-  IN  UINTN                           PoolPages\r
+  IN  UINTN  PoolPages\r
   )\r
 {\r
-  VOID                      *Buffer;\r
+  VOID  *Buffer;\r
 \r
   //\r
   // Always reserve at least PAGE_TABLE_POOL_UNIT_PAGES, including one page for\r
   // header.\r
   //\r
   PoolPages += 1;   // Add one page for header.\r
-  PoolPages = ((PoolPages - 1) / PAGE_TABLE_POOL_UNIT_PAGES + 1) *\r
-              PAGE_TABLE_POOL_UNIT_PAGES;\r
+  PoolPages  = ((PoolPages - 1) / PAGE_TABLE_POOL_UNIT_PAGES + 1) *\r
+               PAGE_TABLE_POOL_UNIT_PAGES;\r
   Buffer = AllocateAlignedPages (PoolPages, PAGE_TABLE_POOL_ALIGNMENT);\r
   if (Buffer == NULL) {\r
     DEBUG ((DEBUG_ERROR, "ERROR: Out of aligned pages\r\n"));\r
@@ -96,19 +96,19 @@ InitializePageTablePool (
   // Link all pools into a list for easier track later.\r
   //\r
   if (mPageTablePool == NULL) {\r
-    mPageTablePool = Buffer;\r
+    mPageTablePool           = Buffer;\r
     mPageTablePool->NextPool = mPageTablePool;\r
   } else {\r
     ((PAGE_TABLE_POOL *)Buffer)->NextPool = mPageTablePool->NextPool;\r
-    mPageTablePool->NextPool = Buffer;\r
-    mPageTablePool = Buffer;\r
+    mPageTablePool->NextPool              = Buffer;\r
+    mPageTablePool                        = Buffer;\r
   }\r
 \r
   //\r
   // Reserve one page for pool header.\r
   //\r
-  mPageTablePool->FreePages  = PoolPages - 1;\r
-  mPageTablePool->Offset = EFI_PAGES_TO_SIZE (1);\r
+  mPageTablePool->FreePages = PoolPages - 1;\r
+  mPageTablePool->Offset    = EFI_PAGES_TO_SIZE (1);\r
 \r
   return TRUE;\r
 }\r
@@ -134,10 +134,10 @@ STATIC
 VOID *\r
 EFIAPI\r
 AllocatePageTableMemory (\r
-  IN UINTN           Pages\r
+  IN UINTN  Pages\r
   )\r
 {\r
-  VOID                            *Buffer;\r
+  VOID  *Buffer;\r
 \r
   if (Pages == 0) {\r
     return NULL;\r
@@ -146,8 +146,9 @@ AllocatePageTableMemory (
   //\r
   // Renew the pool if necessary.\r
   //\r
-  if (mPageTablePool == NULL ||\r
-      Pages > mPageTablePool->FreePages) {\r
+  if ((mPageTablePool == NULL) ||\r
+      (Pages > mPageTablePool->FreePages))\r
+  {\r
     if (!InitializePageTablePool (Pages)) {\r
       return NULL;\r
     }\r
@@ -155,8 +156,8 @@ AllocatePageTableMemory (
 \r
   Buffer = (UINT8 *)mPageTablePool + mPageTablePool->Offset;\r
 \r
-  mPageTablePool->Offset     += EFI_PAGES_TO_SIZE (Pages);\r
-  mPageTablePool->FreePages  -= Pages;\r
+  mPageTablePool->Offset    += EFI_PAGES_TO_SIZE (Pages);\r
+  mPageTablePool->FreePages -= Pages;\r
 \r
   DEBUG ((\r
     DEBUG_VERBOSE,\r
@@ -170,7 +171,6 @@ AllocatePageTableMemory (
   return Buffer;\r
 }\r
 \r
-\r
 /**\r
   Split 2M page to 4K.\r
 \r
@@ -184,19 +184,19 @@ AllocatePageTableMemory (
 STATIC\r
 VOID\r
 Split2MPageTo4K (\r
-  IN        PHYSICAL_ADDRESS               PhysicalAddress,\r
-  IN  OUT   UINT64                        *PageEntry2M,\r
-  IN        PHYSICAL_ADDRESS               StackBase,\r
-  IN        UINTN                          StackSize\r
+  IN        PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  OUT   UINT64            *PageEntry2M,\r
+  IN        PHYSICAL_ADDRESS  StackBase,\r
+  IN        UINTN             StackSize\r
   )\r
 {\r
-  PHYSICAL_ADDRESS                  PhysicalAddress4K;\r
-  UINTN                             IndexOfPageTableEntries;\r
-  PAGE_TABLE_4K_ENTRY               *PageTableEntry;\r
-  PAGE_TABLE_4K_ENTRY               *PageTableEntry1;\r
-  UINT64                            AddressEncMask;\r
+  PHYSICAL_ADDRESS     PhysicalAddress4K;\r
+  UINTN                IndexOfPageTableEntries;\r
+  PAGE_TABLE_4K_ENTRY  *PageTableEntry;\r
+  PAGE_TABLE_4K_ENTRY  *PageTableEntry1;\r
+  UINT64               AddressEncMask;\r
 \r
-  PageTableEntry = AllocatePageTableMemory(1);\r
+  PageTableEntry = AllocatePageTableMemory (1);\r
 \r
   PageTableEntry1 = PageTableEntry;\r
 \r
@@ -210,15 +210,17 @@ Split2MPageTo4K (
        IndexOfPageTableEntries < 512;\r
        (IndexOfPageTableEntries++,\r
         PageTableEntry++,\r
-        PhysicalAddress4K += SIZE_4KB)) {\r
+        PhysicalAddress4K += SIZE_4KB))\r
+  {\r
     //\r
     // Fill in the Page Table entries\r
     //\r
-    PageTableEntry->Uint64 = (UINT64) PhysicalAddress4K | AddressEncMask;\r
+    PageTableEntry->Uint64         = (UINT64)PhysicalAddress4K | AddressEncMask;\r
     PageTableEntry->Bits.ReadWrite = 1;\r
-    PageTableEntry->Bits.Present = 1;\r
+    PageTableEntry->Bits.Present   = 1;\r
     if ((PhysicalAddress4K >= StackBase) &&\r
-        (PhysicalAddress4K < StackBase + StackSize)) {\r
+        (PhysicalAddress4K < StackBase + StackSize))\r
+    {\r
       //\r
       // Set Nx bit for stack.\r
       //\r
@@ -244,9 +246,9 @@ Split2MPageTo4K (
 STATIC\r
 VOID\r
 SetPageTablePoolReadOnly (\r
-  IN  UINTN                             PageTableBase,\r
-  IN  EFI_PHYSICAL_ADDRESS              Address,\r
-  IN  BOOLEAN                           Level4Paging\r
+  IN  UINTN                 PageTableBase,\r
+  IN  EFI_PHYSICAL_ADDRESS  Address,\r
+  IN  BOOLEAN               Level4Paging\r
   )\r
 {\r
   UINTN                 Index;\r
@@ -286,12 +288,12 @@ SetPageTablePoolReadOnly (
   LevelSize[3] = SIZE_1GB;\r
   LevelSize[4] = SIZE_512GB;\r
 \r
-  AddressEncMask  = InternalGetMemEncryptionAddressMask();\r
-  PageTable       = (UINT64 *)(UINTN)PageTableBase;\r
-  PoolUnitSize    = PAGE_TABLE_POOL_UNIT_SIZE;\r
+  AddressEncMask = InternalGetMemEncryptionAddressMask ();\r
+  PageTable      = (UINT64 *)(UINTN)PageTableBase;\r
+  PoolUnitSize   = PAGE_TABLE_POOL_UNIT_SIZE;\r
 \r
   for (Level = (Level4Paging) ? 4 : 3; Level > 0; --Level) {\r
-    Index = ((UINTN)RShiftU64 (Address, LevelShift[Level]));\r
+    Index  = ((UINTN)RShiftU64 (Address, LevelShift[Level]));\r
     Index &= PAGING_PAE_INDEX_MASK;\r
 \r
     PageAttr = PageTable[Index];\r
@@ -319,14 +321,13 @@ SetPageTablePoolReadOnly (
           ASSERT (Index < EFI_PAGE_SIZE/sizeof (UINT64));\r
 \r
           PageTable[Index] &= ~(UINT64)IA32_PG_RW;\r
-          PoolUnitSize    -= LevelSize[Level];\r
+          PoolUnitSize     -= LevelSize[Level];\r
 \r
           ++Index;\r
         }\r
       }\r
 \r
       break;\r
-\r
     } else {\r
       //\r
       // The smaller granularity of page must be needed.\r
@@ -338,18 +339,20 @@ SetPageTablePoolReadOnly (
 \r
       PhysicalAddress = PageAttr & LevelMask[Level];\r
       for (EntryIndex = 0;\r
-            EntryIndex < EFI_PAGE_SIZE/sizeof (UINT64);\r
-            ++EntryIndex) {\r
+           EntryIndex < EFI_PAGE_SIZE/sizeof (UINT64);\r
+           ++EntryIndex)\r
+      {\r
         NewPageTable[EntryIndex] = PhysicalAddress  | AddressEncMask |\r
                                    IA32_PG_P | IA32_PG_RW;\r
         if (Level > 2) {\r
           NewPageTable[EntryIndex] |= IA32_PG_PS;\r
         }\r
+\r
         PhysicalAddress += LevelSize[Level - 1];\r
       }\r
 \r
       PageTable[Index] = (UINT64)(UINTN)NewPageTable | AddressEncMask |\r
-                                        IA32_PG_P | IA32_PG_RW;\r
+                         IA32_PG_P | IA32_PG_RW;\r
       PageTable = NewPageTable;\r
     }\r
   }\r
@@ -365,14 +368,14 @@ SetPageTablePoolReadOnly (
 STATIC\r
 VOID\r
 EnablePageTableProtection (\r
-  IN  UINTN     PageTableBase,\r
-  IN  BOOLEAN   Level4Paging\r
+  IN  UINTN    PageTableBase,\r
+  IN  BOOLEAN  Level4Paging\r
   )\r
 {\r
-  PAGE_TABLE_POOL         *HeadPool;\r
-  PAGE_TABLE_POOL         *Pool;\r
-  UINT64                  PoolSize;\r
-  EFI_PHYSICAL_ADDRESS    Address;\r
+  PAGE_TABLE_POOL       *HeadPool;\r
+  PAGE_TABLE_POOL       *Pool;\r
+  UINT64                PoolSize;\r
+  EFI_PHYSICAL_ADDRESS  Address;\r
 \r
   if (mPageTablePool == NULL) {\r
     return;\r
@@ -383,7 +386,7 @@ EnablePageTableProtection (
   // remember original one in advance.\r
   //\r
   HeadPool = mPageTablePool;\r
-  Pool = HeadPool;\r
+  Pool     = HeadPool;\r
   do {\r
     Address  = (EFI_PHYSICAL_ADDRESS)(UINTN)Pool;\r
     PoolSize = Pool->Offset + EFI_PAGES_TO_SIZE (Pool->FreePages);\r
@@ -394,17 +397,15 @@ EnablePageTableProtection (
     // the protection to them one by one.\r
     //\r
     while (PoolSize > 0) {\r
-      SetPageTablePoolReadOnly(PageTableBase, Address, Level4Paging);\r
-      Address   += PAGE_TABLE_POOL_UNIT_SIZE;\r
-      PoolSize  -= PAGE_TABLE_POOL_UNIT_SIZE;\r
+      SetPageTablePoolReadOnly (PageTableBase, Address, Level4Paging);\r
+      Address  += PAGE_TABLE_POOL_UNIT_SIZE;\r
+      PoolSize -= PAGE_TABLE_POOL_UNIT_SIZE;\r
     }\r
 \r
     Pool = Pool->NextPool;\r
   } while (Pool != HeadPool);\r
-\r
 }\r
 \r
-\r
 /**\r
   Split 1G page to 2M.\r
 \r
@@ -418,18 +419,18 @@ EnablePageTableProtection (
 STATIC\r
 VOID\r
 Split1GPageTo2M (\r
-  IN          PHYSICAL_ADDRESS               PhysicalAddress,\r
-  IN  OUT     UINT64                         *PageEntry1G,\r
-  IN          PHYSICAL_ADDRESS               StackBase,\r
-  IN          UINTN                          StackSize\r
+  IN          PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  OUT     UINT64            *PageEntry1G,\r
+  IN          PHYSICAL_ADDRESS  StackBase,\r
+  IN          UINTN             StackSize\r
   )\r
 {\r
-  PHYSICAL_ADDRESS                  PhysicalAddress2M;\r
-  UINTN                             IndexOfPageDirectoryEntries;\r
-  PAGE_TABLE_ENTRY                  *PageDirectoryEntry;\r
-  UINT64                            AddressEncMask;\r
+  PHYSICAL_ADDRESS  PhysicalAddress2M;\r
+  UINTN             IndexOfPageDirectoryEntries;\r
+  PAGE_TABLE_ENTRY  *PageDirectoryEntry;\r
+  UINT64            AddressEncMask;\r
 \r
-  PageDirectoryEntry = AllocatePageTableMemory(1);\r
+  PageDirectoryEntry = AllocatePageTableMemory (1);\r
 \r
   AddressEncMask = InternalGetMemEncryptionAddressMask ();\r
   ASSERT (PageDirectoryEntry != NULL);\r
@@ -445,9 +446,11 @@ Split1GPageTo2M (
        IndexOfPageDirectoryEntries < 512;\r
        (IndexOfPageDirectoryEntries++,\r
         PageDirectoryEntry++,\r
-        PhysicalAddress2M += SIZE_2MB)) {\r
+        PhysicalAddress2M += SIZE_2MB))\r
+  {\r
     if ((PhysicalAddress2M < StackBase + StackSize) &&\r
-        ((PhysicalAddress2M + SIZE_2MB) > StackBase)) {\r
+        ((PhysicalAddress2M + SIZE_2MB) > StackBase))\r
+    {\r
       //\r
       // Need to split this 2M page that covers stack range.\r
       //\r
@@ -461,15 +464,14 @@ Split1GPageTo2M (
       //\r
       // Fill in the Page Directory entries\r
       //\r
-      PageDirectoryEntry->Uint64 = (UINT64) PhysicalAddress2M | AddressEncMask;\r
+      PageDirectoryEntry->Uint64         = (UINT64)PhysicalAddress2M | AddressEncMask;\r
       PageDirectoryEntry->Bits.ReadWrite = 1;\r
-      PageDirectoryEntry->Bits.Present = 1;\r
-      PageDirectoryEntry->Bits.MustBe1 = 1;\r
+      PageDirectoryEntry->Bits.Present   = 1;\r
+      PageDirectoryEntry->Bits.MustBe1   = 1;\r
     }\r
   }\r
 }\r
 \r
-\r
 /**\r
   Set or Clear the memory encryption bit\r
 \r
@@ -478,12 +480,12 @@ Split1GPageTo2M (
 \r
 **/\r
 STATIC VOID\r
-SetOrClearCBit(\r
-  IN   OUT     UINT64*            PageTablePointer,\r
-  IN           MAP_RANGE_MODE     Mode\r
+SetOrClearCBit (\r
+  IN   OUT     UINT64          *PageTablePointer,\r
+  IN           MAP_RANGE_MODE  Mode\r
   )\r
 {\r
-  UINT64      AddressEncMask;\r
+  UINT64  AddressEncMask;\r
 \r
   AddressEncMask = InternalGetMemEncryptionAddressMask ();\r
 \r
@@ -492,7 +494,6 @@ SetOrClearCBit(
   } else {\r
     *PageTablePointer &= ~AddressEncMask;\r
   }\r
-\r
 }\r
 \r
 /**\r
@@ -511,7 +512,6 @@ IsReadOnlyPageWriteProtected (
   return ((AsmReadCr0 () & BIT16) != 0);\r
 }\r
 \r
-\r
 /**\r
  Disable Write Protect on pages marked as read-only.\r
 **/\r
@@ -521,7 +521,7 @@ DisableReadOnlyPageWriteProtect (
   VOID\r
   )\r
 {\r
-  AsmWriteCr0 (AsmReadCr0() & ~BIT16);\r
+  AsmWriteCr0 (AsmReadCr0 () & ~BIT16);\r
 }\r
 \r
 /**\r
@@ -533,10 +533,9 @@ EnableReadOnlyPageWriteProtect (
   VOID\r
   )\r
 {\r
-  AsmWriteCr0 (AsmReadCr0() | BIT16);\r
+  AsmWriteCr0 (AsmReadCr0 () | BIT16);\r
 }\r
 \r
-\r
 /**\r
   This function either sets or clears memory encryption bit for the memory\r
   region specified by PhysicalAddress and Length from the current page table\r
@@ -568,23 +567,23 @@ STATIC
 RETURN_STATUS\r
 EFIAPI\r
 SetMemoryEncDec (\r
-  IN    PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN    PHYSICAL_ADDRESS         PhysicalAddress,\r
-  IN    UINTN                    Length,\r
-  IN    MAP_RANGE_MODE           Mode,\r
-  IN    BOOLEAN                  CacheFlush\r
+  IN    PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN    PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN    UINTN             Length,\r
+  IN    MAP_RANGE_MODE    Mode,\r
+  IN    BOOLEAN           CacheFlush\r
   )\r
 {\r
-  PAGE_MAP_AND_DIRECTORY_POINTER *PageMapLevel4Entry;\r
-  PAGE_MAP_AND_DIRECTORY_POINTER *PageUpperDirectoryPointerEntry;\r
-  PAGE_MAP_AND_DIRECTORY_POINTER *PageDirectoryPointerEntry;\r
-  PAGE_TABLE_1G_ENTRY            *PageDirectory1GEntry;\r
-  PAGE_TABLE_ENTRY               *PageDirectory2MEntry;\r
-  PAGE_TABLE_4K_ENTRY            *PageTableEntry;\r
-  UINT64                         PgTableMask;\r
-  UINT64                         AddressEncMask;\r
-  BOOLEAN                        IsWpEnabled;\r
-  RETURN_STATUS                  Status;\r
+  PAGE_MAP_AND_DIRECTORY_POINTER  *PageMapLevel4Entry;\r
+  PAGE_MAP_AND_DIRECTORY_POINTER  *PageUpperDirectoryPointerEntry;\r
+  PAGE_MAP_AND_DIRECTORY_POINTER  *PageDirectoryPointerEntry;\r
+  PAGE_TABLE_1G_ENTRY             *PageDirectory1GEntry;\r
+  PAGE_TABLE_ENTRY                *PageDirectory2MEntry;\r
+  PAGE_TABLE_4K_ENTRY             *PageTableEntry;\r
+  UINT64                          PgTableMask;\r
+  UINT64                          AddressEncMask;\r
+  BOOLEAN                         IsWpEnabled;\r
+  RETURN_STATUS                   Status;\r
 \r
   //\r
   // Set PageMapLevel4Entry to suppress incorrect compiler/analyzer warnings.\r
@@ -623,7 +622,7 @@ SetMemoryEncDec (
   // with correct C-bit\r
   //\r
   if (CacheFlush) {\r
-    WriteBackInvalidateDataCacheRange((VOID*) (UINTN)PhysicalAddress, Length);\r
+    WriteBackInvalidateDataCacheRange ((VOID *)(UINTN)PhysicalAddress, Length);\r
   }\r
 \r
   //\r
@@ -636,17 +635,16 @@ SetMemoryEncDec (
 \r
   Status = EFI_SUCCESS;\r
 \r
-  while (Length != 0)\r
-  {\r
+  while (Length != 0) {\r
     //\r
     // If Cr3BaseAddress is not specified then read the current CR3\r
     //\r
     if (Cr3BaseAddress == 0) {\r
-      Cr3BaseAddress = AsmReadCr3();\r
+      Cr3BaseAddress = AsmReadCr3 ();\r
     }\r
 \r
-    PageMapLevel4Entry = (VOID*) (Cr3BaseAddress & ~PgTableMask);\r
-    PageMapLevel4Entry += PML4_OFFSET(PhysicalAddress);\r
+    PageMapLevel4Entry  = (VOID *)(Cr3BaseAddress & ~PgTableMask);\r
+    PageMapLevel4Entry += PML4_OFFSET (PhysicalAddress);\r
     if (!PageMapLevel4Entry->Bits.Present) {\r
       DEBUG ((\r
         DEBUG_ERROR,\r
@@ -660,10 +658,10 @@ SetMemoryEncDec (
     }\r
 \r
     PageDirectory1GEntry = (VOID *)(\r
-                             (PageMapLevel4Entry->Bits.PageTableBaseAddress <<\r
-                              12) & ~PgTableMask\r
-                             );\r
-    PageDirectory1GEntry += PDP_OFFSET(PhysicalAddress);\r
+                                    (PageMapLevel4Entry->Bits.PageTableBaseAddress <<\r
+                                     12) & ~PgTableMask\r
+                                    );\r
+    PageDirectory1GEntry += PDP_OFFSET (PhysicalAddress);\r
     if (!PageDirectory1GEntry->Bits.Present) {\r
       DEBUG ((\r
         DEBUG_ERROR,\r
@@ -684,8 +682,8 @@ SetMemoryEncDec (
       // Valid 1GB page\r
       // If we have at least 1GB to go, we can just update this entry\r
       //\r
-      if ((PhysicalAddress & (BIT30 - 1)) == 0 && Length >= BIT30) {\r
-        SetOrClearCBit(&PageDirectory1GEntry->Uint64, Mode);\r
+      if (((PhysicalAddress & (BIT30 - 1)) == 0) && (Length >= BIT30)) {\r
+        SetOrClearCBit (&PageDirectory1GEntry->Uint64, Mode);\r
         DEBUG ((\r
           DEBUG_VERBOSE,\r
           "%a:%a: updated 1GB entry for Physical=0x%Lx\n",\r
@@ -694,7 +692,7 @@ SetMemoryEncDec (
           PhysicalAddress\r
           ));\r
         PhysicalAddress += BIT30;\r
-        Length -= BIT30;\r
+        Length          -= BIT30;\r
       } else {\r
         //\r
         // We must split the page\r
@@ -722,10 +720,10 @@ SetMemoryEncDec (
         (PAGE_MAP_AND_DIRECTORY_POINTER *)PageDirectory1GEntry;\r
       PageDirectory2MEntry =\r
         (VOID *)(\r
-          (PageUpperDirectoryPointerEntry->Bits.PageTableBaseAddress <<\r
-           12) & ~PgTableMask\r
-          );\r
-      PageDirectory2MEntry += PDE_OFFSET(PhysicalAddress);\r
+                 (PageUpperDirectoryPointerEntry->Bits.PageTableBaseAddress <<\r
+                  12) & ~PgTableMask\r
+                 );\r
+      PageDirectory2MEntry += PDE_OFFSET (PhysicalAddress);\r
       if (!PageDirectory2MEntry->Bits.Present) {\r
         DEBUG ((\r
           DEBUG_ERROR,\r
@@ -737,6 +735,7 @@ SetMemoryEncDec (
         Status = RETURN_NO_MAPPING;\r
         goto Done;\r
       }\r
+\r
       //\r
       // If the MustBe1 bit is not a 1, it's not a 2MB entry\r
       //\r
@@ -745,10 +744,10 @@ SetMemoryEncDec (
         // Valid 2MB page\r
         // If we have at least 2MB left to go, we can just update this entry\r
         //\r
-        if ((PhysicalAddress & (BIT21-1)) == 0 && Length >= BIT21) {\r
+        if (((PhysicalAddress & (BIT21-1)) == 0) && (Length >= BIT21)) {\r
           SetOrClearCBit (&PageDirectory2MEntry->Uint64, Mode);\r
           PhysicalAddress += BIT21;\r
-          Length -= BIT21;\r
+          Length          -= BIT21;\r
         } else {\r
           //\r
           // We must split up this page into 4K pages\r
@@ -773,10 +772,10 @@ SetMemoryEncDec (
           (PAGE_MAP_AND_DIRECTORY_POINTER *)PageDirectory2MEntry;\r
         PageTableEntry =\r
           (VOID *)(\r
-            (PageDirectoryPointerEntry->Bits.PageTableBaseAddress <<\r
-             12) & ~PgTableMask\r
-            );\r
-        PageTableEntry += PTE_OFFSET(PhysicalAddress);\r
+                   (PageDirectoryPointerEntry->Bits.PageTableBaseAddress <<\r
+                    12) & ~PgTableMask\r
+                   );\r
+        PageTableEntry += PTE_OFFSET (PhysicalAddress);\r
         if (!PageTableEntry->Bits.Present) {\r
           DEBUG ((\r
             DEBUG_ERROR,\r
@@ -788,9 +787,10 @@ SetMemoryEncDec (
           Status = RETURN_NO_MAPPING;\r
           goto Done;\r
         }\r
+\r
         SetOrClearCBit (&PageTableEntry->Uint64, Mode);\r
         PhysicalAddress += EFI_PAGE_SIZE;\r
-        Length -= EFI_PAGE_SIZE;\r
+        Length          -= EFI_PAGE_SIZE;\r
       }\r
     }\r
   }\r
@@ -806,7 +806,7 @@ SetMemoryEncDec (
   //\r
   // Flush TLB\r
   //\r
-  CpuFlushTlb();\r
+  CpuFlushTlb ();\r
 \r
 Done:\r
   //\r
@@ -838,12 +838,11 @@ Done:
 RETURN_STATUS\r
 EFIAPI\r
 InternalMemEncryptSevSetMemoryDecrypted (\r
-  IN  PHYSICAL_ADDRESS        Cr3BaseAddress,\r
-  IN  PHYSICAL_ADDRESS        PhysicalAddress,\r
-  IN  UINTN                   Length\r
+  IN  PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN  PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  UINTN             Length\r
   )\r
 {\r
-\r
   return SetMemoryEncDec (\r
            Cr3BaseAddress,\r
            PhysicalAddress,\r
@@ -872,9 +871,9 @@ InternalMemEncryptSevSetMemoryDecrypted (
 RETURN_STATUS\r
 EFIAPI\r
 InternalMemEncryptSevSetMemoryEncrypted (\r
-  IN  PHYSICAL_ADDRESS        Cr3BaseAddress,\r
-  IN  PHYSICAL_ADDRESS        PhysicalAddress,\r
-  IN  UINTN                   Length\r
+  IN  PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN  PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  UINTN             Length\r
   )\r
 {\r
   return SetMemoryEncDec (\r
@@ -905,9 +904,9 @@ InternalMemEncryptSevSetMemoryEncrypted (
 RETURN_STATUS\r
 EFIAPI\r
 InternalMemEncryptSevClearMmioPageEncMask (\r
-  IN  PHYSICAL_ADDRESS        Cr3BaseAddress,\r
-  IN  PHYSICAL_ADDRESS        PhysicalAddress,\r
-  IN  UINTN                   Length\r
+  IN  PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN  PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  UINTN             Length\r
   )\r
 {\r
   return SetMemoryEncDec (\r
index a155c8729bfb9178d6ef37ce61d16553e8ab275a..b5dc70a9246e0cc93d3ddef8c9ce9a0573afda44 100644 (file)
@@ -25,9 +25,9 @@ InternalGetMemEncryptionAddressMask (
   VOID\r
   )\r
 {\r
-  UINT64                            EncryptionMask;\r
+  UINT64  EncryptionMask;\r
 \r
-  EncryptionMask = MemEncryptSevGetEncryptionMask ();\r
+  EncryptionMask  = MemEncryptSevGetEncryptionMask ();\r
   EncryptionMask &= PAGING_1G_ADDRESS_MASK_64;\r
 \r
   return EncryptionMask;\r
@@ -52,9 +52,9 @@ InternalGetMemEncryptionAddressMask (
 RETURN_STATUS\r
 EFIAPI\r
 InternalMemEncryptSevSetMemoryDecrypted (\r
-  IN  PHYSICAL_ADDRESS        Cr3BaseAddress,\r
-  IN  PHYSICAL_ADDRESS        PhysicalAddress,\r
-  IN  UINTN                   Length\r
+  IN  PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN  PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  UINTN             Length\r
   )\r
 {\r
   //\r
@@ -84,9 +84,9 @@ InternalMemEncryptSevSetMemoryDecrypted (
 RETURN_STATUS\r
 EFIAPI\r
 InternalMemEncryptSevSetMemoryEncrypted (\r
-  IN  PHYSICAL_ADDRESS        Cr3BaseAddress,\r
-  IN  PHYSICAL_ADDRESS        PhysicalAddress,\r
-  IN  UINTN                   Length\r
+  IN  PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN  PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  UINTN             Length\r
   )\r
 {\r
   //\r
@@ -114,9 +114,9 @@ InternalMemEncryptSevSetMemoryEncrypted (
 RETURN_STATUS\r
 EFIAPI\r
 InternalMemEncryptSevClearMmioPageEncMask (\r
-  IN  PHYSICAL_ADDRESS        Cr3BaseAddress,\r
-  IN  PHYSICAL_ADDRESS        PhysicalAddress,\r
-  IN  UINTN                   Length\r
+  IN  PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN  PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  UINTN             Length\r
   )\r
 {\r
   //\r
index 36aabcf556a7e935eec6b3e60ccdecb659c72607..2b759cafbfa7aa96946a018a992f5d22a1d7db2a 100644 (file)
@@ -96,10 +96,10 @@ InternalMemEncryptSevGetAddressRangeState (
   // If Cr3BaseAddress is not specified then read the current CR3\r
   //\r
   if (Cr3BaseAddress == 0) {\r
-    Cr3BaseAddress = AsmReadCr3();\r
+    Cr3BaseAddress = AsmReadCr3 ();\r
   }\r
 \r
-  AddressEncMask = MemEncryptSevGetEncryptionMask ();\r
+  AddressEncMask  = MemEncryptSevGetEncryptionMask ();\r
   AddressEncMask &= PAGING_1G_ADDRESS_MASK_64;\r
 \r
   PgTableMask = AddressEncMask | EFI_PAGE_MASK;\r
@@ -110,21 +110,21 @@ InternalMemEncryptSevGetAddressRangeState (
   // Encryption is on a page basis, so start at the beginning of the\r
   // virtual address page boundary and walk page-by-page.\r
   //\r
-  Address = (PHYSICAL_ADDRESS) (UINTN) BaseAddress & ~EFI_PAGE_MASK;\r
+  Address    = (PHYSICAL_ADDRESS)(UINTN)BaseAddress & ~EFI_PAGE_MASK;\r
   AddressEnd = (PHYSICAL_ADDRESS)\r
-                 (UINTN) (BaseAddress + Length);\r
+               (UINTN)(BaseAddress + Length);\r
 \r
   while (Address < AddressEnd) {\r
-    PageMapLevel4Entry = (VOID*) (Cr3BaseAddress & ~PgTableMask);\r
+    PageMapLevel4Entry  = (VOID *)(Cr3BaseAddress & ~PgTableMask);\r
     PageMapLevel4Entry += PML4_OFFSET (Address);\r
     if (!PageMapLevel4Entry->Bits.Present) {\r
       return MemEncryptSevAddressRangeError;\r
     }\r
 \r
-    PageDirectory1GEntry = (VOID *) (\r
-                             (PageMapLevel4Entry->Bits.PageTableBaseAddress <<\r
-                              12) & ~PgTableMask\r
-                             );\r
+    PageDirectory1GEntry = (VOID *)(\r
+                                    (PageMapLevel4Entry->Bits.PageTableBaseAddress <<\r
+                                     12) & ~PgTableMask\r
+                                    );\r
     PageDirectory1GEntry += PDP_OFFSET (Address);\r
     if (!PageDirectory1GEntry->Bits.Present) {\r
       return MemEncryptSevAddressRangeError;\r
@@ -151,12 +151,12 @@ InternalMemEncryptSevGetAddressRangeState (
     // Actually a PDP\r
     //\r
     PageUpperDirectoryPointerEntry =\r
-      (PAGE_MAP_AND_DIRECTORY_POINTER *) PageDirectory1GEntry;\r
+      (PAGE_MAP_AND_DIRECTORY_POINTER *)PageDirectory1GEntry;\r
     PageDirectory2MEntry =\r
-      (VOID *) (\r
-        (PageUpperDirectoryPointerEntry->Bits.PageTableBaseAddress <<\r
-         12) & ~PgTableMask\r
-        );\r
+      (VOID *)(\r
+               (PageUpperDirectoryPointerEntry->Bits.PageTableBaseAddress <<\r
+                12) & ~PgTableMask\r
+               );\r
     PageDirectory2MEntry += PDE_OFFSET (Address);\r
     if (!PageDirectory2MEntry->Bits.Present) {\r
       return MemEncryptSevAddressRangeError;\r
@@ -186,9 +186,9 @@ InternalMemEncryptSevGetAddressRangeState (
       (PAGE_MAP_AND_DIRECTORY_POINTER *)PageDirectory2MEntry;\r
     PageTableEntry =\r
       (VOID *)(\r
-        (PageDirectoryPointerEntry->Bits.PageTableBaseAddress <<\r
-         12) & ~PgTableMask\r
-        );\r
+               (PageDirectoryPointerEntry->Bits.PageTableBaseAddress <<\r
+                12) & ~PgTableMask\r
+               );\r
     PageTableEntry += PTE_OFFSET (Address);\r
     if (!PageTableEntry->Bits.Present) {\r
       return MemEncryptSevAddressRangeError;\r
index 21bbbd1c4f9c2387e42a681226cf95193476c538..93e3d08589d779ef70018b504913f9f6e9e56bac 100644 (file)
 #include <Library/MemoryAllocationLib.h>\r
 #include <Uefi.h>\r
 \r
-#define SYS_CODE64_SEL 0x38\r
+#define SYS_CODE64_SEL  0x38\r
 \r
-#define PAGE_TABLE_POOL_ALIGNMENT   BASE_2MB\r
-#define PAGE_TABLE_POOL_UNIT_SIZE   SIZE_2MB\r
+#define PAGE_TABLE_POOL_ALIGNMENT  BASE_2MB\r
+#define PAGE_TABLE_POOL_UNIT_SIZE  SIZE_2MB\r
 #define PAGE_TABLE_POOL_UNIT_PAGES  \\r
   EFI_SIZE_TO_PAGES (PAGE_TABLE_POOL_UNIT_SIZE)\r
 #define PAGE_TABLE_POOL_ALIGN_MASK  \\r
   (~(EFI_PHYSICAL_ADDRESS)(PAGE_TABLE_POOL_ALIGNMENT - 1))\r
 \r
 typedef struct {\r
-  VOID            *NextPool;\r
-  UINTN           Offset;\r
-  UINTN           FreePages;\r
+  VOID     *NextPool;\r
+  UINTN    Offset;\r
+  UINTN    FreePages;\r
 } PAGE_TABLE_POOL;\r
 \r
 /**\r
@@ -68,9 +68,9 @@ InternalGetMemEncryptionAddressMask (
 RETURN_STATUS\r
 EFIAPI\r
 InternalMemEncryptSevSetMemoryDecrypted (\r
-  IN  PHYSICAL_ADDRESS        Cr3BaseAddress,\r
-  IN  PHYSICAL_ADDRESS        PhysicalAddress,\r
-  IN  UINTN                   Length\r
+  IN  PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN  PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  UINTN             Length\r
   );\r
 \r
 /**\r
@@ -92,9 +92,9 @@ InternalMemEncryptSevSetMemoryDecrypted (
 RETURN_STATUS\r
 EFIAPI\r
 InternalMemEncryptSevSetMemoryEncrypted (\r
-  IN  PHYSICAL_ADDRESS        Cr3BaseAddress,\r
-  IN  PHYSICAL_ADDRESS        PhysicalAddress,\r
-  IN  UINTN                   Length\r
+  IN  PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN  PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  UINTN             Length\r
   );\r
 \r
 /**\r
@@ -115,9 +115,9 @@ InternalMemEncryptSevSetMemoryEncrypted (
 MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE\r
 EFIAPI\r
 InternalMemEncryptSevGetAddressRangeState (\r
-  IN PHYSICAL_ADDRESS         Cr3BaseAddress,\r
-  IN PHYSICAL_ADDRESS         BaseAddress,\r
-  IN UINTN                    Length\r
+  IN PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN             Length\r
   );\r
 \r
 /**\r
@@ -139,8 +139,9 @@ InternalMemEncryptSevGetAddressRangeState (
 RETURN_STATUS\r
 EFIAPI\r
 InternalMemEncryptSevClearMmioPageEncMask (\r
-  IN  PHYSICAL_ADDRESS        Cr3BaseAddress,\r
-  IN  PHYSICAL_ADDRESS        PhysicalAddress,\r
-  IN  UINTN                   Length\r
+  IN  PHYSICAL_ADDRESS  Cr3BaseAddress,\r
+  IN  PHYSICAL_ADDRESS  PhysicalAddress,\r
+  IN  UINTN             Length\r
   );\r
+\r
 #endif\r
index c6f2c726509f33aa1958fd7cfa3cd1d6110845a7..4215e6cdaa2e54f6d7ac9ba3bc82ad5d4b494374 100644 (file)
@@ -17,7 +17,6 @@
 \r
 #include "BasePciCapLib.h"\r
 \r
-\r
 /**\r
   Compare a standalone PCI_CAP_KEY against a PCI_CAP containing an embedded\r
   PCI_CAP_KEY.\r
@@ -36,12 +35,12 @@ STATIC
 INTN\r
 EFIAPI\r
 ComparePciCapKey (\r
-  IN CONST VOID *PciCapKey,\r
-  IN CONST VOID *PciCap\r
+  IN CONST VOID  *PciCapKey,\r
+  IN CONST VOID  *PciCap\r
   )\r
 {\r
-  CONST PCI_CAP_KEY *Key1;\r
-  CONST PCI_CAP_KEY *Key2;\r
+  CONST PCI_CAP_KEY  *Key1;\r
+  CONST PCI_CAP_KEY  *Key2;\r
 \r
   Key1 = PciCapKey;\r
   Key2 = &((CONST PCI_CAP *)PciCap)->Key;\r
@@ -49,25 +48,30 @@ ComparePciCapKey (
   if (Key1->Domain < Key2->Domain) {\r
     return -1;\r
   }\r
+\r
   if (Key1->Domain > Key2->Domain) {\r
     return 1;\r
   }\r
+\r
   if (Key1->CapId < Key2->CapId) {\r
     return -1;\r
   }\r
+\r
   if (Key1->CapId > Key2->CapId) {\r
     return 1;\r
   }\r
+\r
   if (Key1->Instance < Key2->Instance) {\r
     return -1;\r
   }\r
+\r
   if (Key1->Instance > Key2->Instance) {\r
     return 1;\r
   }\r
+\r
   return 0;\r
 }\r
 \r
-\r
 /**\r
   Compare two PCI_CAP objects based on PCI_CAP.Key.\r
 \r
@@ -85,17 +89,16 @@ STATIC
 INTN\r
 EFIAPI\r
 ComparePciCap (\r
-  IN CONST VOID *PciCap1,\r
-  IN CONST VOID *PciCap2\r
+  IN CONST VOID  *PciCap1,\r
+  IN CONST VOID  *PciCap2\r
   )\r
 {\r
-  CONST PCI_CAP_KEY *PciCap1Key;\r
+  CONST PCI_CAP_KEY  *PciCap1Key;\r
 \r
   PciCap1Key = &((CONST PCI_CAP *)PciCap1)->Key;\r
   return ComparePciCapKey (PciCap1Key, PciCap2);\r
 }\r
 \r
-\r
 /**\r
   Compare the standalone UINT16 config space offset of a capability header\r
   against a PCI_CAP containing an embedded Offset.\r
@@ -114,12 +117,12 @@ STATIC
 INTN\r
 EFIAPI\r
 ComparePciCapOffsetKey (\r
-  IN CONST VOID *CapHdrOffset,\r
-  IN CONST VOID *PciCap\r
+  IN CONST VOID  *CapHdrOffset,\r
+  IN CONST VOID  *PciCap\r
   )\r
 {\r
-  UINT16 Offset1;\r
-  UINT16 Offset2;\r
+  UINT16  Offset1;\r
+  UINT16  Offset2;\r
 \r
   Offset1 = *(CONST UINT16 *)CapHdrOffset;\r
   Offset2 = ((CONST PCI_CAP *)PciCap)->Offset;\r
@@ -130,7 +133,6 @@ ComparePciCapOffsetKey (
   return Offset1 - Offset2;\r
 }\r
 \r
-\r
 /**\r
   Compare two PCI_CAP objects based on PCI_CAP.Offset.\r
 \r
@@ -148,12 +150,12 @@ STATIC
 INTN\r
 EFIAPI\r
 ComparePciCapOffset (\r
-  IN CONST VOID *PciCap1,\r
-  IN CONST VOID *PciCap2\r
+  IN CONST VOID  *PciCap1,\r
+  IN CONST VOID  *PciCap2\r
   )\r
 {\r
-  UINT16 Offset1;\r
-  UINT16 Offset2;\r
+  UINT16  Offset1;\r
+  UINT16  Offset2;\r
 \r
   Offset1 = ((CONST PCI_CAP *)PciCap1)->Offset;\r
   Offset2 = ((CONST PCI_CAP *)PciCap2)->Offset;\r
@@ -164,7 +166,6 @@ ComparePciCapOffset (
   return Offset1 - Offset2;\r
 }\r
 \r
-\r
 /**\r
   Insert a new instance of the PCI capability given by (Domain, CapId) in\r
   CapList.\r
@@ -205,22 +206,24 @@ ComparePciCapOffset (
 STATIC\r
 RETURN_STATUS\r
 InsertPciCap (\r
-  IN OUT PCI_CAP_LIST       *CapList,\r
-  IN OUT ORDERED_COLLECTION *CapHdrOffsets,\r
-  IN     PCI_CAP_DOMAIN     Domain,\r
-  IN     UINT16             CapId,\r
-  IN     UINT16             Offset,\r
-  IN     UINT8              Version\r
+  IN OUT PCI_CAP_LIST        *CapList,\r
+  IN OUT ORDERED_COLLECTION  *CapHdrOffsets,\r
+  IN     PCI_CAP_DOMAIN      Domain,\r
+  IN     UINT16              CapId,\r
+  IN     UINT16              Offset,\r
+  IN     UINT8               Version\r
   )\r
 {\r
-  PCI_CAP                  *PciCap;\r
-  RETURN_STATUS            Status;\r
-  ORDERED_COLLECTION_ENTRY *PciCapEntry;\r
-  PCI_CAP                  *InstanceZero;\r
+  PCI_CAP                   *PciCap;\r
+  RETURN_STATUS             Status;\r
+  ORDERED_COLLECTION_ENTRY  *PciCapEntry;\r
+  PCI_CAP                   *InstanceZero;\r
 \r
   ASSERT ((Offset & 0x3) == 0);\r
-  ASSERT (Offset < (Domain == PciCapNormal ?\r
-                    PCI_MAX_CONFIG_OFFSET : PCI_EXP_MAX_CONFIG_OFFSET));\r
+  ASSERT (\r
+    Offset < (Domain == PciCapNormal ?\r
+              PCI_MAX_CONFIG_OFFSET : PCI_EXP_MAX_CONFIG_OFFSET)\r
+    );\r
   ASSERT (Domain == PciCapExtended || Version == 0);\r
 \r
   //\r
@@ -237,6 +240,7 @@ InsertPciCap (
   if (PciCap == NULL) {\r
     return RETURN_OUT_OF_RESOURCES;\r
   }\r
+\r
   PciCap->Key.Domain                     = Domain;\r
   PciCap->Key.CapId                      = CapId;\r
   PciCap->Key.Instance                   = 0;\r
@@ -248,12 +252,16 @@ InsertPciCap (
   //\r
   // Add PciCap to CapList.\r
   //\r
-  Status = OrderedCollectionInsert (CapList->Capabilities, &PciCapEntry,\r
-             PciCap);\r
+  Status = OrderedCollectionInsert (\r
+             CapList->Capabilities,\r
+             &PciCapEntry,\r
+             PciCap\r
+             );\r
   if (RETURN_ERROR (Status)) {\r
     if (Status == RETURN_OUT_OF_RESOURCES) {\r
       goto FreePciCap;\r
     }\r
+\r
     ASSERT (Status == RETURN_ALREADY_STARTED);\r
     //\r
     // PciCap is not the first instance of (Domain, CapId). Add it as a new\r
@@ -261,17 +269,21 @@ InsertPciCap (
     // we don't bump the instance count maintained in Instance#0 just yet, to\r
     // keep rollback on errors simple.\r
     //\r
-    InstanceZero = OrderedCollectionUserStruct (PciCapEntry);\r
-    PciCap->Key.Instance = InstanceZero->NumInstancesUnion.NumInstances;\r
+    InstanceZero                           = OrderedCollectionUserStruct (PciCapEntry);\r
+    PciCap->Key.Instance                   = InstanceZero->NumInstancesUnion.NumInstances;\r
     PciCap->NumInstancesUnion.InstanceZero = InstanceZero;\r
 \r
     ASSERT (PciCap->Key.Instance > 0);\r
-    Status = OrderedCollectionInsert (CapList->Capabilities, &PciCapEntry,\r
-               PciCap);\r
+    Status = OrderedCollectionInsert (\r
+               CapList->Capabilities,\r
+               &PciCapEntry,\r
+               PciCap\r
+               );\r
     if (Status == RETURN_OUT_OF_RESOURCES) {\r
       goto FreePciCap;\r
     }\r
   }\r
+\r
   //\r
   // At this point, PciCap has been inserted in CapList->Capabilities, either\r
   // with Instance==0 or with Instance>0. PciCapEntry is the iterator that\r
@@ -295,6 +307,7 @@ InsertPciCap (
       //\r
       Status = RETURN_DEVICE_ERROR;\r
     }\r
+\r
     goto DeletePciCapFromCapList;\r
   }\r
 \r
@@ -312,6 +325,7 @@ InsertPciCap (
 \r
     InstanceZero->NumInstancesUnion.NumInstances++;\r
   }\r
+\r
   return RETURN_SUCCESS;\r
 \r
 DeletePciCapFromCapList:\r
@@ -323,7 +337,6 @@ FreePciCap:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Calculate the MaxSizeHint member for a PCI_CAP object.\r
 \r
@@ -347,11 +360,11 @@ FreePciCap:
 STATIC\r
 VOID\r
 CalculatePciCapMaxSizeHint (\r
-  IN OUT PCI_CAP *PciCap,\r
-  IN     PCI_CAP *NextPciCap OPTIONAL\r
+  IN OUT PCI_CAP  *PciCap,\r
+  IN     PCI_CAP  *NextPciCap OPTIONAL\r
   )\r
 {\r
-  UINT16 ConfigSpaceSize;\r
+  UINT16  ConfigSpaceSize;\r
 \r
   ConfigSpaceSize = (PciCap->Key.Domain == PciCapNormal ?\r
                      PCI_MAX_CONFIG_OFFSET : PCI_EXP_MAX_CONFIG_OFFSET);\r
@@ -372,14 +385,14 @@ CalculatePciCapMaxSizeHint (
   // PciCap extends from PciCap->Offset to NextPciCap->Offset (if any), except\r
   // it cannot cross config space boundary.\r
   //\r
-  if (NextPciCap == NULL || NextPciCap->Offset >= ConfigSpaceSize) {\r
+  if ((NextPciCap == NULL) || (NextPciCap->Offset >= ConfigSpaceSize)) {\r
     PciCap->MaxSizeHint = ConfigSpaceSize - PciCap->Offset;\r
     return;\r
   }\r
+\r
   PciCap->MaxSizeHint = NextPciCap->Offset - PciCap->Offset;\r
 }\r
 \r
-\r
 /**\r
   Debug dump a PCI_CAP_LIST object at the DEBUG_VERBOSE level.\r
 \r
@@ -389,18 +402,19 @@ STATIC
 VOID\r
 EFIAPI\r
 DebugDumpPciCapList (\r
-  IN PCI_CAP_LIST *CapList\r
+  IN PCI_CAP_LIST  *CapList\r
   )\r
 {\r
   DEBUG_CODE_BEGIN ();\r
-  ORDERED_COLLECTION_ENTRY *PciCapEntry;\r
+  ORDERED_COLLECTION_ENTRY  *PciCapEntry;\r
 \r
   for (PciCapEntry = OrderedCollectionMin (CapList->Capabilities);\r
        PciCapEntry != NULL;\r
-       PciCapEntry = OrderedCollectionNext (PciCapEntry)) {\r
-    PCI_CAP       *PciCap;\r
-    RETURN_STATUS Status;\r
-    PCI_CAP_INFO  Info;\r
+       PciCapEntry = OrderedCollectionNext (PciCapEntry))\r
+  {\r
+    PCI_CAP        *PciCap;\r
+    RETURN_STATUS  Status;\r
+    PCI_CAP_INFO   Info;\r
 \r
     PciCap = OrderedCollectionUserStruct (PciCapEntry);\r
     Status = PciCapGetInfo (PciCap, &Info);\r
@@ -409,16 +423,24 @@ DebugDumpPciCapList (
     //\r
     ASSERT_RETURN_ERROR (Status);\r
 \r
-    DEBUG ((DEBUG_VERBOSE,\r
-      "%a:%a: %a 0x%04x %03u/%03u v0x%x @0x%03x+0x%03x\n", gEfiCallerBaseName,\r
-      __FUNCTION__, (Info.Domain == PciCapNormal ? "Norm" : "Extd"),\r
-      Info.CapId, Info.Instance, Info.NumInstances, Info.Version, Info.Offset,\r
-      Info.MaxSizeHint));\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "%a:%a: %a 0x%04x %03u/%03u v0x%x @0x%03x+0x%03x\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      (Info.Domain == PciCapNormal ? "Norm" : "Extd"),\r
+      Info.CapId,\r
+      Info.Instance,\r
+      Info.NumInstances,\r
+      Info.Version,\r
+      Info.Offset,\r
+      Info.MaxSizeHint\r
+      ));\r
   }\r
+\r
   DEBUG_CODE_END ();\r
 }\r
 \r
-\r
 /**\r
   Empty a collection of PCI_CAP structures, optionally releasing the referenced\r
   PCI_CAP structures themselves. Release the collection at last.\r
@@ -435,17 +457,18 @@ DebugDumpPciCapList (
 STATIC\r
 VOID\r
 EmptyAndUninitPciCapCollection (\r
-  IN OUT ORDERED_COLLECTION *PciCapCollection,\r
-  IN     BOOLEAN            FreePciCap\r
+  IN OUT ORDERED_COLLECTION  *PciCapCollection,\r
+  IN     BOOLEAN             FreePciCap\r
   )\r
 {\r
-  ORDERED_COLLECTION_ENTRY *PciCapEntry;\r
-  ORDERED_COLLECTION_ENTRY *NextEntry;\r
+  ORDERED_COLLECTION_ENTRY  *PciCapEntry;\r
+  ORDERED_COLLECTION_ENTRY  *NextEntry;\r
 \r
   for (PciCapEntry = OrderedCollectionMin (PciCapCollection);\r
        PciCapEntry != NULL;\r
-       PciCapEntry = NextEntry) {\r
-    PCI_CAP *PciCap;\r
+       PciCapEntry = NextEntry)\r
+  {\r
+    PCI_CAP  *PciCap;\r
 \r
     NextEntry = OrderedCollectionNext (PciCapEntry);\r
     OrderedCollectionDelete (PciCapCollection, PciCapEntry, (VOID **)&PciCap);\r
@@ -453,10 +476,10 @@ EmptyAndUninitPciCapCollection (
       FreePool (PciCap);\r
     }\r
   }\r
+\r
   OrderedCollectionUninit (PciCapCollection);\r
 }\r
 \r
-\r
 /**\r
   Parse the capabilities lists (both normal and extended, as applicable) of a\r
   PCI device.\r
@@ -492,16 +515,16 @@ EmptyAndUninitPciCapCollection (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapListInit (\r
-  IN  PCI_CAP_DEV  *PciDevice,\r
-  OUT PCI_CAP_LIST **CapList\r
+  IN  PCI_CAP_DEV   *PciDevice,\r
+  OUT PCI_CAP_LIST  **CapList\r
   )\r
 {\r
-  PCI_CAP_LIST             *OutCapList;\r
-  RETURN_STATUS            Status;\r
-  ORDERED_COLLECTION       *CapHdrOffsets;\r
-  UINT16                   PciStatusReg;\r
-  BOOLEAN                  DeviceIsExpress;\r
-  ORDERED_COLLECTION_ENTRY *OffsetEntry;\r
+  PCI_CAP_LIST              *OutCapList;\r
+  RETURN_STATUS             Status;\r
+  ORDERED_COLLECTION        *CapHdrOffsets;\r
+  UINT16                    PciStatusReg;\r
+  BOOLEAN                   DeviceIsExpress;\r
+  ORDERED_COLLECTION_ENTRY  *OffsetEntry;\r
 \r
   //\r
   // Allocate the output structure.\r
@@ -510,12 +533,15 @@ PciCapListInit (
   if (OutCapList == NULL) {\r
     return RETURN_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // The OutCapList->Capabilities collection owns the PCI_CAP structures and\r
   // orders them based on PCI_CAP.Key.\r
   //\r
-  OutCapList->Capabilities = OrderedCollectionInit (ComparePciCap,\r
-                               ComparePciCapKey);\r
+  OutCapList->Capabilities = OrderedCollectionInit (\r
+                               ComparePciCap,\r
+                               ComparePciCapKey\r
+                               );\r
   if (OutCapList->Capabilities == NULL) {\r
     Status = RETURN_OUT_OF_RESOURCES;\r
     goto FreeOutCapList;\r
@@ -525,8 +551,10 @@ PciCapListInit (
   // The (temporary) CapHdrOffsets collection only references PCI_CAP\r
   // structures, and orders them based on PCI_CAP.Offset.\r
   //\r
-  CapHdrOffsets = OrderedCollectionInit (ComparePciCapOffset,\r
-                    ComparePciCapOffsetKey);\r
+  CapHdrOffsets = OrderedCollectionInit (\r
+                    ComparePciCapOffset,\r
+                    ComparePciCapOffsetKey\r
+                    );\r
   if (CapHdrOffsets == NULL) {\r
     Status = RETURN_OUT_OF_RESOURCES;\r
     goto FreeCapabilities;\r
@@ -542,19 +570,28 @@ PciCapListInit (
   // Check whether a normal capabilities list is present. If there's none,\r
   // that's not an error; we'll just return OutCapList->Capabilities empty.\r
   //\r
-  Status = PciDevice->ReadConfig (PciDevice, PCI_PRIMARY_STATUS_OFFSET,\r
-                        &PciStatusReg, sizeof PciStatusReg);\r
+  Status = PciDevice->ReadConfig (\r
+                        PciDevice,\r
+                        PCI_PRIMARY_STATUS_OFFSET,\r
+                        &PciStatusReg,\r
+                        sizeof PciStatusReg\r
+                        );\r
   if (RETURN_ERROR (Status)) {\r
     goto FreeCapHdrOffsets;\r
   }\r
+\r
   if ((PciStatusReg & EFI_PCI_STATUS_CAPABILITY) != 0) {\r
-    UINT8 NormalCapHdrOffset;\r
+    UINT8  NormalCapHdrOffset;\r
 \r
     //\r
     // Fetch the start offset of the normal capabilities list.\r
     //\r
-    Status = PciDevice->ReadConfig (PciDevice, PCI_CAPBILITY_POINTER_OFFSET,\r
-                          &NormalCapHdrOffset, sizeof NormalCapHdrOffset);\r
+    Status = PciDevice->ReadConfig (\r
+                          PciDevice,\r
+                          PCI_CAPBILITY_POINTER_OFFSET,\r
+                          &NormalCapHdrOffset,\r
+                          sizeof NormalCapHdrOffset\r
+                          );\r
     if (RETURN_ERROR (Status)) {\r
       goto FreeCapHdrOffsets;\r
     }\r
@@ -564,16 +601,26 @@ PciCapListInit (
     //\r
     NormalCapHdrOffset &= 0xFC;\r
     while (NormalCapHdrOffset > 0) {\r
-      EFI_PCI_CAPABILITY_HDR NormalCapHdr;\r
-\r
-      Status = PciDevice->ReadConfig (PciDevice, NormalCapHdrOffset,\r
-                            &NormalCapHdr, sizeof NormalCapHdr);\r
+      EFI_PCI_CAPABILITY_HDR  NormalCapHdr;\r
+\r
+      Status = PciDevice->ReadConfig (\r
+                            PciDevice,\r
+                            NormalCapHdrOffset,\r
+                            &NormalCapHdr,\r
+                            sizeof NormalCapHdr\r
+                            );\r
       if (RETURN_ERROR (Status)) {\r
         goto FreeCapHdrOffsets;\r
       }\r
 \r
-      Status = InsertPciCap (OutCapList, CapHdrOffsets, PciCapNormal,\r
-                 NormalCapHdr.CapabilityID, NormalCapHdrOffset, 0);\r
+      Status = InsertPciCap (\r
+                 OutCapList,\r
+                 CapHdrOffsets,\r
+                 PciCapNormal,\r
+                 NormalCapHdr.CapabilityID,\r
+                 NormalCapHdrOffset,\r
+                 0\r
+                 );\r
       if (RETURN_ERROR (Status)) {\r
         goto FreeCapHdrOffsets;\r
       }\r
@@ -581,6 +628,7 @@ PciCapListInit (
       if (NormalCapHdr.CapabilityID == EFI_PCI_CAPABILITY_ID_PCIEXP) {\r
         DeviceIsExpress = TRUE;\r
       }\r
+\r
       NormalCapHdrOffset = NormalCapHdr.NextItemPtr & 0xFC;\r
     }\r
   }\r
@@ -590,39 +638,51 @@ PciCapListInit (
   // capabilities list. It starts right after the normal config space.\r
   //\r
   if (DeviceIsExpress) {\r
-    UINT16 ExtendedCapHdrOffset;\r
+    UINT16  ExtendedCapHdrOffset;\r
 \r
     ExtendedCapHdrOffset = PCI_MAX_CONFIG_OFFSET;\r
     while (ExtendedCapHdrOffset > 0) {\r
-      PCI_EXPRESS_EXTENDED_CAPABILITIES_HEADER ExtendedCapHdr;\r
-\r
-      Status = PciDevice->ReadConfig (PciDevice, ExtendedCapHdrOffset,\r
-                            &ExtendedCapHdr, sizeof ExtendedCapHdr);\r
+      PCI_EXPRESS_EXTENDED_CAPABILITIES_HEADER  ExtendedCapHdr;\r
+\r
+      Status = PciDevice->ReadConfig (\r
+                            PciDevice,\r
+                            ExtendedCapHdrOffset,\r
+                            &ExtendedCapHdr,\r
+                            sizeof ExtendedCapHdr\r
+                            );\r
       //\r
       // If the first extended config space access fails, assume the device has\r
       // no extended capabilities. If the first extended config space access\r
       // succeeds but we read an "all bits zero" extended capability header,\r
       // that means (by spec) the device has no extended capabilities.\r
       //\r
-      if (ExtendedCapHdrOffset == PCI_MAX_CONFIG_OFFSET &&\r
+      if ((ExtendedCapHdrOffset == PCI_MAX_CONFIG_OFFSET) &&\r
           (RETURN_ERROR (Status) ||\r
-           IsZeroBuffer (&ExtendedCapHdr, sizeof ExtendedCapHdr))) {\r
+           IsZeroBuffer (&ExtendedCapHdr, sizeof ExtendedCapHdr)))\r
+      {\r
         break;\r
       }\r
+\r
       if (RETURN_ERROR (Status)) {\r
         goto FreeCapHdrOffsets;\r
       }\r
 \r
-      Status = InsertPciCap (OutCapList, CapHdrOffsets, PciCapExtended,\r
-                 (UINT16)ExtendedCapHdr.CapabilityId, ExtendedCapHdrOffset,\r
-                 (UINT8)ExtendedCapHdr.CapabilityVersion);\r
+      Status = InsertPciCap (\r
+                 OutCapList,\r
+                 CapHdrOffsets,\r
+                 PciCapExtended,\r
+                 (UINT16)ExtendedCapHdr.CapabilityId,\r
+                 ExtendedCapHdrOffset,\r
+                 (UINT8)ExtendedCapHdr.CapabilityVersion\r
+                 );\r
       if (RETURN_ERROR (Status)) {\r
         goto FreeCapHdrOffsets;\r
       }\r
 \r
       ExtendedCapHdrOffset = ExtendedCapHdr.NextCapabilityOffset & 0xFFC;\r
-      if (ExtendedCapHdrOffset > 0 &&\r
-          ExtendedCapHdrOffset < PCI_MAX_CONFIG_OFFSET) {\r
+      if ((ExtendedCapHdrOffset > 0) &&\r
+          (ExtendedCapHdrOffset < PCI_MAX_CONFIG_OFFSET))\r
+      {\r
         //\r
         // Invalid capability pointer.\r
         //\r
@@ -642,8 +702,8 @@ PciCapListInit (
   //\r
   OffsetEntry = OrderedCollectionMin (CapHdrOffsets);\r
   if (OffsetEntry != NULL) {\r
-    ORDERED_COLLECTION_ENTRY *NextOffsetEntry;\r
-    PCI_CAP                  *PciCap;\r
+    ORDERED_COLLECTION_ENTRY  *NextOffsetEntry;\r
+    PCI_CAP                   *PciCap;\r
 \r
     //\r
     // Initialize NextOffsetEntry to the iterator of the PCI_CAP object with\r
@@ -655,21 +715,23 @@ PciCapListInit (
     // highest Offset.\r
     //\r
     while (NextOffsetEntry != NULL) {\r
-      PCI_CAP *NextPciCap;\r
+      PCI_CAP  *NextPciCap;\r
 \r
       OrderedCollectionDelete (CapHdrOffsets, OffsetEntry, (VOID **)&PciCap);\r
       NextPciCap = OrderedCollectionUserStruct (NextOffsetEntry);\r
       CalculatePciCapMaxSizeHint (PciCap, NextPciCap);\r
 \r
-      OffsetEntry = NextOffsetEntry;\r
+      OffsetEntry     = NextOffsetEntry;\r
       NextOffsetEntry = OrderedCollectionNext (OffsetEntry);\r
     }\r
+\r
     //\r
     // Calculate MaxSizeHint for the PCI_CAP object with the highest Offset.\r
     //\r
     OrderedCollectionDelete (CapHdrOffsets, OffsetEntry, (VOID **)&PciCap);\r
     CalculatePciCapMaxSizeHint (PciCap, NULL);\r
   }\r
+\r
   ASSERT (OrderedCollectionIsEmpty (CapHdrOffsets));\r
   OrderedCollectionUninit (CapHdrOffsets);\r
 \r
@@ -687,12 +749,16 @@ FreeOutCapList:
   FreePool (OutCapList);\r
 \r
   ASSERT (RETURN_ERROR (Status));\r
-  DEBUG ((DEBUG_ERROR, "%a:%a: %r\n", gEfiCallerBaseName, __FUNCTION__,\r
-    Status));\r
+  DEBUG ((\r
+    DEBUG_ERROR,\r
+    "%a:%a: %r\n",\r
+    gEfiCallerBaseName,\r
+    __FUNCTION__,\r
+    Status\r
+    ));\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Free the resources used by CapList.\r
 \r
@@ -702,14 +768,13 @@ FreeOutCapList:
 VOID\r
 EFIAPI\r
 PciCapListUninit (\r
-  IN PCI_CAP_LIST *CapList\r
+  IN PCI_CAP_LIST  *CapList\r
   )\r
 {\r
   EmptyAndUninitPciCapCollection (CapList->Capabilities, TRUE);\r
   FreePool (CapList);\r
 }\r
 \r
-\r
 /**\r
   Locate a capability instance in the parsed capabilities lists.\r
 \r
@@ -746,15 +811,15 @@ PciCapListUninit (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapListFindCap (\r
-  IN  PCI_CAP_LIST   *CapList,\r
-  IN  PCI_CAP_DOMAIN Domain,\r
-  IN  UINT16         CapId,\r
-  IN  UINT16         Instance,\r
-  OUT PCI_CAP        **Cap    OPTIONAL\r
+  IN  PCI_CAP_LIST    *CapList,\r
+  IN  PCI_CAP_DOMAIN  Domain,\r
+  IN  UINT16          CapId,\r
+  IN  UINT16          Instance,\r
+  OUT PCI_CAP         **Cap    OPTIONAL\r
   )\r
 {\r
-  PCI_CAP_KEY              Key;\r
-  ORDERED_COLLECTION_ENTRY *PciCapEntry;\r
+  PCI_CAP_KEY               Key;\r
+  ORDERED_COLLECTION_ENTRY  *PciCapEntry;\r
 \r
   Key.Domain   = Domain;\r
   Key.CapId    = CapId;\r
@@ -764,13 +829,14 @@ PciCapListFindCap (
   if (PciCapEntry == NULL) {\r
     return RETURN_NOT_FOUND;\r
   }\r
+\r
   if (Cap != NULL) {\r
     *Cap = OrderedCollectionUserStruct (PciCapEntry);\r
   }\r
+\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Locate the first instance of the capability given by (Domain, CapId) such\r
   that the instance's Version is greater than or equal to MinVersion.\r
@@ -807,15 +873,15 @@ PciCapListFindCap (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapListFindCapVersion (\r
-  IN  PCI_CAP_LIST   *CapList,\r
-  IN  PCI_CAP_DOMAIN Domain,\r
-  IN  UINT16         CapId,\r
-  IN  UINT8          MinVersion,\r
-  OUT PCI_CAP        **Cap      OPTIONAL\r
+  IN  PCI_CAP_LIST    *CapList,\r
+  IN  PCI_CAP_DOMAIN  Domain,\r
+  IN  UINT16          CapId,\r
+  IN  UINT8           MinVersion,\r
+  OUT PCI_CAP         **Cap      OPTIONAL\r
   )\r
 {\r
-  PCI_CAP_KEY              Key;\r
-  ORDERED_COLLECTION_ENTRY *PciCapEntry;\r
+  PCI_CAP_KEY               Key;\r
+  ORDERED_COLLECTION_ENTRY  *PciCapEntry;\r
 \r
   //\r
   // Start the version checks at Instance#0 of (Domain, CapId).\r
@@ -826,8 +892,9 @@ PciCapListFindCapVersion (
 \r
   for (PciCapEntry = OrderedCollectionFind (CapList->Capabilities, &Key);\r
        PciCapEntry != NULL;\r
-       PciCapEntry = OrderedCollectionNext (PciCapEntry)) {\r
-    PCI_CAP *PciCap;\r
+       PciCapEntry = OrderedCollectionNext (PciCapEntry))\r
+  {\r
+    PCI_CAP  *PciCap;\r
 \r
     PciCap = OrderedCollectionUserStruct (PciCapEntry);\r
     //\r
@@ -835,9 +902,10 @@ PciCapListFindCapVersion (
     // adjacent to each other, so stop searching if either Domain or CapId\r
     // changes.\r
     //\r
-    if (PciCap->Key.Domain != Domain || PciCap->Key.CapId != CapId) {\r
+    if ((PciCap->Key.Domain != Domain) || (PciCap->Key.CapId != CapId)) {\r
       break;\r
     }\r
+\r
     if (PciCap->Version >= MinVersion) {\r
       //\r
       // Match found.\r
@@ -845,13 +913,14 @@ PciCapListFindCapVersion (
       if (Cap != NULL) {\r
         *Cap = PciCap;\r
       }\r
+\r
       return RETURN_SUCCESS;\r
     }\r
   }\r
+\r
   return RETURN_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   Get information about a PCI Capability instance.\r
 \r
@@ -869,11 +938,11 @@ PciCapListFindCapVersion (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapGetInfo (\r
-  IN  PCI_CAP      *Cap,\r
-  OUT PCI_CAP_INFO *Info\r
+  IN  PCI_CAP       *Cap,\r
+  OUT PCI_CAP_INFO  *Info\r
   )\r
 {\r
-  PCI_CAP *InstanceZero;\r
+  PCI_CAP  *InstanceZero;\r
 \r
   ASSERT (Info != NULL);\r
 \r
@@ -891,7 +960,6 @@ PciCapGetInfo (
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Read a slice of a capability instance.\r
 \r
@@ -931,11 +999,11 @@ PciCapGetInfo (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapRead (\r
-  IN  PCI_CAP_DEV *PciDevice,\r
-  IN  PCI_CAP     *Cap,\r
-  IN  UINT16      SourceOffsetInCap,\r
-  OUT VOID        *DestinationBuffer,\r
-  IN  UINT16      Size\r
+  IN  PCI_CAP_DEV  *PciDevice,\r
+  IN  PCI_CAP      *Cap,\r
+  IN  UINT16       SourceOffsetInCap,\r
+  OUT VOID         *DestinationBuffer,\r
+  IN  UINT16       Size\r
   )\r
 {\r
   //\r
@@ -945,10 +1013,14 @@ PciCapRead (
   if (SourceOffsetInCap + Size > Cap->MaxSizeHint) {\r
     return RETURN_BAD_BUFFER_SIZE;\r
   }\r
-  return PciDevice->ReadConfig (PciDevice, Cap->Offset + SourceOffsetInCap,\r
-                      DestinationBuffer, Size);\r
-}\r
 \r
+  return PciDevice->ReadConfig (\r
+                      PciDevice,\r
+                      Cap->Offset + SourceOffsetInCap,\r
+                      DestinationBuffer,\r
+                      Size\r
+                      );\r
+}\r
 \r
 /**\r
   Write a slice of a capability instance.\r
@@ -990,11 +1062,11 @@ PciCapRead (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapWrite (\r
-  IN PCI_CAP_DEV *PciDevice,\r
-  IN PCI_CAP     *Cap,\r
-  IN UINT16      DestinationOffsetInCap,\r
-  IN VOID        *SourceBuffer,\r
-  IN UINT16      Size\r
+  IN PCI_CAP_DEV  *PciDevice,\r
+  IN PCI_CAP      *Cap,\r
+  IN UINT16       DestinationOffsetInCap,\r
+  IN VOID         *SourceBuffer,\r
+  IN UINT16       Size\r
   )\r
 {\r
   //\r
@@ -1004,7 +1076,11 @@ PciCapWrite (
   if (DestinationOffsetInCap + Size > Cap->MaxSizeHint) {\r
     return RETURN_BAD_BUFFER_SIZE;\r
   }\r
-  return PciDevice->WriteConfig (PciDevice,\r
-                      Cap->Offset + DestinationOffsetInCap, SourceBuffer,\r
-                      Size);\r
+\r
+  return PciDevice->WriteConfig (\r
+                      PciDevice,\r
+                      Cap->Offset + DestinationOffsetInCap,\r
+                      SourceBuffer,\r
+                      Size\r
+                      );\r
 }\r
index e84dab62c54b6748978605e044abbcd62f248851..b836fd593c2295c4ec9d132bdc35e74bcff566bf 100644 (file)
@@ -18,9 +18,9 @@
 // for insertion and lookup.\r
 //\r
 typedef struct {\r
-  PCI_CAP_DOMAIN Domain;\r
-  UINT16         CapId;\r
-  UINT16         Instance;\r
+  PCI_CAP_DOMAIN    Domain;\r
+  UINT16            CapId;\r
+  UINT16            Instance;\r
 } PCI_CAP_KEY;\r
 \r
 //\r
@@ -29,26 +29,26 @@ typedef struct {
 // NumInstances needs maintenance in one object only, per (Domain, CapId) pair.\r
 //\r
 typedef union {\r
-  UINT16  NumInstances;\r
-  PCI_CAP *InstanceZero;\r
+  UINT16     NumInstances;\r
+  PCI_CAP    *InstanceZero;\r
 } PCI_CAP_NUM_INSTANCES;\r
 \r
 //\r
 // Complete the incomplete PCI_CAP structure here.\r
 //\r
 struct PCI_CAP {\r
-  PCI_CAP_KEY           Key;\r
-  PCI_CAP_NUM_INSTANCES NumInstancesUnion;\r
-  UINT16                Offset;\r
-  UINT16                MaxSizeHint;\r
-  UINT8                 Version;\r
+  PCI_CAP_KEY              Key;\r
+  PCI_CAP_NUM_INSTANCES    NumInstancesUnion;\r
+  UINT16                   Offset;\r
+  UINT16                   MaxSizeHint;\r
+  UINT8                    Version;\r
 };\r
 \r
 //\r
 // Complete the incomplete PCI_CAP_LIST structure here.\r
 //\r
 struct PCI_CAP_LIST {\r
-  ORDERED_COLLECTION *Capabilities;\r
+  ORDERED_COLLECTION    *Capabilities;\r
 };\r
 \r
 #endif // __BASE_PCI_CAP_LIB_H__\r
index 81f2a3eb06bbeb518f30bb67f91f4fe984b6ee26..8e7ea583fa072f5e2bed0f7c9309071d746f2f97 100644 (file)
@@ -14,7 +14,6 @@
 \r
 #include "BasePciCapPciSegmentLib.h"\r
 \r
-\r
 /**\r
   Read the config space of a given PCI device (both normal and extended).\r
 \r
@@ -44,17 +43,17 @@ STATIC
 RETURN_STATUS\r
 EFIAPI\r
 SegmentDevReadConfig (\r
-  IN  PCI_CAP_DEV *PciDevice,\r
-  IN  UINT16      SourceOffset,\r
-  OUT VOID        *DestinationBuffer,\r
-  IN  UINT16      Size\r
+  IN  PCI_CAP_DEV  *PciDevice,\r
+  IN  UINT16       SourceOffset,\r
+  OUT VOID         *DestinationBuffer,\r
+  IN  UINT16       Size\r
   )\r
 {\r
-  SEGMENT_DEV *SegmentDev;\r
-  UINT16      ConfigSpaceSize;\r
-  UINT64      SourceAddress;\r
+  SEGMENT_DEV  *SegmentDev;\r
+  UINT16       ConfigSpaceSize;\r
+  UINT64       SourceAddress;\r
 \r
-  SegmentDev = SEGMENT_DEV_FROM_PCI_CAP_DEV (PciDevice);\r
+  SegmentDev      = SEGMENT_DEV_FROM_PCI_CAP_DEV (PciDevice);\r
   ConfigSpaceSize = (SegmentDev->MaxDomain == PciCapNormal ?\r
                      PCI_MAX_CONFIG_OFFSET : PCI_EXP_MAX_CONFIG_OFFSET);\r
   //\r
@@ -64,14 +63,18 @@ SegmentDevReadConfig (
   if (SourceOffset + Size > ConfigSpaceSize) {\r
     return RETURN_UNSUPPORTED;\r
   }\r
-  SourceAddress = PCI_SEGMENT_LIB_ADDRESS (SegmentDev->SegmentNr,\r
-                    SegmentDev->BusNr, SegmentDev->DeviceNr,\r
-                    SegmentDev->FunctionNr, SourceOffset);\r
+\r
+  SourceAddress = PCI_SEGMENT_LIB_ADDRESS (\r
+                    SegmentDev->SegmentNr,\r
+                    SegmentDev->BusNr,\r
+                    SegmentDev->DeviceNr,\r
+                    SegmentDev->FunctionNr,\r
+                    SourceOffset\r
+                    );\r
   PciSegmentReadBuffer (SourceAddress, Size, DestinationBuffer);\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Write the config space of a given PCI device (both normal and extended).\r
 \r
@@ -101,17 +104,17 @@ STATIC
 RETURN_STATUS\r
 EFIAPI\r
 SegmentDevWriteConfig (\r
-  IN PCI_CAP_DEV *PciDevice,\r
-  IN UINT16      DestinationOffset,\r
-  IN VOID        *SourceBuffer,\r
-  IN UINT16      Size\r
+  IN PCI_CAP_DEV  *PciDevice,\r
+  IN UINT16       DestinationOffset,\r
+  IN VOID         *SourceBuffer,\r
+  IN UINT16       Size\r
   )\r
 {\r
-  SEGMENT_DEV *SegmentDev;\r
-  UINT16      ConfigSpaceSize;\r
-  UINT64      DestinationAddress;\r
+  SEGMENT_DEV  *SegmentDev;\r
+  UINT16       ConfigSpaceSize;\r
+  UINT64       DestinationAddress;\r
 \r
-  SegmentDev = SEGMENT_DEV_FROM_PCI_CAP_DEV (PciDevice);\r
+  SegmentDev      = SEGMENT_DEV_FROM_PCI_CAP_DEV (PciDevice);\r
   ConfigSpaceSize = (SegmentDev->MaxDomain == PciCapNormal ?\r
                      PCI_MAX_CONFIG_OFFSET : PCI_EXP_MAX_CONFIG_OFFSET);\r
   //\r
@@ -121,14 +124,18 @@ SegmentDevWriteConfig (
   if (DestinationOffset + Size > ConfigSpaceSize) {\r
     return RETURN_UNSUPPORTED;\r
   }\r
-  DestinationAddress = PCI_SEGMENT_LIB_ADDRESS (SegmentDev->SegmentNr,\r
-                         SegmentDev->BusNr, SegmentDev->DeviceNr,\r
-                         SegmentDev->FunctionNr, DestinationOffset);\r
+\r
+  DestinationAddress = PCI_SEGMENT_LIB_ADDRESS (\r
+                         SegmentDev->SegmentNr,\r
+                         SegmentDev->BusNr,\r
+                         SegmentDev->DeviceNr,\r
+                         SegmentDev->FunctionNr,\r
+                         DestinationOffset\r
+                         );\r
   PciSegmentWriteBuffer (DestinationAddress, Size, SourceBuffer);\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Create a PCI_CAP_DEV object from the PCI Segment:Bus:Device.Function\r
   quadruplet. The config space accessors are based upon PciSegmentLib.\r
@@ -168,17 +175,17 @@ SegmentDevWriteConfig (
 RETURN_STATUS\r
 EFIAPI\r
 PciCapPciSegmentDeviceInit (\r
-  IN  PCI_CAP_DOMAIN MaxDomain,\r
-  IN  UINT16         Segment,\r
-  IN  UINT8          Bus,\r
-  IN  UINT8          Device,\r
-  IN  UINT8          Function,\r
-  OUT PCI_CAP_DEV    **PciDevice\r
+  IN  PCI_CAP_DOMAIN  MaxDomain,\r
+  IN  UINT16          Segment,\r
+  IN  UINT8           Bus,\r
+  IN  UINT8           Device,\r
+  IN  UINT8           Function,\r
+  OUT PCI_CAP_DEV     **PciDevice\r
   )\r
 {\r
-  SEGMENT_DEV *SegmentDev;\r
+  SEGMENT_DEV  *SegmentDev;\r
 \r
-  if (Device > PCI_MAX_DEVICE || Function > PCI_MAX_FUNC) {\r
+  if ((Device > PCI_MAX_DEVICE) || (Function > PCI_MAX_FUNC)) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
@@ -200,7 +207,6 @@ PciCapPciSegmentDeviceInit (
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Free the resources used by PciDevice.\r
 \r
@@ -210,10 +216,10 @@ PciCapPciSegmentDeviceInit (
 VOID\r
 EFIAPI\r
 PciCapPciSegmentDeviceUninit (\r
-  IN PCI_CAP_DEV *PciDevice\r
+  IN PCI_CAP_DEV  *PciDevice\r
   )\r
 {\r
-  SEGMENT_DEV *SegmentDev;\r
+  SEGMENT_DEV  *SegmentDev;\r
 \r
   SegmentDev = SEGMENT_DEV_FROM_PCI_CAP_DEV (PciDevice);\r
   FreePool (SegmentDev);\r
index a806bf320d2c719e4163d99f08c02a02fe8a71d6..5d587ceca3e47cc97b1db57156bbec5ebee4d325 100644 (file)
 \r
 #include <Library/PciCapPciSegmentLib.h>\r
 \r
-#define SEGMENT_DEV_SIG SIGNATURE_64 ('P', 'C', 'P', 'S', 'G', 'M', 'N', 'T')\r
+#define SEGMENT_DEV_SIG  SIGNATURE_64 ('P', 'C', 'P', 'S', 'G', 'M', 'N', 'T')\r
 \r
 typedef struct {\r
   //\r
   // Signature identifying the derived class.\r
   //\r
-  UINT64 Signature;\r
+  UINT64            Signature;\r
   //\r
   // Members added by the derived class, specific to the use of PciSegmentLib.\r
   //\r
-  PCI_CAP_DOMAIN MaxDomain;\r
-  UINT16         SegmentNr;\r
-  UINT8          BusNr;\r
-  UINT8          DeviceNr;\r
-  UINT8          FunctionNr;\r
+  PCI_CAP_DOMAIN    MaxDomain;\r
+  UINT16            SegmentNr;\r
+  UINT8             BusNr;\r
+  UINT8             DeviceNr;\r
+  UINT8             FunctionNr;\r
   //\r
   // Base class.\r
   //\r
-  PCI_CAP_DEV BaseDevice;\r
+  PCI_CAP_DEV       BaseDevice;\r
 } SEGMENT_DEV;\r
 \r
 #define SEGMENT_DEV_FROM_PCI_CAP_DEV(PciDevice) \\r
index f1f7b2e0d2405e99c90b5143657add1342c08341..cc3e64f0c44c0826abce7e3352cb07e995abe0b9 100644 (file)
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 \r
-#define FW_PORT    0x510\r
-#define FW_IPORT   0x511\r
+#define FW_PORT   0x510\r
+#define FW_IPORT  0x511\r
 \r
 /* Transport protocol basic operations */\r
-#define OP_NULL      1\r
-#define OP_ECHO      2\r
-#define OP_GET       3\r
-#define OP_GET_LEN   4\r
-#define OP_SET       5\r
+#define OP_NULL     1\r
+#define OP_ECHO     2\r
+#define OP_GET      3\r
+#define OP_GET_LEN  4\r
+#define OP_SET      5\r
 \r
 /* Transport protocol error returns */\r
 #define T_ESUCCESS  0\r
 #define T_E2BIG     7\r
 #define T_EMSGSIZE  40\r
 \r
-#define ROUNDUP(x, y) ((((x)+((y)-1))/(y))*(y))\r
+#define ROUNDUP(x, y)  ((((x)+((y)-1))/(y))*(y))\r
 \r
-STATIC CONST CHAR8 mBhyveSig[4] = { 'B', 'H', 'Y', 'V' };\r
+STATIC CONST CHAR8  mBhyveSig[4] = { 'B', 'H', 'Y', 'V' };\r
 \r
-STATIC BOOLEAN mBhyveFwCtlSupported = FALSE;\r
+STATIC BOOLEAN  mBhyveFwCtlSupported = FALSE;\r
 \r
-STATIC INT32 mBhyveFwCtlTxid = 0xa5;\r
+STATIC INT32  mBhyveFwCtlTxid = 0xa5;\r
 \r
 /* XXX Maybe a better inbuilt version of this ? */\r
 typedef struct {\r
-  VOID     *Base;\r
+  VOID      *Base;\r
   UINT32    Len;\r
 } BIO_VEC;\r
 \r
@@ -59,27 +59,27 @@ STATIC
 RETURN_STATUS\r
 EFIAPI\r
 BhyveFwCtl_CvtErr (\r
-  IN UINT32    errno\r
+  IN UINT32  errno\r
   )\r
 {\r
-  RETURN_STATUS        Status;\r
+  RETURN_STATUS  Status;\r
 \r
   switch (errno) {\r
-  case T_ESUCCESS:\r
-    Status = RETURN_SUCCESS;\r
-    break;\r
-  case T_ENOENT:\r
-    Status = RETURN_NOT_FOUND;\r
-    break;\r
-  case T_E2BIG:\r
-    Status = RETURN_INVALID_PARAMETER;\r
-    break;\r
-  case T_EMSGSIZE:\r
-    Status = RETURN_BUFFER_TOO_SMALL;\r
-    break;\r
-  default:\r
-    Status = RETURN_PROTOCOL_ERROR;\r
-    break;\r
+    case T_ESUCCESS:\r
+      Status = RETURN_SUCCESS;\r
+      break;\r
+    case T_ENOENT:\r
+      Status = RETURN_NOT_FOUND;\r
+      break;\r
+    case T_E2BIG:\r
+      Status = RETURN_INVALID_PARAMETER;\r
+      break;\r
+    case T_EMSGSIZE:\r
+      Status = RETURN_BUFFER_TOO_SMALL;\r
+      break;\r
+    default:\r
+      Status = RETURN_PROTOCOL_ERROR;\r
+      break;\r
   }\r
 \r
   return Status;\r
@@ -89,17 +89,18 @@ STATIC
 UINT32\r
 EFIAPI\r
 BIov_WLen (\r
-  IN BIO_VEC b[]\r
+  IN BIO_VEC  b[]\r
   )\r
 {\r
-  UINT32        i;\r
-  UINT32        tLen;\r
+  UINT32  i;\r
+  UINT32  tLen;\r
 \r
   tLen = 0;\r
 \r
   if (b != NULL) {\r
-    for (i = 0; b[i].Base != NULL; i++)\r
-      tLen += ROUNDUP (b[i].Len, sizeof(UINT32));\r
+    for (i = 0; b[i].Base != NULL; i++) {\r
+      tLen += ROUNDUP (b[i].Len, sizeof (UINT32));\r
+    }\r
   }\r
 \r
   return tLen;\r
@@ -113,21 +114,22 @@ STATIC
 UINT32\r
 BIov_Send_Rem (\r
   IN UINT32  *Data,\r
-  IN UINT32   Len\r
+  IN UINT32  Len\r
   )\r
 {\r
   union {\r
-    UINT8    c[4];\r
+    UINT8     c[4];\r
     UINT32    w;\r
   } u;\r
-  UINT8        *cdata;\r
-  UINT32        i;\r
+  UINT8   *cdata;\r
+  UINT32  i;\r
 \r
   cdata = (UINT8 *)Data;\r
-  u.w = 0;\r
+  u.w   = 0;\r
 \r
-  for (i = 0; i < Len; i++)\r
+  for (i = 0; i < Len; i++) {\r
     u.c[i] = *cdata++;\r
+  }\r
 \r
   return u.w;\r
 }\r
@@ -140,16 +142,16 @@ STATIC
 VOID\r
 BIov_Send (\r
   IN char    *Data,\r
-  IN UINT32   Len\r
+  IN UINT32  Len\r
   )\r
 {\r
-  UINT32    *LData;\r
+  UINT32  *LData;\r
 \r
   LData = (UINT32 *)Data;\r
 \r
-  while (Len > sizeof(UINT32)) {\r
+  while (Len > sizeof (UINT32)) {\r
     IoWrite32 (FW_PORT, *LData++);\r
-    Len -= sizeof(UINT32);\r
+    Len -= sizeof (UINT32);\r
   }\r
 \r
   if (Len > 0) {\r
@@ -163,10 +165,10 @@ BIov_Send (
 STATIC\r
 VOID\r
 BIov_SendAll (\r
-   IN BIO_VEC b[]\r
-   )\r
+  IN BIO_VEC  b[]\r
+  )\r
 {\r
-  INT32        i;\r
+  INT32  i;\r
 \r
   if (b != NULL) {\r
     for (i = 0; b[i].Base; i++) {\r
@@ -181,22 +183,23 @@ BIov_SendAll (
 STATIC\r
 VOID\r
 EFIAPI\r
-BhyveFwCtl_MsgSend(\r
-  IN  UINT32  OpCode,\r
+BhyveFwCtl_MsgSend (\r
+  IN  UINT32   OpCode,\r
   IN  BIO_VEC  Data[]\r
   )\r
 {\r
   BIO_VEC  hIov[4];\r
-  UINT32  Hdr[3];\r
-  UINT32  i;\r
+  UINT32   Hdr[3];\r
+  UINT32   i;\r
 \r
   /* Set up header as an iovec */\r
   for (i = 0; i < 3; i++) {\r
     hIov[i].Base = &Hdr[i];\r
-    hIov[i].Len  = sizeof(Hdr[0]);\r
+    hIov[i].Len  = sizeof (Hdr[0]);\r
   }\r
+\r
   hIov[i].Base = NULL;\r
-  hIov[i].Len = 0;\r
+  hIov[i].Len  = 0;\r
 \r
   /* Initialize header */\r
   Hdr[0] = BIov_WLen (hIov) + BIov_WLen (Data);\r
@@ -214,13 +217,13 @@ BhyveFwCtl_MsgSend(
 STATIC\r
 RETURN_STATUS\r
 EFIAPI\r
-BhyveFwCtl_MsgRecv(\r
-  OUT  MSG_RX_HDR *Rhdr,\r
-  OUT  BIO_VEC    Data[]\r
+BhyveFwCtl_MsgRecv (\r
+  OUT  MSG_RX_HDR  *Rhdr,\r
+  OUT  BIO_VEC     Data[]\r
   )\r
 {\r
   RETURN_STATUS  Status;\r
-  UINT32        *Dp;\r
+  UINT32         *Dp;\r
   UINT32         Rd;\r
   UINT32         remLen;\r
   INT32          oLen;\r
@@ -228,7 +231,6 @@ BhyveFwCtl_MsgRecv(
 \r
   Rd = IoRead32 (FW_PORT);\r
   if (Rd < sizeof (MSG_RX_HDR)) {\r
-    ;\r
   }\r
 \r
   /* Read in header and setup initial error */\r
@@ -241,7 +243,7 @@ BhyveFwCtl_MsgRecv(
   Status = BhyveFwCtl_CvtErr (Rhdr->Err);\r
 \r
   remLen = Rd - sizeof (MSG_RX_HDR);\r
-  xLen = 0;\r
+  xLen   = 0;\r
 \r
   /*\r
    * A few cases to handle:\r
@@ -250,47 +252,48 @@ BhyveFwCtl_MsgRecv(
    *  - the response is zero-length\r
    */\r
   if (Data != NULL) {\r
-    Dp = (UINT32 *)Data[0].Base;\r
+    Dp   = (UINT32 *)Data[0].Base;\r
     oLen = remLen;\r
     if (remLen > Data[0].Len) {\r
       Status = RETURN_BUFFER_TOO_SMALL;\r
-      xLen = remLen - Data[0].Len;\r
-      oLen = remLen = Data[0].Len;\r
+      xLen   = remLen - Data[0].Len;\r
+      oLen   = remLen = Data[0].Len;\r
     }\r
+\r
     while (remLen > 0) {\r
-      *Dp++ = IoRead32 (FW_PORT);\r
+      *Dp++   = IoRead32 (FW_PORT);\r
       remLen -= sizeof (UINT32);\r
     }\r
+\r
     Data[0].Len = oLen;\r
   } else {\r
     /* No user data, but data returned - drop */\r
     if (remLen > 0) {\r
       Status = RETURN_BUFFER_TOO_SMALL;\r
-      xLen = remLen;\r
+      xLen   = remLen;\r
     }\r
   }\r
 \r
   /* Drop additional data */\r
   while (xLen > 0) {\r
-    (void) IoRead32 (FW_PORT);\r
+    (void)IoRead32 (FW_PORT);\r
     xLen -= sizeof (UINT32);\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 RETURN_STATUS\r
 EFIAPI\r
-BhyveFwCtl_Msg(\r
-   IN   UINT32 OpCode,\r
-   IN   BIO_VEC Sdata[],\r
-   OUT  BIO_VEC Rdata[]\r
-   )\r
+BhyveFwCtl_Msg (\r
+  IN   UINT32   OpCode,\r
+  IN   BIO_VEC  Sdata[],\r
+  OUT  BIO_VEC  Rdata[]\r
+  )\r
 {\r
-  MSG_RX_HDR  Rh;\r
-  RETURN_STATUS    Status;\r
+  MSG_RX_HDR     Rh;\r
+  RETURN_STATUS  Status;\r
 \r
   Status = RETURN_SUCCESS;\r
 \r
@@ -306,11 +309,11 @@ STATIC
 RETURN_STATUS\r
 EFIAPI\r
 BhyveFwCtlGetLen (\r
-  IN CONST CHAR8  *Name,\r
-  IN OUT   UINT32 *Size\r
+  IN CONST CHAR8   *Name,\r
+  IN OUT   UINT32  *Size\r
   )\r
 {\r
-  BIO_VEC         Req[2], Resp[2];\r
+  BIO_VEC        Req[2], Resp[2];\r
   RETURN_STATUS  Status;\r
 \r
   Req[0].Base = (VOID *)Name;\r
@@ -326,7 +329,7 @@ BhyveFwCtlGetLen (
   return Status;\r
 }\r
 \r
-#define FMAXSZ    1024\r
+#define FMAXSZ  1024\r
 STATIC struct {\r
   UINT64    fSize;\r
   UINT32    fData[FMAXSZ];\r
@@ -336,18 +339,19 @@ STATIC
 RETURN_STATUS\r
 EFIAPI\r
 BhyveFwCtlGetVal (\r
-  IN CONST CHAR8 *Name,\r
-  OUT      VOID  *Item,\r
-  IN OUT   UINT32   *Size\r
+  IN CONST CHAR8   *Name,\r
+  OUT      VOID    *Item,\r
+  IN OUT   UINT32  *Size\r
   )\r
 {\r
-  BIO_VEC         Req[2];\r
-  BIO_VEC         Resp[2];\r
+  BIO_VEC        Req[2];\r
+  BIO_VEC        Resp[2];\r
   RETURN_STATUS  Status;\r
 \r
   /* Make sure temp buffer is larger than passed-in size */\r
-  if (*Size > sizeof (FwGetvalBuf.fData))\r
-      return RETURN_INVALID_PARAMETER;\r
+  if (*Size > sizeof (FwGetvalBuf.fData)) {\r
+    return RETURN_INVALID_PARAMETER;\r
+  }\r
 \r
   Req[0].Base = (VOID *)Name;\r
   Req[0].Len  = (UINT32)AsciiStrLen (Name) + 1;\r
@@ -378,26 +382,26 @@ BhyveFwCtlGetVal (
 RETURN_STATUS\r
 EFIAPI\r
 BhyveFwCtlGet (\r
-  IN   CONST CHAR8 *Name,\r
-  OUT  VOID        *Item,\r
-  IN OUT  UINTN    *Size\r
+  IN   CONST CHAR8  *Name,\r
+  OUT  VOID         *Item,\r
+  IN OUT  UINTN     *Size\r
   )\r
 {\r
-  RETURN_STATUS        Status;\r
+  RETURN_STATUS  Status;\r
 \r
-  if (mBhyveFwCtlSupported == FALSE)\r
+  if (mBhyveFwCtlSupported == FALSE) {\r
     return RETURN_UNSUPPORTED;\r
+  }\r
 \r
   if (Item == NULL) {\r
-    Status = BhyveFwCtlGetLen (Name, (UINT32*)Size);\r
+    Status = BhyveFwCtlGetLen (Name, (UINT32 *)Size);\r
   } else {\r
-    Status = BhyveFwCtlGetVal (Name, Item, (UINT32*)Size);\r
+    Status = BhyveFwCtlGetVal (Name, Item, (UINT32 *)Size);\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
    Library initialization. Probe the host to see if the f/w ctl\r
    interface is supported.\r
index 975d4dd52f80d17a8b723e90021e2d95f85e071d..e817c3cc951cf9b676c57b8bf0d3c26eff917dcd 100644 (file)
@@ -24,9 +24,9 @@
 EFI_STATUS\r
 EFIAPI\r
 VerifyBlob (\r
-  IN  CONST CHAR16    *BlobName,\r
-  IN  CONST VOID      *Buf,\r
-  IN  UINT32          BufSize\r
+  IN  CONST CHAR16  *BlobName,\r
+  IN  CONST VOID    *Buf,\r
+  IN  UINT32        BufSize\r
   )\r
 {\r
   return EFI_SUCCESS;\r
index 1839f11f3301f448deaf9a23e7eba7d0042adfeb..ab620688f1661129eea2a9e5ba70cd29e019ac38 100644 (file)
@@ -15,7 +15,6 @@
 \r
 **/\r
 \r
-\r
 #include <Base.h>\r
 \r
 #include <IndustryStandard/Q35MchIch9.h>\r
@@ -25,7 +24,7 @@
 #include <Library/PciExpressLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
-STATIC BOOLEAN mRunningOnQ35;\r
+STATIC BOOLEAN  mRunningOnQ35;\r
 \r
 RETURN_STATUS\r
 EFIAPI\r
@@ -88,7 +87,7 @@ PciRegisterForRuntimeAccess (
 UINT8\r
 EFIAPI\r
 PciRead8 (\r
-  IN      UINTN                     Address\r
+  IN      UINTN  Address\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -115,8 +114,8 @@ PciRead8 (
 UINT8\r
 EFIAPI\r
 PciWrite8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Address,\r
+  IN      UINT8  Value\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -147,8 +146,8 @@ PciWrite8 (
 UINT8\r
 EFIAPI\r
 PciOr8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Address,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -179,8 +178,8 @@ PciOr8 (
 UINT8\r
 EFIAPI\r
 PciAnd8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     AndData\r
+  IN      UINTN  Address,\r
+  IN      UINT8  AndData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -213,9 +212,9 @@ PciAnd8 (
 UINT8\r
 EFIAPI\r
 PciAndThenOr8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT8                     AndData,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Address,\r
+  IN      UINT8  AndData,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -247,9 +246,9 @@ PciAndThenOr8 (
 UINT8\r
 EFIAPI\r
 PciBitFieldRead8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -284,10 +283,10 @@ PciBitFieldRead8 (
 UINT8\r
 EFIAPI\r
 PciBitFieldWrite8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  Value\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -325,10 +324,10 @@ PciBitFieldWrite8 (
 UINT8\r
 EFIAPI\r
 PciBitFieldOr8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -366,10 +365,10 @@ PciBitFieldOr8 (
 UINT8\r
 EFIAPI\r
 PciBitFieldAnd8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     AndData\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  AndData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -411,11 +410,11 @@ PciBitFieldAnd8 (
 UINT8\r
 EFIAPI\r
 PciBitFieldAndThenOr8 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT8                     AndData,\r
-  IN      UINT8                     OrData\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit,\r
+  IN      UINT8  AndData,\r
+  IN      UINT8  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -442,7 +441,7 @@ PciBitFieldAndThenOr8 (
 UINT16\r
 EFIAPI\r
 PciRead16 (\r
-  IN      UINTN                     Address\r
+  IN      UINTN  Address\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -470,8 +469,8 @@ PciRead16 (
 UINT16\r
 EFIAPI\r
 PciWrite16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINT16  Value\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -503,8 +502,8 @@ PciWrite16 (
 UINT16\r
 EFIAPI\r
 PciOr16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -536,8 +535,8 @@ PciOr16 (
 UINT16\r
 EFIAPI\r
 PciAnd16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINT16  AndData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -571,9 +570,9 @@ PciAnd16 (
 UINT16\r
 EFIAPI\r
 PciAndThenOr16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT16                    AndData,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT16  AndData,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -606,9 +605,9 @@ PciAndThenOr16 (
 UINT16\r
 EFIAPI\r
 PciBitFieldRead16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -644,10 +643,10 @@ PciBitFieldRead16 (
 UINT16\r
 EFIAPI\r
 PciBitFieldWrite16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  Value\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -686,10 +685,10 @@ PciBitFieldWrite16 (
 UINT16\r
 EFIAPI\r
 PciBitFieldOr16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -728,10 +727,10 @@ PciBitFieldOr16 (
 UINT16\r
 EFIAPI\r
 PciBitFieldAnd16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  AndData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -774,11 +773,11 @@ PciBitFieldAnd16 (
 UINT16\r
 EFIAPI\r
 PciBitFieldAndThenOr16 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT16                    AndData,\r
-  IN      UINT16                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT16  AndData,\r
+  IN      UINT16  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -805,7 +804,7 @@ PciBitFieldAndThenOr16 (
 UINT32\r
 EFIAPI\r
 PciRead32 (\r
-  IN      UINTN                     Address\r
+  IN      UINTN  Address\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -833,8 +832,8 @@ PciRead32 (
 UINT32\r
 EFIAPI\r
 PciWrite32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINT32  Value\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -866,8 +865,8 @@ PciWrite32 (
 UINT32\r
 EFIAPI\r
 PciOr32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -899,8 +898,8 @@ PciOr32 (
 UINT32\r
 EFIAPI\r
 PciAnd32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINT32  AndData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -934,9 +933,9 @@ PciAnd32 (
 UINT32\r
 EFIAPI\r
 PciAndThenOr32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINT32                    AndData,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINT32  AndData,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -969,9 +968,9 @@ PciAndThenOr32 (
 UINT32\r
 EFIAPI\r
 PciBitFieldRead32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit\r
+  IN      UINTN  Address,\r
+  IN      UINTN  StartBit,\r
+  IN      UINTN  EndBit\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -1007,10 +1006,10 @@ PciBitFieldRead32 (
 UINT32\r
 EFIAPI\r
 PciBitFieldWrite32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    Value\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  Value\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -1049,10 +1048,10 @@ PciBitFieldWrite32 (
 UINT32\r
 EFIAPI\r
 PciBitFieldOr32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -1091,10 +1090,10 @@ PciBitFieldOr32 (
 UINT32\r
 EFIAPI\r
 PciBitFieldAnd32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    AndData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  AndData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -1137,11 +1136,11 @@ PciBitFieldAnd32 (
 UINT32\r
 EFIAPI\r
 PciBitFieldAndThenOr32 (\r
-  IN      UINTN                     Address,\r
-  IN      UINTN                     StartBit,\r
-  IN      UINTN                     EndBit,\r
-  IN      UINT32                    AndData,\r
-  IN      UINT32                    OrData\r
+  IN      UINTN   Address,\r
+  IN      UINTN   StartBit,\r
+  IN      UINTN   EndBit,\r
+  IN      UINT32  AndData,\r
+  IN      UINT32  OrData\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -1175,9 +1174,9 @@ PciBitFieldAndThenOr32 (
 UINTN\r
 EFIAPI\r
 PciReadBuffer (\r
-  IN      UINTN                     StartAddress,\r
-  IN      UINTN                     Size,\r
-  OUT     VOID                      *Buffer\r
+  IN      UINTN  StartAddress,\r
+  IN      UINTN  Size,\r
+  OUT     VOID   *Buffer\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
@@ -1212,9 +1211,9 @@ PciReadBuffer (
 UINTN\r
 EFIAPI\r
 PciWriteBuffer (\r
-  IN      UINTN                     StartAddress,\r
-  IN      UINTN                     Size,\r
-  IN      VOID                      *Buffer\r
+  IN      UINTN  StartAddress,\r
+  IN      UINTN  Size,\r
+  IN      VOID   *Buffer\r
   )\r
 {\r
   return mRunningOnQ35 ?\r
index 9c890013e3bd74f28b606ba39ca941051b515798..9840676ff8d38e446691b042a1be64cf7e063483 100644 (file)
@@ -13,7 +13,6 @@
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiRuntimeLib.h>\r
 \r
-\r
 /**\r
   This function will be called following a call to the\r
   EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Read function.\r
 VOID\r
 EFIAPI\r
 PlatformFvbDataRead (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN        EFI_LBA                             Lba,\r
-  IN        UINTN                               Offset,\r
-  IN        UINTN                               NumBytes,\r
-  IN        UINT8                               *Buffer\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN        EFI_LBA                              Lba,\r
+  IN        UINTN                                Offset,\r
+  IN        UINTN                                NumBytes,\r
+  IN        UINT8                                *Buffer\r
   )\r
 {\r
 }\r
 \r
-\r
 /**\r
   This function will be called following a call to the\r
   EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Write function.\r
@@ -54,26 +52,26 @@ PlatformFvbDataRead (
 VOID\r
 EFIAPI\r
 PlatformFvbDataWritten (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN        EFI_LBA                             Lba,\r
-  IN        UINTN                               Offset,\r
-  IN        UINTN                               NumBytes,\r
-  IN        UINT8                               *Buffer\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN        EFI_LBA                              Lba,\r
+  IN        UINTN                                Offset,\r
+  IN        UINTN                                NumBytes,\r
+  IN        UINT8                                *Buffer\r
   )\r
 {\r
-  STATIC EFI_EVENT EventToSignal = NULL;\r
+  STATIC EFI_EVENT  EventToSignal = NULL;\r
 \r
   if (!EfiAtRuntime ()) {\r
     if (EventToSignal == NULL) {\r
-      EventToSignal = (EFI_EVENT)(UINTN) PcdGet64 (PcdEmuVariableEvent);\r
+      EventToSignal = (EFI_EVENT)(UINTN)PcdGet64 (PcdEmuVariableEvent);\r
     }\r
+\r
     if (EventToSignal != NULL) {\r
       gBS->SignalEvent (EventToSignal);\r
     }\r
   }\r
 }\r
 \r
-\r
 /**\r
   This function will be called following a call to the\r
   EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Erase function.\r
@@ -88,10 +86,8 @@ PlatformFvbDataWritten (
 VOID\r
 EFIAPI\r
 PlatformFvbBlocksErased (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN  VA_LIST       List\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN  VA_LIST                                    List\r
   )\r
 {\r
 }\r
-\r
-\r
index 66e029397bd6de085f637a670ffa03404f72ee1f..c751b106792fecaf4f22740cf05e478d65750612 100644 (file)
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  EFI_DEVICE_PATH_PROTOCOL  FilePathHeader;\r
-  CHAR16                    FilePath[ARRAY_SIZE (L"kernel")];\r
+  EFI_DEVICE_PATH_PROTOCOL    FilePathHeader;\r
+  CHAR16                      FilePath[ARRAY_SIZE (L"kernel")];\r
 } KERNEL_FILE_DEVPATH;\r
 \r
 typedef struct {\r
-  VENDOR_DEVICE_PATH        VenMediaNode;\r
-  KERNEL_FILE_DEVPATH       FileNode;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndNode;\r
+  VENDOR_DEVICE_PATH          VenMediaNode;\r
+  KERNEL_FILE_DEVPATH         FileNode;\r
+  EFI_DEVICE_PATH_PROTOCOL    EndNode;\r
 } KERNEL_VENMEDIA_FILE_DEVPATH;\r
 \r
 typedef struct {\r
-  VENDOR_DEVICE_PATH       VenMediaNode;\r
-  EFI_DEVICE_PATH_PROTOCOL EndNode;\r
+  VENDOR_DEVICE_PATH          VenMediaNode;\r
+  EFI_DEVICE_PATH_PROTOCOL    EndNode;\r
 } SINGLE_VENMEDIA_NODE_DEVPATH;\r
 #pragma pack ()\r
 \r
-STATIC CONST KERNEL_VENMEDIA_FILE_DEVPATH mKernelDevicePath = {\r
+STATIC CONST KERNEL_VENMEDIA_FILE_DEVPATH  mKernelDevicePath = {\r
   {\r
     {\r
       MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP,\r
-      { sizeof (VENDOR_DEVICE_PATH) }\r
+      { sizeof (VENDOR_DEVICE_PATH)       }\r
     },\r
     QEMU_KERNEL_LOADER_FS_MEDIA_GUID\r
-  }, {\r
+  },  {\r
     {\r
       MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP,\r
-      { sizeof (KERNEL_FILE_DEVPATH) }\r
+      { sizeof (KERNEL_FILE_DEVPATH)      }\r
     },\r
     L"kernel",\r
-  }, {\r
+  },  {\r
     END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     { sizeof (EFI_DEVICE_PATH_PROTOCOL) }\r
   }\r
 };\r
 \r
-STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mQemuKernelLoaderFsDevicePath = {\r
+STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH  mQemuKernelLoaderFsDevicePath = {\r
   {\r
     {\r
       MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP,\r
-      { sizeof (VENDOR_DEVICE_PATH) }\r
+      { sizeof (VENDOR_DEVICE_PATH)       }\r
     },\r
     QEMU_KERNEL_LOADER_FS_MEDIA_GUID\r
-  }, {\r
+  },  {\r
     END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     { sizeof (EFI_DEVICE_PATH_PROTOCOL) }\r
   }\r
@@ -73,28 +73,31 @@ STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mQemuKernelLoaderFsDevicePath = {
 STATIC\r
 EFI_STATUS\r
 GetQemuKernelLoaderBlobSize (\r
-  IN  EFI_FILE_HANDLE     Root,\r
-  IN  CHAR16              *FileName,\r
-  OUT UINTN               *Size\r
+  IN  EFI_FILE_HANDLE  Root,\r
+  IN  CHAR16           *FileName,\r
+  OUT UINTN            *Size\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  EFI_FILE_HANDLE FileHandle;\r
-  UINT64          FileSize;\r
+  EFI_STATUS       Status;\r
+  EFI_FILE_HANDLE  FileHandle;\r
+  UINT64           FileSize;\r
 \r
   Status = Root->Open (Root, &FileHandle, FileName, EFI_FILE_MODE_READ, 0);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   Status = FileHandleGetSize (FileHandle, &FileSize);\r
   if (EFI_ERROR (Status)) {\r
     goto CloseFile;\r
   }\r
+\r
   if (FileSize > MAX_UINTN) {\r
     Status = EFI_UNSUPPORTED;\r
     goto CloseFile;\r
   }\r
-  *Size = (UINTN)FileSize;\r
+\r
+  *Size  = (UINTN)FileSize;\r
   Status = EFI_SUCCESS;\r
 CloseFile:\r
   FileHandle->Close (FileHandle);\r
@@ -104,29 +107,32 @@ CloseFile:
 STATIC\r
 EFI_STATUS\r
 ReadWholeQemuKernelLoaderBlob (\r
-  IN  EFI_FILE_HANDLE     Root,\r
-  IN  CHAR16              *FileName,\r
-  IN  UINTN               Size,\r
-  OUT VOID                *Buffer\r
+  IN  EFI_FILE_HANDLE  Root,\r
+  IN  CHAR16           *FileName,\r
+  IN  UINTN            Size,\r
+  OUT VOID             *Buffer\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  EFI_FILE_HANDLE FileHandle;\r
-  UINTN           ReadSize;\r
+  EFI_STATUS       Status;\r
+  EFI_FILE_HANDLE  FileHandle;\r
+  UINTN            ReadSize;\r
 \r
   Status = Root->Open (Root, &FileHandle, FileName, EFI_FILE_MODE_READ, 0);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ReadSize = Size;\r
-  Status = FileHandle->Read (FileHandle, &ReadSize, Buffer);\r
+  Status   = FileHandle->Read (FileHandle, &ReadSize, Buffer);\r
   if (EFI_ERROR (Status)) {\r
     goto CloseFile;\r
   }\r
+\r
   if (ReadSize != Size) {\r
     Status = EFI_PROTOCOL_ERROR;\r
     goto CloseFile;\r
   }\r
+\r
   Status = EFI_SUCCESS;\r
 CloseFile:\r
   FileHandle->Close (FileHandle);\r
@@ -155,19 +161,19 @@ CloseFile:
 EFI_STATUS\r
 EFIAPI\r
 QemuLoadKernelImage (\r
-  OUT EFI_HANDLE                  *ImageHandle\r
+  OUT EFI_HANDLE  *ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_HANDLE                      KernelImageHandle;\r
-  EFI_LOADED_IMAGE_PROTOCOL       *KernelLoadedImage;\r
-  EFI_DEVICE_PATH_PROTOCOL        *DevicePathNode;\r
-  EFI_HANDLE                      FsVolumeHandle;\r
-  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *FsProtocol;\r
-  EFI_FILE_HANDLE                 Root;\r
-  UINTN                           CommandLineSize;\r
-  CHAR8                           *CommandLine;\r
-  UINTN                           InitrdSize;\r
+  EFI_STATUS                       Status;\r
+  EFI_HANDLE                       KernelImageHandle;\r
+  EFI_LOADED_IMAGE_PROTOCOL        *KernelLoadedImage;\r
+  EFI_DEVICE_PATH_PROTOCOL         *DevicePathNode;\r
+  EFI_HANDLE                       FsVolumeHandle;\r
+  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *FsProtocol;\r
+  EFI_FILE_HANDLE                  Root;\r
+  UINTN                            CommandLineSize;\r
+  CHAR8                            *CommandLine;\r
+  UINTN                            InitrdSize;\r
 \r
   //\r
   // Load the image. This should call back into the QEMU EFI loader file system.\r
@@ -181,20 +187,24 @@ QemuLoadKernelImage (
                   &KernelImageHandle\r
                   );\r
   switch (Status) {\r
-  case EFI_SUCCESS:\r
-    break;\r
-\r
-  case EFI_SECURITY_VIOLATION:\r
-    //\r
-    // In this case, the image was loaded but failed to authenticate.\r
-    //\r
-    Status = EFI_ACCESS_DENIED;\r
-    goto UnloadImage;\r
-\r
-  default:\r
-    DEBUG ((Status == EFI_NOT_FOUND ? DEBUG_INFO : DEBUG_ERROR,\r
-      "%a: LoadImage(): %r\n", __FUNCTION__, Status));\r
-    return Status;\r
+    case EFI_SUCCESS:\r
+      break;\r
+\r
+    case EFI_SECURITY_VIOLATION:\r
+      //\r
+      // In this case, the image was loaded but failed to authenticate.\r
+      //\r
+      Status = EFI_ACCESS_DENIED;\r
+      goto UnloadImage;\r
+\r
+    default:\r
+      DEBUG ((\r
+        Status == EFI_NOT_FOUND ? DEBUG_INFO : DEBUG_ERROR,\r
+        "%a: LoadImage(): %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
+      return Status;\r
   }\r
 \r
   //\r
@@ -215,11 +225,11 @@ QemuLoadKernelImage (
   // used to query the "initrd" and to read the "cmdline" synthetic files.\r
   //\r
   DevicePathNode = (EFI_DEVICE_PATH_PROTOCOL *)&mQemuKernelLoaderFsDevicePath;\r
-  Status = gBS->LocateDevicePath (\r
-                  &gEfiSimpleFileSystemProtocolGuid,\r
-                  &DevicePathNode,\r
-                  &FsVolumeHandle\r
-                  );\r
+  Status         = gBS->LocateDevicePath (\r
+                          &gEfiSimpleFileSystemProtocolGuid,\r
+                          &DevicePathNode,\r
+                          &FsVolumeHandle\r
+                          );\r
   if (EFI_ERROR (Status)) {\r
     goto UnloadImage;\r
   }\r
@@ -252,8 +262,12 @@ QemuLoadKernelImage (
       goto CloseRoot;\r
     }\r
 \r
-    Status = ReadWholeQemuKernelLoaderBlob (Root, L"cmdline", CommandLineSize,\r
-               CommandLine);\r
+    Status = ReadWholeQemuKernelLoaderBlob (\r
+               Root,\r
+               L"cmdline",\r
+               CommandLineSize,\r
+               CommandLine\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       goto FreeCommandLine;\r
     }\r
@@ -262,8 +276,11 @@ QemuLoadKernelImage (
     // Verify NUL-termination of the command line.\r
     //\r
     if (CommandLine[CommandLineSize - 1] != '\0') {\r
-      DEBUG ((DEBUG_ERROR, "%a: kernel command line is not NUL-terminated\n",\r
-        __FUNCTION__));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: kernel command line is not NUL-terminated\n",\r
+        __FUNCTION__\r
+        ));\r
       Status = EFI_PROTOCOL_ERROR;\r
       goto FreeCommandLine;\r
     }\r
@@ -295,10 +312,11 @@ QemuLoadKernelImage (
     KernelLoadedImage->LoadOptionsSize += 2;\r
 \r
     KernelLoadedImage->LoadOptions = AllocatePool (\r
-                                       KernelLoadedImage->LoadOptionsSize);\r
+                                       KernelLoadedImage->LoadOptionsSize\r
+                                       );\r
     if (KernelLoadedImage->LoadOptions == NULL) {\r
       KernelLoadedImage->LoadOptionsSize = 0;\r
-      Status = EFI_OUT_OF_RESOURCES;\r
+      Status                             = EFI_OUT_OF_RESOURCES;\r
       goto FreeCommandLine;\r
     }\r
 \r
@@ -309,17 +327,22 @@ QemuLoadKernelImage (
       (CommandLineSize == 0) ?  "" : CommandLine,\r
       (InitrdSize == 0)      ?  "" : " initrd=initrd"\r
       );\r
-    DEBUG ((DEBUG_INFO, "%a: command line: \"%s\"\n", __FUNCTION__,\r
-      (CHAR16 *)KernelLoadedImage->LoadOptions));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: command line: \"%s\"\n",\r
+      __FUNCTION__,\r
+      (CHAR16 *)KernelLoadedImage->LoadOptions\r
+      ));\r
   }\r
 \r
   *ImageHandle = KernelImageHandle;\r
-  Status = EFI_SUCCESS;\r
+  Status       = EFI_SUCCESS;\r
 \r
 FreeCommandLine:\r
   if (CommandLineSize > 0) {\r
     FreePool (CommandLine);\r
   }\r
+\r
 CloseRoot:\r
   Root->Close (Root);\r
 UnloadImage:\r
@@ -348,7 +371,7 @@ UnloadImage:
 EFI_STATUS\r
 EFIAPI\r
 QemuStartKernelImage (\r
-  IN  OUT EFI_HANDLE          *ImageHandle\r
+  IN  OUT EFI_HANDLE  *ImageHandle\r
   )\r
 {\r
   return gBS->StartImage (\r
@@ -374,11 +397,11 @@ QemuStartKernelImage (
 EFI_STATUS\r
 EFIAPI\r
 QemuUnloadKernelImage (\r
-  IN  EFI_HANDLE          ImageHandle\r
+  IN  EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_LOADED_IMAGE_PROTOCOL   *KernelLoadedImage;\r
-  EFI_STATUS                  Status;\r
+  EFI_LOADED_IMAGE_PROTOCOL  *KernelLoadedImage;\r
+  EFI_STATUS                 Status;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ImageHandle,\r
@@ -396,6 +419,7 @@ QemuUnloadKernelImage (
     FreePool (KernelLoadedImage->LoadOptions);\r
     KernelLoadedImage->LoadOptions = NULL;\r
   }\r
+\r
   KernelLoadedImage->LoadOptionsSize = 0;\r
 \r
   return gBS->UnloadImage (ImageHandle);\r
index c5022f6636edd536b0db418a02bcda041118bb7b..ce3d760380f7c38f2322d41b1537b75a485f3dc7 100644 (file)
@@ -8,7 +8,6 @@
 \r
 #include "LoadLinuxLib.h"\r
 \r
-\r
 /**\r
   A simple check of the kernel setup image\r
 \r
@@ -26,21 +25,20 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 BasicKernelSetupCheck (\r
-  IN VOID        *KernelSetup\r
+  IN VOID  *KernelSetup\r
   )\r
 {\r
-  return LoadLinuxCheckKernelSetup(KernelSetup, sizeof (struct boot_params));\r
+  return LoadLinuxCheckKernelSetup (KernelSetup, sizeof (struct boot_params));\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 LoadLinuxCheckKernelSetup (\r
-  IN VOID        *KernelSetup,\r
-  IN UINTN       KernelSetupSize\r
+  IN VOID   *KernelSetup,\r
+  IN UINTN  KernelSetupSize\r
   )\r
 {\r
-  struct boot_params        *Bp;\r
+  struct boot_params  *Bp;\r
 \r
   if (KernelSetup == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -50,34 +48,34 @@ LoadLinuxCheckKernelSetup (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Bp = (struct boot_params*) KernelSetup;\r
+  Bp = (struct boot_params *)KernelSetup;\r
 \r
   if ((Bp->hdr.signature != 0xAA55) || // Check boot sector signature\r
       (Bp->hdr.header != SETUP_HDR) ||\r
       (Bp->hdr.version < 0x205) || // We only support relocatable kernels\r
       (!Bp->hdr.relocatable_kernel)\r
-     ) {\r
+      )\r
+  {\r
     return EFI_UNSUPPORTED;\r
   } else {\r
     return EFI_SUCCESS;\r
   }\r
 }\r
 \r
-\r
 UINTN\r
 EFIAPI\r
 LoadLinuxGetKernelSize (\r
-  IN VOID        *KernelSetup,\r
-  IN UINTN       KernelSize\r
+  IN VOID   *KernelSetup,\r
+  IN UINTN  KernelSize\r
   )\r
 {\r
-  struct boot_params        *Bp;\r
+  struct boot_params  *Bp;\r
 \r
   if (EFI_ERROR (BasicKernelSetupCheck (KernelSetup))) {\r
     return 0;\r
   }\r
 \r
-  Bp = (struct boot_params*) KernelSetup;\r
+  Bp = (struct boot_params *)KernelSetup;\r
 \r
   if (Bp->hdr.version > 0x20a) {\r
     return Bp->hdr.init_size;\r
@@ -89,25 +87,24 @@ LoadLinuxGetKernelSize (
   }\r
 }\r
 \r
-\r
-VOID*\r
+VOID *\r
 EFIAPI\r
 LoadLinuxAllocateKernelSetupPages (\r
-  IN UINTN                  Pages\r
+  IN UINTN  Pages\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_PHYSICAL_ADDRESS      Address;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  Address;\r
 \r
   Address = BASE_1GB;\r
-  Status = gBS->AllocatePages (\r
-                  AllocateMaxAddress,\r
-                  EfiLoaderData,\r
-                  Pages,\r
-                  &Address\r
-                  );\r
+  Status  = gBS->AllocatePages (\r
+                   AllocateMaxAddress,\r
+                   EfiLoaderData,\r
+                   Pages,\r
+                   &Address\r
+                   );\r
   if (!EFI_ERROR (Status)) {\r
-    return (VOID*)(UINTN) Address;\r
+    return (VOID *)(UINTN)Address;\r
   } else {\r
     return NULL;\r
   }\r
@@ -116,19 +113,19 @@ LoadLinuxAllocateKernelSetupPages (
 EFI_STATUS\r
 EFIAPI\r
 LoadLinuxInitializeKernelSetup (\r
-  IN VOID        *KernelSetup\r
+  IN VOID  *KernelSetup\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINTN                     SetupEnd;\r
-  struct boot_params        *Bp;\r
+  EFI_STATUS          Status;\r
+  UINTN               SetupEnd;\r
+  struct boot_params  *Bp;\r
 \r
   Status = BasicKernelSetupCheck (KernelSetup);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Bp = (struct boot_params*) KernelSetup;\r
+  Bp = (struct boot_params *)KernelSetup;\r
 \r
   SetupEnd = 0x202 + (Bp->hdr.jump & 0xff);\r
 \r
@@ -137,29 +134,32 @@ LoadLinuxInitializeKernelSetup (
   //\r
   ZeroMem (KernelSetup, 0x1f1);\r
   ZeroMem (((UINT8 *)KernelSetup) + SetupEnd, 4096 - SetupEnd);\r
-  DEBUG ((DEBUG_INFO, "Cleared kernel setup 0-0x1f1, 0x%Lx-0x1000\n",\r
-    (UINT64)SetupEnd));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "Cleared kernel setup 0-0x1f1, 0x%Lx-0x1000\n",\r
+    (UINT64)SetupEnd\r
+    ));\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-VOID*\r
+VOID *\r
 EFIAPI\r
 LoadLinuxAllocateKernelPages (\r
-  IN VOID                   *KernelSetup,\r
-  IN UINTN                  Pages\r
+  IN VOID   *KernelSetup,\r
+  IN UINTN  Pages\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_PHYSICAL_ADDRESS      KernelAddress;\r
-  UINT32                    Loop;\r
-  struct boot_params        *Bp;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  KernelAddress;\r
+  UINT32                Loop;\r
+  struct boot_params    *Bp;\r
 \r
   if (EFI_ERROR (BasicKernelSetupCheck (KernelSetup))) {\r
     return NULL;\r
   }\r
 \r
-  Bp = (struct boot_params*) KernelSetup;\r
+  Bp = (struct boot_params *)KernelSetup;\r
 \r
   for (Loop = 1; Loop < 512; Loop++) {\r
     KernelAddress = MultU64x32 (\r
@@ -173,113 +173,110 @@ LoadLinuxAllocateKernelPages (
                     &KernelAddress\r
                     );\r
     if (!EFI_ERROR (Status)) {\r
-      return (VOID*)(UINTN) KernelAddress;\r
+      return (VOID *)(UINTN)KernelAddress;\r
     }\r
   }\r
 \r
   return NULL;\r
 }\r
 \r
-\r
-VOID*\r
+VOID *\r
 EFIAPI\r
 LoadLinuxAllocateCommandLinePages (\r
-  IN UINTN                  Pages\r
+  IN UINTN  Pages\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_PHYSICAL_ADDRESS      Address;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  Address;\r
 \r
   Address = 0xa0000;\r
-  Status = gBS->AllocatePages (\r
-                  AllocateMaxAddress,\r
-                  EfiLoaderData,\r
-                  Pages,\r
-                  &Address\r
-                  );\r
+  Status  = gBS->AllocatePages (\r
+                   AllocateMaxAddress,\r
+                   EfiLoaderData,\r
+                   Pages,\r
+                   &Address\r
+                   );\r
   if (!EFI_ERROR (Status)) {\r
-    return (VOID*)(UINTN) Address;\r
+    return (VOID *)(UINTN)Address;\r
   } else {\r
     return NULL;\r
   }\r
 }\r
 \r
-\r
-VOID*\r
+VOID *\r
 EFIAPI\r
 LoadLinuxAllocateInitrdPages (\r
-  IN VOID                   *KernelSetup,\r
-  IN UINTN                  Pages\r
+  IN VOID   *KernelSetup,\r
+  IN UINTN  Pages\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_PHYSICAL_ADDRESS      Address;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  Address;\r
 \r
-  struct boot_params        *Bp;\r
+  struct boot_params  *Bp;\r
 \r
   if (EFI_ERROR (BasicKernelSetupCheck (KernelSetup))) {\r
     return NULL;\r
   }\r
 \r
-  Bp = (struct boot_params*) KernelSetup;\r
+  Bp = (struct boot_params *)KernelSetup;\r
 \r
-  Address = (EFI_PHYSICAL_ADDRESS)(UINTN) Bp->hdr.ramdisk_max;\r
-  Status = gBS->AllocatePages (\r
-                  AllocateMaxAddress,\r
-                  EfiLoaderData,\r
-                  Pages,\r
-                  &Address\r
-                  );\r
+  Address = (EFI_PHYSICAL_ADDRESS)(UINTN)Bp->hdr.ramdisk_max;\r
+  Status  = gBS->AllocatePages (\r
+                   AllocateMaxAddress,\r
+                   EfiLoaderData,\r
+                   Pages,\r
+                   &Address\r
+                   );\r
   if (!EFI_ERROR (Status)) {\r
-    return (VOID*)(UINTN) Address;\r
+    return (VOID *)(UINTN)Address;\r
   } else {\r
     return NULL;\r
   }\r
 }\r
 \r
-\r
 STATIC\r
 VOID\r
 SetupLinuxMemmap (\r
-  IN OUT struct boot_params        *Bp\r
+  IN OUT struct boot_params  *Bp\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
-  UINT8                                TmpMemoryMap[1];\r
-  UINTN                                MapKey;\r
-  UINTN                                DescriptorSize;\r
-  UINT32                               DescriptorVersion;\r
-  UINTN                                MemoryMapSize;\r
-  EFI_MEMORY_DESCRIPTOR                *MemoryMap;\r
-  EFI_MEMORY_DESCRIPTOR                *MemoryMapPtr;\r
-  UINTN                                Index;\r
-  struct efi_info                      *Efi;\r
-  struct e820_entry                    *LastE820;\r
-  struct e820_entry                    *E820;\r
-  UINTN                                E820EntryCount;\r
-  EFI_PHYSICAL_ADDRESS                 LastEndAddr;\r
+  EFI_STATUS             Status;\r
+  UINT8                  TmpMemoryMap[1];\r
+  UINTN                  MapKey;\r
+  UINTN                  DescriptorSize;\r
+  UINT32                 DescriptorVersion;\r
+  UINTN                  MemoryMapSize;\r
+  EFI_MEMORY_DESCRIPTOR  *MemoryMap;\r
+  EFI_MEMORY_DESCRIPTOR  *MemoryMapPtr;\r
+  UINTN                  Index;\r
+  struct efi_info        *Efi;\r
+  struct e820_entry      *LastE820;\r
+  struct e820_entry      *E820;\r
+  UINTN                  E820EntryCount;\r
+  EFI_PHYSICAL_ADDRESS   LastEndAddr;\r
 \r
   //\r
   // Get System MemoryMapSize\r
   //\r
   MemoryMapSize = sizeof (TmpMemoryMap);\r
-  Status = gBS->GetMemoryMap (\r
-                  &MemoryMapSize,\r
-                  (EFI_MEMORY_DESCRIPTOR *)TmpMemoryMap,\r
-                  &MapKey,\r
-                  &DescriptorSize,\r
-                  &DescriptorVersion\r
-                  );\r
+  Status        = gBS->GetMemoryMap (\r
+                         &MemoryMapSize,\r
+                         (EFI_MEMORY_DESCRIPTOR *)TmpMemoryMap,\r
+                         &MapKey,\r
+                         &DescriptorSize,\r
+                         &DescriptorVersion\r
+                         );\r
   ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
   //\r
   // Enlarge space here, because we will allocate pool now.\r
   //\r
   MemoryMapSize += EFI_PAGE_SIZE;\r
-  Status = gBS->AllocatePool (\r
-                  EfiLoaderData,\r
-                  MemoryMapSize,\r
-                  (VOID **) &MemoryMap\r
-                  );\r
+  Status         = gBS->AllocatePool (\r
+                          EfiLoaderData,\r
+                          MemoryMapSize,\r
+                          (VOID **)&MemoryMap\r
+                          );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -294,70 +291,72 @@ SetupLinuxMemmap (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  LastE820 = NULL;\r
-  E820 = &Bp->e820_map[0];\r
+  LastE820       = NULL;\r
+  E820           = &Bp->e820_map[0];\r
   E820EntryCount = 0;\r
-  LastEndAddr = 0;\r
-  MemoryMapPtr = MemoryMap;\r
+  LastEndAddr    = 0;\r
+  MemoryMapPtr   = MemoryMap;\r
   for (Index = 0; Index < (MemoryMapSize / DescriptorSize); Index++) {\r
-    UINTN E820Type = 0;\r
+    UINTN  E820Type = 0;\r
 \r
     if (MemoryMap->NumberOfPages == 0) {\r
       continue;\r
     }\r
 \r
-    switch(MemoryMap->Type) {\r
-    case EfiReservedMemoryType:\r
-    case EfiRuntimeServicesCode:\r
-    case EfiRuntimeServicesData:\r
-    case EfiMemoryMappedIO:\r
-    case EfiMemoryMappedIOPortSpace:\r
-    case EfiPalCode:\r
-      E820Type = E820_RESERVED;\r
-      break;\r
-\r
-    case EfiUnusableMemory:\r
-      E820Type = E820_UNUSABLE;\r
-      break;\r
-\r
-    case EfiACPIReclaimMemory:\r
-      E820Type = E820_ACPI;\r
-      break;\r
-\r
-    case EfiLoaderCode:\r
-    case EfiLoaderData:\r
-    case EfiBootServicesCode:\r
-    case EfiBootServicesData:\r
-    case EfiConventionalMemory:\r
-      E820Type = E820_RAM;\r
-      break;\r
-\r
-    case EfiACPIMemoryNVS:\r
-      E820Type = E820_NVS;\r
-      break;\r
-\r
-    default:\r
-      DEBUG ((\r
-        DEBUG_ERROR,\r
-        "Invalid EFI memory descriptor type (0x%x)!\n",\r
-        MemoryMap->Type\r
-        ));\r
-      continue;\r
+    switch (MemoryMap->Type) {\r
+      case EfiReservedMemoryType:\r
+      case EfiRuntimeServicesCode:\r
+      case EfiRuntimeServicesData:\r
+      case EfiMemoryMappedIO:\r
+      case EfiMemoryMappedIOPortSpace:\r
+      case EfiPalCode:\r
+        E820Type = E820_RESERVED;\r
+        break;\r
+\r
+      case EfiUnusableMemory:\r
+        E820Type = E820_UNUSABLE;\r
+        break;\r
+\r
+      case EfiACPIReclaimMemory:\r
+        E820Type = E820_ACPI;\r
+        break;\r
+\r
+      case EfiLoaderCode:\r
+      case EfiLoaderData:\r
+      case EfiBootServicesCode:\r
+      case EfiBootServicesData:\r
+      case EfiConventionalMemory:\r
+        E820Type = E820_RAM;\r
+        break;\r
+\r
+      case EfiACPIMemoryNVS:\r
+        E820Type = E820_NVS;\r
+        break;\r
+\r
+      default:\r
+        DEBUG ((\r
+          DEBUG_ERROR,\r
+          "Invalid EFI memory descriptor type (0x%x)!\n",\r
+          MemoryMap->Type\r
+          ));\r
+        continue;\r
     }\r
 \r
     if ((LastE820 != NULL) &&\r
-        (LastE820->type == (UINT32) E820Type) &&\r
-        (MemoryMap->PhysicalStart == LastEndAddr)) {\r
-      LastE820->size += EFI_PAGES_TO_SIZE ((UINTN) MemoryMap->NumberOfPages);\r
-      LastEndAddr += EFI_PAGES_TO_SIZE ((UINTN) MemoryMap->NumberOfPages);\r
+        (LastE820->type == (UINT32)E820Type) &&\r
+        (MemoryMap->PhysicalStart == LastEndAddr))\r
+    {\r
+      LastE820->size += EFI_PAGES_TO_SIZE ((UINTN)MemoryMap->NumberOfPages);\r
+      LastEndAddr    += EFI_PAGES_TO_SIZE ((UINTN)MemoryMap->NumberOfPages);\r
     } else {\r
       if (E820EntryCount >= ARRAY_SIZE (Bp->e820_map)) {\r
         break;\r
       }\r
-      E820->type = (UINT32) E820Type;\r
-      E820->addr = MemoryMap->PhysicalStart;\r
-      E820->size = EFI_PAGES_TO_SIZE ((UINTN) MemoryMap->NumberOfPages);\r
-      LastE820 = E820;\r
+\r
+      E820->type  = (UINT32)E820Type;\r
+      E820->addr  = MemoryMap->PhysicalStart;\r
+      E820->size  = EFI_PAGES_TO_SIZE ((UINTN)MemoryMap->NumberOfPages);\r
+      LastE820    = E820;\r
       LastEndAddr = E820->addr + E820->size;\r
       E820++;\r
       E820EntryCount++;\r
@@ -368,85 +367,83 @@ SetupLinuxMemmap (
     //\r
     MemoryMap = (EFI_MEMORY_DESCRIPTOR *)((UINTN)MemoryMap + DescriptorSize);\r
   }\r
-  Bp->e820_entries = (UINT8) E820EntryCount;\r
 \r
-  Efi = &Bp->efi_info;\r
-  Efi->efi_systab = (UINT32)(UINTN) gST;\r
-  Efi->efi_memdesc_size = (UINT32) DescriptorSize;\r
+  Bp->e820_entries = (UINT8)E820EntryCount;\r
+\r
+  Efi                      = &Bp->efi_info;\r
+  Efi->efi_systab          = (UINT32)(UINTN)gST;\r
+  Efi->efi_memdesc_size    = (UINT32)DescriptorSize;\r
   Efi->efi_memdesc_version = DescriptorVersion;\r
-  Efi->efi_memmap = (UINT32)(UINTN) MemoryMapPtr;\r
-  Efi->efi_memmap_size = (UINT32) MemoryMapSize;\r
-#ifdef MDE_CPU_IA32\r
+  Efi->efi_memmap          = (UINT32)(UINTN)MemoryMapPtr;\r
+  Efi->efi_memmap_size     = (UINT32)MemoryMapSize;\r
+ #ifdef MDE_CPU_IA32\r
   Efi->efi_loader_signature = SIGNATURE_32 ('E', 'L', '3', '2');\r
-#else\r
-  Efi->efi_systab_hi = (UINT32) (((UINT64)(UINTN) gST) >> 32);\r
-  Efi->efi_memmap_hi = (UINT32) (((UINT64)(UINTN) MemoryMapPtr) >> 32);\r
+ #else\r
+  Efi->efi_systab_hi        = (UINT32)(((UINT64)(UINTN)gST) >> 32);\r
+  Efi->efi_memmap_hi        = (UINT32)(((UINT64)(UINTN)MemoryMapPtr) >> 32);\r
   Efi->efi_loader_signature = SIGNATURE_32 ('E', 'L', '6', '4');\r
-#endif\r
+ #endif\r
 \r
   gBS->ExitBootServices (gImageHandle, MapKey);\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 LoadLinuxSetCommandLine (\r
-  IN OUT VOID    *KernelSetup,\r
-  IN CHAR8       *CommandLine\r
+  IN OUT VOID  *KernelSetup,\r
+  IN CHAR8     *CommandLine\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  struct boot_params     *Bp;\r
+  EFI_STATUS          Status;\r
+  struct boot_params  *Bp;\r
 \r
   Status = BasicKernelSetupCheck (KernelSetup);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Bp = (struct boot_params*) KernelSetup;\r
+  Bp = (struct boot_params *)KernelSetup;\r
 \r
-  Bp->hdr.cmd_line_ptr = (UINT32)(UINTN) CommandLine;\r
+  Bp->hdr.cmd_line_ptr = (UINT32)(UINTN)CommandLine;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 LoadLinuxSetInitrd (\r
-  IN OUT VOID    *KernelSetup,\r
-  IN VOID        *Initrd,\r
-  IN UINTN       InitrdSize\r
+  IN OUT VOID  *KernelSetup,\r
+  IN VOID      *Initrd,\r
+  IN UINTN     InitrdSize\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  struct boot_params     *Bp;\r
+  EFI_STATUS          Status;\r
+  struct boot_params  *Bp;\r
 \r
   Status = BasicKernelSetupCheck (KernelSetup);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Bp = (struct boot_params*) KernelSetup;\r
+  Bp = (struct boot_params *)KernelSetup;\r
 \r
-  Bp->hdr.ramdisk_start = (UINT32)(UINTN) Initrd;\r
-  Bp->hdr.ramdisk_len = (UINT32) InitrdSize;\r
+  Bp->hdr.ramdisk_start = (UINT32)(UINTN)Initrd;\r
+  Bp->hdr.ramdisk_len   = (UINT32)InitrdSize;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 STATIC VOID\r
 FindBits (\r
-  unsigned long Mask,\r
-  UINT8 *Pos,\r
-  UINT8 *Size\r
+  unsigned long  Mask,\r
+  UINT8          *Pos,\r
+  UINT8          *Size\r
   )\r
 {\r
-  UINT8 First, Len;\r
+  UINT8  First, Len;\r
 \r
   First = 0;\r
-  Len = 0;\r
+  Len   = 0;\r
 \r
   if (Mask) {\r
     while (!(Mask & 0x1)) {\r
@@ -459,23 +456,23 @@ FindBits (
       Len++;\r
     }\r
   }\r
-  *Pos = First;\r
+\r
+  *Pos  = First;\r
   *Size = Len;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 SetupGraphicsFromGop (\r
-  struct screen_info           *Si,\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL *Gop\r
+  struct screen_info            *Si,\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *Gop\r
   )\r
 {\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;\r
-  EFI_STATUS                           Status;\r
-  UINTN                                Size;\r
+  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info;\r
+  EFI_STATUS                            Status;\r
+  UINTN                                 Size;\r
 \r
-  Status = Gop->QueryMode(Gop, Gop->Mode->Mode, &Size, &Info);\r
+  Status = Gop->QueryMode (Gop, Gop->Mode->Mode, &Size, &Info);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -485,88 +482,98 @@ SetupGraphicsFromGop (
   /* EFI framebuffer */\r
   Si->orig_video_isVGA = 0x70;\r
 \r
-  Si->orig_x = 0;\r
-  Si->orig_y = 0;\r
-  Si->orig_video_page = 0;\r
-  Si->orig_video_mode = 0;\r
-  Si->orig_video_cols = 0;\r
-  Si->orig_video_lines = 0;\r
+  Si->orig_x            = 0;\r
+  Si->orig_y            = 0;\r
+  Si->orig_video_page   = 0;\r
+  Si->orig_video_mode   = 0;\r
+  Si->orig_video_cols   = 0;\r
+  Si->orig_video_lines  = 0;\r
   Si->orig_video_ega_bx = 0;\r
   Si->orig_video_points = 0;\r
 \r
-  Si->lfb_base = (UINT32) Gop->Mode->FrameBufferBase;\r
-  Si->lfb_size = (UINT32) Gop->Mode->FrameBufferSize;\r
-  Si->lfb_width = (UINT16) Info->HorizontalResolution;\r
-  Si->lfb_height = (UINT16) Info->VerticalResolution;\r
-  Si->pages = 1;\r
+  Si->lfb_base   = (UINT32)Gop->Mode->FrameBufferBase;\r
+  Si->lfb_size   = (UINT32)Gop->Mode->FrameBufferSize;\r
+  Si->lfb_width  = (UINT16)Info->HorizontalResolution;\r
+  Si->lfb_height = (UINT16)Info->VerticalResolution;\r
+  Si->pages      = 1;\r
   Si->vesapm_seg = 0;\r
   Si->vesapm_off = 0;\r
 \r
   if (Info->PixelFormat == PixelRedGreenBlueReserved8BitPerColor) {\r
-    Si->lfb_depth = 32;\r
-    Si->red_size = 8;\r
-    Si->red_pos = 0;\r
-    Si->green_size = 8;\r
-    Si->green_pos = 8;\r
-    Si->blue_size = 8;\r
-    Si->blue_pos = 16;\r
-    Si->rsvd_size = 8;\r
-    Si->rsvd_pos = 24;\r
-    Si->lfb_linelength = (UINT16) (Info->PixelsPerScanLine * 4);\r
-\r
+    Si->lfb_depth      = 32;\r
+    Si->red_size       = 8;\r
+    Si->red_pos        = 0;\r
+    Si->green_size     = 8;\r
+    Si->green_pos      = 8;\r
+    Si->blue_size      = 8;\r
+    Si->blue_pos       = 16;\r
+    Si->rsvd_size      = 8;\r
+    Si->rsvd_pos       = 24;\r
+    Si->lfb_linelength = (UINT16)(Info->PixelsPerScanLine * 4);\r
   } else if (Info->PixelFormat == PixelBlueGreenRedReserved8BitPerColor) {\r
-    Si->lfb_depth = 32;\r
-    Si->red_size = 8;\r
-    Si->red_pos = 16;\r
-    Si->green_size = 8;\r
-    Si->green_pos = 8;\r
-    Si->blue_size = 8;\r
-    Si->blue_pos = 0;\r
-    Si->rsvd_size = 8;\r
-    Si->rsvd_pos = 24;\r
-    Si->lfb_linelength = (UINT16) (Info->PixelsPerScanLine * 4);\r
+    Si->lfb_depth      = 32;\r
+    Si->red_size       = 8;\r
+    Si->red_pos        = 16;\r
+    Si->green_size     = 8;\r
+    Si->green_pos      = 8;\r
+    Si->blue_size      = 8;\r
+    Si->blue_pos       = 0;\r
+    Si->rsvd_size      = 8;\r
+    Si->rsvd_pos       = 24;\r
+    Si->lfb_linelength = (UINT16)(Info->PixelsPerScanLine * 4);\r
   } else if (Info->PixelFormat == PixelBitMask) {\r
-    FindBits(Info->PixelInformation.RedMask,\r
-        &Si->red_pos, &Si->red_size);\r
-    FindBits(Info->PixelInformation.GreenMask,\r
-        &Si->green_pos, &Si->green_size);\r
-    FindBits(Info->PixelInformation.BlueMask,\r
-        &Si->blue_pos, &Si->blue_size);\r
-    FindBits(Info->PixelInformation.ReservedMask,\r
-        &Si->rsvd_pos, &Si->rsvd_size);\r
+    FindBits (\r
+      Info->PixelInformation.RedMask,\r
+      &Si->red_pos,\r
+      &Si->red_size\r
+      );\r
+    FindBits (\r
+      Info->PixelInformation.GreenMask,\r
+      &Si->green_pos,\r
+      &Si->green_size\r
+      );\r
+    FindBits (\r
+      Info->PixelInformation.BlueMask,\r
+      &Si->blue_pos,\r
+      &Si->blue_size\r
+      );\r
+    FindBits (\r
+      Info->PixelInformation.ReservedMask,\r
+      &Si->rsvd_pos,\r
+      &Si->rsvd_size\r
+      );\r
     Si->lfb_depth = Si->red_size + Si->green_size +\r
-      Si->blue_size + Si->rsvd_size;\r
-    Si->lfb_linelength = (UINT16) ((Info->PixelsPerScanLine * Si->lfb_depth) / 8);\r
+                    Si->blue_size + Si->rsvd_size;\r
+    Si->lfb_linelength = (UINT16)((Info->PixelsPerScanLine * Si->lfb_depth) / 8);\r
   } else {\r
-    Si->lfb_depth = 4;\r
-    Si->red_size = 0;\r
-    Si->red_pos = 0;\r
-    Si->green_size = 0;\r
-    Si->green_pos = 0;\r
-    Si->blue_size = 0;\r
-    Si->blue_pos = 0;\r
-    Si->rsvd_size = 0;\r
-    Si->rsvd_pos = 0;\r
+    Si->lfb_depth      = 4;\r
+    Si->red_size       = 0;\r
+    Si->red_pos        = 0;\r
+    Si->green_size     = 0;\r
+    Si->green_pos      = 0;\r
+    Si->blue_size      = 0;\r
+    Si->blue_pos       = 0;\r
+    Si->rsvd_size      = 0;\r
+    Si->rsvd_pos       = 0;\r
     Si->lfb_linelength = Si->lfb_width / 2;\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 SetupGraphics (\r
-  IN OUT struct boot_params *Bp\r
+  IN OUT struct boot_params  *Bp\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_HANDLE                      *HandleBuffer;\r
-  UINTN                           HandleCount;\r
-  UINTN                           Index;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL    *Gop;\r
+  EFI_STATUS                    Status;\r
+  EFI_HANDLE                    *HandleBuffer;\r
+  UINTN                         HandleCount;\r
+  UINTN                         Index;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *Gop;\r
 \r
-  ZeroMem ((VOID*)&Bp->screen_info, sizeof(Bp->screen_info));\r
+  ZeroMem ((VOID *)&Bp->screen_info, sizeof (Bp->screen_info));\r
 \r
   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
@@ -580,7 +587,7 @@ SetupGraphics (
       Status = gBS->HandleProtocol (\r
                       HandleBuffer[Index],\r
                       &gEfiGraphicsOutputProtocolGuid,\r
-                      (VOID*) &Gop\r
+                      (VOID *)&Gop\r
                       );\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
@@ -599,11 +606,10 @@ SetupGraphics (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 SetupLinuxBootParams (\r
-  IN OUT struct boot_params *Bp\r
+  IN OUT struct boot_params  *Bp\r
   )\r
 {\r
   SetupGraphics (Bp);\r
@@ -613,7 +619,6 @@ SetupLinuxBootParams (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 LoadLinux (\r
@@ -621,7 +626,7 @@ LoadLinux (
   IN OUT VOID  *KernelSetup\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
+  EFI_STATUS          Status;\r
   struct boot_params  *Bp;\r
 \r
   Status = BasicKernelSetupCheck (KernelSetup);\r
@@ -629,9 +634,9 @@ LoadLinux (
     return Status;\r
   }\r
 \r
-  Bp = (struct boot_params *) KernelSetup;\r
+  Bp = (struct boot_params *)KernelSetup;\r
 \r
-  if (Bp->hdr.version < 0x205 || !Bp->hdr.relocatable_kernel) {\r
+  if ((Bp->hdr.version < 0x205) || !Bp->hdr.relocatable_kernel) {\r
     //\r
     // We only support relocatable kernels\r
     //\r
@@ -640,13 +645,14 @@ LoadLinux (
 \r
   InitLinuxDescriptorTables ();\r
 \r
-  Bp->hdr.code32_start = (UINT32)(UINTN) Kernel;\r
-  if (Bp->hdr.version >= 0x20c && Bp->hdr.handover_offset &&\r
-      (Bp->hdr.xloadflags & (sizeof (UINTN) == 4 ? BIT2 : BIT3))) {\r
+  Bp->hdr.code32_start = (UINT32)(UINTN)Kernel;\r
+  if ((Bp->hdr.version >= 0x20c) && Bp->hdr.handover_offset &&\r
+      (Bp->hdr.xloadflags & ((sizeof (UINTN) == 4) ? BIT2 : BIT3)))\r
+  {\r
     DEBUG ((DEBUG_INFO, "Jumping to kernel EFI handover point at ofs %x\n", Bp->hdr.handover_offset));\r
 \r
     DisableInterrupts ();\r
-    JumpToUefiKernel ((VOID*) gImageHandle, (VOID*) gST, KernelSetup, Kernel);\r
+    JumpToUefiKernel ((VOID *)gImageHandle, (VOID *)gST, KernelSetup, Kernel);\r
   }\r
 \r
   //\r
@@ -657,8 +663,7 @@ LoadLinux (
   DEBUG ((DEBUG_INFO, "Jumping to kernel\n"));\r
   DisableInterrupts ();\r
   SetLinuxDescriptorTables ();\r
-  JumpToKernel (Kernel, (VOID*) KernelSetup);\r
+  JumpToKernel (Kernel, (VOID *)KernelSetup);\r
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index d90e999d824b6109ee4d184cf200a27790ef180f..8f1e2375b6a2a5219fd7b1c127122e199b1b80ee 100644 (file)
@@ -8,7 +8,6 @@
 \r
 #include "LoadLinuxLib.h"\r
 \r
-\r
 //\r
 // Local structure definitions\r
 //\r
 //\r
 \r
 typedef struct _GDT_ENTRY {\r
-  UINT16 Limit15_0;\r
-  UINT16 Base15_0;\r
-  UINT8  Base23_16;\r
-  UINT8  Type;\r
-  UINT8  Limit19_16_and_flags;\r
-  UINT8  Base31_24;\r
+  UINT16    Limit15_0;\r
+  UINT16    Base15_0;\r
+  UINT8     Base23_16;\r
+  UINT8     Type;\r
+  UINT8     Limit19_16_and_flags;\r
+  UINT8     Base31_24;\r
 } GDT_ENTRY;\r
 \r
 typedef\r
-struct _GDT_ENTRIES {\r
-  GDT_ENTRY Null;\r
-  GDT_ENTRY Null2;\r
-  GDT_ENTRY Linear;\r
-  GDT_ENTRY LinearCode;\r
-  GDT_ENTRY TaskSegment;\r
-  GDT_ENTRY Spare4;\r
-  GDT_ENTRY Spare5;\r
+  struct _GDT_ENTRIES {\r
+  GDT_ENTRY    Null;\r
+  GDT_ENTRY    Null2;\r
+  GDT_ENTRY    Linear;\r
+  GDT_ENTRY    LinearCode;\r
+  GDT_ENTRY    TaskSegment;\r
+  GDT_ENTRY    Spare4;\r
+  GDT_ENTRY    Spare5;\r
 } GDT_ENTRIES;\r
 \r
 #pragma pack ()\r
 \r
-STATIC GDT_ENTRIES *mGdt = NULL;\r
+STATIC GDT_ENTRIES  *mGdt = NULL;\r
 \r
 //\r
 // Global descriptor table (GDT) Template\r
 //\r
-STATIC GDT_ENTRIES GdtTemplate = {\r
+STATIC GDT_ENTRIES  GdtTemplate = {\r
   //\r
   // Null\r
   //\r
@@ -146,7 +145,6 @@ InitLinuxDescriptorTables (
   // Initialize all GDT entries\r
   //\r
   CopyMem (mGdt, &GdtTemplate, sizeof (GdtTemplate));\r
-\r
 }\r
 \r
 /**\r
@@ -158,18 +156,17 @@ SetLinuxDescriptorTables (
   VOID\r
   )\r
 {\r
-  IA32_DESCRIPTOR GdtPtr;\r
-  IA32_DESCRIPTOR IdtPtr;\r
+  IA32_DESCRIPTOR  GdtPtr;\r
+  IA32_DESCRIPTOR  IdtPtr;\r
 \r
   //\r
   // Write GDT register\r
   //\r
-  GdtPtr.Base = (UINT32)(UINTN)(VOID*) mGdt;\r
-  GdtPtr.Limit = (UINT16) (sizeof (GdtTemplate) - 1);\r
+  GdtPtr.Base  = (UINT32)(UINTN)(VOID *)mGdt;\r
+  GdtPtr.Limit = (UINT16)(sizeof (GdtTemplate) - 1);\r
   AsmWriteGdtr (&GdtPtr);\r
 \r
-  IdtPtr.Base = (UINT32) 0;\r
-  IdtPtr.Limit = (UINT16) 0;\r
+  IdtPtr.Base  = (UINT32)0;\r
+  IdtPtr.Limit = (UINT16)0;\r
   AsmWriteIdtr (&IdtPtr);\r
 }\r
-\r
index daaecb61541760591a8e0bc5887005e9a319c18e..deb9b6e861522e6e312ba62c1d5890f64cec9149 100644 (file)
 VOID\r
 EFIAPI\r
 JumpToKernel (\r
-  VOID *KernelStart,\r
-  VOID *KernelBootParams\r
+  VOID  *KernelStart,\r
+  VOID  *KernelBootParams\r
   );\r
 \r
 VOID\r
 EFIAPI\r
 JumpToUefiKernel (\r
-  EFI_HANDLE ImageHandle,\r
-  EFI_SYSTEM_TABLE *SystemTable,\r
-  VOID *KernelBootParams,\r
-  VOID *KernelStart\r
+  EFI_HANDLE        ImageHandle,\r
+  EFI_SYSTEM_TABLE  *SystemTable,\r
+  VOID              *KernelBootParams,\r
+  VOID              *KernelStart\r
   );\r
 \r
 VOID\r
@@ -50,4 +50,3 @@ SetLinuxDescriptorTables (
   );\r
 \r
 #endif\r
-\r
index 7dc2eea2395a23ebe3dfa97419f3132250506840..c9d679cb840c39cecc42797a28e381debc38048b 100644 (file)
 STATIC\r
 VOID *\r
 AllocateMemoryBelow4G (\r
-  IN EFI_MEMORY_TYPE    MemoryType,\r
-  IN UINTN              Size\r
+  IN EFI_MEMORY_TYPE  MemoryType,\r
+  IN UINTN            Size\r
   )\r
 {\r
   UINTN                 Pages;\r
   EFI_PHYSICAL_ADDRESS  Address;\r
   EFI_STATUS            Status;\r
-  VOID*                 Buffer;\r
+  VOID                  *Buffer;\r
   UINTN                 AllocRemaining;\r
 \r
-  Pages = EFI_SIZE_TO_PAGES (Size);\r
+  Pages   = EFI_SIZE_TO_PAGES (Size);\r
   Address = 0xffffffff;\r
 \r
   //\r
@@ -49,36 +49,35 @@ AllocateMemoryBelow4G (
   // allocations, and use these to allocate memory for small buffers.\r
   //\r
   ASSERT (mLockBoxGlobal->Signature == LOCK_BOX_GLOBAL_SIGNATURE);\r
-  if ((UINTN) mLockBoxGlobal->SubPageRemaining >= Size) {\r
-    Buffer = (VOID*)(UINTN) mLockBoxGlobal->SubPageBuffer;\r
-    mLockBoxGlobal->SubPageBuffer += (UINT32) Size;\r
-    mLockBoxGlobal->SubPageRemaining -= (UINT32) Size;\r
+  if ((UINTN)mLockBoxGlobal->SubPageRemaining >= Size) {\r
+    Buffer                            = (VOID *)(UINTN)mLockBoxGlobal->SubPageBuffer;\r
+    mLockBoxGlobal->SubPageBuffer    += (UINT32)Size;\r
+    mLockBoxGlobal->SubPageRemaining -= (UINT32)Size;\r
     return Buffer;\r
   }\r
 \r
-  Status  = gBS->AllocatePages (\r
-                   AllocateMaxAddress,\r
-                   MemoryType,\r
-                   Pages,\r
-                   &Address\r
-                   );\r
+  Status = gBS->AllocatePages (\r
+                  AllocateMaxAddress,\r
+                  MemoryType,\r
+                  Pages,\r
+                  &Address\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
   }\r
 \r
-  Buffer = (VOID *) (UINTN) Address;\r
+  Buffer = (VOID *)(UINTN)Address;\r
   ZeroMem (Buffer, EFI_PAGES_TO_SIZE (Pages));\r
 \r
   AllocRemaining = EFI_PAGES_TO_SIZE (Pages) - Size;\r
-  if (AllocRemaining > (UINTN) mLockBoxGlobal->SubPageRemaining) {\r
-    mLockBoxGlobal->SubPageBuffer = (UINT32) (Address + Size);\r
-    mLockBoxGlobal->SubPageRemaining = (UINT32) AllocRemaining;\r
+  if (AllocRemaining > (UINTN)mLockBoxGlobal->SubPageRemaining) {\r
+    mLockBoxGlobal->SubPageBuffer    = (UINT32)(Address + Size);\r
+    mLockBoxGlobal->SubPageRemaining = (UINT32)AllocRemaining;\r
   }\r
 \r
   return Buffer;\r
 }\r
 \r
-\r
 /**\r
   Allocates a buffer of type EfiACPIMemoryNVS.\r
 \r
@@ -102,7 +101,6 @@ AllocateAcpiNvsPool (
   return AllocateMemoryBelow4G (EfiACPIMemoryNVS, AllocationSize);\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 LockBoxDxeLibInitialize (\r
@@ -110,8 +108,8 @@ LockBoxDxeLibInitialize (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  VOID          *Interface;\r
+  EFI_STATUS  Status;\r
+  VOID        *Interface;\r
 \r
   Status = LockBoxLibInitialize ();\r
   if (!EFI_ERROR (Status)) {\r
index 95ab4332e7e8f7a0534cafa9477f93e2fd1c0230..2000afeeb85efcd9f845193081453b4d28a5173f 100644 (file)
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  EFI_GUID             Guid;\r
-  EFI_PHYSICAL_ADDRESS OrigAddress;\r
-  EFI_PHYSICAL_ADDRESS CopyAddress;\r
-  UINT32               Size;\r
-  UINT64               Attributes;\r
+  EFI_GUID                Guid;\r
+  EFI_PHYSICAL_ADDRESS    OrigAddress;\r
+  EFI_PHYSICAL_ADDRESS    CopyAddress;\r
+  UINT32                  Size;\r
+  UINT64                  Attributes;\r
 } LOCK_BOX_ENTRY;\r
 #pragma pack()\r
 \r
-LOCK_BOX_GLOBAL *mLockBoxGlobal = NULL;\r
-STATIC LOCK_BOX_ENTRY *StartOfEntries = NULL;\r
-STATIC LOCK_BOX_ENTRY *EndOfEntries = NULL;\r
+LOCK_BOX_GLOBAL        *mLockBoxGlobal = NULL;\r
+STATIC LOCK_BOX_ENTRY  *StartOfEntries = NULL;\r
+STATIC LOCK_BOX_ENTRY  *EndOfEntries   = NULL;\r
 \r
 RETURN_STATUS\r
 EFIAPI\r
@@ -36,7 +36,7 @@ LockBoxLibInitialize (
   VOID\r
   )\r
 {\r
-  UINTN NumEntries;\r
+  UINTN  NumEntries;\r
 \r
   ASSERT (!FeaturePcdGet (PcdSmmSmramRequire));\r
 \r
@@ -44,10 +44,10 @@ LockBoxLibInitialize (
     return RETURN_UNSUPPORTED;\r
   }\r
 \r
-  mLockBoxGlobal = (LOCK_BOX_GLOBAL *)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageBase);\r
-  StartOfEntries = ((LOCK_BOX_ENTRY *) (mLockBoxGlobal + 1));\r
-  NumEntries = ((PcdGet32 (PcdOvmfLockBoxStorageSize) - sizeof (LOCK_BOX_GLOBAL)) /\r
-                sizeof (LOCK_BOX_ENTRY));\r
+  mLockBoxGlobal = (LOCK_BOX_GLOBAL *)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageBase);\r
+  StartOfEntries = ((LOCK_BOX_ENTRY *)(mLockBoxGlobal + 1));\r
+  NumEntries     = ((PcdGet32 (PcdOvmfLockBoxStorageSize) - sizeof (LOCK_BOX_GLOBAL)) /\r
+                    sizeof (LOCK_BOX_ENTRY));\r
   EndOfEntries = StartOfEntries + NumEntries;\r
   if (mLockBoxGlobal->Signature != LOCK_BOX_GLOBAL_SIGNATURE) {\r
     //\r
@@ -57,10 +57,10 @@ LockBoxLibInitialize (
     //\r
     mLockBoxGlobal->Signature = LOCK_BOX_GLOBAL_SIGNATURE;\r
   }\r
+\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Find LockBox entry based on GUID.\r
 \r
@@ -80,13 +80,13 @@ STATIC
 LOCK_BOX_ENTRY *\r
 EFIAPI\r
 FindHeaderByGuid (\r
-  IN CONST EFI_GUID *Guid\r
+  IN CONST EFI_GUID  *Guid\r
   )\r
 {\r
-  LOCK_BOX_ENTRY *Header;\r
+  LOCK_BOX_ENTRY  *Header;\r
 \r
   for (Header = StartOfEntries; Header < EndOfEntries; Header++) {\r
-    if (Header->Size == 0 || CompareGuid (Guid, &Header->Guid)) {\r
+    if ((Header->Size == 0) || CompareGuid (Guid, &Header->Guid)) {\r
       return Header;\r
     }\r
   }\r
@@ -94,7 +94,6 @@ FindHeaderByGuid (
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   This function will save confidential information to lockbox.\r
 \r
@@ -115,18 +114,24 @@ FindHeaderByGuid (
 RETURN_STATUS\r
 EFIAPI\r
 SaveLockBox (\r
-  IN  GUID                        *Guid,\r
-  IN  VOID                        *Buffer,\r
-  IN  UINTN                       Length\r
+  IN  GUID   *Guid,\r
+  IN  VOID   *Buffer,\r
+  IN  UINTN  Length\r
   )\r
 {\r
-  LOCK_BOX_ENTRY *Header;\r
+  LOCK_BOX_ENTRY  *Header;\r
   VOID            *CopyBuffer;\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Buffer=%p Length=0x%x\n", __FUNCTION__,\r
-    Guid, Buffer, (UINT32) Length));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: Guid=%g Buffer=%p Length=0x%x\n",\r
+    __FUNCTION__,\r
+    Guid,\r
+    Buffer,\r
+    (UINT32)Length\r
+    ));\r
 \r
-  if (Guid == NULL || Buffer == NULL || Length == 0) {\r
+  if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
@@ -152,9 +157,9 @@ SaveLockBox (
   // overwrite the current terminator header with new metadata\r
   //\r
   CopyGuid (&Header->Guid, Guid);\r
-  Header->OrigAddress = (UINTN) Buffer;\r
-  Header->CopyAddress = (UINTN) CopyBuffer;\r
-  Header->Size        = (UINT32) Length;\r
+  Header->OrigAddress = (UINTN)Buffer;\r
+  Header->CopyAddress = (UINTN)CopyBuffer;\r
+  Header->Size        = (UINT32)Length;\r
   Header->Attributes  = 0;\r
 \r
   //\r
@@ -165,7 +170,6 @@ SaveLockBox (
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function will set lockbox attributes.\r
 \r
@@ -183,29 +187,34 @@ SaveLockBox (
 RETURN_STATUS\r
 EFIAPI\r
 SetLockBoxAttributes (\r
-  IN  GUID                        *Guid,\r
-  IN  UINT64                      Attributes\r
+  IN  GUID    *Guid,\r
+  IN  UINT64  Attributes\r
   )\r
 {\r
-  LOCK_BOX_ENTRY *Header;\r
+  LOCK_BOX_ENTRY  *Header;\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Attributes=0x%Lx\n", __FUNCTION__, Guid,\r
-    Attributes));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: Guid=%g Attributes=0x%Lx\n",\r
+    __FUNCTION__,\r
+    Guid,\r
+    Attributes\r
+    ));\r
 \r
   if (Guid == NULL) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
   Header = FindHeaderByGuid (Guid);\r
-  if (!Header || Header->Size == 0) {\r
+  if (!Header || (Header->Size == 0)) {\r
     return RETURN_NOT_FOUND;\r
   }\r
+\r
   Header->Attributes = Attributes;\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function will update confidential information to lockbox.\r
 \r
@@ -233,37 +242,43 @@ SetLockBoxAttributes (
 RETURN_STATUS\r
 EFIAPI\r
 UpdateLockBox (\r
-  IN  GUID                        *Guid,\r
-  IN  UINTN                       Offset,\r
-  IN  VOID                        *Buffer,\r
-  IN  UINTN                       Length\r
+  IN  GUID   *Guid,\r
+  IN  UINTN  Offset,\r
+  IN  VOID   *Buffer,\r
+  IN  UINTN  Length\r
   )\r
 {\r
-  LOCK_BOX_ENTRY *Header;\r
-\r
-  DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Offset=0x%x Length=0x%x\n", __FUNCTION__,\r
-    Guid, (UINT32) Offset, (UINT32) Length));\r
-\r
-  if (Guid == NULL || Buffer == NULL || Length == 0) {\r
+  LOCK_BOX_ENTRY  *Header;\r
+\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: Guid=%g Offset=0x%x Length=0x%x\n",\r
+    __FUNCTION__,\r
+    Guid,\r
+    (UINT32)Offset,\r
+    (UINT32)Length\r
+    ));\r
+\r
+  if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
   Header = FindHeaderByGuid (Guid);\r
-  if (!Header || Header->Size == 0) {\r
+  if (!Header || (Header->Size == 0)) {\r
     return RETURN_NOT_FOUND;\r
   }\r
 \r
-  if (Header->Size < Offset ||\r
-      Length > Header->Size - Offset) {\r
+  if ((Header->Size < Offset) ||\r
+      (Length > Header->Size - Offset))\r
+  {\r
     return RETURN_BUFFER_TOO_SMALL;\r
   }\r
 \r
-  CopyMem ((UINT8 *)(UINTN) (Header->CopyAddress) + Offset, Buffer, Length);\r
+  CopyMem ((UINT8 *)(UINTN)(Header->CopyAddress) + Offset, Buffer, Length);\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function will restore confidential information from lockbox.\r
 \r
@@ -290,24 +305,30 @@ UpdateLockBox (
 RETURN_STATUS\r
 EFIAPI\r
 RestoreLockBox (\r
-  IN  GUID                        *Guid,\r
-  IN  VOID                        *Buffer  OPTIONAL,\r
-  IN  OUT UINTN                   *Length  OPTIONAL\r
+  IN  GUID       *Guid,\r
+  IN  VOID       *Buffer  OPTIONAL,\r
+  IN  OUT UINTN  *Length  OPTIONAL\r
   )\r
 {\r
-  LOCK_BOX_ENTRY *Header;\r
+  LOCK_BOX_ENTRY  *Header;\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Buffer=%p\n", __FUNCTION__, Guid,\r
-    Buffer));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: Guid=%g Buffer=%p\n",\r
+    __FUNCTION__,\r
+    Guid,\r
+    Buffer\r
+    ));\r
 \r
   if ((Guid == NULL) ||\r
       ((Buffer == NULL) && (Length != NULL)) ||\r
-      ((Buffer != NULL) && (Length == NULL))) {\r
+      ((Buffer != NULL) && (Length == NULL)))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Header = FindHeaderByGuid (Guid);\r
-  if (!Header || Header->Size == 0) {\r
+  if (!Header || (Header->Size == 0)) {\r
     return RETURN_NOT_FOUND;\r
   }\r
 \r
@@ -315,10 +336,12 @@ RestoreLockBox (
     if (!(Header->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE)) {\r
       return RETURN_WRITE_PROTECTED;\r
     }\r
+\r
     if (Header->OrigAddress + (Header->Size - 1) > MAX_ADDRESS) {\r
       return RETURN_UNSUPPORTED;\r
     }\r
-    Buffer = (VOID *)(UINTN) Header->OrigAddress;\r
+\r
+    Buffer = (VOID *)(UINTN)Header->OrigAddress;\r
   }\r
 \r
   //\r
@@ -332,15 +355,15 @@ RestoreLockBox (
       *Length = Header->Size;\r
       return EFI_BUFFER_TOO_SMALL;\r
     }\r
+\r
     *Length = Header->Size;\r
   }\r
 \r
-  CopyMem (Buffer, (VOID*)(UINTN) Header->CopyAddress, Header->Size);\r
+  CopyMem (Buffer, (VOID *)(UINTN)Header->CopyAddress, Header->Size);\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function will restore confidential information from all lockbox which\r
   have RestoreInPlace attribute.\r
@@ -356,22 +379,30 @@ RestoreAllLockBoxInPlace (
   VOID\r
   )\r
 {\r
-  LOCK_BOX_ENTRY *Header;\r
+  LOCK_BOX_ENTRY  *Header;\r
 \r
   for (Header = StartOfEntries;\r
        Header < EndOfEntries && Header->Size > 0;\r
-       Header++) {\r
+       Header++)\r
+  {\r
     if (Header->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) {\r
-      VOID *Buffer;\r
+      VOID  *Buffer;\r
 \r
       if (Header->OrigAddress + (Header->Size - 1) > MAX_ADDRESS) {\r
         return RETURN_UNSUPPORTED;\r
       }\r
-      Buffer = (VOID *)(UINTN) Header->OrigAddress;\r
-      CopyMem (Buffer, (VOID*)(UINTN)Header->CopyAddress, Header->Size);\r
-      DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Buffer=%p\n", __FUNCTION__,\r
-        &Header->Guid, Buffer));\r
+\r
+      Buffer = (VOID *)(UINTN)Header->OrigAddress;\r
+      CopyMem (Buffer, (VOID *)(UINTN)Header->CopyAddress, Header->Size);\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: Guid=%g Buffer=%p\n",\r
+        __FUNCTION__,\r
+        &Header->Guid,\r
+        Buffer\r
+        ));\r
     }\r
   }\r
+\r
   return RETURN_SUCCESS;\r
 }\r
index d654ea63987bd5b00463bb81a1ae48fca0b66e14..a5392c91244d9bdc5b69f086308b6719a2118592 100644 (file)
 #pragma pack(1)\r
 \r
 typedef struct {\r
-  UINT32               Signature;\r
-  UINT32               SubPageBuffer;\r
-  UINT32               SubPageRemaining;\r
+  UINT32    Signature;\r
+  UINT32    SubPageBuffer;\r
+  UINT32    SubPageRemaining;\r
 } LOCK_BOX_GLOBAL;\r
 \r
-#define LOCK_BOX_GLOBAL_SIGNATURE SIGNATURE_32('L', 'B', 'G', 'S')\r
+#define LOCK_BOX_GLOBAL_SIGNATURE  SIGNATURE_32('L', 'B', 'G', 'S')\r
 \r
-extern LOCK_BOX_GLOBAL *mLockBoxGlobal;\r
+extern LOCK_BOX_GLOBAL  *mLockBoxGlobal;\r
 \r
 #pragma pack()\r
 \r
@@ -43,12 +43,10 @@ AllocateAcpiNvsPool (
   IN UINTN  AllocationSize\r
   );\r
 \r
-\r
 RETURN_STATUS\r
 EFIAPI\r
 LockBoxLibInitialize (\r
   VOID\r
   );\r
 \r
-\r
 #endif\r
index 2ba03522fbb6b7c23dc702b40658d5552b4b2792..3f515bd0340e250b999cbf4aebf022f8496e6434 100644 (file)
@@ -12,7 +12,6 @@
 #include <Library/DebugLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 \r
-\r
 /**\r
   Open the NvVars file for reading or writing\r
 \r
 **/\r
 EFI_STATUS\r
 GetNvVarsFile (\r
-  IN  EFI_HANDLE            FsHandle,\r
-  IN  BOOLEAN               ReadingFile,\r
-  OUT EFI_FILE_HANDLE       *NvVarsFile\r
+  IN  EFI_HANDLE       FsHandle,\r
+  IN  BOOLEAN          ReadingFile,\r
+  OUT EFI_FILE_HANDLE  *NvVarsFile\r
   )\r
 {\r
-  EFI_STATUS                            Status;\r
-  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL       *Fs;\r
-  EFI_FILE_HANDLE                       Root;\r
+  EFI_STATUS                       Status;\r
+  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *Fs;\r
+  EFI_FILE_HANDLE                  Root;\r
 \r
   //\r
   // Get the FileSystem protocol on that handle\r
@@ -63,19 +62,18 @@ GetNvVarsFile (
                    NvVarsFile,\r
                    L"NvVars",\r
                    ReadingFile ?\r
-                     EFI_FILE_MODE_READ :\r
-                     (\r
-                       EFI_FILE_MODE_CREATE |\r
-                       EFI_FILE_MODE_READ |\r
-                       EFI_FILE_MODE_WRITE\r
-                     ),\r
+                   EFI_FILE_MODE_READ :\r
+                   (\r
+                    EFI_FILE_MODE_CREATE |\r
+                    EFI_FILE_MODE_READ |\r
+                    EFI_FILE_MODE_WRITE\r
+                   ),\r
                    0\r
                    );\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Open the NvVars file for reading or writing\r
 \r
@@ -87,15 +85,15 @@ GetNvVarsFile (
 **/\r
 VOID\r
 NvVarsFileReadCheckup (\r
-  IN  EFI_FILE_HANDLE        File,\r
-  OUT BOOLEAN                *Exists,\r
-  OUT UINTN                  *Size\r
+  IN  EFI_FILE_HANDLE  File,\r
+  OUT BOOLEAN          *Exists,\r
+  OUT UINTN            *Size\r
   )\r
 {\r
-  EFI_FILE_INFO               *FileInfo;\r
+  EFI_FILE_INFO  *FileInfo;\r
 \r
   *Exists = FALSE;\r
-  *Size = 0;\r
+  *Size   = 0;\r
 \r
   FileInfo = FileHandleGetInfo (File);\r
   if (FileInfo == NULL) {\r
@@ -108,12 +106,11 @@ NvVarsFileReadCheckup (
   }\r
 \r
   *Exists = TRUE;\r
-  *Size = (UINTN) FileInfo->FileSize;\r
+  *Size   = (UINTN)FileInfo->FileSize;\r
 \r
   FreePool (FileInfo);\r
 }\r
 \r
-\r
 /**\r
   Open the NvVars file for reading or writing\r
 \r
@@ -125,11 +122,11 @@ NvVarsFileReadCheckup (
 **/\r
 EFI_STATUS\r
 FileHandleEmpty (\r
-  IN  EFI_FILE_HANDLE        File\r
+  IN  EFI_FILE_HANDLE  File\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_FILE_INFO               *FileInfo;\r
+  EFI_STATUS     Status;\r
+  EFI_FILE_INFO  *FileInfo;\r
 \r
   //\r
   // Retrieve the FileInfo structure\r
@@ -160,14 +157,13 @@ FileHandleEmpty (
   // Set the file size to 0.\r
   //\r
   FileInfo->FileSize = 0;\r
-  Status = FileHandleSetInfo (File, FileInfo);\r
+  Status             = FileHandleSetInfo (File, FileInfo);\r
 \r
   FreePool (FileInfo);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Reads a file to a newly allocated buffer\r
 \r
@@ -178,18 +174,18 @@ FileHandleEmpty (
               contents.  NULL if an error occurred.\r
 \r
 **/\r
-VOID*\r
+VOID *\r
 FileHandleReadToNewBuffer (\r
-  IN EFI_FILE_HANDLE            FileHandle,\r
-  IN UINTN                      ReadSize\r
+  IN EFI_FILE_HANDLE  FileHandle,\r
+  IN UINTN            ReadSize\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINTN                       ActualReadSize;\r
-  VOID                        *FileContents;\r
+  EFI_STATUS  Status;\r
+  UINTN       ActualReadSize;\r
+  VOID        *FileContents;\r
 \r
   ActualReadSize = ReadSize;\r
-  FileContents = AllocatePool (ReadSize);\r
+  FileContents   = AllocatePool (ReadSize);\r
   if (FileContents != NULL) {\r
     Status = FileHandleRead (\r
                FileHandle,\r
@@ -205,7 +201,6 @@ FileHandleReadToNewBuffer (
   return FileContents;\r
 }\r
 \r
-\r
 /**\r
   Reads the contents of the NvVars file on the file system\r
 \r
@@ -216,15 +211,15 @@ FileHandleReadToNewBuffer (
 **/\r
 EFI_STATUS\r
 ReadNvVarsFile (\r
-  IN  EFI_HANDLE            FsHandle\r
+  IN  EFI_HANDLE  FsHandle\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_FILE_HANDLE             File;\r
-  UINTN                       FileSize;\r
-  BOOLEAN                     FileExists;\r
-  VOID                        *FileContents;\r
-  EFI_HANDLE                  SerializedVariables;\r
+  EFI_STATUS       Status;\r
+  EFI_FILE_HANDLE  File;\r
+  UINTN            FileSize;\r
+  BOOLEAN          FileExists;\r
+  VOID             *FileContents;\r
+  EFI_HANDLE       SerializedVariables;\r
 \r
   Status = GetNvVarsFile (FsHandle, TRUE, &File);\r
   if (EFI_ERROR (Status)) {\r
@@ -265,7 +260,6 @@ ReadNvVarsFile (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Writes a variable to indicate that the NV variables\r
   have been loaded from the file system.\r
@@ -277,28 +271,27 @@ SetNvVarsVariable (
   VOID\r
   )\r
 {\r
-  BOOLEAN                        VarData;\r
-  UINTN                          Size;\r
+  BOOLEAN  VarData;\r
+  UINTN    Size;\r
 \r
   //\r
   // Write a variable to indicate we've already loaded the\r
   // variable data.  If it is found, we skip the loading on\r
   // subsequent attempts.\r
   //\r
-  Size = sizeof (VarData);\r
+  Size    = sizeof (VarData);\r
   VarData = TRUE;\r
   gRT->SetVariable (\r
          L"NvVars",\r
          &gEfiSimpleFileSystemProtocolGuid,\r
          EFI_VARIABLE_NON_VOLATILE |\r
-           EFI_VARIABLE_BOOTSERVICE_ACCESS |\r
-           EFI_VARIABLE_RUNTIME_ACCESS,\r
+         EFI_VARIABLE_BOOTSERVICE_ACCESS |\r
+         EFI_VARIABLE_RUNTIME_ACCESS,\r
          Size,\r
-         (VOID*) &VarData\r
+         (VOID *)&VarData\r
          );\r
 }\r
 \r
-\r
 /**\r
   Loads the non-volatile variables from the NvVars file on the\r
   given file system.\r
@@ -310,12 +303,12 @@ SetNvVarsVariable (
 **/\r
 EFI_STATUS\r
 LoadNvVarsFromFs (\r
-  EFI_HANDLE                            FsHandle\r
+  EFI_HANDLE  FsHandle\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  BOOLEAN                        VarData;\r
-  UINTN                          Size;\r
+  EFI_STATUS  Status;\r
+  BOOLEAN     VarData;\r
+  UINTN       Size;\r
 \r
   DEBUG ((DEBUG_INFO, "FsAccess.c: LoadNvVarsFromFs\n"));\r
 \r
@@ -328,15 +321,15 @@ LoadNvVarsFromFs (
   // want to re-load the file as it would overwrite newer changes\r
   // made to the variables.\r
   //\r
-  Size = sizeof (VarData);\r
+  Size    = sizeof (VarData);\r
   VarData = TRUE;\r
-  Status = gRT->GetVariable (\r
-                  L"NvVars",\r
-                  &gEfiSimpleFileSystemProtocolGuid,\r
-                  NULL,\r
-                  &Size,\r
-                  (VOID*) &VarData\r
-                  );\r
+  Status  = gRT->GetVariable (\r
+                   L"NvVars",\r
+                   &gEfiSimpleFileSystemProtocolGuid,\r
+                   NULL,\r
+                   &Size,\r
+                   (VOID *)&VarData\r
+                   );\r
   if (Status == EFI_SUCCESS) {\r
     DEBUG ((DEBUG_INFO, "NV Variables were already loaded\n"));\r
     return EFI_ALREADY_STARTED;\r
@@ -356,7 +349,7 @@ LoadNvVarsFromFs (
   // variable data.  If it is found, we skip the loading on\r
   // subsequent attempts.\r
   //\r
-  SetNvVarsVariable();\r
+  SetNvVarsVariable ();\r
 \r
   DEBUG ((\r
     DEBUG_INFO,\r
@@ -367,22 +360,21 @@ LoadNvVarsFromFs (
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 RETURN_STATUS\r
 EFIAPI\r
 IterateVariablesCallbackAddAllNvVariables (\r
-  IN  VOID                         *Context,\r
-  IN  CHAR16                       *VariableName,\r
-  IN  EFI_GUID                     *VendorGuid,\r
-  IN  UINT32                       Attributes,\r
-  IN  UINTN                        DataSize,\r
-  IN  VOID                         *Data\r
+  IN  VOID      *Context,\r
+  IN  CHAR16    *VariableName,\r
+  IN  EFI_GUID  *VendorGuid,\r
+  IN  UINT32    Attributes,\r
+  IN  UINTN     DataSize,\r
+  IN  VOID      *Data\r
   )\r
 {\r
   EFI_HANDLE  Instance;\r
 \r
-  Instance = (EFI_HANDLE) Context;\r
+  Instance = (EFI_HANDLE)Context;\r
 \r
   //\r
   // Only save non-volatile variables\r
@@ -401,7 +393,6 @@ IterateVariablesCallbackAddAllNvVariables (
            );\r
 }\r
 \r
-\r
 /**\r
   Saves the non-volatile variables into the NvVars file on the\r
   given file system.\r
@@ -413,15 +404,15 @@ IterateVariablesCallbackAddAllNvVariables (
 **/\r
 EFI_STATUS\r
 SaveNvVarsToFs (\r
-  EFI_HANDLE                            FsHandle\r
+  EFI_HANDLE  FsHandle\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_FILE_HANDLE             File;\r
-  UINTN                       WriteSize;\r
-  UINTN                       VariableDataSize;\r
-  VOID                        *VariableData;\r
-  EFI_HANDLE                  SerializedVariables;\r
+  EFI_STATUS       Status;\r
+  EFI_FILE_HANDLE  File;\r
+  UINTN            WriteSize;\r
+  UINTN            VariableDataSize;\r
+  VOID             *VariableData;\r
+  EFI_HANDLE       SerializedVariables;\r
 \r
   SerializedVariables = NULL;\r
 \r
@@ -432,19 +423,19 @@ SaveNvVarsToFs (
 \r
   Status = SerializeVariablesIterateSystemVariables (\r
              IterateVariablesCallbackAddAllNvVariables,\r
-             (VOID*) SerializedVariables\r
+             (VOID *)SerializedVariables\r
              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  VariableData = NULL;\r
+  VariableData     = NULL;\r
   VariableDataSize = 0;\r
-  Status = SerializeVariablesToBuffer (\r
-             SerializedVariables,\r
-             NULL,\r
-             &VariableDataSize\r
-             );\r
+  Status           = SerializeVariablesToBuffer (\r
+                       SerializedVariables,\r
+                       NULL,\r
+                       &VariableDataSize\r
+                       );\r
   if (Status == RETURN_BUFFER_TOO_SMALL) {\r
     VariableData = AllocatePool (VariableDataSize);\r
     if (VariableData == NULL) {\r
@@ -483,7 +474,7 @@ SaveNvVarsToFs (
   }\r
 \r
   WriteSize = VariableDataSize;\r
-  Status = FileHandleWrite (File, &WriteSize, VariableData);\r
+  Status    = FileHandleWrite (File, &WriteSize, VariableData);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -496,13 +487,10 @@ SaveNvVarsToFs (
     // variable data.  If it is found, we skip the loading on\r
     // subsequent attempts.\r
     //\r
-    SetNvVarsVariable();\r
+    SetNvVarsVariable ();\r
 \r
     DEBUG ((DEBUG_INFO, "Saved NV Variables to NvVars file\n"));\r
   }\r
 \r
   return Status;\r
-\r
 }\r
-\r
-\r
index 65ab6a06e147f213153edcc44cac31dff749e074..21b71524ea48c559fed05a9a33a3a345adb81a6f 100644 (file)
@@ -10,8 +10,7 @@
 #include <Library/DebugLib.h>\r
 #include <Library/NvVarsFileLib.h>\r
 \r
-EFI_HANDLE    mNvVarsFileLibFsHandle = NULL;\r
-\r
+EFI_HANDLE  mNvVarsFileLibFsHandle = NULL;\r
 \r
 /**\r
   Attempts to connect the NvVarsFileLib to the specified file system.\r
@@ -26,10 +25,10 @@ EFI_HANDLE    mNvVarsFileLibFsHandle = NULL;
 EFI_STATUS\r
 EFIAPI\r
 ConnectNvVarsToFileSystem (\r
-  IN EFI_HANDLE    FsHandle\r
+  IN EFI_HANDLE  FsHandle\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // We might fail to load the variable, since the file system initially\r
@@ -49,7 +48,6 @@ ConnectNvVarsToFileSystem (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Update non-volatile variables stored on the file system.\r
 \r
@@ -73,5 +71,3 @@ UpdateNvVarsOnFileSystem (
     return SaveNvVarsToFs (mNvVarsFileLibFsHandle);\r
   }\r
 }\r
-\r
-\r
index d602ae1fa84c08a1d0754bd57db8b4e1eff2dfad..15161cbddc3df5fe1542d50a960e294e969887ab 100644 (file)
 **/\r
 EFI_STATUS\r
 LoadNvVarsFromFs (\r
-  EFI_HANDLE                            FsHandle\r
+  EFI_HANDLE  FsHandle\r
   );\r
 \r
-\r
 /**\r
   Saves the non-volatile variables into the NvVars file on the\r
   given file system.\r
@@ -48,8 +47,7 @@ LoadNvVarsFromFs (
 **/\r
 EFI_STATUS\r
 SaveNvVarsToFs (\r
-  EFI_HANDLE                            FsHandle\r
+  EFI_HANDLE  FsHandle\r
   );\r
 \r
 #endif\r
-\r
index 835efffccaf596637db3a26ebcfe41336dbb66cd..c36b6f34c4a77fe93c2311bc1fd1c5ea70324c0d 100644 (file)
@@ -16,8 +16,7 @@
 #include <Protocol/PciHostBridgeResourceAllocation.h> // EFI_PCI_HOST_BRIDGE...\r
 #include <Protocol/PciRootBridgeIo.h>                 // EFI_PCI_ATTRIBUTE_I...\r
 \r
-STATIC PCI_ROOT_BRIDGE_APERTURE mNonExistAperture = { MAX_UINT64, 0 };\r
-\r
+STATIC PCI_ROOT_BRIDGE_APERTURE  mNonExistAperture = { MAX_UINT64, 0 };\r
 \r
 /**\r
   Return all the root bridge instances in an array.\r
@@ -31,59 +30,58 @@ STATIC PCI_ROOT_BRIDGE_APERTURE mNonExistAperture = { MAX_UINT64, 0 };
 PCI_ROOT_BRIDGE *\r
 EFIAPI\r
 PciHostBridgeGetRootBridges (\r
-  UINTN *Count\r
+  UINTN  *Count\r
   )\r
 {\r
-  UINT64               Attributes;\r
-  UINT64               AllocationAttributes;\r
-  PCI_ROOT_BRIDGE_APERTURE Io;\r
-  PCI_ROOT_BRIDGE_APERTURE Mem;\r
-  PCI_ROOT_BRIDGE_APERTURE MemAbove4G;\r
+  UINT64                    Attributes;\r
+  UINT64                    AllocationAttributes;\r
+  PCI_ROOT_BRIDGE_APERTURE  Io;\r
+  PCI_ROOT_BRIDGE_APERTURE  Mem;\r
+  PCI_ROOT_BRIDGE_APERTURE  MemAbove4G;\r
 \r
   ZeroMem (&Io, sizeof (Io));\r
   ZeroMem (&Mem, sizeof (Mem));\r
   ZeroMem (&MemAbove4G, sizeof (MemAbove4G));\r
 \r
   Attributes = EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO |\r
-    EFI_PCI_ATTRIBUTE_IDE_SECONDARY_IO |\r
-    EFI_PCI_ATTRIBUTE_ISA_IO_16 |\r
-    EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |\r
-    EFI_PCI_ATTRIBUTE_VGA_MEMORY |\r
-    EFI_PCI_ATTRIBUTE_VGA_IO_16 |\r
-    EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16;\r
+               EFI_PCI_ATTRIBUTE_IDE_SECONDARY_IO |\r
+               EFI_PCI_ATTRIBUTE_ISA_IO_16 |\r
+               EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |\r
+               EFI_PCI_ATTRIBUTE_VGA_MEMORY |\r
+               EFI_PCI_ATTRIBUTE_VGA_IO_16 |\r
+               EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16;\r
 \r
   AllocationAttributes = EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM;\r
   if (PcdGet64 (PcdPciMmio64Size) > 0) {\r
     AllocationAttributes |= EFI_PCI_HOST_BRIDGE_MEM64_DECODE;\r
-    MemAbove4G.Base = PcdGet64 (PcdPciMmio64Base);\r
-    MemAbove4G.Limit = PcdGet64 (PcdPciMmio64Base) +\r
-                       PcdGet64 (PcdPciMmio64Size) - 1;\r
+    MemAbove4G.Base       = PcdGet64 (PcdPciMmio64Base);\r
+    MemAbove4G.Limit      = PcdGet64 (PcdPciMmio64Base) +\r
+                            PcdGet64 (PcdPciMmio64Size) - 1;\r
   } else {\r
     CopyMem (&MemAbove4G, &mNonExistAperture, sizeof (mNonExistAperture));\r
   }\r
 \r
-  Io.Base = PcdGet64 (PcdPciIoBase);\r
-  Io.Limit = PcdGet64 (PcdPciIoBase) + (PcdGet64 (PcdPciIoSize) - 1);\r
-  Mem.Base = PcdGet64 (PcdPciMmio32Base);\r
+  Io.Base   = PcdGet64 (PcdPciIoBase);\r
+  Io.Limit  = PcdGet64 (PcdPciIoBase) + (PcdGet64 (PcdPciIoSize) - 1);\r
+  Mem.Base  = PcdGet64 (PcdPciMmio32Base);\r
   Mem.Limit = PcdGet64 (PcdPciMmio32Base) + (PcdGet64 (PcdPciMmio32Size) - 1);\r
 \r
   return PciHostBridgeUtilityGetRootBridges (\r
-    Count,\r
-    Attributes,\r
-    AllocationAttributes,\r
-    FALSE,\r
-    PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID,\r
-    0,\r
-    PCI_MAX_BUS,\r
-    &Io,\r
-    &Mem,\r
-    &MemAbove4G,\r
-    &mNonExistAperture,\r
-    &mNonExistAperture\r
-    );\r
+           Count,\r
+           Attributes,\r
+           AllocationAttributes,\r
+           FALSE,\r
+           PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID,\r
+           0,\r
+           PCI_MAX_BUS,\r
+           &Io,\r
+           &Mem,\r
+           &MemAbove4G,\r
+           &mNonExistAperture,\r
+           &mNonExistAperture\r
+           );\r
 }\r
 \r
-\r
 /**\r
   Free the root bridge instances array returned from\r
   PciHostBridgeGetRootBridges().\r
@@ -94,14 +92,13 @@ PciHostBridgeGetRootBridges (
 VOID\r
 EFIAPI\r
 PciHostBridgeFreeRootBridges (\r
-  PCI_ROOT_BRIDGE *Bridges,\r
-  UINTN           Count\r
+  PCI_ROOT_BRIDGE  *Bridges,\r
+  UINTN            Count\r
   )\r
 {\r
   PciHostBridgeUtilityFreeRootBridges (Bridges, Count);\r
 }\r
 \r
-\r
 /**\r
   Inform the platform that the resource conflict happens.\r
 \r
@@ -119,8 +116,8 @@ PciHostBridgeFreeRootBridges (
 VOID\r
 EFIAPI\r
 PciHostBridgeResourceConflict (\r
-  EFI_HANDLE                        HostBridgeHandle,\r
-  VOID                              *Configuration\r
+  EFI_HANDLE  HostBridgeHandle,\r
+  VOID        *Configuration\r
   )\r
 {\r
   PciHostBridgeUtilityResourceConflict (Configuration);\r
index cb05220161d71696a3782aa702db58673113fd0d..43ab2b2f97b323c29516b8a6265d9c3bade2ca84 100644 (file)
@@ -11,5 +11,5 @@
 \r
 PCI_ROOT_BRIDGE *\r
 ScanForRootBridges (\r
-  UINTN      *NumberOfRootBridges\r
-);\r
+  UINTN  *NumberOfRootBridges\r
+  );\r
index ac8d1033df24870b5dd2eef087d599d6bf48b783..ddcdd8886de244e97bedb5598a51578aac84863d 100644 (file)
 PCI_ROOT_BRIDGE *\r
 EFIAPI\r
 PciHostBridgeGetRootBridges (\r
-  UINTN *Count\r
+  UINTN  *Count\r
   )\r
 {\r
   return ScanForRootBridges (Count);\r
 }\r
 \r
-\r
 /**\r
   Free the root bridge instances array returned from\r
   PciHostBridgeGetRootBridges().\r
@@ -41,14 +40,13 @@ PciHostBridgeGetRootBridges (
 VOID\r
 EFIAPI\r
 PciHostBridgeFreeRootBridges (\r
-  PCI_ROOT_BRIDGE *Bridges,\r
-  UINTN           Count\r
+  PCI_ROOT_BRIDGE  *Bridges,\r
+  UINTN            Count\r
   )\r
 {\r
   PciHostBridgeUtilityFreeRootBridges (Bridges, Count);\r
 }\r
 \r
-\r
 /**\r
   Inform the platform that the resource conflict happens.\r
 \r
@@ -66,8 +64,8 @@ PciHostBridgeFreeRootBridges (
 VOID\r
 EFIAPI\r
 PciHostBridgeResourceConflict (\r
-  EFI_HANDLE                        HostBridgeHandle,\r
-  VOID                              *Configuration\r
+  EFI_HANDLE  HostBridgeHandle,\r
+  VOID        *Configuration\r
   )\r
 {\r
   PciHostBridgeUtilityResourceConflict (Configuration);\r
index a6126a1aea52337f2b44c038dee19ee7bd0ff5e7..5fb02a89b964e7b7bfd958cb5541b7dfd471ea71 100644 (file)
@@ -23,9 +23,9 @@
 STATIC\r
 VOID\r
 PcatPciRootBridgeBarExisted (\r
-  IN  UINTN                          Address,\r
-  OUT UINT32                         *OriginalValue,\r
-  OUT UINT32                         *Value\r
+  IN  UINTN   Address,\r
+  OUT UINT32  *OriginalValue,\r
+  OUT UINT32  *Value\r
   )\r
 {\r
   //\r
@@ -48,15 +48,15 @@ PcatPciRootBridgeBarExisted (
   EnableInterrupts ();\r
 }\r
 \r
-#define PCI_COMMAND_DECODE ((UINT16)(EFI_PCI_COMMAND_IO_SPACE | \\r
+#define PCI_COMMAND_DECODE  ((UINT16)(EFI_PCI_COMMAND_IO_SPACE |\\r
                                      EFI_PCI_COMMAND_MEMORY_SPACE))\r
 STATIC\r
 VOID\r
 PcatPciRootBridgeDecodingDisable (\r
-  IN  UINTN                          Address\r
+  IN  UINTN  Address\r
   )\r
 {\r
-  UINT16                             Value;\r
+  UINT16  Value;\r
 \r
   Value = PciRead16 (Address);\r
   if (Value & PCI_COMMAND_DECODE) {\r
@@ -67,59 +67,63 @@ PcatPciRootBridgeDecodingDisable (
 STATIC\r
 VOID\r
 PcatPciRootBridgeParseBars (\r
-  IN UINT16                         Command,\r
-  IN UINTN                          Bus,\r
-  IN UINTN                          Device,\r
-  IN UINTN                          Function,\r
-  IN UINTN                          BarOffsetBase,\r
-  IN UINTN                          BarOffsetEnd,\r
-  IN PCI_ROOT_BRIDGE_APERTURE       *Io,\r
-  IN PCI_ROOT_BRIDGE_APERTURE       *Mem,\r
-  IN PCI_ROOT_BRIDGE_APERTURE       *MemAbove4G\r
-\r
-)\r
+  IN UINT16                    Command,\r
+  IN UINTN                     Bus,\r
+  IN UINTN                     Device,\r
+  IN UINTN                     Function,\r
+  IN UINTN                     BarOffsetBase,\r
+  IN UINTN                     BarOffsetEnd,\r
+  IN PCI_ROOT_BRIDGE_APERTURE  *Io,\r
+  IN PCI_ROOT_BRIDGE_APERTURE  *Mem,\r
+  IN PCI_ROOT_BRIDGE_APERTURE  *MemAbove4G\r
+\r
+  )\r
 {\r
-  UINT32                            OriginalValue;\r
-  UINT32                            Value;\r
-  UINT32                            OriginalUpperValue;\r
-  UINT32                            UpperValue;\r
-  UINT64                            Mask;\r
-  UINTN                             Offset;\r
-  UINT64                            Base;\r
-  UINT64                            Length;\r
-  UINT64                            Limit;\r
-  PCI_ROOT_BRIDGE_APERTURE          *MemAperture;\r
+  UINT32                    OriginalValue;\r
+  UINT32                    Value;\r
+  UINT32                    OriginalUpperValue;\r
+  UINT32                    UpperValue;\r
+  UINT64                    Mask;\r
+  UINTN                     Offset;\r
+  UINT64                    Base;\r
+  UINT64                    Length;\r
+  UINT64                    Limit;\r
+  PCI_ROOT_BRIDGE_APERTURE  *MemAperture;\r
 \r
   // Disable address decoding for every device before OVMF starts sizing it\r
   PcatPciRootBridgeDecodingDisable (\r
     PCI_LIB_ADDRESS (Bus, Device, Function, PCI_COMMAND_OFFSET)\r
-  );\r
+    );\r
 \r
   for (Offset = BarOffsetBase; Offset < BarOffsetEnd; Offset += sizeof (UINT32)) {\r
     PcatPciRootBridgeBarExisted (\r
       PCI_LIB_ADDRESS (Bus, Device, Function, Offset),\r
-      &OriginalValue, &Value\r
-    );\r
+      &OriginalValue,\r
+      &Value\r
+      );\r
     if (Value == 0) {\r
       continue;\r
     }\r
+\r
     if ((Value & BIT0) == BIT0) {\r
       //\r
       // IO Bar\r
       //\r
       if (Command & EFI_PCI_COMMAND_IO_SPACE) {\r
-        Mask = 0xfffffffc;\r
-        Base = OriginalValue & Mask;\r
+        Mask   = 0xfffffffc;\r
+        Base   = OriginalValue & Mask;\r
         Length = ((~(Value & Mask)) & Mask) + 0x04;\r
         if (!(Value & 0xFFFF0000)) {\r
           Length &= 0x0000FFFF;\r
         }\r
+\r
         Limit = Base + Length - 1;\r
 \r
         if (Base < Limit) {\r
           if (Io->Base > Base) {\r
             Io->Base = Base;\r
           }\r
+\r
           if (Io->Limit < Limit) {\r
             Io->Limit = Limit;\r
           }\r
@@ -130,9 +134,8 @@ PcatPciRootBridgeParseBars (
       // Mem Bar\r
       //\r
       if (Command & EFI_PCI_COMMAND_MEMORY_SPACE) {\r
-\r
-        Mask = 0xfffffff0;\r
-        Base = OriginalValue & Mask;\r
+        Mask   = 0xfffffff0;\r
+        Base   = OriginalValue & Mask;\r
         Length = Value & Mask;\r
 \r
         if ((Value & (BIT1 | BIT2)) == 0) {\r
@@ -151,10 +154,10 @@ PcatPciRootBridgeParseBars (
             PCI_LIB_ADDRESS (Bus, Device, Function, Offset),\r
             &OriginalUpperValue,\r
             &UpperValue\r
-          );\r
+            );\r
 \r
-          Base = Base | LShiftU64 ((UINT64) OriginalUpperValue, 32);\r
-          Length = Length | LShiftU64 ((UINT64) UpperValue, 32);\r
+          Base   = Base | LShiftU64 ((UINT64)OriginalUpperValue, 32);\r
+          Length = Length | LShiftU64 ((UINT64)UpperValue, 32);\r
           Length = (~Length) + 1;\r
 \r
           if (Base < BASE_4GB) {\r
@@ -169,6 +172,7 @@ PcatPciRootBridgeParseBars (
           if (MemAperture->Base > Base) {\r
             MemAperture->Base = Base;\r
           }\r
+\r
           if (MemAperture->Limit < Limit) {\r
             MemAperture->Limit = Limit;\r
           }\r
@@ -178,31 +182,30 @@ PcatPciRootBridgeParseBars (
   }\r
 }\r
 \r
-STATIC PCI_ROOT_BRIDGE_APERTURE mNonExistAperture = { MAX_UINT64, 0 };\r
+STATIC PCI_ROOT_BRIDGE_APERTURE  mNonExistAperture = { MAX_UINT64, 0 };\r
 \r
 PCI_ROOT_BRIDGE *\r
 ScanForRootBridges (\r
-  UINTN      *NumberOfRootBridges\r
+  UINTN  *NumberOfRootBridges\r
   )\r
 {\r
-  UINTN      PrimaryBus;\r
-  UINTN      SubBus;\r
-  UINT8      Device;\r
-  UINT8      Function;\r
-  UINTN      NumberOfDevices;\r
-  UINTN      Address;\r
-  PCI_TYPE01 Pci;\r
-  UINT64     Attributes;\r
-  UINT64     Base;\r
-  UINT64     Limit;\r
-  UINT64     Value;\r
-  PCI_ROOT_BRIDGE_APERTURE Io, Mem, MemAbove4G, *MemAperture;\r
-  PCI_ROOT_BRIDGE *RootBridges;\r
-  UINTN      BarOffsetEnd;\r
-\r
+  UINTN                     PrimaryBus;\r
+  UINTN                     SubBus;\r
+  UINT8                     Device;\r
+  UINT8                     Function;\r
+  UINTN                     NumberOfDevices;\r
+  UINTN                     Address;\r
+  PCI_TYPE01                Pci;\r
+  UINT64                    Attributes;\r
+  UINT64                    Base;\r
+  UINT64                    Limit;\r
+  UINT64                    Value;\r
+  PCI_ROOT_BRIDGE_APERTURE  Io, Mem, MemAbove4G, *MemAperture;\r
+  PCI_ROOT_BRIDGE           *RootBridges;\r
+  UINTN                     BarOffsetEnd;\r
 \r
   *NumberOfRootBridges = 0;\r
-  RootBridges = NULL;\r
+  RootBridges          = NULL;\r
 \r
   //\r
   // After scanning all the PCI devices on the PCI root bridge's primary bus,\r
@@ -210,7 +213,7 @@ ScanForRootBridges (
   // root bridge's subordinate bus number + 1.\r
   //\r
   for (PrimaryBus = 0; PrimaryBus <= PCI_MAX_BUS; PrimaryBus = SubBus + 1) {\r
-    SubBus = PrimaryBus;\r
+    SubBus     = PrimaryBus;\r
     Attributes = 0;\r
 \r
     ZeroMem (&Io, sizeof (Io));\r
@@ -221,9 +224,7 @@ ScanForRootBridges (
     // Scan all the PCI devices on the primary bus of the PCI root bridge\r
     //\r
     for (Device = 0, NumberOfDevices = 0; Device <= PCI_MAX_DEVICE; Device++) {\r
-\r
       for (Function = 0; Function <= PCI_MAX_FUNC; Function++) {\r
-\r
         //\r
         // Compute the PCI configuration address of the PCI device to probe\r
         //\r
@@ -290,16 +291,18 @@ ScanForRootBridges (
           // Get the I/O range that the PPB is decoding\r
           //\r
           Value = Pci.Bridge.IoBase & 0x0f;\r
-          Base = ((UINT32) Pci.Bridge.IoBase & 0xf0) << 8;\r
-          Limit = (((UINT32) Pci.Bridge.IoLimit & 0xf0) << 8) | 0x0fff;\r
+          Base  = ((UINT32)Pci.Bridge.IoBase & 0xf0) << 8;\r
+          Limit = (((UINT32)Pci.Bridge.IoLimit & 0xf0) << 8) | 0x0fff;\r
           if (Value == BIT0) {\r
-            Base |= ((UINT32) Pci.Bridge.IoBaseUpper16 << 16);\r
-            Limit |= ((UINT32) Pci.Bridge.IoLimitUpper16 << 16);\r
+            Base  |= ((UINT32)Pci.Bridge.IoBaseUpper16 << 16);\r
+            Limit |= ((UINT32)Pci.Bridge.IoLimitUpper16 << 16);\r
           }\r
+\r
           if (Base < Limit) {\r
             if (Io.Base > Base) {\r
               Io.Base = Base;\r
             }\r
+\r
             if (Io.Limit < Limit) {\r
               Io.Limit = Limit;\r
             }\r
@@ -308,12 +311,13 @@ ScanForRootBridges (
           //\r
           // Get the Memory range that the PPB is decoding\r
           //\r
-          Base = ((UINT32) Pci.Bridge.MemoryBase & 0xfff0) << 16;\r
-          Limit = (((UINT32) Pci.Bridge.MemoryLimit & 0xfff0) << 16) | 0xfffff;\r
+          Base  = ((UINT32)Pci.Bridge.MemoryBase & 0xfff0) << 16;\r
+          Limit = (((UINT32)Pci.Bridge.MemoryLimit & 0xfff0) << 16) | 0xfffff;\r
           if (Base < Limit) {\r
             if (Mem.Base > Base) {\r
               Mem.Base = Base;\r
             }\r
+\r
             if (Mem.Limit < Limit) {\r
               Mem.Limit = Limit;\r
             }\r
@@ -324,19 +328,21 @@ ScanForRootBridges (
           // and merge it into Memory range\r
           //\r
           Value = Pci.Bridge.PrefetchableMemoryBase & 0x0f;\r
-          Base = ((UINT32) Pci.Bridge.PrefetchableMemoryBase & 0xfff0) << 16;\r
-          Limit = (((UINT32) Pci.Bridge.PrefetchableMemoryLimit & 0xfff0)\r
+          Base  = ((UINT32)Pci.Bridge.PrefetchableMemoryBase & 0xfff0) << 16;\r
+          Limit = (((UINT32)Pci.Bridge.PrefetchableMemoryLimit & 0xfff0)\r
                    << 16) | 0xfffff;\r
           MemAperture = &Mem;\r
           if (Value == BIT0) {\r
-            Base |= LShiftU64 (Pci.Bridge.PrefetchableBaseUpper32, 32);\r
-            Limit |= LShiftU64 (Pci.Bridge.PrefetchableLimitUpper32, 32);\r
+            Base       |= LShiftU64 (Pci.Bridge.PrefetchableBaseUpper32, 32);\r
+            Limit      |= LShiftU64 (Pci.Bridge.PrefetchableLimitUpper32, 32);\r
             MemAperture = &MemAbove4G;\r
           }\r
+\r
           if (Base < Limit) {\r
             if (MemAperture->Base > Base) {\r
               MemAperture->Base = Base;\r
             }\r
+\r
             if (MemAperture->Limit < Limit) {\r
               MemAperture->Limit = Limit;\r
             }\r
@@ -346,18 +352,22 @@ ScanForRootBridges (
           // Look at the PPB Configuration for legacy decoding attributes\r
           //\r
           if ((Pci.Bridge.BridgeControl & EFI_PCI_BRIDGE_CONTROL_ISA)\r
-              == EFI_PCI_BRIDGE_CONTROL_ISA) {\r
+              == EFI_PCI_BRIDGE_CONTROL_ISA)\r
+          {\r
             Attributes |= EFI_PCI_ATTRIBUTE_ISA_IO;\r
             Attributes |= EFI_PCI_ATTRIBUTE_ISA_IO_16;\r
             Attributes |= EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO;\r
           }\r
+\r
           if ((Pci.Bridge.BridgeControl & EFI_PCI_BRIDGE_CONTROL_VGA)\r
-              == EFI_PCI_BRIDGE_CONTROL_VGA) {\r
+              == EFI_PCI_BRIDGE_CONTROL_VGA)\r
+          {\r
             Attributes |= EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO;\r
             Attributes |= EFI_PCI_ATTRIBUTE_VGA_MEMORY;\r
             Attributes |= EFI_PCI_ATTRIBUTE_VGA_IO;\r
             if ((Pci.Bridge.BridgeControl & EFI_PCI_BRIDGE_CONTROL_VGA_16)\r
-                != 0) {\r
+                != 0)\r
+            {\r
               Attributes |= EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16;\r
               Attributes |= EFI_PCI_ATTRIBUTE_VGA_IO_16;\r
             }\r
@@ -382,21 +392,28 @@ ScanForRootBridges (
           OFFSET_OF (PCI_TYPE00, Device.Bar),\r
           BarOffsetEnd,\r
           &Io,\r
-          &Mem, &MemAbove4G\r
-        );\r
+          &Mem,\r
+          &MemAbove4G\r
+          );\r
 \r
         //\r
         // See if the PCI device is an IDE controller\r
         //\r
-        if (IS_CLASS2 (&Pci, PCI_CLASS_MASS_STORAGE,\r
-                       PCI_CLASS_MASS_STORAGE_IDE)) {\r
+        if (IS_CLASS2 (\r
+              &Pci,\r
+              PCI_CLASS_MASS_STORAGE,\r
+              PCI_CLASS_MASS_STORAGE_IDE\r
+              ))\r
+        {\r
           if (Pci.Hdr.ClassCode[0] & 0x80) {\r
             Attributes |= EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO;\r
             Attributes |= EFI_PCI_ATTRIBUTE_IDE_SECONDARY_IO;\r
           }\r
+\r
           if (Pci.Hdr.ClassCode[0] & 0x01) {\r
             Attributes |= EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO;\r
           }\r
+\r
           if (Pci.Hdr.ClassCode[0] & 0x04) {\r
             Attributes |= EFI_PCI_ATTRIBUTE_IDE_SECONDARY_IO;\r
           }\r
@@ -408,7 +425,8 @@ ScanForRootBridges (
         //\r
         if (IS_CLASS2 (&Pci, PCI_CLASS_OLD, PCI_CLASS_OLD_VGA) ||\r
             IS_CLASS2 (&Pci, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_VGA)\r
-            ) {\r
+            )\r
+        {\r
           Attributes |= EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO;\r
           Attributes |= EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16;\r
           Attributes |= EFI_PCI_ATTRIBUTE_VGA_MEMORY;\r
@@ -421,9 +439,10 @@ ScanForRootBridges (
         // or ISA_POSITIVE_DECODE Bridge device\r
         //\r
         if (Pci.Hdr.ClassCode[2] == PCI_CLASS_BRIDGE) {\r
-          if (Pci.Hdr.ClassCode[1] == PCI_CLASS_BRIDGE_ISA ||\r
-              Pci.Hdr.ClassCode[1] == PCI_CLASS_BRIDGE_EISA ||\r
-              Pci.Hdr.ClassCode[1] == PCI_CLASS_BRIDGE_ISA_PDECODE) {\r
+          if ((Pci.Hdr.ClassCode[1] == PCI_CLASS_BRIDGE_ISA) ||\r
+              (Pci.Hdr.ClassCode[1] == PCI_CLASS_BRIDGE_EISA) ||\r
+              (Pci.Hdr.ClassCode[1] == PCI_CLASS_BRIDGE_ISA_PDECODE))\r
+          {\r
             Attributes |= EFI_PCI_ATTRIBUTE_ISA_IO;\r
             Attributes |= EFI_PCI_ATTRIBUTE_ISA_IO_16;\r
             Attributes |= EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO;\r
@@ -434,7 +453,7 @@ ScanForRootBridges (
         // If this device is not a multi function device, then skip the rest\r
         // of this PCI device\r
         //\r
-        if (Function == 0 && !IS_PCI_MULTI_FUNC (&Pci)) {\r
+        if ((Function == 0) && !IS_PCI_MULTI_FUNC (&Pci)) {\r
           break;\r
         }\r
       }\r
@@ -446,18 +465,26 @@ ScanForRootBridges (
     //\r
     if (NumberOfDevices > 0) {\r
       RootBridges = ReallocatePool (\r
-        (*NumberOfRootBridges) * sizeof (PCI_ROOT_BRIDGE),\r
-        (*NumberOfRootBridges + 1) * sizeof (PCI_ROOT_BRIDGE),\r
-        RootBridges\r
-      );\r
+                      (*NumberOfRootBridges) * sizeof (PCI_ROOT_BRIDGE),\r
+                      (*NumberOfRootBridges + 1) * sizeof (PCI_ROOT_BRIDGE),\r
+                      RootBridges\r
+                      );\r
       ASSERT (RootBridges != NULL);\r
       PciHostBridgeUtilityInitRootBridge (\r
-        Attributes, Attributes, 0,\r
-        FALSE, TRUE /* NoExtendedConfigSpace */,\r
-        (UINT8) PrimaryBus, (UINT8) SubBus,\r
-        &Io, &Mem, &MemAbove4G, &mNonExistAperture, &mNonExistAperture,\r
+        Attributes,\r
+        Attributes,\r
+        0,\r
+        FALSE,\r
+        TRUE /* NoExtendedConfigSpace */,\r
+        (UINT8)PrimaryBus,\r
+        (UINT8)SubBus,\r
+        &Io,\r
+        &Mem,\r
+        &MemAbove4G,\r
+        &mNonExistAperture,\r
+        &mNonExistAperture,\r
         &RootBridges[*NumberOfRootBridges]\r
-      );\r
+        );\r
       RootBridges[*NumberOfRootBridges].ResourceAssigned = TRUE;\r
       //\r
       // Increment the index for the next PCI Root Bridge\r
index d2296f33085ee178d3a1f5c75f0c65d4ab6b298d..92e1ea812f886eb329a7ea75ddec0505a2110c31 100644 (file)
 #include <Library/PciLib.h>\r
 #include <Library/QemuFwCfgLib.h>\r
 \r
-\r
 #pragma pack(1)\r
 typedef struct {\r
-  ACPI_HID_DEVICE_PATH     AcpiDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL EndDevicePath;\r
+  ACPI_HID_DEVICE_PATH        AcpiDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    EndDevicePath;\r
 } OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
-\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-CHAR16 *mPciHostBridgeUtilityLibAcpiAddressSpaceTypeStr[] = {\r
+CHAR16  *mPciHostBridgeUtilityLibAcpiAddressSpaceTypeStr[] = {\r
   L"Mem", L"I/O", L"Bus"\r
 };\r
 \r
-\r
 STATIC\r
 CONST\r
-OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH mRootBridgeDevicePathTemplate = {\r
+OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH  mRootBridgeDevicePathTemplate = {\r
   {\r
     {\r
       ACPI_DEVICE_PATH,\r
       ACPI_DP,\r
       {\r
-        (UINT8) (sizeof(ACPI_HID_DEVICE_PATH)),\r
-        (UINT8) ((sizeof(ACPI_HID_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (ACPI_HID_DEVICE_PATH)),\r
+        (UINT8)((sizeof (ACPI_HID_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    EISA_PNP_ID(0x0A03), // HID\r
-    0                    // UID\r
+    EISA_PNP_ID (0x0A03), // HID\r
+    0                     // UID\r
   },\r
 \r
   {\r
@@ -61,7 +58,6 @@ OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH mRootBridgeDevicePathTemplate = {
   }\r
 };\r
 \r
-\r
 /**\r
   Utility function to initialize a PCI_ROOT_BRIDGE structure.\r
 \r
@@ -112,22 +108,22 @@ OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH mRootBridgeDevicePathTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 PciHostBridgeUtilityInitRootBridge (\r
-  IN  UINT64                   Supports,\r
-  IN  UINT64                   Attributes,\r
-  IN  UINT64                   AllocAttributes,\r
-  IN  BOOLEAN                  DmaAbove4G,\r
-  IN  BOOLEAN                  NoExtendedConfigSpace,\r
-  IN  UINT8                    RootBusNumber,\r
-  IN  UINT8                    MaxSubBusNumber,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *Io,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *Mem,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *PMem,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *PMemAbove4G,\r
-  OUT PCI_ROOT_BRIDGE          *RootBus\r
+  IN  UINT64                    Supports,\r
+  IN  UINT64                    Attributes,\r
+  IN  UINT64                    AllocAttributes,\r
+  IN  BOOLEAN                   DmaAbove4G,\r
+  IN  BOOLEAN                   NoExtendedConfigSpace,\r
+  IN  UINT8                     RootBusNumber,\r
+  IN  UINT8                     MaxSubBusNumber,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *Io,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *Mem,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *MemAbove4G,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *PMem,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *PMemAbove4G,\r
+  OUT PCI_ROOT_BRIDGE           *RootBus\r
   )\r
 {\r
-  OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH *DevicePath;\r
+  OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH  *DevicePath;\r
 \r
   //\r
   // Be safe if other fields are added to PCI_ROOT_BRIDGE later.\r
@@ -142,8 +138,8 @@ PciHostBridgeUtilityInitRootBridge (
   RootBus->DmaAbove4G = DmaAbove4G;\r
 \r
   RootBus->AllocationAttributes = AllocAttributes;\r
-  RootBus->Bus.Base  = RootBusNumber;\r
-  RootBus->Bus.Limit = MaxSubBusNumber;\r
+  RootBus->Bus.Base             = RootBusNumber;\r
+  RootBus->Bus.Limit            = MaxSubBusNumber;\r
   CopyMem (&RootBus->Io, Io, sizeof (*Io));\r
   CopyMem (&RootBus->Mem, Mem, sizeof (*Mem));\r
   CopyMem (&RootBus->MemAbove4G, MemAbove4G, sizeof (*MemAbove4G));\r
@@ -152,22 +148,28 @@ PciHostBridgeUtilityInitRootBridge (
 \r
   RootBus->NoExtendedConfigSpace = NoExtendedConfigSpace;\r
 \r
-  DevicePath = AllocateCopyPool (sizeof mRootBridgeDevicePathTemplate,\r
-                 &mRootBridgeDevicePathTemplate);\r
+  DevicePath = AllocateCopyPool (\r
+                 sizeof mRootBridgeDevicePathTemplate,\r
+                 &mRootBridgeDevicePathTemplate\r
+                 );\r
   if (DevicePath == NULL) {\r
     DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   DevicePath->AcpiDevicePath.UID = RootBusNumber;\r
-  RootBus->DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)DevicePath;\r
+  RootBus->DevicePath            = (EFI_DEVICE_PATH_PROTOCOL *)DevicePath;\r
 \r
-  DEBUG ((DEBUG_INFO,\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
     "%a: populated root bus %d, with room for %d subordinate bus(es)\n",\r
-    __FUNCTION__, RootBusNumber, MaxSubBusNumber - RootBusNumber));\r
+    __FUNCTION__,\r
+    RootBusNumber,\r
+    MaxSubBusNumber - RootBusNumber\r
+    ));\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Utility function to uninitialize a PCI_ROOT_BRIDGE structure set up with\r
   PciHostBridgeUtilityInitRootBridge().\r
@@ -180,13 +182,12 @@ PciHostBridgeUtilityInitRootBridge (
 VOID\r
 EFIAPI\r
 PciHostBridgeUtilityUninitRootBridge (\r
-  IN PCI_ROOT_BRIDGE *RootBus\r
+  IN PCI_ROOT_BRIDGE  *RootBus\r
   )\r
 {\r
   FreePool (RootBus->DevicePath);\r
 }\r
 \r
-\r
 /**\r
   Utility function to return all the root bridge instances in an array.\r
 \r
@@ -219,34 +220,40 @@ PciHostBridgeUtilityUninitRootBridge (
 PCI_ROOT_BRIDGE *\r
 EFIAPI\r
 PciHostBridgeUtilityGetRootBridges (\r
-  OUT UINTN                    *Count,\r
-  IN  UINT64                   Attributes,\r
-  IN  UINT64                   AllocationAttributes,\r
-  IN  BOOLEAN                  DmaAbove4G,\r
-  IN  BOOLEAN                  NoExtendedConfigSpace,\r
-  IN  UINTN                    BusMin,\r
-  IN  UINTN                    BusMax,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *Io,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *Mem,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *PMem,\r
-  IN  PCI_ROOT_BRIDGE_APERTURE *PMemAbove4G\r
+  OUT UINTN                     *Count,\r
+  IN  UINT64                    Attributes,\r
+  IN  UINT64                    AllocationAttributes,\r
+  IN  BOOLEAN                   DmaAbove4G,\r
+  IN  BOOLEAN                   NoExtendedConfigSpace,\r
+  IN  UINTN                     BusMin,\r
+  IN  UINTN                     BusMax,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *Io,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *Mem,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *MemAbove4G,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *PMem,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE  *PMemAbove4G\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  FIRMWARE_CONFIG_ITEM FwCfgItem;\r
-  UINTN                FwCfgSize;\r
-  UINT64               ExtraRootBridges;\r
-  PCI_ROOT_BRIDGE      *Bridges;\r
-  UINTN                Initialized;\r
-  UINTN                LastRootBridgeNumber;\r
-  UINTN                RootBridgeNumber;\r
+  EFI_STATUS            Status;\r
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;\r
+  UINTN                 FwCfgSize;\r
+  UINT64                ExtraRootBridges;\r
+  PCI_ROOT_BRIDGE       *Bridges;\r
+  UINTN                 Initialized;\r
+  UINTN                 LastRootBridgeNumber;\r
+  UINTN                 RootBridgeNumber;\r
 \r
   *Count = 0;\r
 \r
-  if (BusMin > BusMax || BusMax > PCI_MAX_BUS) {\r
-    DEBUG ((DEBUG_ERROR, "%a: invalid bus range with BusMin %Lu and BusMax "\r
-      "%Lu\n", __FUNCTION__, (UINT64)BusMin, (UINT64)BusMax));\r
+  if ((BusMin > BusMax) || (BusMax > PCI_MAX_BUS)) {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: invalid bus range with BusMin %Lu and BusMax "\r
+      "%Lu\n",\r
+      __FUNCTION__,\r
+      (UINT64)BusMin,\r
+      (UINT64)BusMax\r
+      ));\r
     return NULL;\r
   }\r
 \r
@@ -255,7 +262,7 @@ PciHostBridgeUtilityGetRootBridges (
   // search below. If there is no hint, the feature is missing.\r
   //\r
   Status = QemuFwCfgFindFile ("etc/extra-pci-roots", &FwCfgItem, &FwCfgSize);\r
-  if (EFI_ERROR (Status) || FwCfgSize != sizeof ExtraRootBridges) {\r
+  if (EFI_ERROR (Status) || (FwCfgSize != sizeof ExtraRootBridges)) {\r
     ExtraRootBridges = 0;\r
   } else {\r
     QemuFwCfgSelectItem (FwCfgItem);\r
@@ -269,12 +276,22 @@ PciHostBridgeUtilityGetRootBridges (
     // invalid behavior.\r
     //\r
     if (ExtraRootBridges > BusMax - BusMin) {\r
-      DEBUG ((DEBUG_ERROR, "%a: invalid count of extra root buses (%Lu) "\r
-        "reported by QEMU\n", __FUNCTION__, ExtraRootBridges));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: invalid count of extra root buses (%Lu) "\r
+        "reported by QEMU\n",\r
+        __FUNCTION__,\r
+        ExtraRootBridges\r
+        ));\r
       return NULL;\r
     }\r
-    DEBUG ((DEBUG_INFO, "%a: %Lu extra root buses reported by QEMU\n",\r
-      __FUNCTION__, ExtraRootBridges));\r
+\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: %Lu extra root buses reported by QEMU\n",\r
+      __FUNCTION__,\r
+      ExtraRootBridges\r
+      ));\r
   }\r
 \r
   //\r
@@ -285,6 +302,7 @@ PciHostBridgeUtilityGetRootBridges (
     DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));\r
     return NULL;\r
   }\r
+\r
   Initialized = 0;\r
 \r
   //\r
@@ -299,15 +317,24 @@ PciHostBridgeUtilityGetRootBridges (
   //\r
   for (RootBridgeNumber = BusMin + 1;\r
        RootBridgeNumber <= BusMax && Initialized < ExtraRootBridges;\r
-       ++RootBridgeNumber) {\r
-    UINTN Device;\r
+       ++RootBridgeNumber)\r
+  {\r
+    UINTN  Device;\r
 \r
     for (Device = 0; Device <= PCI_MAX_DEVICE; ++Device) {\r
-      if (PciRead16 (PCI_LIB_ADDRESS (RootBridgeNumber, Device, 0,\r
-                       PCI_VENDOR_ID_OFFSET)) != MAX_UINT16) {\r
+      if (PciRead16 (\r
+            PCI_LIB_ADDRESS (\r
+              RootBridgeNumber,\r
+              Device,\r
+              0,\r
+              PCI_VENDOR_ID_OFFSET\r
+              )\r
+            ) != MAX_UINT16)\r
+      {\r
         break;\r
       }\r
     }\r
+\r
     if (Device <= PCI_MAX_DEVICE) {\r
       //\r
       // Found the next root bus. We can now install the *previous* one,\r
@@ -315,23 +342,24 @@ PciHostBridgeUtilityGetRootBridges (
       // subordinate buses that might exist behind PCI bridges hanging off it.\r
       //\r
       Status = PciHostBridgeUtilityInitRootBridge (\r
-        Attributes,\r
-        Attributes,\r
-        AllocationAttributes,\r
-        DmaAbove4G,\r
-        NoExtendedConfigSpace,\r
-        (UINT8) LastRootBridgeNumber,\r
-        (UINT8) (RootBridgeNumber - 1),\r
-        Io,\r
-        Mem,\r
-        MemAbove4G,\r
-        PMem,\r
-        PMemAbove4G,\r
-        &Bridges[Initialized]\r
-        );\r
+                 Attributes,\r
+                 Attributes,\r
+                 AllocationAttributes,\r
+                 DmaAbove4G,\r
+                 NoExtendedConfigSpace,\r
+                 (UINT8)LastRootBridgeNumber,\r
+                 (UINT8)(RootBridgeNumber - 1),\r
+                 Io,\r
+                 Mem,\r
+                 MemAbove4G,\r
+                 PMem,\r
+                 PMemAbove4G,\r
+                 &Bridges[Initialized]\r
+                 );\r
       if (EFI_ERROR (Status)) {\r
         goto FreeBridges;\r
       }\r
+\r
       ++Initialized;\r
       LastRootBridgeNumber = RootBridgeNumber;\r
     }\r
@@ -342,23 +370,24 @@ PciHostBridgeUtilityGetRootBridges (
   // we've found no extra root buses).\r
   //\r
   Status = PciHostBridgeUtilityInitRootBridge (\r
-    Attributes,\r
-    Attributes,\r
-    AllocationAttributes,\r
-    DmaAbove4G,\r
-    NoExtendedConfigSpace,\r
-    (UINT8) LastRootBridgeNumber,\r
-    (UINT8) BusMax,\r
-    Io,\r
-    Mem,\r
-    MemAbove4G,\r
-    PMem,\r
-    PMemAbove4G,\r
-    &Bridges[Initialized]\r
-    );\r
+             Attributes,\r
+             Attributes,\r
+             AllocationAttributes,\r
+             DmaAbove4G,\r
+             NoExtendedConfigSpace,\r
+             (UINT8)LastRootBridgeNumber,\r
+             (UINT8)BusMax,\r
+             Io,\r
+             Mem,\r
+             MemAbove4G,\r
+             PMem,\r
+             PMemAbove4G,\r
+             &Bridges[Initialized]\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeBridges;\r
   }\r
+\r
   ++Initialized;\r
 \r
   *Count = Initialized;\r
@@ -374,7 +403,6 @@ FreeBridges:
   return NULL;\r
 }\r
 \r
-\r
 /**\r
   Utility function to free root bridge instances array from\r
   PciHostBridgeUtilityGetRootBridges().\r
@@ -385,13 +413,14 @@ FreeBridges:
 VOID\r
 EFIAPI\r
 PciHostBridgeUtilityFreeRootBridges (\r
-  IN PCI_ROOT_BRIDGE *Bridges,\r
-  IN UINTN           Count\r
+  IN PCI_ROOT_BRIDGE  *Bridges,\r
+  IN UINTN            Count\r
   )\r
 {\r
-  if (Bridges == NULL && Count == 0) {\r
+  if ((Bridges == NULL) && (Count == 0)) {\r
     return;\r
   }\r
+\r
   ASSERT (Bridges != NULL && Count > 0);\r
 \r
   do {\r
@@ -402,7 +431,6 @@ PciHostBridgeUtilityFreeRootBridges (
   FreePool (Bridges);\r
 }\r
 \r
-\r
 /**\r
   Utility function to inform the platform that the resource conflict happens.\r
 \r
@@ -423,38 +451,46 @@ PciHostBridgeUtilityResourceConflict (
   IN VOID  *Configuration\r
   )\r
 {\r
-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor;\r
-  UINTN                             RootBridgeIndex;\r
+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *Descriptor;\r
+  UINTN                              RootBridgeIndex;\r
+\r
   DEBUG ((DEBUG_ERROR, "PciHostBridge: Resource conflict happens!\n"));\r
 \r
   RootBridgeIndex = 0;\r
-  Descriptor = (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *) Configuration;\r
+  Descriptor      = (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *)Configuration;\r
   while (Descriptor->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR) {\r
     DEBUG ((DEBUG_ERROR, "RootBridge[%d]:\n", RootBridgeIndex++));\r
-    for (; Descriptor->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR; Descriptor++) {\r
-      ASSERT (Descriptor->ResType <\r
-              ARRAY_SIZE (mPciHostBridgeUtilityLibAcpiAddressSpaceTypeStr)\r
-              );\r
-      DEBUG ((DEBUG_ERROR, " %s: Length/Alignment = 0x%lx / 0x%lx\n",\r
-              mPciHostBridgeUtilityLibAcpiAddressSpaceTypeStr[Descriptor->ResType],\r
-              Descriptor->AddrLen, Descriptor->AddrRangeMax\r
-              ));\r
+    for ( ; Descriptor->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR; Descriptor++) {\r
+      ASSERT (\r
+        Descriptor->ResType <\r
+        ARRAY_SIZE (mPciHostBridgeUtilityLibAcpiAddressSpaceTypeStr)\r
+        );\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        " %s: Length/Alignment = 0x%lx / 0x%lx\n",\r
+        mPciHostBridgeUtilityLibAcpiAddressSpaceTypeStr[Descriptor->ResType],\r
+        Descriptor->AddrLen,\r
+        Descriptor->AddrRangeMax\r
+        ));\r
       if (Descriptor->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM) {\r
-        DEBUG ((DEBUG_ERROR, "     Granularity/SpecificFlag = %ld / %02x%s\n",\r
-                Descriptor->AddrSpaceGranularity, Descriptor->SpecificFlag,\r
-                ((Descriptor->SpecificFlag &\r
-                  EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE\r
-                  ) != 0) ? L" (Prefetchable)" : L""\r
-                ));\r
+        DEBUG ((\r
+          DEBUG_ERROR,\r
+          "     Granularity/SpecificFlag = %ld / %02x%s\n",\r
+          Descriptor->AddrSpaceGranularity,\r
+          Descriptor->SpecificFlag,\r
+          ((Descriptor->SpecificFlag &\r
+            EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE\r
+            ) != 0) ? L" (Prefetchable)" : L""\r
+          ));\r
       }\r
     }\r
+\r
     //\r
     // Skip the END descriptor for root bridge\r
     //\r
     ASSERT (Descriptor->Desc == ACPI_END_TAG_DESCRIPTOR);\r
     Descriptor = (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *)(\r
-                   (EFI_ACPI_END_TAG_DESCRIPTOR *)Descriptor + 1\r
-                   );\r
+                                                       (EFI_ACPI_END_TAG_DESCRIPTOR *)Descriptor + 1\r
+                                                       );\r
   }\r
 }\r
-\r
index 594ab105e2f54ebc02a08c2a427b3ee47125f65b..065673d904944adebc32ec806901ff84b07618eb 100644 (file)
 \r
 #include <Pi/PiStatusCode.h>\r
 \r
-\r
 //\r
 // Convenience variables for the status codes that are relevant for LoadImage()\r
 // and StartImage() preparations and return codes.\r
 //\r
-STATIC EFI_STATUS_CODE_VALUE mLoadPrep;\r
-STATIC EFI_STATUS_CODE_VALUE mLoadFail;\r
-STATIC EFI_STATUS_CODE_VALUE mStartPrep;\r
-STATIC EFI_STATUS_CODE_VALUE mStartFail;\r
-\r
+STATIC EFI_STATUS_CODE_VALUE  mLoadPrep;\r
+STATIC EFI_STATUS_CODE_VALUE  mLoadFail;\r
+STATIC EFI_STATUS_CODE_VALUE  mStartPrep;\r
+STATIC EFI_STATUS_CODE_VALUE  mStartFail;\r
 \r
 /**\r
   Handle status codes reported through ReportStatusCodeLib /\r
@@ -79,29 +77,31 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 HandleStatusCode (\r
-  IN EFI_STATUS_CODE_TYPE  CodeType,\r
-  IN EFI_STATUS_CODE_VALUE Value,\r
-  IN UINT32                Instance,\r
-  IN EFI_GUID              *CallerId,\r
-  IN EFI_STATUS_CODE_DATA  *Data\r
+  IN EFI_STATUS_CODE_TYPE   CodeType,\r
+  IN EFI_STATUS_CODE_VALUE  Value,\r
+  IN UINT32                 Instance,\r
+  IN EFI_GUID               *CallerId,\r
+  IN EFI_STATUS_CODE_DATA   *Data\r
   )\r
 {\r
-  UINTN                        VariableSize;\r
-  UINT16                       BootCurrent;\r
-  EFI_STATUS                   Status;\r
-  CHAR16                       BootOptionName[ARRAY_SIZE (L"Boot####")];\r
-  EFI_BOOT_MANAGER_LOAD_OPTION BmBootOption;\r
-  BOOLEAN                      DevPathStringIsDynamic;\r
-  CHAR16                       *DevPathString;\r
+  UINTN                         VariableSize;\r
+  UINT16                        BootCurrent;\r
+  EFI_STATUS                    Status;\r
+  CHAR16                        BootOptionName[ARRAY_SIZE (L"Boot####")];\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  BmBootOption;\r
+  BOOLEAN                       DevPathStringIsDynamic;\r
+  CHAR16                        *DevPathString;\r
 \r
   //\r
   // Ignore all status codes that are irrelevant for LoadImage() and\r
   // StartImage() preparations and return codes.\r
   //\r
-  if (Value != mLoadPrep && Value != mLoadFail &&\r
-      Value != mStartPrep && Value != mStartFail) {\r
+  if ((Value != mLoadPrep) && (Value != mLoadFail) &&\r
+      (Value != mStartPrep) && (Value != mStartFail))\r
+  {\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // Ignore status codes that are not reported by the same containing module.\r
   //\r
@@ -112,13 +112,18 @@ HandleStatusCode (
   //\r
   // Sanity-check Data in case of failure reports.\r
   //\r
-  if ((Value == mLoadFail || Value == mStartFail) &&\r
-      (Data == NULL ||\r
-       Data->HeaderSize != sizeof *Data ||\r
-       Data->Size != sizeof (EFI_RETURN_STATUS_EXTENDED_DATA) - sizeof *Data ||\r
-       !CompareGuid (&Data->Type, &gEfiStatusCodeSpecificDataGuid))) {\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: malformed Data\n", gEfiCallerBaseName,\r
-      __FUNCTION__));\r
+  if (((Value == mLoadFail) || (Value == mStartFail)) &&\r
+      ((Data == NULL) ||\r
+       (Data->HeaderSize != sizeof *Data) ||\r
+       (Data->Size != sizeof (EFI_RETURN_STATUS_EXTENDED_DATA) - sizeof *Data) ||\r
+       !CompareGuid (&Data->Type, &gEfiStatusCodeSpecificDataGuid)))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: malformed Data\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -126,33 +131,59 @@ HandleStatusCode (
   // Get the number of the Boot#### option that the status code applies to.\r
   //\r
   VariableSize = sizeof BootCurrent;\r
-  Status = gRT->GetVariable (EFI_BOOT_CURRENT_VARIABLE_NAME,\r
-                  &gEfiGlobalVariableGuid, NULL /* Attributes */,\r
-                  &VariableSize, &BootCurrent);\r
+  Status       = gRT->GetVariable (\r
+                        EFI_BOOT_CURRENT_VARIABLE_NAME,\r
+                        &gEfiGlobalVariableGuid,\r
+                        NULL /* Attributes */,\r
+                        &VariableSize,\r
+                        &BootCurrent\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: failed to get %g:\"%s\": %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, &gEfiGlobalVariableGuid,\r
-      EFI_BOOT_CURRENT_VARIABLE_NAME, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: failed to get %g:\"%s\": %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      &gEfiGlobalVariableGuid,\r
+      EFI_BOOT_CURRENT_VARIABLE_NAME,\r
+      Status\r
+      ));\r
     return Status;\r
   }\r
+\r
   if (VariableSize != sizeof BootCurrent) {\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: got %Lu bytes for %g:\"%s\", expected %Lu\n",\r
-      gEfiCallerBaseName, __FUNCTION__, (UINT64)VariableSize,\r
-      &gEfiGlobalVariableGuid, EFI_BOOT_CURRENT_VARIABLE_NAME,\r
-      (UINT64)sizeof BootCurrent));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: got %Lu bytes for %g:\"%s\", expected %Lu\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      (UINT64)VariableSize,\r
+      &gEfiGlobalVariableGuid,\r
+      EFI_BOOT_CURRENT_VARIABLE_NAME,\r
+      (UINT64)sizeof BootCurrent\r
+      ));\r
     return EFI_INCOMPATIBLE_VERSION;\r
   }\r
 \r
   //\r
   // Get the Boot#### option that the status code applies to.\r
   //\r
-  UnicodeSPrint (BootOptionName, sizeof BootOptionName, L"Boot%04x",\r
-    BootCurrent);\r
+  UnicodeSPrint (\r
+    BootOptionName,\r
+    sizeof BootOptionName,\r
+    L"Boot%04x",\r
+    BootCurrent\r
+    );\r
   Status = EfiBootManagerVariableToLoadOption (BootOptionName, &BmBootOption);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "%a:%a: EfiBootManagerVariableToLoadOption(\"%s\"): %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, BootOptionName, Status));\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      BootOptionName,\r
+      Status\r
+      ));\r
     return Status;\r
   }\r
 \r
@@ -160,20 +191,20 @@ HandleStatusCode (
   // Format the device path.\r
   //\r
   DevPathStringIsDynamic = TRUE;\r
-  DevPathString = ConvertDevicePathToText (\r
-                    BmBootOption.FilePath,\r
-                    FALSE,                 // DisplayOnly\r
-                    FALSE                  // AllowShortcuts\r
-                    );\r
+  DevPathString          = ConvertDevicePathToText (\r
+                             BmBootOption.FilePath,\r
+                             FALSE,        // DisplayOnly\r
+                             FALSE         // AllowShortcuts\r
+                             );\r
   if (DevPathString == NULL) {\r
     DevPathStringIsDynamic = FALSE;\r
-    DevPathString = L"<out of memory while formatting device path>";\r
+    DevPathString          = L"<out of memory while formatting device path>";\r
   }\r
 \r
   //\r
   // Print the message to the console.\r
   //\r
-  if (Value == mLoadPrep || Value == mStartPrep) {\r
+  if ((Value == mLoadPrep) || (Value == mStartPrep)) {\r
     Print (\r
       L"%a: %a %s \"%s\" from %s\n",\r
       gEfiCallerBaseName,\r
@@ -200,11 +231,11 @@ HandleStatusCode (
   if (DevPathStringIsDynamic) {\r
     FreePool (DevPathString);\r
   }\r
+\r
   EfiBootManagerFreeLoadOption (&BmBootOption);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Unregister HandleStatusCode() at ExitBootServices().\r
 \r
@@ -219,17 +250,16 @@ STATIC
 VOID\r
 EFIAPI\r
 UnregisterAtExitBootServices (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  EFI_RSC_HANDLER_PROTOCOL *StatusCodeRouter;\r
+  EFI_RSC_HANDLER_PROTOCOL  *StatusCodeRouter;\r
 \r
   StatusCodeRouter = Context;\r
   StatusCodeRouter->Unregister (HandleStatusCode);\r
 }\r
 \r
-\r
 /**\r
   Register a status code handler for printing the Boot Manager's LoadImage()\r
   and StartImage() preparations, and return codes, to the UEFI console.\r
@@ -246,12 +276,15 @@ PlatformBmPrintScRegisterHandler (
   VOID\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  EFI_RSC_HANDLER_PROTOCOL *StatusCodeRouter;\r
-  EFI_EVENT                ExitBootEvent;\r
-\r
-  Status = gBS->LocateProtocol (&gEfiRscHandlerProtocolGuid,\r
-                  NULL /* Registration */, (VOID **)&StatusCodeRouter);\r
+  EFI_STATUS                Status;\r
+  EFI_RSC_HANDLER_PROTOCOL  *StatusCodeRouter;\r
+  EFI_EVENT                 ExitBootEvent;\r
+\r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiRscHandlerProtocolGuid,\r
+                  NULL /* Registration */,\r
+                  (VOID **)&StatusCodeRouter\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -260,9 +293,9 @@ PlatformBmPrintScRegisterHandler (
   //\r
   // Set the EFI_STATUS_CODE_VALUE convenience variables.\r
   //\r
-  mLoadPrep  = PcdGet32 (PcdProgressCodeOsLoaderLoad);\r
-  mLoadFail  = (EFI_SOFTWARE_DXE_BS_DRIVER |\r
-                EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR);\r
+  mLoadPrep = PcdGet32 (PcdProgressCodeOsLoaderLoad);\r
+  mLoadFail = (EFI_SOFTWARE_DXE_BS_DRIVER |\r
+               EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR);\r
   mStartPrep = PcdGet32 (PcdProgressCodeOsLoaderStart);\r
   mStartFail = (EFI_SOFTWARE_DXE_BS_DRIVER |\r
                 EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED);\r
@@ -272,8 +305,13 @@ PlatformBmPrintScRegisterHandler (
   //\r
   Status = StatusCodeRouter->Register (HandleStatusCode, TPL_CALLBACK);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: failed to register status code handler: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: failed to register status code handler: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return Status;\r
   }\r
 \r
@@ -294,8 +332,14 @@ PlatformBmPrintScRegisterHandler (
     //\r
     // We have to unregister the callback right now, and fail the function.\r
     //\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: failed to create ExitBootServices() event: "\r
-      "%r\n", gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: failed to create ExitBootServices() event: "\r
+      "%r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     StatusCodeRouter->Unregister (HandleStatusCode);\r
     return Status;\r
   }\r
index 1408d94f7dae74fcef6b74f34e8f4f414026baee..f73c59dfff501b54f94b9bb2cfdf93272ac36ba3 100644 (file)
 #include <Library/Tcg2PhysicalPresenceLib.h>\r
 #include <Library/XenPlatformLib.h>\r
 \r
-\r
 //\r
 // Global data\r
 //\r
 \r
-VOID          *mEfiDevPathNotifyReg;\r
-EFI_EVENT     mEfiDevPathEvent;\r
-VOID          *mEmuVariableEventReg;\r
-EFI_EVENT     mEmuVariableEvent;\r
-UINT16        mHostBridgeDevId;\r
+VOID       *mEfiDevPathNotifyReg;\r
+EFI_EVENT  mEfiDevPathEvent;\r
+VOID       *mEmuVariableEventReg;\r
+EFI_EVENT  mEmuVariableEvent;\r
+UINT16     mHostBridgeDevId;\r
 \r
 //\r
 // Table of host IRQs matching PCI IRQs A-D\r
 // (for configuring PCI Interrupt Line register)\r
 //\r
-CONST UINT8 PciHostIrqs[] = {\r
+CONST UINT8  PciHostIrqs[] = {\r
   0x0a, // LNKA, LNKE\r
   0x0a, // LNKB, LNKF\r
   0x0b, // LNKC, LNKG\r
@@ -61,7 +60,6 @@ EFI_STATUS
   IN PCI_TYPE00           *Pci\r
   );\r
 \r
-\r
 //\r
 // Function prototypes\r
 //\r
@@ -75,7 +73,7 @@ VisitAllInstancesOfProtocol (
 \r
 EFI_STATUS\r
 VisitAllPciInstancesOfProtocol (\r
-  IN VISIT_PCI_INSTANCE_CALLBACK CallBackFunction\r
+  IN VISIT_PCI_INSTANCE_CALLBACK  CallBackFunction\r
   );\r
 \r
 VOID\r
@@ -85,24 +83,24 @@ InstallDevicePathCallback (
 \r
 VOID\r
 PlatformRegisterFvBootOption (\r
-  EFI_GUID                         *FileGuid,\r
-  CHAR16                           *Description,\r
-  UINT32                           Attributes\r
+  EFI_GUID  *FileGuid,\r
+  CHAR16    *Description,\r
+  UINT32    Attributes\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  INTN                              OptionIndex;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION      NewOption;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION      *BootOptions;\r
-  UINTN                             BootOptionCount;\r
-  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;\r
-  EFI_LOADED_IMAGE_PROTOCOL         *LoadedImage;\r
-  EFI_DEVICE_PATH_PROTOCOL          *DevicePath;\r
+  EFI_STATUS                         Status;\r
+  INTN                               OptionIndex;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION       NewOption;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION       *BootOptions;\r
+  UINTN                              BootOptionCount;\r
+  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  FileNode;\r
+  EFI_LOADED_IMAGE_PROTOCOL          *LoadedImage;\r
+  EFI_DEVICE_PATH_PROTOCOL           *DevicePath;\r
 \r
   Status = gBS->HandleProtocol (\r
                   gImageHandle,\r
                   &gEfiLoadedImageProtocolGuid,\r
-                  (VOID **) &LoadedImage\r
+                  (VOID **)&LoadedImage\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -111,7 +109,7 @@ PlatformRegisterFvBootOption (
   ASSERT (DevicePath != NULL);\r
   DevicePath = AppendDevicePathNode (\r
                  DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *) &FileNode\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&FileNode\r
                  );\r
   ASSERT (DevicePath != NULL);\r
 \r
@@ -129,17 +127,21 @@ PlatformRegisterFvBootOption (
   FreePool (DevicePath);\r
 \r
   BootOptions = EfiBootManagerGetLoadOptions (\r
-                  &BootOptionCount, LoadOptionTypeBoot\r
+                  &BootOptionCount,\r
+                  LoadOptionTypeBoot\r
                   );\r
 \r
   OptionIndex = EfiBootManagerFindLoadOption (\r
-                  &NewOption, BootOptions, BootOptionCount\r
+                  &NewOption,\r
+                  BootOptions,\r
+                  BootOptionCount\r
                   );\r
 \r
   if (OptionIndex == -1) {\r
     Status = EfiBootManagerAddLoadOptionVariable (&NewOption, MAX_UINTN);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
+\r
   EfiBootManagerFreeLoadOption (&NewOption);\r
   EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);\r
 }\r
@@ -163,27 +165,30 @@ RemoveStaleFvFileOptions (
   VOID\r
   )\r
 {\r
-  EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;\r
-  UINTN                        BootOptionCount;\r
-  UINTN                        Index;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  *BootOptions;\r
+  UINTN                         BootOptionCount;\r
+  UINTN                         Index;\r
 \r
-  BootOptions = EfiBootManagerGetLoadOptions (&BootOptionCount,\r
-                  LoadOptionTypeBoot);\r
+  BootOptions = EfiBootManagerGetLoadOptions (\r
+                  &BootOptionCount,\r
+                  LoadOptionTypeBoot\r
+                  );\r
 \r
   for (Index = 0; Index < BootOptionCount; ++Index) {\r
-    EFI_DEVICE_PATH_PROTOCOL *Node1, *Node2, *SearchNode;\r
-    EFI_STATUS               Status;\r
-    EFI_HANDLE               FvHandle;\r
+    EFI_DEVICE_PATH_PROTOCOL  *Node1, *Node2, *SearchNode;\r
+    EFI_STATUS                Status;\r
+    EFI_HANDLE                FvHandle;\r
 \r
     //\r
     // If the device path starts with neither MemoryMapped(...) nor Fv(...),\r
     // then keep the boot option.\r
     //\r
     Node1 = BootOptions[Index].FilePath;\r
-    if (!(DevicePathType (Node1) == HARDWARE_DEVICE_PATH &&\r
-          DevicePathSubType (Node1) == HW_MEMMAP_DP) &&\r
-        !(DevicePathType (Node1) == MEDIA_DEVICE_PATH &&\r
-          DevicePathSubType (Node1) == MEDIA_PIWG_FW_VOL_DP)) {\r
+    if (!((DevicePathType (Node1) == HARDWARE_DEVICE_PATH) &&\r
+          (DevicePathSubType (Node1) == HW_MEMMAP_DP)) &&\r
+        !((DevicePathType (Node1) == MEDIA_DEVICE_PATH) &&\r
+          (DevicePathSubType (Node1) == MEDIA_PIWG_FW_VOL_DP)))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -192,8 +197,9 @@ RemoveStaleFvFileOptions (
     // option.\r
     //\r
     Node2 = NextDevicePathNode (Node1);\r
-    if (DevicePathType (Node2) != MEDIA_DEVICE_PATH ||\r
-        DevicePathSubType (Node2) != MEDIA_PIWG_FW_FILE_DP) {\r
+    if ((DevicePathType (Node2) != MEDIA_DEVICE_PATH) ||\r
+        (DevicePathSubType (Node2) != MEDIA_PIWG_FW_FILE_DP))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -204,23 +210,29 @@ RemoveStaleFvFileOptions (
     // boot option.\r
     //\r
     SearchNode = Node1;\r
-    Status = gBS->LocateDevicePath (&gEfiFirmwareVolume2ProtocolGuid,\r
-                    &SearchNode, &FvHandle);\r
+    Status     = gBS->LocateDevicePath (\r
+                        &gEfiFirmwareVolume2ProtocolGuid,\r
+                        &SearchNode,\r
+                        &FvHandle\r
+                        );\r
 \r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // The firmware volume was found; now let's see if it contains the FvFile\r
       // identified by GUID.\r
       //\r
-      EFI_FIRMWARE_VOLUME2_PROTOCOL     *FvProtocol;\r
-      MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFileNode;\r
-      UINTN                             BufferSize;\r
-      EFI_FV_FILETYPE                   FoundType;\r
-      EFI_FV_FILE_ATTRIBUTES            FileAttributes;\r
-      UINT32                            AuthenticationStatus;\r
-\r
-      Status = gBS->HandleProtocol (FvHandle, &gEfiFirmwareVolume2ProtocolGuid,\r
-                      (VOID **)&FvProtocol);\r
+      EFI_FIRMWARE_VOLUME2_PROTOCOL      *FvProtocol;\r
+      MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvFileNode;\r
+      UINTN                              BufferSize;\r
+      EFI_FV_FILETYPE                    FoundType;\r
+      EFI_FV_FILE_ATTRIBUTES             FileAttributes;\r
+      UINT32                             AuthenticationStatus;\r
+\r
+      Status = gBS->HandleProtocol (\r
+                      FvHandle,\r
+                      &gEfiFirmwareVolume2ProtocolGuid,\r
+                      (VOID **)&FvProtocol\r
+                      );\r
       ASSERT_EFI_ERROR (Status);\r
 \r
       FvFileNode = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)Node2;\r
@@ -249,23 +261,29 @@ RemoveStaleFvFileOptions (
     // Delete the boot option.\r
     //\r
     Status = EfiBootManagerDeleteLoadOptionVariable (\r
-               BootOptions[Index].OptionNumber, LoadOptionTypeBoot);\r
+               BootOptions[Index].OptionNumber,\r
+               LoadOptionTypeBoot\r
+               );\r
     DEBUG_CODE_BEGIN ();\r
-      CHAR16 *DevicePathString;\r
+    CHAR16  *DevicePathString;\r
+\r
+    DevicePathString = ConvertDevicePathToText (\r
+                         BootOptions[Index].FilePath,\r
+                         FALSE,\r
+                         FALSE\r
+                         );\r
+    DEBUG ((\r
+      EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,\r
+      "%a: removing stale Boot#%04x %s: %r\n",\r
+      __FUNCTION__,\r
+      (UINT32)BootOptions[Index].OptionNumber,\r
+      DevicePathString == NULL ? L"<unavailable>" : DevicePathString,\r
+      Status\r
+      ));\r
+    if (DevicePathString != NULL) {\r
+      FreePool (DevicePathString);\r
+    }\r
 \r
-      DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,\r
-                           FALSE, FALSE);\r
-      DEBUG ((\r
-        EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,\r
-        "%a: removing stale Boot#%04x %s: %r\n",\r
-        __FUNCTION__,\r
-        (UINT32)BootOptions[Index].OptionNumber,\r
-        DevicePathString == NULL ? L"<unavailable>" : DevicePathString,\r
-        Status\r
-        ));\r
-      if (DevicePathString != NULL) {\r
-        FreePool (DevicePathString);\r
-      }\r
     DEBUG_CODE_END ();\r
   }\r
 \r
@@ -277,18 +295,18 @@ PlatformRegisterOptionsAndKeys (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_INPUT_KEY                Enter;\r
-  EFI_INPUT_KEY                F2;\r
-  EFI_INPUT_KEY                Esc;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION BootOption;\r
+  EFI_STATUS                    Status;\r
+  EFI_INPUT_KEY                 Enter;\r
+  EFI_INPUT_KEY                 F2;\r
+  EFI_INPUT_KEY                 Esc;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  BootOption;\r
 \r
   //\r
   // Register ENTER as CONTINUE key\r
   //\r
   Enter.ScanCode    = SCAN_NULL;\r
   Enter.UnicodeChar = CHAR_CARRIAGE_RETURN;\r
-  Status = EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL);\r
+  Status            = EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -298,14 +316,22 @@ PlatformRegisterOptionsAndKeys (
   F2.UnicodeChar  = CHAR_NULL;\r
   Esc.ScanCode    = SCAN_ESC;\r
   Esc.UnicodeChar = CHAR_NULL;\r
-  Status = EfiBootManagerGetBootManagerMenu (&BootOption);\r
+  Status          = EfiBootManagerGetBootManagerMenu (&BootOption);\r
   ASSERT_EFI_ERROR (Status);\r
   Status = EfiBootManagerAddKeyOptionVariable (\r
-             NULL, (UINT16) BootOption.OptionNumber, 0, &F2, NULL\r
+             NULL,\r
+             (UINT16)BootOption.OptionNumber,\r
+             0,\r
+             &F2,\r
+             NULL\r
              );\r
   ASSERT (Status == EFI_SUCCESS || Status == EFI_ALREADY_STARTED);\r
   Status = EfiBootManagerAddKeyOptionVariable (\r
-             NULL, (UINT16) BootOption.OptionNumber, 0, &Esc, NULL\r
+             NULL,\r
+             (UINT16)BootOption.OptionNumber,\r
+             0,\r
+             &Esc,\r
+             NULL\r
              );\r
   ASSERT (Status == EFI_SUCCESS || Status == EFI_ALREADY_STARTED);\r
 }\r
@@ -322,9 +348,9 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 ConnectVirtioPciRng (\r
-  IN EFI_HANDLE Handle,\r
-  IN VOID       *Instance,\r
-  IN VOID       *Context\r
+  IN EFI_HANDLE  Handle,\r
+  IN VOID        *Instance,\r
+  IN VOID        *Context\r
   );\r
 \r
 STATIC\r
@@ -336,6 +362,7 @@ SaveS3BootScript (
 //\r
 // BDS Platform Functions\r
 //\r
+\r
 /**\r
   Do the platform init, can be customized by OEM/IBV\r
 \r
@@ -355,16 +382,19 @@ PlatformBootManagerBeforeConsole (
   VOID\r
   )\r
 {\r
-  EFI_HANDLE    Handle;\r
-  EFI_STATUS    Status;\r
-  UINT16        FrontPageTimeout;\r
-  RETURN_STATUS PcdStatus;\r
+  EFI_HANDLE     Handle;\r
+  EFI_STATUS     Status;\r
+  UINT16         FrontPageTimeout;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   DEBUG ((DEBUG_INFO, "PlatformBootManagerBeforeConsole\n"));\r
   InstallDevicePathCallback ();\r
 \r
-  VisitAllInstancesOfProtocol (&gEfiPciRootBridgeIoProtocolGuid,\r
-    ConnectRootBridge, NULL);\r
+  VisitAllInstancesOfProtocol (\r
+    &gEfiPciRootBridgeIoProtocolGuid,\r
+    ConnectRootBridge,\r
+    NULL\r
+    );\r
 \r
   //\r
   // Signal the ACPI platform driver that it can download QEMU ACPI tables.\r
@@ -391,7 +421,8 @@ PlatformBootManagerBeforeConsole (
   // We need to connect all trusted consoles for TCG PP. Here we treat all\r
   // consoles in OVMF to be trusted consoles.\r
   PlatformInitializeConsole (\r
-    XenDetected() ? gXenPlatformConsole : gPlatformConsole);\r
+    XenDetected () ? gXenPlatformConsole : gPlatformConsole\r
+    );\r
 \r
   //\r
   // Process TPM PPI request; this may require keyboard input\r
@@ -403,9 +434,12 @@ PlatformBootManagerBeforeConsole (
   // Any TPM 2 Physical Presence Interface opcode must be handled before.\r
   //\r
   Handle = NULL;\r
-  Status = gBS->InstallProtocolInterface (&Handle,\r
-                  &gEfiDxeSmmReadyToLockProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  NULL);\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &Handle,\r
+                  &gEfiDxeSmmReadyToLockProtocolGuid,\r
+                  EFI_NATIVE_INTERFACE,\r
+                  NULL\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -415,7 +449,7 @@ PlatformBootManagerBeforeConsole (
   EfiBootManagerDispatchDeferredImages ();\r
 \r
   FrontPageTimeout = GetFrontPageTimeoutFromQemu ();\r
-  PcdStatus = PcdSet16S (PcdPlatformBootTimeOut, FrontPageTimeout);\r
+  PcdStatus        = PcdSet16S (PcdPlatformBootTimeOut, FrontPageTimeout);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
   //\r
   // Reflect the PCD in the standard Timeout variable.\r
@@ -444,11 +478,13 @@ PlatformBootManagerBeforeConsole (
   // Install both VIRTIO_DEVICE_PROTOCOL and (dependent) EFI_RNG_PROTOCOL\r
   // instances on Virtio PCI RNG devices.\r
   //\r
-  VisitAllInstancesOfProtocol (&gEfiPciIoProtocolGuid, ConnectVirtioPciRng,\r
-    NULL);\r
+  VisitAllInstancesOfProtocol (\r
+    &gEfiPciIoProtocolGuid,\r
+    ConnectVirtioPciRng,\r
+    NULL\r
+    );\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConnectRootBridge (\r
@@ -457,7 +493,7 @@ ConnectRootBridge (
   IN VOID        *Context\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Make the PCI bus driver connect the root bridge, non-recursively. This\r
@@ -473,34 +509,39 @@ ConnectRootBridge (
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConnectVirtioPciRng (\r
-  IN EFI_HANDLE Handle,\r
-  IN VOID       *Instance,\r
-  IN VOID       *Context\r
+  IN EFI_HANDLE  Handle,\r
+  IN VOID        *Instance,\r
+  IN VOID        *Context\r
   )\r
 {\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  EFI_STATUS          Status;\r
-  UINT16              VendorId;\r
-  UINT16              DeviceId;\r
-  UINT8               RevisionId;\r
-  BOOLEAN             Virtio10;\r
-  UINT16              SubsystemId;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  EFI_STATUS           Status;\r
+  UINT16               VendorId;\r
+  UINT16               DeviceId;\r
+  UINT8                RevisionId;\r
+  BOOLEAN              Virtio10;\r
+  UINT16               SubsystemId;\r
 \r
   PciIo = Instance;\r
 \r
   //\r
   // Read and check VendorId.\r
   //\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_VENDOR_ID_OFFSET,\r
-                        1, &VendorId);\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint16,\r
+                        PCI_VENDOR_ID_OFFSET,\r
+                        1,\r
+                        &VendorId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
+\r
   if (VendorId != VIRTIO_VENDOR_ID) {\r
     return EFI_SUCCESS;\r
   }\r
@@ -508,13 +549,24 @@ ConnectVirtioPciRng (
   //\r
   // Read DeviceId and RevisionId.\r
   //\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_DEVICE_ID_OFFSET,\r
-                        1, &DeviceId);\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint16,\r
+                        PCI_DEVICE_ID_OFFSET,\r
+                        1,\r
+                        &DeviceId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, PCI_REVISION_ID_OFFSET,\r
-                        1, &RevisionId);\r
+\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint8,\r
+                        PCI_REVISION_ID_OFFSET,\r
+                        1,\r
+                        &RevisionId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
@@ -526,10 +578,11 @@ ConnectVirtioPciRng (
   // SubsystemId will only play a sanity-check role. Otherwise, DeviceId can\r
   // only be sanity-checked, and SubsystemId will decide.\r
   //\r
-  if (DeviceId == 0x1040 + VIRTIO_SUBSYSTEM_ENTROPY_SOURCE &&\r
-      RevisionId >= 0x01) {\r
+  if ((DeviceId == 0x1040 + VIRTIO_SUBSYSTEM_ENTROPY_SOURCE) &&\r
+      (RevisionId >= 0x01))\r
+  {\r
     Virtio10 = TRUE;\r
-  } else if (DeviceId >= 0x1000 && DeviceId <= 0x103F && RevisionId == 0x00) {\r
+  } else if ((DeviceId >= 0x1000) && (DeviceId <= 0x103F) && (RevisionId == 0x00)) {\r
     Virtio10 = FALSE;\r
   } else {\r
     return EFI_SUCCESS;\r
@@ -538,13 +591,20 @@ ConnectVirtioPciRng (
   //\r
   // Read and check SubsystemId as dictated by Virtio10.\r
   //\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16,\r
-                        PCI_SUBSYSTEM_ID_OFFSET, 1, &SubsystemId);\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint16,\r
+                        PCI_SUBSYSTEM_ID_OFFSET,\r
+                        1,\r
+                        &SubsystemId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
-  if ((Virtio10 && SubsystemId >= 0x40) ||\r
-      (!Virtio10 && SubsystemId == VIRTIO_SUBSYSTEM_ENTROPY_SOURCE)) {\r
+\r
+  if ((Virtio10 && (SubsystemId >= 0x40)) ||\r
+      (!Virtio10 && (SubsystemId == VIRTIO_SUBSYSTEM_ENTROPY_SOURCE)))\r
+  {\r
     Status = gBS->ConnectController (\r
                     Handle, // ControllerHandle\r
                     NULL,   // DriverImageHandle -- connect all drivers\r
@@ -555,6 +615,7 @@ ConnectVirtioPciRng (
       goto Error;\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 \r
 Error:\r
@@ -562,7 +623,6 @@ Error:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Add IsaKeyboard to ConIn; add IsaSerial to ConOut, ConIn, ErrOut.\r
 \r
@@ -576,7 +636,7 @@ Error:
 **/\r
 EFI_STATUS\r
 PrepareLpcBridgeDevicePath (\r
-  IN EFI_HANDLE                DeviceHandle\r
+  IN EFI_HANDLE  DeviceHandle\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -585,50 +645,59 @@ PrepareLpcBridgeDevicePath (
   CHAR16                    *DevPathStr;\r
 \r
   DevicePath = NULL;\r
-  Status = gBS->HandleProtocol (\r
-                  DeviceHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID*)&DevicePath\r
-                  );\r
+  Status     = gBS->HandleProtocol (\r
+                      DeviceHandle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      (VOID *)&DevicePath\r
+                      );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   TempDevicePath = DevicePath;\r
 \r
   //\r
   // Register Keyboard\r
   //\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnpPs2KeyboardDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnpPs2KeyboardDeviceNode\r
+                 );\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
 \r
   //\r
   // Register COM1\r
   //\r
-  DevicePath = TempDevicePath;\r
+  DevicePath                     = TempDevicePath;\r
   gPnp16550ComPortDeviceNode.UID = 0;\r
 \r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode\r
+                 );\r
 \r
   //\r
   // Print Device Path\r
   //\r
   DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);\r
   if (DevPathStr != NULL) {\r
-    DEBUG((\r
+    DEBUG ((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r
       DEBUG_LINE_NUMBER,\r
       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r
-    FreePool(DevPathStr);\r
+    FreePool (DevPathStr);\r
   }\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
@@ -638,29 +707,35 @@ PrepareLpcBridgeDevicePath (
   //\r
   // Register COM2\r
   //\r
-  DevicePath = TempDevicePath;\r
+  DevicePath                     = TempDevicePath;\r
   gPnp16550ComPortDeviceNode.UID = 1;\r
 \r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode\r
+                 );\r
 \r
   //\r
   // Print Device Path\r
   //\r
   DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);\r
   if (DevPathStr != NULL) {\r
-    DEBUG((\r
+    DEBUG ((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r
       DEBUG_LINE_NUMBER,\r
       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r
-    FreePool(DevPathStr);\r
+    FreePool (DevPathStr);\r
   }\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
@@ -671,16 +746,18 @@ PrepareLpcBridgeDevicePath (
 }\r
 \r
 typedef struct {\r
-  VENDOR_DEVICE_PATH        Guid;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
+  VENDOR_DEVICE_PATH          Guid;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } SERIAL_DEVICE_PATH;\r
 \r
-SERIAL_DEVICE_PATH serialDevicePath = {\r
+SERIAL_DEVICE_PATH  serialDevicePath = {\r
   {\r
-    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },\r
+    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP,                   { sizeof (VENDOR_DEVICE_PATH),       0 }\r
+    },\r
     EDKII_SERIAL_PORT_LIB_VENDOR_GUID\r
   },\r
-  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 } }\r
+  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }\r
+  }\r
 };\r
 \r
 VOID\r
@@ -696,11 +773,15 @@ PrepareMicrovmDevicePath (
     return;\r
   }\r
 \r
-  DevicePath = (EFI_DEVICE_PATH_PROTOCOL*)&serialDevicePath;\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);\r
+  DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)&serialDevicePath;\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode\r
+                 );\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
   EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
@@ -709,19 +790,19 @@ PrepareMicrovmDevicePath (
 \r
 EFI_STATUS\r
 GetGopDevicePath (\r
-   IN  EFI_DEVICE_PATH_PROTOCOL *PciDevicePath,\r
-   OUT EFI_DEVICE_PATH_PROTOCOL **GopDevicePath\r
-   )\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *PciDevicePath,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **GopDevicePath\r
+  )\r
 {\r
-  UINTN                           Index;\r
-  EFI_STATUS                      Status;\r
-  EFI_HANDLE                      PciDeviceHandle;\r
-  EFI_DEVICE_PATH_PROTOCOL        *TempDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL        *TempPciDevicePath;\r
-  UINTN                           GopHandleCount;\r
-  EFI_HANDLE                      *GopHandleBuffer;\r
-\r
-  if (PciDevicePath == NULL || GopDevicePath == NULL) {\r
+  UINTN                     Index;\r
+  EFI_STATUS                Status;\r
+  EFI_HANDLE                PciDeviceHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TempDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TempPciDevicePath;\r
+  UINTN                     GopHandleCount;\r
+  EFI_HANDLE                *GopHandleBuffer;\r
+\r
+  if ((PciDevicePath == NULL) || (GopDevicePath == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -760,16 +841,21 @@ GetGopDevicePath (
     // Add all the child handles as possible Console Device\r
     //\r
     for (Index = 0; Index < GopHandleCount; Index++) {\r
-      Status = gBS->HandleProtocol (GopHandleBuffer[Index],\r
-                      &gEfiDevicePathProtocolGuid, (VOID*)&TempDevicePath);\r
+      Status = gBS->HandleProtocol (\r
+                      GopHandleBuffer[Index],\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      (VOID *)&TempDevicePath\r
+                      );\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r
+\r
       if (CompareMem (\r
             PciDevicePath,\r
             TempDevicePath,\r
             GetDevicePathSize (PciDevicePath) - END_DEVICE_PATH_LENGTH\r
-            ) == 0) {\r
+            ) == 0)\r
+      {\r
         //\r
         // In current implementation, we only enable one of the child handles\r
         // as console device, i.e. sotre one of the child handle's device\r
@@ -787,6 +873,7 @@ GetGopDevicePath (
         EfiBootManagerUpdateConsoleVariable (ConOutDev, TempDevicePath, NULL);\r
       }\r
     }\r
+\r
     gBS->FreePool (GopHandleBuffer);\r
   }\r
 \r
@@ -805,7 +892,7 @@ GetGopDevicePath (
 **/\r
 EFI_STATUS\r
 PreparePciDisplayDevicePath (\r
-  IN EFI_HANDLE                DeviceHandle\r
+  IN EFI_HANDLE  DeviceHandle\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -814,11 +901,11 @@ PreparePciDisplayDevicePath (
 \r
   DevicePath    = NULL;\r
   GopDevicePath = NULL;\r
-  Status = gBS->HandleProtocol (\r
-                  DeviceHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID*)&DevicePath\r
-                  );\r
+  Status        = gBS->HandleProtocol (\r
+                         DeviceHandle,\r
+                         &gEfiDevicePathProtocolGuid,\r
+                         (VOID *)&DevicePath\r
+                         );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -844,26 +931,30 @@ PreparePciDisplayDevicePath (
 **/\r
 EFI_STATUS\r
 PreparePciSerialDevicePath (\r
-  IN EFI_HANDLE                DeviceHandle\r
+  IN EFI_HANDLE  DeviceHandle\r
   )\r
 {\r
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r
   DevicePath = NULL;\r
-  Status = gBS->HandleProtocol (\r
-                  DeviceHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID*)&DevicePath\r
-                  );\r
+  Status     = gBS->HandleProtocol (\r
+                      DeviceHandle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      (VOID *)&DevicePath\r
+                      );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode\r
+                 );\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
   EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
@@ -879,24 +970,24 @@ VisitAllInstancesOfProtocol (
   IN VOID                        *Context\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINTN                     HandleCount;\r
-  EFI_HANDLE                *HandleBuffer;\r
-  UINTN                     Index;\r
-  VOID                      *Instance;\r
+  EFI_STATUS  Status;\r
+  UINTN       HandleCount;\r
+  EFI_HANDLE  *HandleBuffer;\r
+  UINTN       Index;\r
+  VOID        *Instance;\r
 \r
   //\r
   // Start to check all the PciIo to find all possible device\r
   //\r
-  HandleCount = 0;\r
+  HandleCount  = 0;\r
   HandleBuffer = NULL;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  Id,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &HandleBuffer\r
-                  );\r
+  Status       = gBS->LocateHandleBuffer (\r
+                        ByProtocol,\r
+                        Id,\r
+                        NULL,\r
+                        &HandleCount,\r
+                        &HandleBuffer\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -907,11 +998,11 @@ VisitAllInstancesOfProtocol (
       continue;\r
     }\r
 \r
-    Status = (*CallBackFunction) (\r
-               HandleBuffer[Index],\r
-               Instance,\r
-               Context\r
-               );\r
+    Status = (*CallBackFunction)(\r
+  HandleBuffer[Index],\r
+  Instance,\r
+  Context\r
+  );\r
   }\r
 \r
   gBS->FreePool (HandleBuffer);\r
@@ -919,7 +1010,6 @@ VisitAllInstancesOfProtocol (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VisitingAPciInstance (\r
@@ -928,49 +1018,45 @@ VisitingAPciInstance (
   IN VOID        *Context\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_PCI_IO_PROTOCOL       *PciIo;\r
-  PCI_TYPE00                Pci;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
 \r
-  PciIo = (EFI_PCI_IO_PROTOCOL*) Instance;\r
+  PciIo = (EFI_PCI_IO_PROTOCOL *)Instance;\r
 \r
   //\r
   // Check for all PCI device\r
   //\r
   Status = PciIo->Pci.Read (\r
-                    PciIo,\r
-                    EfiPciIoWidthUint32,\r
-                    0,\r
-                    sizeof (Pci) / sizeof (UINT32),\r
-                    &Pci\r
-                    );\r
+                        PciIo,\r
+                        EfiPciIoWidthUint32,\r
+                        0,\r
+                        sizeof (Pci) / sizeof (UINT32),\r
+                        &Pci\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  return (*(VISIT_PCI_INSTANCE_CALLBACK)(UINTN) Context) (\r
-           Handle,\r
-           PciIo,\r
-           &Pci\r
-           );\r
-\r
+  return (*(VISIT_PCI_INSTANCE_CALLBACK)(UINTN)Context)(\r
+  Handle,\r
+  PciIo,\r
+  &Pci\r
+  );\r
 }\r
 \r
-\r
-\r
 EFI_STATUS\r
 VisitAllPciInstances (\r
-  IN VISIT_PCI_INSTANCE_CALLBACK CallBackFunction\r
+  IN VISIT_PCI_INSTANCE_CALLBACK  CallBackFunction\r
   )\r
 {\r
   return VisitAllInstancesOfProtocol (\r
            &gEfiPciIoProtocolGuid,\r
            VisitingAPciInstance,\r
-           (VOID*)(UINTN) CallBackFunction\r
+           (VOID *)(UINTN)CallBackFunction\r
            );\r
 }\r
 \r
-\r
 /**\r
   Do platform specific PCI Device check and add them to\r
   ConOut, ConIn, ErrOut.\r
@@ -992,14 +1078,14 @@ DetectAndPreparePlatformPciDevicePath (
   IN PCI_TYPE00           *Pci\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = PciIo->Attributes (\r
-    PciIo,\r
-    EfiPciIoAttributeOperationEnable,\r
-    EFI_PCI_DEVICE_ENABLE,\r
-    NULL\r
-    );\r
+                    PciIo,\r
+                    EfiPciIoAttributeOperationEnable,\r
+                    EFI_PCI_DEVICE_ENABLE,\r
+                    NULL\r
+                    );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -1010,7 +1096,8 @@ DetectAndPreparePlatformPciDevicePath (
        (Pci->Hdr.VendorId == 0x8086) &&\r
        (Pci->Hdr.DeviceId == 0x7000)\r
       )\r
-     ) {\r
+      )\r
+  {\r
     //\r
     // Add IsaKeyboard to ConIn,\r
     // add IsaSerial to ConOut, ConIn, ErrOut\r
@@ -1019,6 +1106,7 @@ DetectAndPreparePlatformPciDevicePath (
     PrepareLpcBridgeDevicePath (Handle);\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // Here we decide which Serial device to enable in PCI bus\r
   //\r
@@ -1046,7 +1134,6 @@ DetectAndPreparePlatformPciDevicePath (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Connect the predefined platform default console device.\r
 \r
@@ -1056,10 +1143,10 @@ DetectAndPreparePlatformPciDevicePath (
 **/\r
 VOID\r
 PlatformInitializeConsole (\r
-  IN PLATFORM_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
+  IN PLATFORM_CONSOLE_CONNECT_ENTRY  *PlatformConsole\r
   )\r
 {\r
-  UINTN                              Index;\r
+  UINTN  Index;\r
 \r
   //\r
   // Do platform specific PCI Device check and add them to ConOut, ConIn,\r
@@ -1079,21 +1166,31 @@ PlatformInitializeConsole (
     // Update the console variable with the connect type\r
     //\r
     if ((PlatformConsole[Index].ConnectType & CONSOLE_IN) == CONSOLE_IN) {\r
-      EfiBootManagerUpdateConsoleVariable (ConIn,\r
-        PlatformConsole[Index].DevicePath, NULL);\r
+      EfiBootManagerUpdateConsoleVariable (\r
+        ConIn,\r
+        PlatformConsole[Index].DevicePath,\r
+        NULL\r
+        );\r
     }\r
+\r
     if ((PlatformConsole[Index].ConnectType & CONSOLE_OUT) == CONSOLE_OUT) {\r
-      EfiBootManagerUpdateConsoleVariable (ConOut,\r
-        PlatformConsole[Index].DevicePath, NULL);\r
+      EfiBootManagerUpdateConsoleVariable (\r
+        ConOut,\r
+        PlatformConsole[Index].DevicePath,\r
+        NULL\r
+        );\r
     }\r
+\r
     if ((PlatformConsole[Index].ConnectType & STD_ERROR) == STD_ERROR) {\r
-      EfiBootManagerUpdateConsoleVariable (ErrOut,\r
-        PlatformConsole[Index].DevicePath, NULL);\r
+      EfiBootManagerUpdateConsoleVariable (\r
+        ErrOut,\r
+        PlatformConsole[Index].DevicePath,\r
+        NULL\r
+        );\r
     }\r
   }\r
 }\r
 \r
-\r
 /**\r
   Configure PCI Interrupt Line register for applicable devices\r
   Ported from SeaBIOS, src/fw/pciinit.c, *_pci_slot_get_irq()\r
@@ -1124,15 +1221,15 @@ SetPciIntLine (
   Status = EFI_SUCCESS;\r
 \r
   if (PciHdr->Device.InterruptPin != 0) {\r
-\r
     DevPathNode = DevicePathFromHandle (Handle);\r
     ASSERT (DevPathNode != NULL);\r
     DevPath = DevPathNode;\r
 \r
     RootBusNumber = 0;\r
-    if (DevicePathType (DevPathNode) == ACPI_DEVICE_PATH &&\r
-        DevicePathSubType (DevPathNode) == ACPI_DP &&\r
-        ((ACPI_HID_DEVICE_PATH *)DevPathNode)->HID == EISA_PNP_ID(0x0A03)) {\r
+    if ((DevicePathType (DevPathNode) == ACPI_DEVICE_PATH) &&\r
+        (DevicePathSubType (DevPathNode) == ACPI_DP) &&\r
+        (((ACPI_HID_DEVICE_PATH *)DevPathNode)->HID == EISA_PNP_ID (0x0A03)))\r
+    {\r
       RootBusNumber = ((ACPI_HID_DEVICE_PATH *)DevPathNode)->UID;\r
     }\r
 \r
@@ -1140,13 +1237,13 @@ SetPciIntLine (
     // Compute index into PciHostIrqs[] table by walking\r
     // the device path and adding up all device numbers\r
     //\r
-    Status = EFI_NOT_FOUND;\r
+    Status   = EFI_NOT_FOUND;\r
     RootSlot = 0;\r
-    Idx = PciHdr->Device.InterruptPin - 1;\r
+    Idx      = PciHdr->Device.InterruptPin - 1;\r
     while (!IsDevicePathEnd (DevPathNode)) {\r
-      if (DevicePathType (DevPathNode) == HARDWARE_DEVICE_PATH &&\r
-          DevicePathSubType (DevPathNode) == HW_PCI_DP) {\r
-\r
+      if ((DevicePathType (DevPathNode) == HARDWARE_DEVICE_PATH) &&\r
+          (DevicePathSubType (DevPathNode) == HW_PCI_DP))\r
+      {\r
         Idx += ((PCI_DEVICE_PATH *)DevPathNode)->Device;\r
 \r
         //\r
@@ -1157,18 +1254,20 @@ SetPciIntLine (
         // Q35 cases with more than 24 slots on the root bus.\r
         //\r
         if (Status != EFI_SUCCESS) {\r
-          Status = EFI_SUCCESS;\r
+          Status   = EFI_SUCCESS;\r
           RootSlot = ((PCI_DEVICE_PATH *)DevPathNode)->Device;\r
         }\r
       }\r
 \r
       DevPathNode = NextDevicePathNode (DevPathNode);\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-    if (RootBusNumber == 0 && RootSlot == 0) {\r
-      DEBUG((\r
+\r
+    if ((RootBusNumber == 0) && (RootSlot == 0)) {\r
+      DEBUG ((\r
         DEBUG_ERROR,\r
         "%a: PCI host bridge (00:00.0) should have no interrupts!\n",\r
         __FUNCTION__\r
@@ -1200,29 +1299,39 @@ SetPciIntLine (
           //\r
           Idx -= RootSlot;\r
         }\r
+\r
         break;\r
       default:\r
         ASSERT (FALSE); // should never get here\r
     }\r
-    Idx %= ARRAY_SIZE (PciHostIrqs);\r
+\r
+    Idx    %= ARRAY_SIZE (PciHostIrqs);\r
     IrqLine = PciHostIrqs[Idx];\r
 \r
     DEBUG_CODE_BEGIN ();\r
     {\r
-      CHAR16        *DevPathString;\r
-      STATIC CHAR16 Fallback[] = L"<failed to convert>";\r
-      UINTN         Segment, Bus, Device, Function;\r
+      CHAR16         *DevPathString;\r
+      STATIC CHAR16  Fallback[] = L"<failed to convert>";\r
+      UINTN          Segment, Bus, Device, Function;\r
 \r
       DevPathString = ConvertDevicePathToText (DevPath, FALSE, FALSE);\r
       if (DevPathString == NULL) {\r
         DevPathString = Fallback;\r
       }\r
+\r
       Status = PciIo->GetLocation (PciIo, &Segment, &Bus, &Device, &Function);\r
       ASSERT_EFI_ERROR (Status);\r
 \r
-      DEBUG ((DEBUG_VERBOSE, "%a: [%02x:%02x.%x] %s -> 0x%02x\n", __FUNCTION__,\r
-        (UINT32)Bus, (UINT32)Device, (UINT32)Function, DevPathString,\r
-        IrqLine));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: [%02x:%02x.%x] %s -> 0x%02x\n",\r
+        __FUNCTION__,\r
+        (UINT32)Bus,\r
+        (UINT32)Device,\r
+        (UINT32)Function,\r
+        DevPathString,\r
+        IrqLine\r
+        ));\r
 \r
       if (DevPathString != Fallback) {\r
         FreePool (DevPathString);\r
@@ -1234,18 +1343,17 @@ SetPciIntLine (
     // Set PCI Interrupt Line register for this device to PciHostIrqs[Idx]\r
     //\r
     Status = PciIo->Pci.Write (\r
-               PciIo,\r
-               EfiPciIoWidthUint8,\r
-               PCI_INT_LINE_OFFSET,\r
-               1,\r
-               &IrqLine\r
-               );\r
+                          PciIo,\r
+                          EfiPciIoWidthUint8,\r
+                          PCI_INT_LINE_OFFSET,\r
+                          1,\r
+                          &IrqLine\r
+                          );\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 VOID\r
 PciAcpiInitialization (\r
   )\r
@@ -1290,8 +1398,13 @@ PciAcpiInitialization (
         //\r
         return;\r
       }\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, mHostBridgeDevId));\r
+\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        mHostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return;\r
   }\r
@@ -1323,13 +1436,14 @@ ConnectRecursivelyIfPciMassStorage (
   // Recognize PCI Mass Storage, and Xen PCI devices\r
   //\r
   if (IS_CLASS1 (PciHeader, PCI_CLASS_MASS_STORAGE) ||\r
-      (XenDetected() && IS_CLASS2 (PciHeader, 0xFF, 0x80))) {\r
+      (XenDetected () && IS_CLASS2 (PciHeader, 0xFF, 0x80)))\r
+  {\r
     DevicePath = NULL;\r
-    Status = gBS->HandleProtocol (\r
-                    Handle,\r
-                    &gEfiDevicePathProtocolGuid,\r
-                    (VOID*)&DevicePath\r
-                    );\r
+    Status     = gBS->HandleProtocol (\r
+                        Handle,\r
+                        &gEfiDevicePathProtocolGuid,\r
+                        (VOID *)&DevicePath\r
+                        );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -1339,29 +1453,27 @@ ConnectRecursivelyIfPciMassStorage (
     //\r
     DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);\r
     if (DevPathStr != NULL) {\r
-      DEBUG((\r
+      DEBUG ((\r
         DEBUG_INFO,\r
         "Found %s device: %s\n",\r
         (IS_CLASS1 (PciHeader, PCI_CLASS_MASS_STORAGE) ?\r
          L"Mass Storage" :\r
          L"Xen"\r
-         ),\r
+        ),\r
         DevPathStr\r
         ));\r
-      FreePool(DevPathStr);\r
+      FreePool (DevPathStr);\r
     }\r
 \r
     Status = gBS->ConnectController (Handle, NULL, NULL, TRUE);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This notification function is invoked when the\r
   EMU Variable FVB has been changed.\r
@@ -1373,15 +1485,14 @@ ConnectRecursivelyIfPciMassStorage (
 VOID\r
 EFIAPI\r
 EmuVariablesUpdatedCallback (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
   DEBUG ((DEBUG_INFO, "EmuVariablesUpdatedCallback\n"));\r
   UpdateNvVarsOnFileSystem ();\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VisitingFileSystemInstance (\r
@@ -1404,7 +1515,7 @@ VisitingFileSystemInstance (
   }\r
 \r
   ConnectedToFileSystem = TRUE;\r
-  mEmuVariableEvent =\r
+  mEmuVariableEvent     =\r
     EfiCreateProtocolNotifyEvent (\r
       &gEfiDevicePathProtocolGuid,\r
       TPL_CALLBACK,\r
@@ -1412,14 +1523,15 @@ VisitingFileSystemInstance (
       NULL,\r
       &mEmuVariableEventReg\r
       );\r
-  PcdStatus = PcdSet64S (PcdEmuVariableEvent,\r
-                (UINT64)(UINTN) mEmuVariableEvent);\r
+  PcdStatus = PcdSet64S (\r
+                PcdEmuVariableEvent,\r
+                (UINT64)(UINTN)mEmuVariableEvent\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 VOID\r
 PlatformBdsRestoreNvVarsFromHardDisk (\r
   )\r
@@ -1430,7 +1542,6 @@ PlatformBdsRestoreNvVarsFromHardDisk (
     VisitingFileSystemInstance,\r
     NULL\r
     );\r
-\r
 }\r
 \r
 /**\r
@@ -1443,8 +1554,8 @@ PlatformBdsConnectSequence (
   VOID\r
   )\r
 {\r
-  UINTN         Index;\r
-  RETURN_STATUS Status;\r
+  UINTN          Index;\r
+  RETURN_STATUS  Status;\r
 \r
   DEBUG ((DEBUG_INFO, "PlatformBdsConnectSequence\n"));\r
 \r
@@ -1485,12 +1596,15 @@ SaveS3BootScript (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_S3_SAVE_STATE_PROTOCOL *BootScript;\r
-  STATIC CONST UINT8         Info[] = { 0xDE, 0xAD, 0xBE, 0xEF };\r
+  EFI_STATUS                  Status;\r
+  EFI_S3_SAVE_STATE_PROTOCOL  *BootScript;\r
+  STATIC CONST UINT8          Info[] = { 0xDE, 0xAD, 0xBE, 0xEF };\r
 \r
-  Status = gBS->LocateProtocol (&gEfiS3SaveStateProtocolGuid, NULL,\r
-                  (VOID **) &BootScript);\r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiS3SaveStateProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&BootScript\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -1498,13 +1612,15 @@ SaveS3BootScript (
   // implementation embeds a deep copy of the info in the boot script, rather\r
   // than storing just a pointer to runtime or NVS storage.\r
   //\r
-  Status = BootScript->Write(BootScript, EFI_BOOT_SCRIPT_INFORMATION_OPCODE,\r
-                         (UINT32) sizeof Info,\r
-                         (EFI_PHYSICAL_ADDRESS)(UINTN) &Info);\r
+  Status = BootScript->Write (\r
+                         BootScript,\r
+                         EFI_BOOT_SCRIPT_INFORMATION_OPCODE,\r
+                         (UINT32)sizeof Info,\r
+                         (EFI_PHYSICAL_ADDRESS)(UINTN)&Info\r
+                         );\r
   ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
-\r
 /**\r
   Do the platform specific action after the console is ready\r
 \r
@@ -1524,13 +1640,16 @@ PlatformBootManagerAfterConsole (
   VOID\r
   )\r
 {\r
-  EFI_BOOT_MODE                      BootMode;\r
+  EFI_BOOT_MODE  BootMode;\r
 \r
   DEBUG ((DEBUG_INFO, "PlatformBootManagerAfterConsole\n"));\r
 \r
   if (PcdGetBool (PcdOvmfFlashVariablesEnable)) {\r
-    DEBUG ((DEBUG_INFO, "PlatformBdsPolicyBehavior: not restoring NvVars "\r
-      "from disk since flash variables appear to be supported.\n"));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "PlatformBdsPolicyBehavior: not restoring NvVars "\r
+      "from disk since flash variables appear to be supported.\n"\r
+      ));\r
   } else {\r
     //\r
     // Try to restore variables from the hard disk early so\r
@@ -1577,7 +1696,9 @@ PlatformBootManagerAfterConsole (
   // Register UEFI Shell\r
   //\r
   PlatformRegisterFvBootOption (\r
-    &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE\r
+    &gUefiShellFileGuid,\r
+    L"EFI Internal Shell",\r
+    LOAD_OPTION_ACTIVE\r
     );\r
 \r
   RemoveStaleFvFileOptions ();\r
@@ -1597,31 +1718,31 @@ PlatformBootManagerAfterConsole (
 VOID\r
 EFIAPI\r
 NotifyDevPath (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  EFI_HANDLE                            Handle;\r
-  EFI_STATUS                            Status;\r
-  UINTN                                 BufferSize;\r
-  EFI_DEVICE_PATH_PROTOCOL             *DevPathNode;\r
-  ATAPI_DEVICE_PATH                    *Atapi;\r
+  EFI_HANDLE                Handle;\r
+  EFI_STATUS                Status;\r
+  UINTN                     BufferSize;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevPathNode;\r
+  ATAPI_DEVICE_PATH         *Atapi;\r
 \r
   //\r
   // Examine all new handles\r
   //\r
-  for (;;) {\r
+  for ( ; ;) {\r
     //\r
     // Get the next handle\r
     //\r
     BufferSize = sizeof (Handle);\r
-    Status = gBS->LocateHandle (\r
-              ByRegisterNotify,\r
-              NULL,\r
-              mEfiDevPathNotifyReg,\r
-              &BufferSize,\r
-              &Handle\r
-              );\r
+    Status     = gBS->LocateHandle (\r
+                        ByRegisterNotify,\r
+                        NULL,\r
+                        mEfiDevPathNotifyReg,\r
+                        &BufferSize,\r
+                        &Handle\r
+                        );\r
 \r
     //\r
     // If not found, we're done\r
@@ -1637,8 +1758,11 @@ NotifyDevPath (
     //\r
     // Get the DevicePath protocol on that handle\r
     //\r
-    Status = gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid,\r
-                    (VOID **)&DevPathNode);\r
+    Status = gBS->HandleProtocol (\r
+                    Handle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    (VOID **)&DevPathNode\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     while (!IsDevicePathEnd (DevPathNode)) {\r
@@ -1646,16 +1770,17 @@ NotifyDevPath (
       // Find the handler to dump this device path node\r
       //\r
       if (\r
-           (DevicePathType(DevPathNode) == MESSAGING_DEVICE_PATH) &&\r
-           (DevicePathSubType(DevPathNode) == MSG_ATAPI_DP)\r
-         ) {\r
-        Atapi = (ATAPI_DEVICE_PATH*) DevPathNode;\r
+          (DevicePathType (DevPathNode) == MESSAGING_DEVICE_PATH) &&\r
+          (DevicePathSubType (DevPathNode) == MSG_ATAPI_DP)\r
+          )\r
+      {\r
+        Atapi = (ATAPI_DEVICE_PATH *)DevPathNode;\r
         PciOr16 (\r
           PCI_LIB_ADDRESS (\r
             0,\r
             1,\r
             1,\r
-            (Atapi->PrimarySecondary == 1) ? 0x42: 0x40\r
+            (Atapi->PrimarySecondary == 1) ? 0x42 : 0x40\r
             ),\r
           BIT15\r
           );\r
@@ -1671,7 +1796,6 @@ NotifyDevPath (
   return;\r
 }\r
 \r
-\r
 VOID\r
 InstallDevicePathCallback (\r
   VOID\r
@@ -1679,12 +1803,12 @@ InstallDevicePathCallback (
 {\r
   DEBUG ((DEBUG_INFO, "Registered NotifyDevPath Event\n"));\r
   mEfiDevPathEvent = EfiCreateProtocolNotifyEvent (\r
-                          &gEfiDevicePathProtocolGuid,\r
-                          TPL_CALLBACK,\r
-                          NotifyDevPath,\r
-                          NULL,\r
-                          &mEfiDevPathNotifyReg\r
-                          );\r
+                       &gEfiDevicePathProtocolGuid,\r
+                       TPL_CALLBACK,\r
+                       NotifyDevPath,\r
+                       NULL,\r
+                       &mEfiDevPathNotifyReg\r
+                       );\r
 }\r
 \r
 /**\r
@@ -1696,12 +1820,12 @@ InstallDevicePathCallback (
 VOID\r
 EFIAPI\r
 PlatformBootManagerWaitCallback (\r
-  UINT16          TimeoutRemain\r
+  UINT16  TimeoutRemain\r
   )\r
 {\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Black;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White;\r
-  UINT16                              TimeoutInitial;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION  Black;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION  White;\r
+  UINT16                               TimeoutInitial;\r
 \r
   TimeoutInitial = PcdGet16 (PcdPlatformBootTimeOut);\r
 \r
@@ -1740,10 +1864,10 @@ PlatformBootManagerUnableToBoot (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_INPUT_KEY                Key;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION BootManagerMenu;\r
-  UINTN                        Index;\r
+  EFI_STATUS                    Status;\r
+  EFI_INPUT_KEY                 Key;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  BootManagerMenu;\r
+  UINTN                         Index;\r
 \r
   //\r
   // BootManagerMenu doesn't contain the correct information when return status\r
@@ -1753,6 +1877,7 @@ PlatformBootManagerUnableToBoot (
   if (EFI_ERROR (Status)) {\r
     return;\r
   }\r
+\r
   //\r
   // Normally BdsDxe does not print anything to the system console, but this is\r
   // a last resort -- the end-user will likely not see any DEBUG messages\r
@@ -1782,7 +1907,7 @@ PlatformBootManagerUnableToBoot (
     }\r
   }\r
 \r
-  for (;;) {\r
+  for ( ; ;) {\r
     EfiBootManagerBoot (&BootManagerMenu);\r
   }\r
 }\r
index 153e21510156a95284cf2aa7b40c7da1b7fba00f..1676d61616d8e58223a15ccf6879fddf1842f0a5 100644 (file)
@@ -17,7 +17,6 @@ Abstract:
 #ifndef _PLATFORM_SPECIFIC_BDS_PLATFORM_H_\r
 #define _PLATFORM_SPECIFIC_BDS_PLATFORM_H_\r
 \r
-\r
 #include <PiDxe.h>\r
 \r
 #include <IndustryStandard/Pci.h>\r
@@ -64,11 +63,11 @@ Abstract:
 \r
 #include <OvmfPlatforms.h>\r
 \r
-extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformConnectSequence[];\r
-extern ACPI_HID_DEVICE_PATH       gPnpPs2KeyboardDeviceNode;\r
-extern ACPI_HID_DEVICE_PATH       gPnp16550ComPortDeviceNode;\r
-extern UART_DEVICE_PATH           gUartDeviceNode;\r
-extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;\r
+extern EFI_DEVICE_PATH_PROTOCOL  *gPlatformConnectSequence[];\r
+extern ACPI_HID_DEVICE_PATH      gPnpPs2KeyboardDeviceNode;\r
+extern ACPI_HID_DEVICE_PATH      gPnp16550ComPortDeviceNode;\r
+extern UART_DEVICE_PATH          gUartDeviceNode;\r
+extern VENDOR_DEVICE_PATH        gTerminalTypeDeviceNode;\r
 \r
 #define PCI_DEVICE_PATH_NODE(Func, Dev) \\r
   { \\r
@@ -150,20 +149,20 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
     } \\r
   }\r
 \r
-#define PCI_CLASS_SCC          0x07\r
-#define PCI_SUBCLASS_SERIAL    0x00\r
-#define PCI_IF_16550           0x02\r
-#define IS_PCI_16550SERIAL(_p)           IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)\r
-#define IS_PCI_ISA_PDECODE(_p)        IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA_PDECODE, 0)\r
+#define PCI_CLASS_SCC        0x07\r
+#define PCI_SUBCLASS_SERIAL  0x00\r
+#define PCI_IF_16550         0x02\r
+#define IS_PCI_16550SERIAL(_p)  IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)\r
+#define IS_PCI_ISA_PDECODE(_p)  IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA_PDECODE, 0)\r
 \r
 typedef struct {\r
-  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
-  UINTN                     ConnectType;\r
+  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;\r
+  UINTN                       ConnectType;\r
 } PLATFORM_CONSOLE_CONNECT_ENTRY;\r
 \r
-#define CONSOLE_OUT BIT0\r
-#define CONSOLE_IN  BIT1\r
-#define STD_ERROR   BIT2\r
+#define CONSOLE_OUT  BIT0\r
+#define CONSOLE_IN   BIT1\r
+#define STD_ERROR    BIT2\r
 extern PLATFORM_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r
 extern PLATFORM_CONSOLE_CONNECT_ENTRY  gXenPlatformConsole[];\r
 \r
@@ -173,7 +172,7 @@ extern PLATFORM_CONSOLE_CONNECT_ENTRY  gXenPlatformConsole[];
 \r
 VOID\r
 PlatformInitializeConsole (\r
-  IN PLATFORM_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
+  IN PLATFORM_CONSOLE_CONNECT_ENTRY  *PlatformConsole\r
   );\r
 \r
 /**\r
index 2858c3dfd5cad0c4ba5e6bf867b143aca1081ff6..6536d9fe369eb52006d5a133e3b745def2242d68 100644 (file)
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH        VendorHardware;\r
-  UART_DEVICE_PATH          Uart;\r
-  VENDOR_DEVICE_PATH        TerminalType;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
+  VENDOR_DEVICE_PATH          VendorHardware;\r
+  UART_DEVICE_PATH            Uart;\r
+  VENDOR_DEVICE_PATH          TerminalType;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } VENDOR_UART_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
@@ -28,8 +28,8 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  USB_CLASS_DEVICE_PATH    Keyboard;\r
-  EFI_DEVICE_PATH_PROTOCOL End;\r
+  USB_CLASS_DEVICE_PATH       Keyboard;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } USB_KEYBOARD_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
@@ -38,33 +38,32 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH        Vendor;\r
-  ACPI_ADR_DEVICE_PATH      AcpiAdr;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
+  VENDOR_DEVICE_PATH          Vendor;\r
+  ACPI_ADR_DEVICE_PATH        AcpiAdr;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } VENDOR_RAMFB_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
-ACPI_HID_DEVICE_PATH       gPnpPs2KeyboardDeviceNode  = gPnpPs2Keyboard;\r
-ACPI_HID_DEVICE_PATH       gPnp16550ComPortDeviceNode = gPnp16550ComPort;\r
-UART_DEVICE_PATH           gUartDeviceNode            = gUart;\r
-VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode    = gPcAnsiTerminal;\r
+ACPI_HID_DEVICE_PATH  gPnpPs2KeyboardDeviceNode  = gPnpPs2Keyboard;\r
+ACPI_HID_DEVICE_PATH  gPnp16550ComPortDeviceNode = gPnp16550ComPort;\r
+UART_DEVICE_PATH      gUartDeviceNode            = gUart;\r
+VENDOR_DEVICE_PATH    gTerminalTypeDeviceNode    = gPcAnsiTerminal;\r
 \r
 //\r
 // Platform specific keyboard device path\r
 //\r
 \r
-\r
 //\r
 // Debug Agent UART Device Path\r
 //\r
-VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {\r
+VENDOR_UART_DEVICE_PATH  gDebugAgentUartDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     EFI_DEBUG_AGENT_GUID,\r
@@ -74,8 +73,8 @@ VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {
       MESSAGING_DEVICE_PATH,\r
       MSG_UART_DP,\r
       {\r
-        (UINT8) (sizeof (UART_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (UART_DEVICE_PATH)),\r
+        (UINT8)((sizeof (UART_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     0,  // Reserved\r
@@ -88,7 +87,7 @@ VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {
   gEndEntire\r
 };\r
 \r
-STATIC USB_KEYBOARD_DEVICE_PATH gUsbKeyboardDevicePath = {\r
+STATIC USB_KEYBOARD_DEVICE_PATH  gUsbKeyboardDevicePath = {\r
   {\r
     {\r
       MESSAGING_DEVICE_PATH,\r
@@ -107,14 +106,14 @@ STATIC USB_KEYBOARD_DEVICE_PATH gUsbKeyboardDevicePath = {
   gEndEntire\r
 };\r
 \r
-STATIC VENDOR_RAMFB_DEVICE_PATH gQemuRamfbDevicePath = {\r
+STATIC VENDOR_RAMFB_DEVICE_PATH  gQemuRamfbDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     QEMU_RAMFB_GUID,\r
@@ -124,8 +123,8 @@ STATIC VENDOR_RAMFB_DEVICE_PATH gQemuRamfbDevicePath = {
       ACPI_DEVICE_PATH,\r
       ACPI_ADR_DP,\r
       {\r
-        (UINT8) (sizeof (ACPI_ADR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (ACPI_ADR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (ACPI_ADR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (ACPI_ADR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     ACPI_DISPLAY_ADR (\r
@@ -142,14 +141,14 @@ STATIC VENDOR_RAMFB_DEVICE_PATH gQemuRamfbDevicePath = {
   gEndEntire\r
 };\r
 \r
-STATIC VENDOR_UART_DEVICE_PATH gXenConsoleDevicePath = {\r
+STATIC VENDOR_UART_DEVICE_PATH  gXenConsoleDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     EDKII_SERIAL_PORT_LIB_VENDOR_GUID\r
@@ -159,8 +158,8 @@ STATIC VENDOR_UART_DEVICE_PATH gXenConsoleDevicePath = {
       MESSAGING_DEVICE_PATH,\r
       MSG_UART_DP,\r
       {\r
-        (UINT8) (sizeof (UART_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (UART_DEVICE_PATH)),\r
+        (UINT8)((sizeof (UART_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     0,\r
@@ -176,9 +175,9 @@ STATIC VENDOR_UART_DEVICE_PATH gXenConsoleDevicePath = {
 //\r
 // Predefined platform default console device path\r
 //\r
-PLATFORM_CONSOLE_CONNECT_ENTRY   gPlatformConsole[] = {\r
+PLATFORM_CONSOLE_CONNECT_ENTRY  gPlatformConsole[] = {\r
   {\r
-    (EFI_DEVICE_PATH_PROTOCOL *) &gDebugAgentUartDevicePath,\r
+    (EFI_DEVICE_PATH_PROTOCOL *)&gDebugAgentUartDevicePath,\r
     (CONSOLE_OUT | CONSOLE_IN | STD_ERROR)\r
   },\r
   {\r
@@ -195,7 +194,7 @@ PLATFORM_CONSOLE_CONNECT_ENTRY   gPlatformConsole[] = {
   }\r
 };\r
 \r
-PLATFORM_CONSOLE_CONNECT_ENTRY   gXenPlatformConsole[] = {\r
+PLATFORM_CONSOLE_CONNECT_ENTRY  gXenPlatformConsole[] = {\r
   {\r
     (EFI_DEVICE_PATH_PROTOCOL *)&gXenConsoleDevicePath,\r
     (CONSOLE_OUT | CONSOLE_IN | STD_ERROR)\r
@@ -209,5 +208,4 @@ PLATFORM_CONSOLE_CONNECT_ENTRY   gXenPlatformConsole[] = {
 //\r
 // Predefined platform connect sequence\r
 //\r
-EFI_DEVICE_PATH_PROTOCOL    *gPlatformConnectSequence[] = { NULL };\r
-\r
+EFI_DEVICE_PATH_PROTOCOL  *gPlatformConnectSequence[] = { NULL };\r
index c6255921779ea67caf592d23f134f95dd4a49d25..1e66e3c452583ce53ccda6706fabbb187efc44ed 100644 (file)
 #include <Library/ReportStatusCodeLib.h>\r
 #include <Library/UefiLib.h>\r
 \r
-\r
 EFI_STATUS\r
 TryRunningQemuKernel (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_HANDLE                KernelImageHandle;\r
+  EFI_STATUS  Status;\r
+  EFI_HANDLE  KernelImageHandle;\r
 \r
   Status = QemuLoadKernelImage (&KernelImageHandle);\r
   if (EFI_ERROR (Status)) {\r
@@ -30,18 +29,24 @@ TryRunningQemuKernel (
   //\r
   // Signal the EVT_SIGNAL_READY_TO_BOOT event\r
   //\r
-  EfiSignalEventReadyToBoot();\r
+  EfiSignalEventReadyToBoot ();\r
 \r
-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE,\r
-    (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT));\r
+  REPORT_STATUS_CODE (\r
+    EFI_PROGRESS_CODE,\r
+    (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT)\r
+    );\r
 \r
   //\r
   // Start the image.\r
   //\r
   Status = QemuStartKernelImage (&KernelImageHandle);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: QemuStartKernelImage(): %r\n", __FUNCTION__,\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: QemuStartKernelImage(): %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
   }\r
 \r
   QemuUnloadKernelImage (KernelImageHandle);\r
index 32b70a46d007620a2a2c1d91b89dbbbdb7c76ee5..119f24b33016837aa42f0bd32d6aa9c638260ca8 100644 (file)
 // Global data\r
 //\r
 \r
-VOID          *mEfiDevPathNotifyReg;\r
-EFI_EVENT     mEfiDevPathEvent;\r
-VOID          *mEmuVariableEventReg;\r
-EFI_EVENT     mEmuVariableEvent;\r
-UINT16        mHostBridgeDevId;\r
+VOID       *mEfiDevPathNotifyReg;\r
+EFI_EVENT  mEfiDevPathEvent;\r
+VOID       *mEmuVariableEventReg;\r
+EFI_EVENT  mEmuVariableEvent;\r
+UINT16     mHostBridgeDevId;\r
 \r
 //\r
 // Table of host IRQs matching PCI IRQs A-D\r
 // (for configuring PCI Interrupt Line register)\r
 //\r
-CONST UINT8 PciHostIrqs[] = {\r
+CONST UINT8  PciHostIrqs[] = {\r
   0x0a, 0x0a, 0x0b, 0x0b\r
 };\r
 \r
@@ -58,7 +58,6 @@ EFI_STATUS
   IN PCI_TYPE00           *Pci\r
   );\r
 \r
-\r
 //\r
 // Function prototypes\r
 //\r
@@ -72,7 +71,7 @@ VisitAllInstancesOfProtocol (
 \r
 EFI_STATUS\r
 VisitAllPciInstancesOfProtocol (\r
-  IN VISIT_PCI_INSTANCE_CALLBACK CallBackFunction\r
+  IN VISIT_PCI_INSTANCE_CALLBACK  CallBackFunction\r
   );\r
 \r
 VOID\r
@@ -82,24 +81,24 @@ InstallDevicePathCallback (
 \r
 VOID\r
 PlatformRegisterFvBootOption (\r
-  EFI_GUID                         *FileGuid,\r
-  CHAR16                           *Description,\r
-  UINT32                           Attributes\r
+  EFI_GUID  *FileGuid,\r
+  CHAR16    *Description,\r
+  UINT32    Attributes\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  INTN                              OptionIndex;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION      NewOption;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION      *BootOptions;\r
-  UINTN                             BootOptionCount;\r
-  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;\r
-  EFI_LOADED_IMAGE_PROTOCOL         *LoadedImage;\r
-  EFI_DEVICE_PATH_PROTOCOL          *DevicePath;\r
+  EFI_STATUS                         Status;\r
+  INTN                               OptionIndex;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION       NewOption;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION       *BootOptions;\r
+  UINTN                              BootOptionCount;\r
+  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  FileNode;\r
+  EFI_LOADED_IMAGE_PROTOCOL          *LoadedImage;\r
+  EFI_DEVICE_PATH_PROTOCOL           *DevicePath;\r
 \r
   Status = gBS->HandleProtocol (\r
                   gImageHandle,\r
                   &gEfiLoadedImageProtocolGuid,\r
-                  (VOID **) &LoadedImage\r
+                  (VOID **)&LoadedImage\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -108,7 +107,7 @@ PlatformRegisterFvBootOption (
   ASSERT (DevicePath != NULL);\r
   DevicePath = AppendDevicePathNode (\r
                  DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *) &FileNode\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&FileNode\r
                  );\r
   ASSERT (DevicePath != NULL);\r
 \r
@@ -126,17 +125,21 @@ PlatformRegisterFvBootOption (
   FreePool (DevicePath);\r
 \r
   BootOptions = EfiBootManagerGetLoadOptions (\r
-                  &BootOptionCount, LoadOptionTypeBoot\r
+                  &BootOptionCount,\r
+                  LoadOptionTypeBoot\r
                   );\r
 \r
   OptionIndex = EfiBootManagerFindLoadOption (\r
-                  &NewOption, BootOptions, BootOptionCount\r
+                  &NewOption,\r
+                  BootOptions,\r
+                  BootOptionCount\r
                   );\r
 \r
   if (OptionIndex == -1) {\r
     Status = EfiBootManagerAddLoadOptionVariable (&NewOption, MAX_UINTN);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
+\r
   EfiBootManagerFreeLoadOption (&NewOption);\r
   EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);\r
 }\r
@@ -160,27 +163,30 @@ RemoveStaleFvFileOptions (
   VOID\r
   )\r
 {\r
-  EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;\r
-  UINTN                        BootOptionCount;\r
-  UINTN                        Index;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  *BootOptions;\r
+  UINTN                         BootOptionCount;\r
+  UINTN                         Index;\r
 \r
-  BootOptions = EfiBootManagerGetLoadOptions (&BootOptionCount,\r
-                  LoadOptionTypeBoot);\r
+  BootOptions = EfiBootManagerGetLoadOptions (\r
+                  &BootOptionCount,\r
+                  LoadOptionTypeBoot\r
+                  );\r
 \r
   for (Index = 0; Index < BootOptionCount; ++Index) {\r
-    EFI_DEVICE_PATH_PROTOCOL *Node1, *Node2, *SearchNode;\r
-    EFI_STATUS               Status;\r
-    EFI_HANDLE               FvHandle;\r
+    EFI_DEVICE_PATH_PROTOCOL  *Node1, *Node2, *SearchNode;\r
+    EFI_STATUS                Status;\r
+    EFI_HANDLE                FvHandle;\r
 \r
     //\r
     // If the device path starts with neither MemoryMapped(...) nor Fv(...),\r
     // then keep the boot option.\r
     //\r
     Node1 = BootOptions[Index].FilePath;\r
-    if (!(DevicePathType (Node1) == HARDWARE_DEVICE_PATH &&\r
-          DevicePathSubType (Node1) == HW_MEMMAP_DP) &&\r
-        !(DevicePathType (Node1) == MEDIA_DEVICE_PATH &&\r
-          DevicePathSubType (Node1) == MEDIA_PIWG_FW_VOL_DP)) {\r
+    if (!((DevicePathType (Node1) == HARDWARE_DEVICE_PATH) &&\r
+          (DevicePathSubType (Node1) == HW_MEMMAP_DP)) &&\r
+        !((DevicePathType (Node1) == MEDIA_DEVICE_PATH) &&\r
+          (DevicePathSubType (Node1) == MEDIA_PIWG_FW_VOL_DP)))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -189,8 +195,9 @@ RemoveStaleFvFileOptions (
     // option.\r
     //\r
     Node2 = NextDevicePathNode (Node1);\r
-    if (DevicePathType (Node2) != MEDIA_DEVICE_PATH ||\r
-        DevicePathSubType (Node2) != MEDIA_PIWG_FW_FILE_DP) {\r
+    if ((DevicePathType (Node2) != MEDIA_DEVICE_PATH) ||\r
+        (DevicePathSubType (Node2) != MEDIA_PIWG_FW_FILE_DP))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -201,23 +208,29 @@ RemoveStaleFvFileOptions (
     // boot option.\r
     //\r
     SearchNode = Node1;\r
-    Status = gBS->LocateDevicePath (&gEfiFirmwareVolume2ProtocolGuid,\r
-                    &SearchNode, &FvHandle);\r
+    Status     = gBS->LocateDevicePath (\r
+                        &gEfiFirmwareVolume2ProtocolGuid,\r
+                        &SearchNode,\r
+                        &FvHandle\r
+                        );\r
 \r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // The firmware volume was found; now let's see if it contains the FvFile\r
       // identified by GUID.\r
       //\r
-      EFI_FIRMWARE_VOLUME2_PROTOCOL     *FvProtocol;\r
-      MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFileNode;\r
-      UINTN                             BufferSize;\r
-      EFI_FV_FILETYPE                   FoundType;\r
-      EFI_FV_FILE_ATTRIBUTES            FileAttributes;\r
-      UINT32                            AuthenticationStatus;\r
-\r
-      Status = gBS->HandleProtocol (FvHandle, &gEfiFirmwareVolume2ProtocolGuid,\r
-                      (VOID **)&FvProtocol);\r
+      EFI_FIRMWARE_VOLUME2_PROTOCOL      *FvProtocol;\r
+      MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvFileNode;\r
+      UINTN                              BufferSize;\r
+      EFI_FV_FILETYPE                    FoundType;\r
+      EFI_FV_FILE_ATTRIBUTES             FileAttributes;\r
+      UINT32                             AuthenticationStatus;\r
+\r
+      Status = gBS->HandleProtocol (\r
+                      FvHandle,\r
+                      &gEfiFirmwareVolume2ProtocolGuid,\r
+                      (VOID **)&FvProtocol\r
+                      );\r
       ASSERT_EFI_ERROR (Status);\r
 \r
       FvFileNode = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)Node2;\r
@@ -246,23 +259,29 @@ RemoveStaleFvFileOptions (
     // Delete the boot option.\r
     //\r
     Status = EfiBootManagerDeleteLoadOptionVariable (\r
-               BootOptions[Index].OptionNumber, LoadOptionTypeBoot);\r
+               BootOptions[Index].OptionNumber,\r
+               LoadOptionTypeBoot\r
+               );\r
     DEBUG_CODE_BEGIN ();\r
-      CHAR16 *DevicePathString;\r
+    CHAR16  *DevicePathString;\r
+\r
+    DevicePathString = ConvertDevicePathToText (\r
+                         BootOptions[Index].FilePath,\r
+                         FALSE,\r
+                         FALSE\r
+                         );\r
+    DEBUG ((\r
+      EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,\r
+      "%a: removing stale Boot#%04x %s: %r\n",\r
+      __FUNCTION__,\r
+      (UINT32)BootOptions[Index].OptionNumber,\r
+      DevicePathString == NULL ? L"<unavailable>" : DevicePathString,\r
+      Status\r
+      ));\r
+    if (DevicePathString != NULL) {\r
+      FreePool (DevicePathString);\r
+    }\r
 \r
-      DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,\r
-                           FALSE, FALSE);\r
-      DEBUG ((\r
-        EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,\r
-        "%a: removing stale Boot#%04x %s: %r\n",\r
-        __FUNCTION__,\r
-        (UINT32)BootOptions[Index].OptionNumber,\r
-        DevicePathString == NULL ? L"<unavailable>" : DevicePathString,\r
-        Status\r
-        ));\r
-      if (DevicePathString != NULL) {\r
-        FreePool (DevicePathString);\r
-      }\r
     DEBUG_CODE_END ();\r
   }\r
 \r
@@ -274,18 +293,18 @@ PlatformRegisterOptionsAndKeys (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_INPUT_KEY                Enter;\r
-  EFI_INPUT_KEY                F2;\r
-  EFI_INPUT_KEY                Esc;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION BootOption;\r
+  EFI_STATUS                    Status;\r
+  EFI_INPUT_KEY                 Enter;\r
+  EFI_INPUT_KEY                 F2;\r
+  EFI_INPUT_KEY                 Esc;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  BootOption;\r
 \r
   //\r
   // Register ENTER as CONTINUE key\r
   //\r
   Enter.ScanCode    = SCAN_NULL;\r
   Enter.UnicodeChar = CHAR_CARRIAGE_RETURN;\r
-  Status = EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL);\r
+  Status            = EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -295,14 +314,22 @@ PlatformRegisterOptionsAndKeys (
   F2.UnicodeChar  = CHAR_NULL;\r
   Esc.ScanCode    = SCAN_ESC;\r
   Esc.UnicodeChar = CHAR_NULL;\r
-  Status = EfiBootManagerGetBootManagerMenu (&BootOption);\r
+  Status          = EfiBootManagerGetBootManagerMenu (&BootOption);\r
   ASSERT_EFI_ERROR (Status);\r
   Status = EfiBootManagerAddKeyOptionVariable (\r
-             NULL, (UINT16) BootOption.OptionNumber, 0, &F2, NULL\r
+             NULL,\r
+             (UINT16)BootOption.OptionNumber,\r
+             0,\r
+             &F2,\r
+             NULL\r
              );\r
   ASSERT (Status == EFI_SUCCESS || Status == EFI_ALREADY_STARTED);\r
   Status = EfiBootManagerAddKeyOptionVariable (\r
-             NULL, (UINT16) BootOption.OptionNumber, 0, &Esc, NULL\r
+             NULL,\r
+             (UINT16)BootOption.OptionNumber,\r
+             0,\r
+             &Esc,\r
+             NULL\r
              );\r
   ASSERT (Status == EFI_SUCCESS || Status == EFI_ALREADY_STARTED);\r
 }\r
@@ -319,9 +346,9 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 ConnectVirtioPciRng (\r
-  IN EFI_HANDLE Handle,\r
-  IN VOID       *Instance,\r
-  IN VOID       *Context\r
+  IN EFI_HANDLE  Handle,\r
+  IN VOID        *Instance,\r
+  IN VOID        *Context\r
   );\r
 \r
 STATIC\r
@@ -333,6 +360,7 @@ SaveS3BootScript (
 //\r
 // BDS Platform Functions\r
 //\r
+\r
 /**\r
   Do the platform init, can be customized by OEM/IBV\r
 \r
@@ -352,14 +380,17 @@ PlatformBootManagerBeforeConsole (
   VOID\r
   )\r
 {\r
-  EFI_HANDLE    Handle;\r
-  EFI_STATUS    Status;\r
+  EFI_HANDLE  Handle;\r
+  EFI_STATUS  Status;\r
 \r
   DEBUG ((DEBUG_INFO, "PlatformBootManagerBeforeConsole\n"));\r
   InstallDevicePathCallback ();\r
 \r
-  VisitAllInstancesOfProtocol (&gEfiPciRootBridgeIoProtocolGuid,\r
-    ConnectRootBridge, NULL);\r
+  VisitAllInstancesOfProtocol (\r
+    &gEfiPciRootBridgeIoProtocolGuid,\r
+    ConnectRootBridge,\r
+    NULL\r
+    );\r
 \r
   //\r
   // Signal the ACPI platform driver that it can download QEMU ACPI tables.\r
@@ -389,9 +420,12 @@ PlatformBootManagerBeforeConsole (
   // Any TPM 2 Physical Presence Interface opcode must be handled before.\r
   //\r
   Handle = NULL;\r
-  Status = gBS->InstallProtocolInterface (&Handle,\r
-                  &gEfiDxeSmmReadyToLockProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  NULL);\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &Handle,\r
+                  &gEfiDxeSmmReadyToLockProtocolGuid,\r
+                  EFI_NATIVE_INTERFACE,\r
+                  NULL\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -406,11 +440,13 @@ PlatformBootManagerBeforeConsole (
   // Install both VIRTIO_DEVICE_PROTOCOL and (dependent) EFI_RNG_PROTOCOL\r
   // instances on Virtio PCI RNG devices.\r
   //\r
-  VisitAllInstancesOfProtocol (&gEfiPciIoProtocolGuid, ConnectVirtioPciRng,\r
-    NULL);\r
+  VisitAllInstancesOfProtocol (\r
+    &gEfiPciIoProtocolGuid,\r
+    ConnectVirtioPciRng,\r
+    NULL\r
+    );\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConnectRootBridge (\r
@@ -419,7 +455,7 @@ ConnectRootBridge (
   IN VOID        *Context\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Make the PCI bus driver connect the root bridge, non-recursively. This\r
@@ -435,34 +471,39 @@ ConnectRootBridge (
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConnectVirtioPciRng (\r
-  IN EFI_HANDLE Handle,\r
-  IN VOID       *Instance,\r
-  IN VOID       *Context\r
+  IN EFI_HANDLE  Handle,\r
+  IN VOID        *Instance,\r
+  IN VOID        *Context\r
   )\r
 {\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  EFI_STATUS          Status;\r
-  UINT16              VendorId;\r
-  UINT16              DeviceId;\r
-  UINT8               RevisionId;\r
-  BOOLEAN             Virtio10;\r
-  UINT16              SubsystemId;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  EFI_STATUS           Status;\r
+  UINT16               VendorId;\r
+  UINT16               DeviceId;\r
+  UINT8                RevisionId;\r
+  BOOLEAN              Virtio10;\r
+  UINT16               SubsystemId;\r
 \r
   PciIo = Instance;\r
 \r
   //\r
   // Read and check VendorId.\r
   //\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_VENDOR_ID_OFFSET,\r
-                        1, &VendorId);\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint16,\r
+                        PCI_VENDOR_ID_OFFSET,\r
+                        1,\r
+                        &VendorId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
+\r
   if (VendorId != VIRTIO_VENDOR_ID) {\r
     return EFI_SUCCESS;\r
   }\r
@@ -470,13 +511,24 @@ ConnectVirtioPciRng (
   //\r
   // Read DeviceId and RevisionId.\r
   //\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_DEVICE_ID_OFFSET,\r
-                        1, &DeviceId);\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint16,\r
+                        PCI_DEVICE_ID_OFFSET,\r
+                        1,\r
+                        &DeviceId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, PCI_REVISION_ID_OFFSET,\r
-                        1, &RevisionId);\r
+\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint8,\r
+                        PCI_REVISION_ID_OFFSET,\r
+                        1,\r
+                        &RevisionId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
@@ -488,10 +540,11 @@ ConnectVirtioPciRng (
   // SubsystemId will only play a sanity-check role. Otherwise, DeviceId can\r
   // only be sanity-checked, and SubsystemId will decide.\r
   //\r
-  if (DeviceId == 0x1040 + VIRTIO_SUBSYSTEM_ENTROPY_SOURCE &&\r
-      RevisionId >= 0x01) {\r
+  if ((DeviceId == 0x1040 + VIRTIO_SUBSYSTEM_ENTROPY_SOURCE) &&\r
+      (RevisionId >= 0x01))\r
+  {\r
     Virtio10 = TRUE;\r
-  } else if (DeviceId >= 0x1000 && DeviceId <= 0x103F && RevisionId == 0x00) {\r
+  } else if ((DeviceId >= 0x1000) && (DeviceId <= 0x103F) && (RevisionId == 0x00)) {\r
     Virtio10 = FALSE;\r
   } else {\r
     return EFI_SUCCESS;\r
@@ -500,13 +553,20 @@ ConnectVirtioPciRng (
   //\r
   // Read and check SubsystemId as dictated by Virtio10.\r
   //\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16,\r
-                        PCI_SUBSYSTEM_ID_OFFSET, 1, &SubsystemId);\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint16,\r
+                        PCI_SUBSYSTEM_ID_OFFSET,\r
+                        1,\r
+                        &SubsystemId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
-  if ((Virtio10 && SubsystemId >= 0x40) ||\r
-      (!Virtio10 && SubsystemId == VIRTIO_SUBSYSTEM_ENTROPY_SOURCE)) {\r
+\r
+  if ((Virtio10 && (SubsystemId >= 0x40)) ||\r
+      (!Virtio10 && (SubsystemId == VIRTIO_SUBSYSTEM_ENTROPY_SOURCE)))\r
+  {\r
     Status = gBS->ConnectController (\r
                     Handle, // ControllerHandle\r
                     NULL,   // DriverImageHandle -- connect all drivers\r
@@ -517,6 +577,7 @@ ConnectVirtioPciRng (
       goto Error;\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 \r
 Error:\r
@@ -524,7 +585,6 @@ Error:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Add IsaKeyboard to ConIn; add IsaSerial to ConOut, ConIn, ErrOut.\r
 \r
@@ -538,7 +598,7 @@ Error:
 **/\r
 EFI_STATUS\r
 PrepareLpcBridgeDevicePath (\r
-  IN EFI_HANDLE                DeviceHandle\r
+  IN EFI_HANDLE  DeviceHandle\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -547,50 +607,59 @@ PrepareLpcBridgeDevicePath (
   CHAR16                    *DevPathStr;\r
 \r
   DevicePath = NULL;\r
-  Status = gBS->HandleProtocol (\r
-                  DeviceHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID*)&DevicePath\r
-                  );\r
+  Status     = gBS->HandleProtocol (\r
+                      DeviceHandle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      (VOID *)&DevicePath\r
+                      );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   TempDevicePath = DevicePath;\r
 \r
   //\r
   // Register Keyboard\r
   //\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnpPs2KeyboardDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnpPs2KeyboardDeviceNode\r
+                 );\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
 \r
   //\r
   // Register COM1\r
   //\r
-  DevicePath = TempDevicePath;\r
+  DevicePath                     = TempDevicePath;\r
   gPnp16550ComPortDeviceNode.UID = 0;\r
 \r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode\r
+                 );\r
 \r
   //\r
   // Print Device Path\r
   //\r
   DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);\r
   if (DevPathStr != NULL) {\r
-    DEBUG((\r
+    DEBUG ((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r
       DEBUG_LINE_NUMBER,\r
       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r
-    FreePool(DevPathStr);\r
+    FreePool (DevPathStr);\r
   }\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
@@ -604,19 +673,19 @@ PrepareLpcBridgeDevicePath (
 \r
 EFI_STATUS\r
 GetGopDevicePath (\r
-   IN  EFI_DEVICE_PATH_PROTOCOL *PciDevicePath,\r
-   OUT EFI_DEVICE_PATH_PROTOCOL **GopDevicePath\r
-   )\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *PciDevicePath,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **GopDevicePath\r
+  )\r
 {\r
-  UINTN                           Index;\r
-  EFI_STATUS                      Status;\r
-  EFI_HANDLE                      PciDeviceHandle;\r
-  EFI_DEVICE_PATH_PROTOCOL        *TempDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL        *TempPciDevicePath;\r
-  UINTN                           GopHandleCount;\r
-  EFI_HANDLE                      *GopHandleBuffer;\r
-\r
-  if (PciDevicePath == NULL || GopDevicePath == NULL) {\r
+  UINTN                     Index;\r
+  EFI_STATUS                Status;\r
+  EFI_HANDLE                PciDeviceHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TempDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TempPciDevicePath;\r
+  UINTN                     GopHandleCount;\r
+  EFI_HANDLE                *GopHandleBuffer;\r
+\r
+  if ((PciDevicePath == NULL) || (GopDevicePath == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -655,16 +724,21 @@ GetGopDevicePath (
     // Add all the child handles as possible Console Device\r
     //\r
     for (Index = 0; Index < GopHandleCount; Index++) {\r
-      Status = gBS->HandleProtocol (GopHandleBuffer[Index],\r
-                      &gEfiDevicePathProtocolGuid, (VOID*)&TempDevicePath);\r
+      Status = gBS->HandleProtocol (\r
+                      GopHandleBuffer[Index],\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      (VOID *)&TempDevicePath\r
+                      );\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r
+\r
       if (CompareMem (\r
             PciDevicePath,\r
             TempDevicePath,\r
             GetDevicePathSize (PciDevicePath) - END_DEVICE_PATH_LENGTH\r
-            ) == 0) {\r
+            ) == 0)\r
+      {\r
         //\r
         // In current implementation, we only enable one of the child handles\r
         // as console device, i.e. sotre one of the child handle's device\r
@@ -682,6 +756,7 @@ GetGopDevicePath (
         EfiBootManagerUpdateConsoleVariable (ConOutDev, TempDevicePath, NULL);\r
       }\r
     }\r
+\r
     gBS->FreePool (GopHandleBuffer);\r
   }\r
 \r
@@ -700,7 +775,7 @@ GetGopDevicePath (
 **/\r
 EFI_STATUS\r
 PreparePciDisplayDevicePath (\r
-  IN EFI_HANDLE                DeviceHandle\r
+  IN EFI_HANDLE  DeviceHandle\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -709,11 +784,11 @@ PreparePciDisplayDevicePath (
 \r
   DevicePath    = NULL;\r
   GopDevicePath = NULL;\r
-  Status = gBS->HandleProtocol (\r
-                  DeviceHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID*)&DevicePath\r
-                  );\r
+  Status        = gBS->HandleProtocol (\r
+                         DeviceHandle,\r
+                         &gEfiDevicePathProtocolGuid,\r
+                         (VOID *)&DevicePath\r
+                         );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -739,26 +814,30 @@ PreparePciDisplayDevicePath (
 **/\r
 EFI_STATUS\r
 PreparePciSerialDevicePath (\r
-  IN EFI_HANDLE                DeviceHandle\r
+  IN EFI_HANDLE  DeviceHandle\r
   )\r
 {\r
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r
   DevicePath = NULL;\r
-  Status = gBS->HandleProtocol (\r
-                  DeviceHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID*)&DevicePath\r
-                  );\r
+  Status     = gBS->HandleProtocol (\r
+                      DeviceHandle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      (VOID *)&DevicePath\r
+                      );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode\r
+                 );\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
   EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
@@ -774,24 +853,24 @@ VisitAllInstancesOfProtocol (
   IN VOID                        *Context\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINTN                     HandleCount;\r
-  EFI_HANDLE                *HandleBuffer;\r
-  UINTN                     Index;\r
-  VOID                      *Instance;\r
+  EFI_STATUS  Status;\r
+  UINTN       HandleCount;\r
+  EFI_HANDLE  *HandleBuffer;\r
+  UINTN       Index;\r
+  VOID        *Instance;\r
 \r
   //\r
   // Start to check all the PciIo to find all possible device\r
   //\r
-  HandleCount = 0;\r
+  HandleCount  = 0;\r
   HandleBuffer = NULL;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  Id,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &HandleBuffer\r
-                  );\r
+  Status       = gBS->LocateHandleBuffer (\r
+                        ByProtocol,\r
+                        Id,\r
+                        NULL,\r
+                        &HandleCount,\r
+                        &HandleBuffer\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -802,11 +881,11 @@ VisitAllInstancesOfProtocol (
       continue;\r
     }\r
 \r
-    Status = (*CallBackFunction) (\r
-               HandleBuffer[Index],\r
-               Instance,\r
-               Context\r
-               );\r
+    Status = (*CallBackFunction)(\r
+  HandleBuffer[Index],\r
+  Instance,\r
+  Context\r
+  );\r
   }\r
 \r
   gBS->FreePool (HandleBuffer);\r
@@ -814,7 +893,6 @@ VisitAllInstancesOfProtocol (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VisitingAPciInstance (\r
@@ -823,49 +901,45 @@ VisitingAPciInstance (
   IN VOID        *Context\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_PCI_IO_PROTOCOL       *PciIo;\r
-  PCI_TYPE00                Pci;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
 \r
-  PciIo = (EFI_PCI_IO_PROTOCOL*) Instance;\r
+  PciIo = (EFI_PCI_IO_PROTOCOL *)Instance;\r
 \r
   //\r
   // Check for all PCI device\r
   //\r
   Status = PciIo->Pci.Read (\r
-                    PciIo,\r
-                    EfiPciIoWidthUint32,\r
-                    0,\r
-                    sizeof (Pci) / sizeof (UINT32),\r
-                    &Pci\r
-                    );\r
+                        PciIo,\r
+                        EfiPciIoWidthUint32,\r
+                        0,\r
+                        sizeof (Pci) / sizeof (UINT32),\r
+                        &Pci\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  return (*(VISIT_PCI_INSTANCE_CALLBACK)(UINTN) Context) (\r
-           Handle,\r
-           PciIo,\r
-           &Pci\r
-           );\r
-\r
+  return (*(VISIT_PCI_INSTANCE_CALLBACK)(UINTN)Context)(\r
+  Handle,\r
+  PciIo,\r
+  &Pci\r
+  );\r
 }\r
 \r
-\r
-\r
 EFI_STATUS\r
 VisitAllPciInstances (\r
-  IN VISIT_PCI_INSTANCE_CALLBACK CallBackFunction\r
+  IN VISIT_PCI_INSTANCE_CALLBACK  CallBackFunction\r
   )\r
 {\r
   return VisitAllInstancesOfProtocol (\r
            &gEfiPciIoProtocolGuid,\r
            VisitingAPciInstance,\r
-           (VOID*)(UINTN) CallBackFunction\r
+           (VOID *)(UINTN)CallBackFunction\r
            );\r
 }\r
 \r
-\r
 /**\r
   Do platform specific PCI Device check and add them to\r
   ConOut, ConIn, ErrOut.\r
@@ -887,14 +961,14 @@ DetectAndPreparePlatformPciDevicePath (
   IN PCI_TYPE00           *Pci\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = PciIo->Attributes (\r
-    PciIo,\r
-    EfiPciIoAttributeOperationEnable,\r
-    EFI_PCI_DEVICE_ENABLE,\r
-    NULL\r
-    );\r
+                    PciIo,\r
+                    EfiPciIoAttributeOperationEnable,\r
+                    EFI_PCI_DEVICE_ENABLE,\r
+                    NULL\r
+                    );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -905,7 +979,8 @@ DetectAndPreparePlatformPciDevicePath (
        (Pci->Hdr.VendorId == 0x8086) &&\r
        (Pci->Hdr.DeviceId == 0x7000)\r
       )\r
-     ) {\r
+      )\r
+  {\r
     //\r
     // Add IsaKeyboard to ConIn,\r
     // add IsaSerial to ConOut, ConIn, ErrOut\r
@@ -914,6 +989,7 @@ DetectAndPreparePlatformPciDevicePath (
     PrepareLpcBridgeDevicePath (Handle);\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // Here we decide which Serial device to enable in PCI bus\r
   //\r
@@ -941,7 +1017,6 @@ DetectAndPreparePlatformPciDevicePath (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Connect the predefined platform default console device.\r
 \r
@@ -951,10 +1026,10 @@ DetectAndPreparePlatformPciDevicePath (
 **/\r
 VOID\r
 PlatformInitializeConsole (\r
-  IN PLATFORM_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
+  IN PLATFORM_CONSOLE_CONNECT_ENTRY  *PlatformConsole\r
   )\r
 {\r
-  UINTN                              Index;\r
+  UINTN  Index;\r
 \r
   //\r
   // Do platform specific PCI Device check and add them to ConOut, ConIn,\r
@@ -972,21 +1047,31 @@ PlatformInitializeConsole (
     // Update the console variable with the connect type\r
     //\r
     if ((PlatformConsole[Index].ConnectType & CONSOLE_IN) == CONSOLE_IN) {\r
-      EfiBootManagerUpdateConsoleVariable (ConIn,\r
-        PlatformConsole[Index].DevicePath, NULL);\r
+      EfiBootManagerUpdateConsoleVariable (\r
+        ConIn,\r
+        PlatformConsole[Index].DevicePath,\r
+        NULL\r
+        );\r
     }\r
+\r
     if ((PlatformConsole[Index].ConnectType & CONSOLE_OUT) == CONSOLE_OUT) {\r
-      EfiBootManagerUpdateConsoleVariable (ConOut,\r
-        PlatformConsole[Index].DevicePath, NULL);\r
+      EfiBootManagerUpdateConsoleVariable (\r
+        ConOut,\r
+        PlatformConsole[Index].DevicePath,\r
+        NULL\r
+        );\r
     }\r
+\r
     if ((PlatformConsole[Index].ConnectType & STD_ERROR) == STD_ERROR) {\r
-      EfiBootManagerUpdateConsoleVariable (ErrOut,\r
-        PlatformConsole[Index].DevicePath, NULL);\r
+      EfiBootManagerUpdateConsoleVariable (\r
+        ErrOut,\r
+        PlatformConsole[Index].DevicePath,\r
+        NULL\r
+        );\r
     }\r
   }\r
 }\r
 \r
-\r
 /**\r
   Configure PCI Interrupt Line register for applicable devices\r
   Ported from SeaBIOS, src/fw/pciinit.c, *_pci_slot_get_irq()\r
@@ -1017,15 +1102,15 @@ SetPciIntLine (
   Status = EFI_SUCCESS;\r
 \r
   if (PciHdr->Device.InterruptPin != 0) {\r
-\r
     DevPathNode = DevicePathFromHandle (Handle);\r
     ASSERT (DevPathNode != NULL);\r
     DevPath = DevPathNode;\r
 \r
     RootBusNumber = 0;\r
-    if (DevicePathType (DevPathNode) == ACPI_DEVICE_PATH &&\r
-        DevicePathSubType (DevPathNode) == ACPI_DP &&\r
-        ((ACPI_HID_DEVICE_PATH *)DevPathNode)->HID == EISA_PNP_ID(0x0A03)) {\r
+    if ((DevicePathType (DevPathNode) == ACPI_DEVICE_PATH) &&\r
+        (DevicePathSubType (DevPathNode) == ACPI_DP) &&\r
+        (((ACPI_HID_DEVICE_PATH *)DevPathNode)->HID == EISA_PNP_ID (0x0A03)))\r
+    {\r
       RootBusNumber = ((ACPI_HID_DEVICE_PATH *)DevPathNode)->UID;\r
     }\r
 \r
@@ -1033,13 +1118,13 @@ SetPciIntLine (
     // Compute index into PciHostIrqs[] table by walking\r
     // the device path and adding up all device numbers\r
     //\r
-    Status = EFI_NOT_FOUND;\r
+    Status   = EFI_NOT_FOUND;\r
     RootSlot = 0;\r
-    Idx = PciHdr->Device.InterruptPin - 1;\r
+    Idx      = PciHdr->Device.InterruptPin - 1;\r
     while (!IsDevicePathEnd (DevPathNode)) {\r
-      if (DevicePathType (DevPathNode) == HARDWARE_DEVICE_PATH &&\r
-          DevicePathSubType (DevPathNode) == HW_PCI_DP) {\r
-\r
+      if ((DevicePathType (DevPathNode) == HARDWARE_DEVICE_PATH) &&\r
+          (DevicePathSubType (DevPathNode) == HW_PCI_DP))\r
+      {\r
         Idx += ((PCI_DEVICE_PATH *)DevPathNode)->Device;\r
 \r
         //\r
@@ -1050,18 +1135,20 @@ SetPciIntLine (
         // Q35 cases with more than 24 slots on the root bus.\r
         //\r
         if (Status != EFI_SUCCESS) {\r
-          Status = EFI_SUCCESS;\r
+          Status   = EFI_SUCCESS;\r
           RootSlot = ((PCI_DEVICE_PATH *)DevPathNode)->Device;\r
         }\r
       }\r
 \r
       DevPathNode = NextDevicePathNode (DevPathNode);\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-    if (RootBusNumber == 0 && RootSlot == 0) {\r
-      DEBUG((\r
+\r
+    if ((RootBusNumber == 0) && (RootSlot == 0)) {\r
+      DEBUG ((\r
         DEBUG_ERROR,\r
         "%a: PCI host bridge (00:00.0) should have no interrupts!\n",\r
         __FUNCTION__\r
@@ -1095,29 +1182,39 @@ SetPciIntLine (
           //\r
           Idx -= RootSlot;\r
         }\r
+\r
         break;\r
       default:\r
         ASSERT (FALSE); // should never get here\r
     }\r
-    Idx %= ARRAY_SIZE (PciHostIrqs);\r
+\r
+    Idx    %= ARRAY_SIZE (PciHostIrqs);\r
     IrqLine = PciHostIrqs[Idx];\r
 \r
     DEBUG_CODE_BEGIN ();\r
     {\r
-      CHAR16        *DevPathString;\r
-      STATIC CHAR16 Fallback[] = L"<failed to convert>";\r
-      UINTN         Segment, Bus, Device, Function;\r
+      CHAR16         *DevPathString;\r
+      STATIC CHAR16  Fallback[] = L"<failed to convert>";\r
+      UINTN          Segment, Bus, Device, Function;\r
 \r
       DevPathString = ConvertDevicePathToText (DevPath, FALSE, FALSE);\r
       if (DevPathString == NULL) {\r
         DevPathString = Fallback;\r
       }\r
+\r
       Status = PciIo->GetLocation (PciIo, &Segment, &Bus, &Device, &Function);\r
       ASSERT_EFI_ERROR (Status);\r
 \r
-      DEBUG ((DEBUG_VERBOSE, "%a: [%02x:%02x.%x] %s -> 0x%02x\n", __FUNCTION__,\r
-        (UINT32)Bus, (UINT32)Device, (UINT32)Function, DevPathString,\r
-        IrqLine));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: [%02x:%02x.%x] %s -> 0x%02x\n",\r
+        __FUNCTION__,\r
+        (UINT32)Bus,\r
+        (UINT32)Device,\r
+        (UINT32)Function,\r
+        DevPathString,\r
+        IrqLine\r
+        ));\r
 \r
       if (DevPathString != Fallback) {\r
         FreePool (DevPathString);\r
@@ -1129,18 +1226,17 @@ SetPciIntLine (
     // Set PCI Interrupt Line register for this device to PciHostIrqs[Idx]\r
     //\r
     Status = PciIo->Pci.Write (\r
-               PciIo,\r
-               EfiPciIoWidthUint8,\r
-               PCI_INT_LINE_OFFSET,\r
-               1,\r
-               &IrqLine\r
-               );\r
+                          PciIo,\r
+                          EfiPciIoWidthUint8,\r
+                          PCI_INT_LINE_OFFSET,\r
+                          1,\r
+                          &IrqLine\r
+                          );\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 VOID\r
 PciAcpiInitialization (\r
   )\r
@@ -1179,8 +1275,12 @@ PciAcpiInitialization (
       PciWrite8 (PCI_LIB_ADDRESS (0, 0x1f, 0, 0x6b), 0x0b); // H\r
       break;\r
     default:\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, mHostBridgeDevId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        mHostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return;\r
   }\r
@@ -1213,11 +1313,11 @@ ConnectRecursivelyIfPciMassStorage (
   //\r
   if (IS_CLASS1 (PciHeader, PCI_CLASS_MASS_STORAGE)) {\r
     DevicePath = NULL;\r
-    Status = gBS->HandleProtocol (\r
-                    Handle,\r
-                    &gEfiDevicePathProtocolGuid,\r
-                    (VOID*)&DevicePath\r
-                    );\r
+    Status     = gBS->HandleProtocol (\r
+                        Handle,\r
+                        &gEfiDevicePathProtocolGuid,\r
+                        (VOID *)&DevicePath\r
+                        );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -1227,29 +1327,27 @@ ConnectRecursivelyIfPciMassStorage (
     //\r
     DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);\r
     if (DevPathStr != NULL) {\r
-      DEBUG((\r
+      DEBUG ((\r
         DEBUG_INFO,\r
         "Found %s device: %s\n",\r
         (IS_CLASS1 (PciHeader, PCI_CLASS_MASS_STORAGE) ?\r
          L"Mass Storage" :\r
          L"Xen"\r
-         ),\r
+        ),\r
         DevPathStr\r
         ));\r
-      FreePool(DevPathStr);\r
+      FreePool (DevPathStr);\r
     }\r
 \r
     Status = gBS->ConnectController (Handle, NULL, NULL, TRUE);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This notification function is invoked when the\r
   EMU Variable FVB has been changed.\r
@@ -1261,15 +1359,14 @@ ConnectRecursivelyIfPciMassStorage (
 VOID\r
 EFIAPI\r
 EmuVariablesUpdatedCallback (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
   DEBUG ((DEBUG_INFO, "EmuVariablesUpdatedCallback\n"));\r
   UpdateNvVarsOnFileSystem ();\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VisitingFileSystemInstance (\r
@@ -1292,7 +1389,7 @@ VisitingFileSystemInstance (
   }\r
 \r
   ConnectedToFileSystem = TRUE;\r
-  mEmuVariableEvent =\r
+  mEmuVariableEvent     =\r
     EfiCreateProtocolNotifyEvent (\r
       &gEfiDevicePathProtocolGuid,\r
       TPL_CALLBACK,\r
@@ -1300,14 +1397,15 @@ VisitingFileSystemInstance (
       NULL,\r
       &mEmuVariableEventReg\r
       );\r
-  PcdStatus = PcdSet64S (PcdEmuVariableEvent,\r
-                (UINT64)(UINTN) mEmuVariableEvent);\r
+  PcdStatus = PcdSet64S (\r
+                PcdEmuVariableEvent,\r
+                (UINT64)(UINTN)mEmuVariableEvent\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 VOID\r
 PlatformBdsRestoreNvVarsFromHardDisk (\r
   )\r
@@ -1318,7 +1416,6 @@ PlatformBdsRestoreNvVarsFromHardDisk (
     VisitingFileSystemInstance,\r
     NULL\r
     );\r
-\r
 }\r
 \r
 /**\r
@@ -1331,7 +1428,7 @@ PlatformBdsConnectSequence (
   VOID\r
   )\r
 {\r
-  UINTN         Index;\r
+  UINTN  Index;\r
 \r
   DEBUG ((DEBUG_INFO, "PlatformBdsConnectSequence\n"));\r
 \r
@@ -1363,8 +1460,8 @@ PlatformBdsConnectSequence (
   Note that DxeSmmReadyToLock must be signaled after this function returns;\r
   otherwise the script wouldn't be saved actually.\r
 **/\r
-#if defined(__GNUC__)\r
-__attribute__((unused))\r
+#if defined (__GNUC__)\r
+__attribute__ ((unused))\r
 #endif\r
 STATIC\r
 VOID\r
@@ -1372,12 +1469,15 @@ SaveS3BootScript (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_S3_SAVE_STATE_PROTOCOL *BootScript;\r
-  STATIC CONST UINT8         Info[] = { 0xDE, 0xAD, 0xBE, 0xEF };\r
+  EFI_STATUS                  Status;\r
+  EFI_S3_SAVE_STATE_PROTOCOL  *BootScript;\r
+  STATIC CONST UINT8          Info[] = { 0xDE, 0xAD, 0xBE, 0xEF };\r
 \r
-  Status = gBS->LocateProtocol (&gEfiS3SaveStateProtocolGuid, NULL,\r
-                  (VOID **) &BootScript);\r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiS3SaveStateProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&BootScript\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -1385,13 +1485,15 @@ SaveS3BootScript (
   // implementation embeds a deep copy of the info in the boot script, rather\r
   // than storing just a pointer to runtime or NVS storage.\r
   //\r
-  Status = BootScript->Write(BootScript, EFI_BOOT_SCRIPT_INFORMATION_OPCODE,\r
-                         (UINT32) sizeof Info,\r
-                         (EFI_PHYSICAL_ADDRESS)(UINTN) &Info);\r
+  Status = BootScript->Write (\r
+                         BootScript,\r
+                         EFI_BOOT_SCRIPT_INFORMATION_OPCODE,\r
+                         (UINT32)sizeof Info,\r
+                         (EFI_PHYSICAL_ADDRESS)(UINTN)&Info\r
+                         );\r
   ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
-\r
 /**\r
   Do the platform specific action after the console is ready\r
 \r
@@ -1411,18 +1513,22 @@ PlatformBootManagerAfterConsole (
   VOID\r
   )\r
 {\r
-  EFI_BOOT_MODE                      BootMode;\r
+  EFI_BOOT_MODE  BootMode;\r
 \r
   DEBUG ((DEBUG_INFO, "PlatformBootManagerAfterConsole\n"));\r
 \r
   if (PcdGetBool (PcdOvmfFlashVariablesEnable)) {\r
-    DEBUG ((DEBUG_INFO, "PlatformBdsPolicyBehavior: not restoring NvVars "\r
-      "from disk since flash variables appear to be supported.\n"));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "PlatformBdsPolicyBehavior: not restoring NvVars "\r
+      "from disk since flash variables appear to be supported.\n"\r
+      ));\r
   } else {\r
     //\r
     // Try to restore variables from the hard disk early so\r
     // they can be used for the other BDS connect operations.\r
     //\r
+\r
     /* XXX Calling this causes Keyboard to be removed from ConIn which\r
        results in unresponsive guest boot loaders in the GUI. Restore it\r
        when we figure out what is needed to get NvVars storage done\r
@@ -1464,7 +1570,9 @@ PlatformBootManagerAfterConsole (
   // Register UEFI Shell\r
   //\r
   PlatformRegisterFvBootOption (\r
-    &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE\r
+    &gUefiShellFileGuid,\r
+    L"EFI Internal Shell",\r
+    LOAD_OPTION_ACTIVE\r
     );\r
 \r
   RemoveStaleFvFileOptions ();\r
@@ -1483,31 +1591,31 @@ PlatformBootManagerAfterConsole (
 VOID\r
 EFIAPI\r
 NotifyDevPath (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  EFI_HANDLE                            Handle;\r
-  EFI_STATUS                            Status;\r
-  UINTN                                 BufferSize;\r
-  EFI_DEVICE_PATH_PROTOCOL             *DevPathNode;\r
-  ATAPI_DEVICE_PATH                    *Atapi;\r
+  EFI_HANDLE                Handle;\r
+  EFI_STATUS                Status;\r
+  UINTN                     BufferSize;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevPathNode;\r
+  ATAPI_DEVICE_PATH         *Atapi;\r
 \r
   //\r
   // Examine all new handles\r
   //\r
-  for (;;) {\r
+  for ( ; ;) {\r
     //\r
     // Get the next handle\r
     //\r
     BufferSize = sizeof (Handle);\r
-    Status = gBS->LocateHandle (\r
-              ByRegisterNotify,\r
-              NULL,\r
-              mEfiDevPathNotifyReg,\r
-              &BufferSize,\r
-              &Handle\r
-              );\r
+    Status     = gBS->LocateHandle (\r
+                        ByRegisterNotify,\r
+                        NULL,\r
+                        mEfiDevPathNotifyReg,\r
+                        &BufferSize,\r
+                        &Handle\r
+                        );\r
 \r
     //\r
     // If not found, we're done\r
@@ -1523,8 +1631,11 @@ NotifyDevPath (
     //\r
     // Get the DevicePath protocol on that handle\r
     //\r
-    Status = gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid,\r
-                    (VOID **)&DevPathNode);\r
+    Status = gBS->HandleProtocol (\r
+                    Handle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    (VOID **)&DevPathNode\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     while (!IsDevicePathEnd (DevPathNode)) {\r
@@ -1532,16 +1643,17 @@ NotifyDevPath (
       // Find the handler to dump this device path node\r
       //\r
       if (\r
-           (DevicePathType(DevPathNode) == MESSAGING_DEVICE_PATH) &&\r
-           (DevicePathSubType(DevPathNode) == MSG_ATAPI_DP)\r
-         ) {\r
-        Atapi = (ATAPI_DEVICE_PATH*) DevPathNode;\r
+          (DevicePathType (DevPathNode) == MESSAGING_DEVICE_PATH) &&\r
+          (DevicePathSubType (DevPathNode) == MSG_ATAPI_DP)\r
+          )\r
+      {\r
+        Atapi = (ATAPI_DEVICE_PATH *)DevPathNode;\r
         PciOr16 (\r
           PCI_LIB_ADDRESS (\r
             0,\r
             1,\r
             1,\r
-            (Atapi->PrimarySecondary == 1) ? 0x42: 0x40\r
+            (Atapi->PrimarySecondary == 1) ? 0x42 : 0x40\r
             ),\r
           BIT15\r
           );\r
@@ -1557,7 +1669,6 @@ NotifyDevPath (
   return;\r
 }\r
 \r
-\r
 VOID\r
 InstallDevicePathCallback (\r
   VOID\r
@@ -1565,12 +1676,12 @@ InstallDevicePathCallback (
 {\r
   DEBUG ((DEBUG_INFO, "Registered NotifyDevPath Event\n"));\r
   mEfiDevPathEvent = EfiCreateProtocolNotifyEvent (\r
-                          &gEfiDevicePathProtocolGuid,\r
-                          TPL_CALLBACK,\r
-                          NotifyDevPath,\r
-                          NULL,\r
-                          &mEfiDevPathNotifyReg\r
-                          );\r
+                       &gEfiDevicePathProtocolGuid,\r
+                       TPL_CALLBACK,\r
+                       NotifyDevPath,\r
+                       NULL,\r
+                       &mEfiDevPathNotifyReg\r
+                       );\r
 }\r
 \r
 /**\r
@@ -1582,12 +1693,12 @@ InstallDevicePathCallback (
 VOID\r
 EFIAPI\r
 PlatformBootManagerWaitCallback (\r
-  UINT16          TimeoutRemain\r
+  UINT16  TimeoutRemain\r
   )\r
 {\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Black;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White;\r
-  UINT16                              Timeout;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION  Black;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION  White;\r
+  UINT16                               Timeout;\r
 \r
   Timeout = PcdGet16 (PcdPlatformBootTimeOut);\r
 \r
@@ -1617,10 +1728,10 @@ PlatformBootManagerUnableToBoot (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_INPUT_KEY                Key;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION BootManagerMenu;\r
-  UINTN                        Index;\r
+  EFI_STATUS                    Status;\r
+  EFI_INPUT_KEY                 Key;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  BootManagerMenu;\r
+  UINTN                         Index;\r
 \r
   //\r
   // BootManagerMenu doesn't contain the correct information when return status\r
@@ -1630,6 +1741,7 @@ PlatformBootManagerUnableToBoot (
   if (EFI_ERROR (Status)) {\r
     return;\r
   }\r
+\r
   //\r
   // Normally BdsDxe does not print anything to the system console, but this is\r
   // a last resort -- the end-user will likely not see any DEBUG messages\r
@@ -1659,7 +1771,7 @@ PlatformBootManagerUnableToBoot (
     }\r
   }\r
 \r
-  for (;;) {\r
+  for ( ; ;) {\r
     EfiBootManagerBoot (&BootManagerMenu);\r
   }\r
 }\r
index 382fe191a93e6280d1745ea213bd195fffaf7fae..9be184cb64af7e8c2f24761430db7653257aeaee 100644 (file)
@@ -18,7 +18,6 @@ Abstract:
 #ifndef _PLATFORM_SPECIFIC_BDS_PLATFORM_H_\r
 #define _PLATFORM_SPECIFIC_BDS_PLATFORM_H_\r
 \r
-\r
 #include <PiDxe.h>\r
 \r
 #include <IndustryStandard/Pci.h>\r
@@ -65,11 +64,11 @@ Abstract:
 \r
 #include <OvmfPlatforms.h>\r
 \r
-extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformConnectSequence[];\r
-extern ACPI_HID_DEVICE_PATH       gPnpPs2KeyboardDeviceNode;\r
-extern ACPI_HID_DEVICE_PATH       gPnp16550ComPortDeviceNode;\r
-extern UART_DEVICE_PATH           gUartDeviceNode;\r
-extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;\r
+extern EFI_DEVICE_PATH_PROTOCOL  *gPlatformConnectSequence[];\r
+extern ACPI_HID_DEVICE_PATH      gPnpPs2KeyboardDeviceNode;\r
+extern ACPI_HID_DEVICE_PATH      gPnp16550ComPortDeviceNode;\r
+extern UART_DEVICE_PATH          gUartDeviceNode;\r
+extern VENDOR_DEVICE_PATH        gTerminalTypeDeviceNode;\r
 \r
 #define PCI_DEVICE_PATH_NODE(Func, Dev) \\r
   { \\r
@@ -151,20 +150,20 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
     } \\r
   }\r
 \r
-#define PCI_CLASS_SCC          0x07\r
-#define PCI_SUBCLASS_SERIAL    0x00\r
-#define PCI_IF_16550           0x02\r
-#define IS_PCI_16550SERIAL(_p)           IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)\r
-#define IS_PCI_ISA_PDECODE(_p)        IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA_PDECODE, 0)\r
+#define PCI_CLASS_SCC        0x07\r
+#define PCI_SUBCLASS_SERIAL  0x00\r
+#define PCI_IF_16550         0x02\r
+#define IS_PCI_16550SERIAL(_p)  IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)\r
+#define IS_PCI_ISA_PDECODE(_p)  IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA_PDECODE, 0)\r
 \r
 typedef struct {\r
-  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
-  UINTN                     ConnectType;\r
+  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;\r
+  UINTN                       ConnectType;\r
 } PLATFORM_CONSOLE_CONNECT_ENTRY;\r
 \r
-#define CONSOLE_OUT BIT0\r
-#define CONSOLE_IN  BIT1\r
-#define STD_ERROR   BIT2\r
+#define CONSOLE_OUT  BIT0\r
+#define CONSOLE_IN   BIT1\r
+#define STD_ERROR    BIT2\r
 extern PLATFORM_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r
 \r
 //\r
@@ -173,7 +172,7 @@ extern PLATFORM_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];
 \r
 VOID\r
 PlatformInitializeConsole (\r
-  IN PLATFORM_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
+  IN PLATFORM_CONSOLE_CONNECT_ENTRY  *PlatformConsole\r
   );\r
 \r
 /**\r
index 73674d536dce69e8715f609015ab5cb9683a4d4a..b57789b73d05d44ffc082d74a07253598374c26a 100644 (file)
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH        VendorHardware;\r
-  UART_DEVICE_PATH          Uart;\r
-  VENDOR_DEVICE_PATH        TerminalType;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
+  VENDOR_DEVICE_PATH          VendorHardware;\r
+  UART_DEVICE_PATH            Uart;\r
+  VENDOR_DEVICE_PATH          TerminalType;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } VENDOR_UART_DEVICE_PATH;\r
 #pragma pack()\r
 \r
@@ -28,8 +28,8 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  USB_CLASS_DEVICE_PATH    Keyboard;\r
-  EFI_DEVICE_PATH_PROTOCOL End;\r
+  USB_CLASS_DEVICE_PATH       Keyboard;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } USB_KEYBOARD_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
@@ -38,33 +38,32 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH        Vendor;\r
-  ACPI_ADR_DEVICE_PATH      AcpiAdr;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
+  VENDOR_DEVICE_PATH          Vendor;\r
+  ACPI_ADR_DEVICE_PATH        AcpiAdr;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } VENDOR_RAMFB_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
-ACPI_HID_DEVICE_PATH       gPnpPs2KeyboardDeviceNode  = gPnpPs2Keyboard;\r
-ACPI_HID_DEVICE_PATH       gPnp16550ComPortDeviceNode = gPnp16550ComPort;\r
-UART_DEVICE_PATH           gUartDeviceNode            = gUart;\r
-VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode    = gPcAnsiTerminal;\r
+ACPI_HID_DEVICE_PATH  gPnpPs2KeyboardDeviceNode  = gPnpPs2Keyboard;\r
+ACPI_HID_DEVICE_PATH  gPnp16550ComPortDeviceNode = gPnp16550ComPort;\r
+UART_DEVICE_PATH      gUartDeviceNode            = gUart;\r
+VENDOR_DEVICE_PATH    gTerminalTypeDeviceNode    = gPcAnsiTerminal;\r
 \r
 //\r
 // Platform specific keyboard device path\r
 //\r
 \r
-\r
 //\r
 // Debug Agent UART Device Path\r
 //\r
-VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {\r
+VENDOR_UART_DEVICE_PATH  gDebugAgentUartDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     EFI_DEBUG_AGENT_GUID,\r
@@ -74,8 +73,8 @@ VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {
       MESSAGING_DEVICE_PATH,\r
       MSG_UART_DP,\r
       {\r
-        (UINT8) (sizeof (UART_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (UART_DEVICE_PATH)),\r
+        (UINT8)((sizeof (UART_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     0,  // Reserved\r
@@ -88,7 +87,7 @@ VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {
   gEndEntire\r
 };\r
 \r
-STATIC USB_KEYBOARD_DEVICE_PATH gUsbKeyboardDevicePath = {\r
+STATIC USB_KEYBOARD_DEVICE_PATH  gUsbKeyboardDevicePath = {\r
   {\r
     {\r
       MESSAGING_DEVICE_PATH,\r
@@ -107,14 +106,14 @@ STATIC USB_KEYBOARD_DEVICE_PATH gUsbKeyboardDevicePath = {
   gEndEntire\r
 };\r
 \r
-STATIC VENDOR_RAMFB_DEVICE_PATH gQemuRamfbDevicePath = {\r
+STATIC VENDOR_RAMFB_DEVICE_PATH  gQemuRamfbDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     QEMU_RAMFB_GUID,\r
@@ -124,8 +123,8 @@ STATIC VENDOR_RAMFB_DEVICE_PATH gQemuRamfbDevicePath = {
       ACPI_DEVICE_PATH,\r
       ACPI_ADR_DP,\r
       {\r
-        (UINT8) (sizeof (ACPI_ADR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (ACPI_ADR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (ACPI_ADR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (ACPI_ADR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     ACPI_DISPLAY_ADR (\r
@@ -145,9 +144,9 @@ STATIC VENDOR_RAMFB_DEVICE_PATH gQemuRamfbDevicePath = {
 //\r
 // Predefined platform default console device path\r
 //\r
-PLATFORM_CONSOLE_CONNECT_ENTRY   gPlatformConsole[] = {\r
+PLATFORM_CONSOLE_CONNECT_ENTRY  gPlatformConsole[] = {\r
   {\r
-    (EFI_DEVICE_PATH_PROTOCOL *) &gDebugAgentUartDevicePath,\r
+    (EFI_DEVICE_PATH_PROTOCOL *)&gDebugAgentUartDevicePath,\r
     (CONSOLE_OUT | CONSOLE_IN | STD_ERROR)\r
   },\r
   {\r
@@ -167,5 +166,4 @@ PLATFORM_CONSOLE_CONNECT_ENTRY   gPlatformConsole[] = {
 //\r
 // Predefined platform connect sequence\r
 //\r
-EFI_DEVICE_PATH_PROTOCOL    *gPlatformConnectSequence[] = { NULL };\r
-\r
+EFI_DEVICE_PATH_PROTOCOL  *gPlatformConnectSequence[] = { NULL };\r
index e238af21f13a749eddd153c32bfc2c48f586c92e..9c6848bbffb4c542e2837126cb238e6bcc4f22e6 100644 (file)
 #include <Library/PlatformBmPrintScLib.h>\r
 #include <Library/Tcg2PhysicalPresenceLib.h>\r
 \r
-\r
 //\r
 // Global data\r
 //\r
 \r
-VOID          *mEfiDevPathNotifyReg;\r
-EFI_EVENT     mEfiDevPathEvent;\r
-UINT16        mHostBridgeDevId;\r
+VOID       *mEfiDevPathNotifyReg;\r
+EFI_EVENT  mEfiDevPathEvent;\r
+UINT16     mHostBridgeDevId;\r
 \r
 //\r
 // Table of host IRQs matching PCI IRQs A-D\r
 // (for configuring PCI Interrupt Line register)\r
 //\r
-CONST UINT8 PciHostIrqs[] = {\r
+CONST UINT8  PciHostIrqs[] = {\r
   0x0a, 0x0a, 0x0b, 0x0b\r
 };\r
 \r
@@ -55,7 +54,6 @@ EFI_STATUS
   IN PCI_TYPE00           *Pci\r
   );\r
 \r
-\r
 //\r
 // Function prototypes\r
 //\r
@@ -69,7 +67,7 @@ VisitAllInstancesOfProtocol (
 \r
 EFI_STATUS\r
 VisitAllPciInstancesOfProtocol (\r
-  IN VISIT_PCI_INSTANCE_CALLBACK CallBackFunction\r
+  IN VISIT_PCI_INSTANCE_CALLBACK  CallBackFunction\r
   );\r
 \r
 VOID\r
@@ -79,24 +77,24 @@ InstallDevicePathCallback (
 \r
 VOID\r
 PlatformRegisterFvBootOption (\r
-  EFI_GUID                         *FileGuid,\r
-  CHAR16                           *Description,\r
-  UINT32                           Attributes\r
+  EFI_GUID  *FileGuid,\r
+  CHAR16    *Description,\r
+  UINT32    Attributes\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  INTN                              OptionIndex;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION      NewOption;\r
-  EFI_BOOT_MANAGER_LOAD_OPTION      *BootOptions;\r
-  UINTN                             BootOptionCount;\r
-  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;\r
-  EFI_LOADED_IMAGE_PROTOCOL         *LoadedImage;\r
-  EFI_DEVICE_PATH_PROTOCOL          *DevicePath;\r
+  EFI_STATUS                         Status;\r
+  INTN                               OptionIndex;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION       NewOption;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION       *BootOptions;\r
+  UINTN                              BootOptionCount;\r
+  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  FileNode;\r
+  EFI_LOADED_IMAGE_PROTOCOL          *LoadedImage;\r
+  EFI_DEVICE_PATH_PROTOCOL           *DevicePath;\r
 \r
   Status = gBS->HandleProtocol (\r
                   gImageHandle,\r
                   &gEfiLoadedImageProtocolGuid,\r
-                  (VOID **) &LoadedImage\r
+                  (VOID **)&LoadedImage\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -105,7 +103,7 @@ PlatformRegisterFvBootOption (
   ASSERT (DevicePath != NULL);\r
   DevicePath = AppendDevicePathNode (\r
                  DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *) &FileNode\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&FileNode\r
                  );\r
   ASSERT (DevicePath != NULL);\r
 \r
@@ -123,17 +121,21 @@ PlatformRegisterFvBootOption (
   FreePool (DevicePath);\r
 \r
   BootOptions = EfiBootManagerGetLoadOptions (\r
-                  &BootOptionCount, LoadOptionTypeBoot\r
+                  &BootOptionCount,\r
+                  LoadOptionTypeBoot\r
                   );\r
 \r
   OptionIndex = EfiBootManagerFindLoadOption (\r
-                  &NewOption, BootOptions, BootOptionCount\r
+                  &NewOption,\r
+                  BootOptions,\r
+                  BootOptionCount\r
                   );\r
 \r
   if (OptionIndex == -1) {\r
     Status = EfiBootManagerAddLoadOptionVariable (&NewOption, MAX_UINTN);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
+\r
   EfiBootManagerFreeLoadOption (&NewOption);\r
   EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);\r
 }\r
@@ -160,29 +162,34 @@ RemoveStaleFvFileOptions (
   VOID\r
   )\r
 {\r
-  EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;\r
-  UINTN                        BootOptionCount;\r
-  UINTN                        Index;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  *BootOptions;\r
+  UINTN                         BootOptionCount;\r
+  UINTN                         Index;\r
 \r
-  BootOptions = EfiBootManagerGetLoadOptions (&BootOptionCount,\r
-                  LoadOptionTypeBoot);\r
+  BootOptions = EfiBootManagerGetLoadOptions (\r
+                  &BootOptionCount,\r
+                  LoadOptionTypeBoot\r
+                  );\r
 \r
   for (Index = 0; Index < BootOptionCount; ++Index) {\r
-    EFI_DEVICE_PATH_PROTOCOL *Node1, *Node2, *SearchNode;\r
-    EFI_STATUS               Status;\r
-    EFI_HANDLE               FvHandle;\r
+    EFI_DEVICE_PATH_PROTOCOL  *Node1, *Node2, *SearchNode;\r
+    EFI_STATUS                Status;\r
+    EFI_HANDLE                FvHandle;\r
 \r
     //\r
     // If the device path starts with neither MemoryMapped(...) nor Fv(...),\r
     // then delete the boot option.\r
     //\r
     Node1 = BootOptions[Index].FilePath;\r
-    if (!(DevicePathType (Node1) == HARDWARE_DEVICE_PATH &&\r
-          DevicePathSubType (Node1) == HW_MEMMAP_DP) &&\r
-        !(DevicePathType (Node1) == MEDIA_DEVICE_PATH &&\r
-          DevicePathSubType (Node1) == MEDIA_PIWG_FW_VOL_DP)) {\r
+    if (!((DevicePathType (Node1) == HARDWARE_DEVICE_PATH) &&\r
+          (DevicePathSubType (Node1) == HW_MEMMAP_DP)) &&\r
+        !((DevicePathType (Node1) == MEDIA_DEVICE_PATH) &&\r
+          (DevicePathSubType (Node1) == MEDIA_PIWG_FW_VOL_DP)))\r
+    {\r
       EfiBootManagerDeleteLoadOptionVariable (\r
-          BootOptions[Index].OptionNumber, LoadOptionTypeBoot);\r
+        BootOptions[Index].OptionNumber,\r
+        LoadOptionTypeBoot\r
+        );\r
       continue;\r
     }\r
 \r
@@ -191,10 +198,13 @@ RemoveStaleFvFileOptions (
     // option.\r
     //\r
     Node2 = NextDevicePathNode (Node1);\r
-    if (DevicePathType (Node2) != MEDIA_DEVICE_PATH ||\r
-        DevicePathSubType (Node2) != MEDIA_PIWG_FW_FILE_DP) {\r
+    if ((DevicePathType (Node2) != MEDIA_DEVICE_PATH) ||\r
+        (DevicePathSubType (Node2) != MEDIA_PIWG_FW_FILE_DP))\r
+    {\r
       EfiBootManagerDeleteLoadOptionVariable (\r
-        BootOptions[Index].OptionNumber, LoadOptionTypeBoot);\r
+        BootOptions[Index].OptionNumber,\r
+        LoadOptionTypeBoot\r
+        );\r
       continue;\r
     }\r
 \r
@@ -205,23 +215,29 @@ RemoveStaleFvFileOptions (
     // boot option.\r
     //\r
     SearchNode = Node1;\r
-    Status = gBS->LocateDevicePath (&gEfiFirmwareVolume2ProtocolGuid,\r
-                    &SearchNode, &FvHandle);\r
+    Status     = gBS->LocateDevicePath (\r
+                        &gEfiFirmwareVolume2ProtocolGuid,\r
+                        &SearchNode,\r
+                        &FvHandle\r
+                        );\r
 \r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // The firmware volume was found; now let's see if it contains the FvFile\r
       // identified by GUID.\r
       //\r
-      EFI_FIRMWARE_VOLUME2_PROTOCOL     *FvProtocol;\r
-      MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFileNode;\r
-      UINTN                             BufferSize;\r
-      EFI_FV_FILETYPE                   FoundType;\r
-      EFI_FV_FILE_ATTRIBUTES            FileAttributes;\r
-      UINT32                            AuthenticationStatus;\r
-\r
-      Status = gBS->HandleProtocol (FvHandle, &gEfiFirmwareVolume2ProtocolGuid,\r
-                      (VOID **)&FvProtocol);\r
+      EFI_FIRMWARE_VOLUME2_PROTOCOL      *FvProtocol;\r
+      MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvFileNode;\r
+      UINTN                              BufferSize;\r
+      EFI_FV_FILETYPE                    FoundType;\r
+      EFI_FV_FILE_ATTRIBUTES             FileAttributes;\r
+      UINT32                             AuthenticationStatus;\r
+\r
+      Status = gBS->HandleProtocol (\r
+                      FvHandle,\r
+                      &gEfiFirmwareVolume2ProtocolGuid,\r
+                      (VOID **)&FvProtocol\r
+                      );\r
       ASSERT_EFI_ERROR (Status);\r
 \r
       FvFileNode = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)Node2;\r
@@ -250,23 +266,29 @@ RemoveStaleFvFileOptions (
     // Delete the boot option.\r
     //\r
     Status = EfiBootManagerDeleteLoadOptionVariable (\r
-               BootOptions[Index].OptionNumber, LoadOptionTypeBoot);\r
+               BootOptions[Index].OptionNumber,\r
+               LoadOptionTypeBoot\r
+               );\r
     DEBUG_CODE_BEGIN ();\r
-      CHAR16 *DevicePathString;\r
+    CHAR16  *DevicePathString;\r
+\r
+    DevicePathString = ConvertDevicePathToText (\r
+                         BootOptions[Index].FilePath,\r
+                         FALSE,\r
+                         FALSE\r
+                         );\r
+    DEBUG ((\r
+      EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,\r
+      "%a: removing stale Boot#%04x %s: %r\n",\r
+      __FUNCTION__,\r
+      (UINT32)BootOptions[Index].OptionNumber,\r
+      DevicePathString == NULL ? L"<unavailable>" : DevicePathString,\r
+      Status\r
+      ));\r
+    if (DevicePathString != NULL) {\r
+      FreePool (DevicePathString);\r
+    }\r
 \r
-      DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,\r
-                           FALSE, FALSE);\r
-      DEBUG ((\r
-        EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,\r
-        "%a: removing stale Boot#%04x %s: %r\n",\r
-        __FUNCTION__,\r
-        (UINT32)BootOptions[Index].OptionNumber,\r
-        DevicePathString == NULL ? L"<unavailable>" : DevicePathString,\r
-        Status\r
-        ));\r
-      if (DevicePathString != NULL) {\r
-        FreePool (DevicePathString);\r
-      }\r
     DEBUG_CODE_END ();\r
   }\r
 \r
@@ -285,14 +307,15 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 ConnectVirtioPciRng (\r
-  IN EFI_HANDLE Handle,\r
-  IN VOID       *Instance,\r
-  IN VOID       *Context\r
+  IN EFI_HANDLE  Handle,\r
+  IN VOID        *Instance,\r
+  IN VOID        *Context\r
   );\r
 \r
 //\r
 // BDS Platform Functions\r
 //\r
+\r
 /**\r
   Do the platform init, can be customized by OEM/IBV\r
 \r
@@ -312,17 +335,20 @@ PlatformBootManagerBeforeConsole (
   VOID\r
   )\r
 {\r
-  EFI_HANDLE    Handle;\r
-  EFI_STATUS    Status;\r
-  UINT16        FrontPageTimeout;\r
+  EFI_HANDLE  Handle;\r
+  EFI_STATUS  Status;\r
+  UINT16      FrontPageTimeout;\r
 \r
   FrontPageTimeout = 0;\r
 \r
   DEBUG ((DEBUG_INFO, "PlatformBootManagerBeforeConsole\n"));\r
   InstallDevicePathCallback ();\r
 \r
-  VisitAllInstancesOfProtocol (&gEfiPciRootBridgeIoProtocolGuid,\r
-    ConnectRootBridge, NULL);\r
+  VisitAllInstancesOfProtocol (\r
+    &gEfiPciRootBridgeIoProtocolGuid,\r
+    ConnectRootBridge,\r
+    NULL\r
+    );\r
 \r
   //\r
   // Signal the ACPI platform driver that it can download QEMU ACPI tables.\r
@@ -352,9 +378,12 @@ PlatformBootManagerBeforeConsole (
   // Any TPM 2 Physical Presence Interface opcode must be handled before.\r
   //\r
   Handle = NULL;\r
-  Status = gBS->InstallProtocolInterface (&Handle,\r
-                  &gEfiDxeSmmReadyToLockProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  NULL);\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &Handle,\r
+                  &gEfiDxeSmmReadyToLockProtocolGuid,\r
+                  EFI_NATIVE_INTERFACE,\r
+                  NULL\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -376,11 +405,13 @@ PlatformBootManagerBeforeConsole (
   // Install both VIRTIO_DEVICE_PROTOCOL and (dependent) EFI_RNG_PROTOCOL\r
   // instances on Virtio PCI RNG devices.\r
   //\r
-  VisitAllInstancesOfProtocol (&gEfiPciIoProtocolGuid, ConnectVirtioPciRng,\r
-    NULL);\r
+  VisitAllInstancesOfProtocol (\r
+    &gEfiPciIoProtocolGuid,\r
+    ConnectVirtioPciRng,\r
+    NULL\r
+    );\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConnectRootBridge (\r
@@ -389,7 +420,7 @@ ConnectRootBridge (
   IN VOID        *Context\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Make the PCI bus driver connect the root bridge, non-recursively. This\r
@@ -405,34 +436,39 @@ ConnectRootBridge (
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConnectVirtioPciRng (\r
-  IN EFI_HANDLE Handle,\r
-  IN VOID       *Instance,\r
-  IN VOID       *Context\r
+  IN EFI_HANDLE  Handle,\r
+  IN VOID        *Instance,\r
+  IN VOID        *Context\r
   )\r
 {\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  EFI_STATUS          Status;\r
-  UINT16              VendorId;\r
-  UINT16              DeviceId;\r
-  UINT8               RevisionId;\r
-  BOOLEAN             Virtio10;\r
-  UINT16              SubsystemId;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  EFI_STATUS           Status;\r
+  UINT16               VendorId;\r
+  UINT16               DeviceId;\r
+  UINT8                RevisionId;\r
+  BOOLEAN              Virtio10;\r
+  UINT16               SubsystemId;\r
 \r
   PciIo = Instance;\r
 \r
   //\r
   // Read and check VendorId.\r
   //\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_VENDOR_ID_OFFSET,\r
-                        1, &VendorId);\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint16,\r
+                        PCI_VENDOR_ID_OFFSET,\r
+                        1,\r
+                        &VendorId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
+\r
   if (VendorId != VIRTIO_VENDOR_ID) {\r
     return EFI_SUCCESS;\r
   }\r
@@ -440,13 +476,24 @@ ConnectVirtioPciRng (
   //\r
   // Read DeviceId and RevisionId.\r
   //\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_DEVICE_ID_OFFSET,\r
-                        1, &DeviceId);\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint16,\r
+                        PCI_DEVICE_ID_OFFSET,\r
+                        1,\r
+                        &DeviceId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, PCI_REVISION_ID_OFFSET,\r
-                        1, &RevisionId);\r
+\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint8,\r
+                        PCI_REVISION_ID_OFFSET,\r
+                        1,\r
+                        &RevisionId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
@@ -458,10 +505,11 @@ ConnectVirtioPciRng (
   // SubsystemId will only play a sanity-check role. Otherwise, DeviceId can\r
   // only be sanity-checked, and SubsystemId will decide.\r
   //\r
-  if (DeviceId == 0x1040 + VIRTIO_SUBSYSTEM_ENTROPY_SOURCE &&\r
-      RevisionId >= 0x01) {\r
+  if ((DeviceId == 0x1040 + VIRTIO_SUBSYSTEM_ENTROPY_SOURCE) &&\r
+      (RevisionId >= 0x01))\r
+  {\r
     Virtio10 = TRUE;\r
-  } else if (DeviceId >= 0x1000 && DeviceId <= 0x103F && RevisionId == 0x00) {\r
+  } else if ((DeviceId >= 0x1000) && (DeviceId <= 0x103F) && (RevisionId == 0x00)) {\r
     Virtio10 = FALSE;\r
   } else {\r
     return EFI_SUCCESS;\r
@@ -470,13 +518,20 @@ ConnectVirtioPciRng (
   //\r
   // Read and check SubsystemId as dictated by Virtio10.\r
   //\r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16,\r
-                        PCI_SUBSYSTEM_ID_OFFSET, 1, &SubsystemId);\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint16,\r
+                        PCI_SUBSYSTEM_ID_OFFSET,\r
+                        1,\r
+                        &SubsystemId\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
-  if ((Virtio10 && SubsystemId >= 0x40) ||\r
-      (!Virtio10 && SubsystemId == VIRTIO_SUBSYSTEM_ENTROPY_SOURCE)) {\r
+\r
+  if ((Virtio10 && (SubsystemId >= 0x40)) ||\r
+      (!Virtio10 && (SubsystemId == VIRTIO_SUBSYSTEM_ENTROPY_SOURCE)))\r
+  {\r
     Status = gBS->ConnectController (\r
                     Handle, // ControllerHandle\r
                     NULL,   // DriverImageHandle -- connect all drivers\r
@@ -487,6 +542,7 @@ ConnectVirtioPciRng (
       goto Error;\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 \r
 Error:\r
@@ -494,7 +550,6 @@ Error:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Add IsaKeyboard to ConIn; add IsaSerial to ConOut, ConIn, ErrOut.\r
 \r
@@ -508,7 +563,7 @@ Error:
 **/\r
 EFI_STATUS\r
 PrepareLpcBridgeDevicePath (\r
-  IN EFI_HANDLE                DeviceHandle\r
+  IN EFI_HANDLE  DeviceHandle\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -517,50 +572,59 @@ PrepareLpcBridgeDevicePath (
   CHAR16                    *DevPathStr;\r
 \r
   DevicePath = NULL;\r
-  Status = gBS->HandleProtocol (\r
-                  DeviceHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID*)&DevicePath\r
-                  );\r
+  Status     = gBS->HandleProtocol (\r
+                      DeviceHandle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      (VOID *)&DevicePath\r
+                      );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   TempDevicePath = DevicePath;\r
 \r
   //\r
   // Register Keyboard\r
   //\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnpPs2KeyboardDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnpPs2KeyboardDeviceNode\r
+                 );\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
 \r
   //\r
   // Register COM1\r
   //\r
-  DevicePath = TempDevicePath;\r
+  DevicePath                     = TempDevicePath;\r
   gPnp16550ComPortDeviceNode.UID = 0;\r
 \r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode\r
+                 );\r
 \r
   //\r
   // Print Device Path\r
   //\r
   DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);\r
   if (DevPathStr != NULL) {\r
-    DEBUG((\r
+    DEBUG ((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r
       DEBUG_LINE_NUMBER,\r
       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r
-    FreePool(DevPathStr);\r
+    FreePool (DevPathStr);\r
   }\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
@@ -570,29 +634,35 @@ PrepareLpcBridgeDevicePath (
   //\r
   // Register COM2\r
   //\r
-  DevicePath = TempDevicePath;\r
+  DevicePath                     = TempDevicePath;\r
   gPnp16550ComPortDeviceNode.UID = 1;\r
 \r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gPnp16550ComPortDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode\r
+                 );\r
 \r
   //\r
   // Print Device Path\r
   //\r
   DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);\r
   if (DevPathStr != NULL) {\r
-    DEBUG((\r
+    DEBUG ((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r
       DEBUG_LINE_NUMBER,\r
       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r
-    FreePool(DevPathStr);\r
+    FreePool (DevPathStr);\r
   }\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
@@ -604,19 +674,19 @@ PrepareLpcBridgeDevicePath (
 \r
 EFI_STATUS\r
 GetGopDevicePath (\r
-   IN  EFI_DEVICE_PATH_PROTOCOL *PciDevicePath,\r
-   OUT EFI_DEVICE_PATH_PROTOCOL **GopDevicePath\r
-   )\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *PciDevicePath,\r
+  OUT EFI_DEVICE_PATH_PROTOCOL  **GopDevicePath\r
+  )\r
 {\r
-  UINTN                           Index;\r
-  EFI_STATUS                      Status;\r
-  EFI_HANDLE                      PciDeviceHandle;\r
-  EFI_DEVICE_PATH_PROTOCOL        *TempDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL        *TempPciDevicePath;\r
-  UINTN                           GopHandleCount;\r
-  EFI_HANDLE                      *GopHandleBuffer;\r
-\r
-  if (PciDevicePath == NULL || GopDevicePath == NULL) {\r
+  UINTN                     Index;\r
+  EFI_STATUS                Status;\r
+  EFI_HANDLE                PciDeviceHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TempDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TempPciDevicePath;\r
+  UINTN                     GopHandleCount;\r
+  EFI_HANDLE                *GopHandleBuffer;\r
+\r
+  if ((PciDevicePath == NULL) || (GopDevicePath == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -655,16 +725,21 @@ GetGopDevicePath (
     // Add all the child handles as possible Console Device\r
     //\r
     for (Index = 0; Index < GopHandleCount; Index++) {\r
-      Status = gBS->HandleProtocol (GopHandleBuffer[Index],\r
-                      &gEfiDevicePathProtocolGuid, (VOID*)&TempDevicePath);\r
+      Status = gBS->HandleProtocol (\r
+                      GopHandleBuffer[Index],\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      (VOID *)&TempDevicePath\r
+                      );\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r
+\r
       if (CompareMem (\r
             PciDevicePath,\r
             TempDevicePath,\r
             GetDevicePathSize (PciDevicePath) - END_DEVICE_PATH_LENGTH\r
-            ) == 0) {\r
+            ) == 0)\r
+      {\r
         //\r
         // In current implementation, we only enable one of the child handles\r
         // as console device, i.e. sotre one of the child handle's device\r
@@ -682,6 +757,7 @@ GetGopDevicePath (
         EfiBootManagerUpdateConsoleVariable (ConOutDev, TempDevicePath, NULL);\r
       }\r
     }\r
+\r
     gBS->FreePool (GopHandleBuffer);\r
   }\r
 \r
@@ -700,7 +776,7 @@ GetGopDevicePath (
 **/\r
 EFI_STATUS\r
 PreparePciDisplayDevicePath (\r
-  IN EFI_HANDLE                DeviceHandle\r
+  IN EFI_HANDLE  DeviceHandle\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -709,11 +785,11 @@ PreparePciDisplayDevicePath (
 \r
   DevicePath    = NULL;\r
   GopDevicePath = NULL;\r
-  Status = gBS->HandleProtocol (\r
-                  DeviceHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID*)&DevicePath\r
-                  );\r
+  Status        = gBS->HandleProtocol (\r
+                         DeviceHandle,\r
+                         &gEfiDevicePathProtocolGuid,\r
+                         (VOID *)&DevicePath\r
+                         );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -739,26 +815,30 @@ PreparePciDisplayDevicePath (
 **/\r
 EFI_STATUS\r
 PreparePciSerialDevicePath (\r
-  IN EFI_HANDLE                DeviceHandle\r
+  IN EFI_HANDLE  DeviceHandle\r
   )\r
 {\r
   EFI_STATUS                Status;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r
   DevicePath = NULL;\r
-  Status = gBS->HandleProtocol (\r
-                  DeviceHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  (VOID*)&DevicePath\r
-                  );\r
+  Status     = gBS->HandleProtocol (\r
+                      DeviceHandle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      (VOID *)&DevicePath\r
+                      );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);\r
-  DevicePath = AppendDevicePathNode (DevicePath,\r
-                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode\r
+                 );\r
+  DevicePath = AppendDevicePathNode (\r
+                 DevicePath,\r
+                 (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode\r
+                 );\r
 \r
   EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);\r
   EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);\r
@@ -774,24 +854,24 @@ VisitAllInstancesOfProtocol (
   IN VOID                        *Context\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINTN                     HandleCount;\r
-  EFI_HANDLE                *HandleBuffer;\r
-  UINTN                     Index;\r
-  VOID                      *Instance;\r
+  EFI_STATUS  Status;\r
+  UINTN       HandleCount;\r
+  EFI_HANDLE  *HandleBuffer;\r
+  UINTN       Index;\r
+  VOID        *Instance;\r
 \r
   //\r
   // Start to check all the PciIo to find all possible device\r
   //\r
-  HandleCount = 0;\r
+  HandleCount  = 0;\r
   HandleBuffer = NULL;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  Id,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &HandleBuffer\r
-                  );\r
+  Status       = gBS->LocateHandleBuffer (\r
+                        ByProtocol,\r
+                        Id,\r
+                        NULL,\r
+                        &HandleCount,\r
+                        &HandleBuffer\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -802,11 +882,11 @@ VisitAllInstancesOfProtocol (
       continue;\r
     }\r
 \r
-    Status = (*CallBackFunction) (\r
-               HandleBuffer[Index],\r
-               Instance,\r
-               Context\r
-               );\r
+    Status = (*CallBackFunction)(\r
+  HandleBuffer[Index],\r
+  Instance,\r
+  Context\r
+  );\r
   }\r
 \r
   gBS->FreePool (HandleBuffer);\r
@@ -814,7 +894,6 @@ VisitAllInstancesOfProtocol (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VisitingAPciInstance (\r
@@ -823,49 +902,45 @@ VisitingAPciInstance (
   IN VOID        *Context\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_PCI_IO_PROTOCOL       *PciIo;\r
-  PCI_TYPE00                Pci;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
 \r
-  PciIo = (EFI_PCI_IO_PROTOCOL*) Instance;\r
+  PciIo = (EFI_PCI_IO_PROTOCOL *)Instance;\r
 \r
   //\r
   // Check for all PCI device\r
   //\r
   Status = PciIo->Pci.Read (\r
-                    PciIo,\r
-                    EfiPciIoWidthUint32,\r
-                    0,\r
-                    sizeof (Pci) / sizeof (UINT32),\r
-                    &Pci\r
-                    );\r
+                        PciIo,\r
+                        EfiPciIoWidthUint32,\r
+                        0,\r
+                        sizeof (Pci) / sizeof (UINT32),\r
+                        &Pci\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  return (*(VISIT_PCI_INSTANCE_CALLBACK)(UINTN) Context) (\r
-           Handle,\r
-           PciIo,\r
-           &Pci\r
-           );\r
-\r
+  return (*(VISIT_PCI_INSTANCE_CALLBACK)(UINTN)Context)(\r
+  Handle,\r
+  PciIo,\r
+  &Pci\r
+  );\r
 }\r
 \r
-\r
-\r
 EFI_STATUS\r
 VisitAllPciInstances (\r
-  IN VISIT_PCI_INSTANCE_CALLBACK CallBackFunction\r
+  IN VISIT_PCI_INSTANCE_CALLBACK  CallBackFunction\r
   )\r
 {\r
   return VisitAllInstancesOfProtocol (\r
            &gEfiPciIoProtocolGuid,\r
            VisitingAPciInstance,\r
-           (VOID*)(UINTN) CallBackFunction\r
+           (VOID *)(UINTN)CallBackFunction\r
            );\r
 }\r
 \r
-\r
 /**\r
   Do platform specific PCI Device check and add them to\r
   ConOut, ConIn, ErrOut.\r
@@ -887,14 +962,14 @@ DetectAndPreparePlatformPciDevicePath (
   IN PCI_TYPE00           *Pci\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = PciIo->Attributes (\r
-    PciIo,\r
-    EfiPciIoAttributeOperationEnable,\r
-    EFI_PCI_DEVICE_ENABLE,\r
-    NULL\r
-    );\r
+                    PciIo,\r
+                    EfiPciIoAttributeOperationEnable,\r
+                    EFI_PCI_DEVICE_ENABLE,\r
+                    NULL\r
+                    );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -905,7 +980,8 @@ DetectAndPreparePlatformPciDevicePath (
        (Pci->Hdr.VendorId == 0x8086) &&\r
        (Pci->Hdr.DeviceId == 0x7000)\r
       )\r
-     ) {\r
+      )\r
+  {\r
     //\r
     // Add IsaKeyboard to ConIn,\r
     // add IsaSerial to ConOut, ConIn, ErrOut\r
@@ -914,6 +990,7 @@ DetectAndPreparePlatformPciDevicePath (
     PrepareLpcBridgeDevicePath (Handle);\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // Here we decide which Serial device to enable in PCI bus\r
   //\r
@@ -941,7 +1018,6 @@ DetectAndPreparePlatformPciDevicePath (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Connect the predefined platform default console device.\r
 \r
@@ -951,10 +1027,10 @@ DetectAndPreparePlatformPciDevicePath (
 **/\r
 VOID\r
 PlatformInitializeConsole (\r
-  IN PLATFORM_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
+  IN PLATFORM_CONSOLE_CONNECT_ENTRY  *PlatformConsole\r
   )\r
 {\r
-  UINTN                              Index;\r
+  UINTN  Index;\r
 \r
   //\r
   // Do platform specific PCI Device check and add them to ConOut, ConIn,\r
@@ -972,21 +1048,31 @@ PlatformInitializeConsole (
     // Update the console variable with the connect type\r
     //\r
     if ((PlatformConsole[Index].ConnectType & CONSOLE_IN) == CONSOLE_IN) {\r
-      EfiBootManagerUpdateConsoleVariable (ConIn,\r
-        PlatformConsole[Index].DevicePath, NULL);\r
+      EfiBootManagerUpdateConsoleVariable (\r
+        ConIn,\r
+        PlatformConsole[Index].DevicePath,\r
+        NULL\r
+        );\r
     }\r
+\r
     if ((PlatformConsole[Index].ConnectType & CONSOLE_OUT) == CONSOLE_OUT) {\r
-      EfiBootManagerUpdateConsoleVariable (ConOut,\r
-        PlatformConsole[Index].DevicePath, NULL);\r
+      EfiBootManagerUpdateConsoleVariable (\r
+        ConOut,\r
+        PlatformConsole[Index].DevicePath,\r
+        NULL\r
+        );\r
     }\r
+\r
     if ((PlatformConsole[Index].ConnectType & STD_ERROR) == STD_ERROR) {\r
-      EfiBootManagerUpdateConsoleVariable (ErrOut,\r
-        PlatformConsole[Index].DevicePath, NULL);\r
+      EfiBootManagerUpdateConsoleVariable (\r
+        ErrOut,\r
+        PlatformConsole[Index].DevicePath,\r
+        NULL\r
+        );\r
     }\r
   }\r
 }\r
 \r
-\r
 /**\r
   Configure PCI Interrupt Line register for applicable devices\r
   Ported from SeaBIOS, src/fw/pciinit.c, *_pci_slot_get_irq()\r
@@ -1017,15 +1103,15 @@ SetPciIntLine (
   Status = EFI_SUCCESS;\r
 \r
   if (PciHdr->Device.InterruptPin != 0) {\r
-\r
     DevPathNode = DevicePathFromHandle (Handle);\r
     ASSERT (DevPathNode != NULL);\r
     DevPath = DevPathNode;\r
 \r
     RootBusNumber = 0;\r
-    if (DevicePathType (DevPathNode) == ACPI_DEVICE_PATH &&\r
-        DevicePathSubType (DevPathNode) == ACPI_DP &&\r
-        ((ACPI_HID_DEVICE_PATH *)DevPathNode)->HID == EISA_PNP_ID(0x0A03)) {\r
+    if ((DevicePathType (DevPathNode) == ACPI_DEVICE_PATH) &&\r
+        (DevicePathSubType (DevPathNode) == ACPI_DP) &&\r
+        (((ACPI_HID_DEVICE_PATH *)DevPathNode)->HID == EISA_PNP_ID (0x0A03)))\r
+    {\r
       RootBusNumber = ((ACPI_HID_DEVICE_PATH *)DevPathNode)->UID;\r
     }\r
 \r
@@ -1033,13 +1119,13 @@ SetPciIntLine (
     // Compute index into PciHostIrqs[] table by walking\r
     // the device path and adding up all device numbers\r
     //\r
-    Status = EFI_NOT_FOUND;\r
+    Status   = EFI_NOT_FOUND;\r
     RootSlot = 0;\r
-    Idx = PciHdr->Device.InterruptPin - 1;\r
+    Idx      = PciHdr->Device.InterruptPin - 1;\r
     while (!IsDevicePathEnd (DevPathNode)) {\r
-      if (DevicePathType (DevPathNode) == HARDWARE_DEVICE_PATH &&\r
-          DevicePathSubType (DevPathNode) == HW_PCI_DP) {\r
-\r
+      if ((DevicePathType (DevPathNode) == HARDWARE_DEVICE_PATH) &&\r
+          (DevicePathSubType (DevPathNode) == HW_PCI_DP))\r
+      {\r
         Idx += ((PCI_DEVICE_PATH *)DevPathNode)->Device;\r
 \r
         //\r
@@ -1050,18 +1136,20 @@ SetPciIntLine (
         // Q35 cases with more than 24 slots on the root bus.\r
         //\r
         if (Status != EFI_SUCCESS) {\r
-          Status = EFI_SUCCESS;\r
+          Status   = EFI_SUCCESS;\r
           RootSlot = ((PCI_DEVICE_PATH *)DevPathNode)->Device;\r
         }\r
       }\r
 \r
       DevPathNode = NextDevicePathNode (DevPathNode);\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-    if (RootBusNumber == 0 && RootSlot == 0) {\r
-      DEBUG((\r
+\r
+    if ((RootBusNumber == 0) && (RootSlot == 0)) {\r
+      DEBUG ((\r
         DEBUG_ERROR,\r
         "%a: PCI host bridge (00:00.0) should have no interrupts!\n",\r
         __FUNCTION__\r
@@ -1093,29 +1181,39 @@ SetPciIntLine (
           //\r
           Idx -= RootSlot;\r
         }\r
+\r
         break;\r
       default:\r
         ASSERT (FALSE); // should never get here\r
     }\r
-    Idx %= ARRAY_SIZE (PciHostIrqs);\r
+\r
+    Idx    %= ARRAY_SIZE (PciHostIrqs);\r
     IrqLine = PciHostIrqs[Idx];\r
 \r
     DEBUG_CODE_BEGIN ();\r
     {\r
-      CHAR16        *DevPathString;\r
-      STATIC CHAR16 Fallback[] = L"<failed to convert>";\r
-      UINTN         Segment, Bus, Device, Function;\r
+      CHAR16         *DevPathString;\r
+      STATIC CHAR16  Fallback[] = L"<failed to convert>";\r
+      UINTN          Segment, Bus, Device, Function;\r
 \r
       DevPathString = ConvertDevicePathToText (DevPath, FALSE, FALSE);\r
       if (DevPathString == NULL) {\r
         DevPathString = Fallback;\r
       }\r
+\r
       Status = PciIo->GetLocation (PciIo, &Segment, &Bus, &Device, &Function);\r
       ASSERT_EFI_ERROR (Status);\r
 \r
-      DEBUG ((DEBUG_VERBOSE, "%a: [%02x:%02x.%x] %s -> 0x%02x\n", __FUNCTION__,\r
-        (UINT32)Bus, (UINT32)Device, (UINT32)Function, DevPathString,\r
-        IrqLine));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: [%02x:%02x.%x] %s -> 0x%02x\n",\r
+        __FUNCTION__,\r
+        (UINT32)Bus,\r
+        (UINT32)Device,\r
+        (UINT32)Function,\r
+        DevPathString,\r
+        IrqLine\r
+        ));\r
 \r
       if (DevPathString != Fallback) {\r
         FreePool (DevPathString);\r
@@ -1127,18 +1225,17 @@ SetPciIntLine (
     // Set PCI Interrupt Line register for this device to PciHostIrqs[Idx]\r
     //\r
     Status = PciIo->Pci.Write (\r
-               PciIo,\r
-               EfiPciIoWidthUint8,\r
-               PCI_INT_LINE_OFFSET,\r
-               1,\r
-               &IrqLine\r
-               );\r
+                          PciIo,\r
+                          EfiPciIoWidthUint8,\r
+                          PCI_INT_LINE_OFFSET,\r
+                          1,\r
+                          &IrqLine\r
+                          );\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 VOID\r
 PciAcpiInitialization (\r
   )\r
@@ -1175,8 +1272,12 @@ PciAcpiInitialization (
       PciWrite8 (PCI_LIB_ADDRESS (0, 0x1f, 0, 0x6b), 0x0b); // H\r
       break;\r
     default:\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, mHostBridgeDevId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        mHostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return;\r
   }\r
@@ -1209,11 +1310,11 @@ ConnectRecursivelyIfPciMassStorage (
   //\r
   if (IS_CLASS1 (PciHeader, PCI_CLASS_MASS_STORAGE)) {\r
     DevicePath = NULL;\r
-    Status = gBS->HandleProtocol (\r
-                    Handle,\r
-                    &gEfiDevicePathProtocolGuid,\r
-                    (VOID*)&DevicePath\r
-                    );\r
+    Status     = gBS->HandleProtocol (\r
+                        Handle,\r
+                        &gEfiDevicePathProtocolGuid,\r
+                        (VOID *)&DevicePath\r
+                        );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -1223,25 +1324,23 @@ ConnectRecursivelyIfPciMassStorage (
     //\r
     DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);\r
     if (DevPathStr != NULL) {\r
-      DEBUG((\r
+      DEBUG ((\r
         DEBUG_INFO,\r
         "Found Mass Storage device: %s\n",\r
         DevPathStr\r
         ));\r
-      FreePool(DevPathStr);\r
+      FreePool (DevPathStr);\r
     }\r
 \r
     Status = gBS->ConnectController (Handle, NULL, NULL, TRUE);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Connect with predefined platform connect sequence.\r
 \r
@@ -1252,7 +1351,7 @@ PlatformBdsConnectSequence (
   VOID\r
   )\r
 {\r
-  UINTN         Index;\r
+  UINTN  Index;\r
 \r
   DEBUG ((DEBUG_INFO, "PlatformBdsConnectSequence\n"));\r
 \r
@@ -1270,6 +1369,7 @@ PlatformBdsConnectSequence (
     EfiBootManagerConnectDevicePath (gPlatformConnectSequence[Index], NULL);\r
     Index++;\r
   }\r
+\r
   EfiBootManagerConnectAll ();\r
 }\r
 \r
@@ -1292,7 +1392,7 @@ PlatformBootManagerAfterConsole (
   VOID\r
   )\r
 {\r
-  EFI_BOOT_MODE                      BootMode;\r
+  EFI_BOOT_MODE  BootMode;\r
 \r
   DEBUG ((DEBUG_INFO, "PlatformBootManagerAfterConsole\n"));\r
 \r
@@ -1335,14 +1435,18 @@ PlatformBootManagerAfterConsole (
   // which is the default)\r
   //\r
   PlatformRegisterFvBootOption (\r
-    &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE\r
+    &gUefiShellFileGuid,\r
+    L"EFI Internal Shell",\r
+    LOAD_OPTION_ACTIVE\r
     );\r
 \r
   //\r
   // Register Grub\r
   //\r
   PlatformRegisterFvBootOption (\r
-    &gGrubFileGuid, L"Grub Bootloader", LOAD_OPTION_ACTIVE\r
+    &gGrubFileGuid,\r
+    L"Grub Bootloader",\r
+    LOAD_OPTION_ACTIVE\r
     );\r
 \r
   RemoveStaleFvFileOptions ();\r
@@ -1361,31 +1465,31 @@ PlatformBootManagerAfterConsole (
 VOID\r
 EFIAPI\r
 NotifyDevPath (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  EFI_HANDLE                            Handle;\r
-  EFI_STATUS                            Status;\r
-  UINTN                                 BufferSize;\r
-  EFI_DEVICE_PATH_PROTOCOL             *DevPathNode;\r
-  ATAPI_DEVICE_PATH                    *Atapi;\r
+  EFI_HANDLE                Handle;\r
+  EFI_STATUS                Status;\r
+  UINTN                     BufferSize;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevPathNode;\r
+  ATAPI_DEVICE_PATH         *Atapi;\r
 \r
   //\r
   // Examine all new handles\r
   //\r
-  for (;;) {\r
+  for ( ; ;) {\r
     //\r
     // Get the next handle\r
     //\r
     BufferSize = sizeof (Handle);\r
-    Status = gBS->LocateHandle (\r
-              ByRegisterNotify,\r
-              NULL,\r
-              mEfiDevPathNotifyReg,\r
-              &BufferSize,\r
-              &Handle\r
-              );\r
+    Status     = gBS->LocateHandle (\r
+                        ByRegisterNotify,\r
+                        NULL,\r
+                        mEfiDevPathNotifyReg,\r
+                        &BufferSize,\r
+                        &Handle\r
+                        );\r
 \r
     //\r
     // If not found, we're done\r
@@ -1401,8 +1505,11 @@ NotifyDevPath (
     //\r
     // Get the DevicePath protocol on that handle\r
     //\r
-    Status = gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid,\r
-                    (VOID **)&DevPathNode);\r
+    Status = gBS->HandleProtocol (\r
+                    Handle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    (VOID **)&DevPathNode\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     while (!IsDevicePathEnd (DevPathNode)) {\r
@@ -1410,16 +1517,17 @@ NotifyDevPath (
       // Find the handler to dump this device path node\r
       //\r
       if (\r
-           (DevicePathType(DevPathNode) == MESSAGING_DEVICE_PATH) &&\r
-           (DevicePathSubType(DevPathNode) == MSG_ATAPI_DP)\r
-         ) {\r
-        Atapi = (ATAPI_DEVICE_PATH*) DevPathNode;\r
+          (DevicePathType (DevPathNode) == MESSAGING_DEVICE_PATH) &&\r
+          (DevicePathSubType (DevPathNode) == MSG_ATAPI_DP)\r
+          )\r
+      {\r
+        Atapi = (ATAPI_DEVICE_PATH *)DevPathNode;\r
         PciOr16 (\r
           PCI_LIB_ADDRESS (\r
             0,\r
             1,\r
             1,\r
-            (Atapi->PrimarySecondary == 1) ? 0x42: 0x40\r
+            (Atapi->PrimarySecondary == 1) ? 0x42 : 0x40\r
             ),\r
           BIT15\r
           );\r
@@ -1435,7 +1543,6 @@ NotifyDevPath (
   return;\r
 }\r
 \r
-\r
 VOID\r
 InstallDevicePathCallback (\r
   VOID\r
@@ -1443,12 +1550,12 @@ InstallDevicePathCallback (
 {\r
   DEBUG ((DEBUG_INFO, "Registered NotifyDevPath Event\n"));\r
   mEfiDevPathEvent = EfiCreateProtocolNotifyEvent (\r
-                          &gEfiDevicePathProtocolGuid,\r
-                          TPL_CALLBACK,\r
-                          NotifyDevPath,\r
-                          NULL,\r
-                          &mEfiDevPathNotifyReg\r
-                          );\r
+                       &gEfiDevicePathProtocolGuid,\r
+                       TPL_CALLBACK,\r
+                       NotifyDevPath,\r
+                       NULL,\r
+                       &mEfiDevPathNotifyReg\r
+                       );\r
 }\r
 \r
 /**\r
@@ -1460,7 +1567,7 @@ InstallDevicePathCallback (
 VOID\r
 EFIAPI\r
 PlatformBootManagerWaitCallback (\r
-  UINT16          TimeoutRemain\r
+  UINT16  TimeoutRemain\r
   )\r
 {\r
   //\r
index f1d3a2906c00d6e6f2ae92cc5a622a4c94fb219c..0593a51046257c4681da00a37e690dfbe908328e 100644 (file)
@@ -18,7 +18,6 @@ Abstract:
 #ifndef _PLATFORM_SPECIFIC_BDS_PLATFORM_H_\r
 #define _PLATFORM_SPECIFIC_BDS_PLATFORM_H_\r
 \r
-\r
 #include <PiDxe.h>\r
 \r
 #include <IndustryStandard/Pci.h>\r
@@ -60,11 +59,11 @@ Abstract:
 \r
 #include <OvmfPlatforms.h>\r
 \r
-extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformConnectSequence[];\r
-extern ACPI_HID_DEVICE_PATH       gPnpPs2KeyboardDeviceNode;\r
-extern ACPI_HID_DEVICE_PATH       gPnp16550ComPortDeviceNode;\r
-extern UART_DEVICE_PATH           gUartDeviceNode;\r
-extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;\r
+extern EFI_DEVICE_PATH_PROTOCOL  *gPlatformConnectSequence[];\r
+extern ACPI_HID_DEVICE_PATH      gPnpPs2KeyboardDeviceNode;\r
+extern ACPI_HID_DEVICE_PATH      gPnp16550ComPortDeviceNode;\r
+extern UART_DEVICE_PATH          gUartDeviceNode;\r
+extern VENDOR_DEVICE_PATH        gTerminalTypeDeviceNode;\r
 \r
 #define PCI_DEVICE_PATH_NODE(Func, Dev) \\r
   { \\r
@@ -146,20 +145,20 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
     } \\r
   }\r
 \r
-#define PCI_CLASS_SCC          0x07\r
-#define PCI_SUBCLASS_SERIAL    0x00\r
-#define PCI_IF_16550           0x02\r
-#define IS_PCI_16550SERIAL(_p)           IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)\r
-#define IS_PCI_ISA_PDECODE(_p)        IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA_PDECODE, 0)\r
+#define PCI_CLASS_SCC        0x07\r
+#define PCI_SUBCLASS_SERIAL  0x00\r
+#define PCI_IF_16550         0x02\r
+#define IS_PCI_16550SERIAL(_p)  IS_CLASS3 (_p, PCI_CLASS_SCC, PCI_SUBCLASS_SERIAL, PCI_IF_16550)\r
+#define IS_PCI_ISA_PDECODE(_p)  IS_CLASS3 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA_PDECODE, 0)\r
 \r
 typedef struct {\r
-  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
-  UINTN                     ConnectType;\r
+  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;\r
+  UINTN                       ConnectType;\r
 } PLATFORM_CONSOLE_CONNECT_ENTRY;\r
 \r
-#define CONSOLE_OUT BIT0\r
-#define CONSOLE_IN  BIT1\r
-#define STD_ERROR   BIT2\r
+#define CONSOLE_OUT  BIT0\r
+#define CONSOLE_IN   BIT1\r
+#define STD_ERROR    BIT2\r
 extern PLATFORM_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r
 extern PLATFORM_CONSOLE_CONNECT_ENTRY  gXenPlatformConsole[];\r
 \r
@@ -169,7 +168,7 @@ extern PLATFORM_CONSOLE_CONNECT_ENTRY  gXenPlatformConsole[];
 \r
 VOID\r
 PlatformInitializeConsole (\r
-  IN PLATFORM_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
+  IN PLATFORM_CONSOLE_CONNECT_ENTRY  *PlatformConsole\r
   );\r
 \r
 /**\r
index e5945727f2209b09f9d14cb0635ef16d859de26f..5e2b7510c5dd1b7eebed42b17ff1a8449bdb6f75 100644 (file)
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH        VendorHardware;\r
-  UART_DEVICE_PATH          Uart;\r
-  VENDOR_DEVICE_PATH        TerminalType;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
+  VENDOR_DEVICE_PATH          VendorHardware;\r
+  UART_DEVICE_PATH            Uart;\r
+  VENDOR_DEVICE_PATH          TerminalType;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } VENDOR_UART_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
@@ -29,8 +29,8 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  USB_CLASS_DEVICE_PATH    Keyboard;\r
-  EFI_DEVICE_PATH_PROTOCOL End;\r
+  USB_CLASS_DEVICE_PATH       Keyboard;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } USB_KEYBOARD_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
@@ -39,33 +39,32 @@ typedef struct {
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH        Vendor;\r
-  ACPI_ADR_DEVICE_PATH      AcpiAdr;\r
-  EFI_DEVICE_PATH_PROTOCOL  End;\r
+  VENDOR_DEVICE_PATH          Vendor;\r
+  ACPI_ADR_DEVICE_PATH        AcpiAdr;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } VENDOR_RAMFB_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
-ACPI_HID_DEVICE_PATH       gPnpPs2KeyboardDeviceNode  = gPnpPs2Keyboard;\r
-ACPI_HID_DEVICE_PATH       gPnp16550ComPortDeviceNode = gPnp16550ComPort;\r
-UART_DEVICE_PATH           gUartDeviceNode            = gUart;\r
-VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode    = gPcAnsiTerminal;\r
+ACPI_HID_DEVICE_PATH  gPnpPs2KeyboardDeviceNode  = gPnpPs2Keyboard;\r
+ACPI_HID_DEVICE_PATH  gPnp16550ComPortDeviceNode = gPnp16550ComPort;\r
+UART_DEVICE_PATH      gUartDeviceNode            = gUart;\r
+VENDOR_DEVICE_PATH    gTerminalTypeDeviceNode    = gPcAnsiTerminal;\r
 \r
 //\r
 // Platform specific keyboard device path\r
 //\r
 \r
-\r
 //\r
 // Debug Agent UART Device Path\r
 //\r
-VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {\r
+VENDOR_UART_DEVICE_PATH  gDebugAgentUartDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     EFI_DEBUG_AGENT_GUID,\r
@@ -75,8 +74,8 @@ VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {
       MESSAGING_DEVICE_PATH,\r
       MSG_UART_DP,\r
       {\r
-        (UINT8) (sizeof (UART_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (UART_DEVICE_PATH)),\r
+        (UINT8)((sizeof (UART_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     0,  // Reserved\r
@@ -89,7 +88,7 @@ VENDOR_UART_DEVICE_PATH gDebugAgentUartDevicePath = {
   gEndEntire\r
 };\r
 \r
-STATIC USB_KEYBOARD_DEVICE_PATH gUsbKeyboardDevicePath = {\r
+STATIC USB_KEYBOARD_DEVICE_PATH  gUsbKeyboardDevicePath = {\r
   {\r
     {\r
       MESSAGING_DEVICE_PATH,\r
@@ -108,14 +107,14 @@ STATIC USB_KEYBOARD_DEVICE_PATH gUsbKeyboardDevicePath = {
   gEndEntire\r
 };\r
 \r
-STATIC VENDOR_RAMFB_DEVICE_PATH gQemuRamfbDevicePath = {\r
+STATIC VENDOR_RAMFB_DEVICE_PATH  gQemuRamfbDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     QEMU_RAMFB_GUID,\r
@@ -125,8 +124,8 @@ STATIC VENDOR_RAMFB_DEVICE_PATH gQemuRamfbDevicePath = {
       ACPI_DEVICE_PATH,\r
       ACPI_ADR_DP,\r
       {\r
-        (UINT8) (sizeof (ACPI_ADR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (ACPI_ADR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (ACPI_ADR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (ACPI_ADR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     ACPI_DISPLAY_ADR (\r
@@ -143,14 +142,14 @@ STATIC VENDOR_RAMFB_DEVICE_PATH gQemuRamfbDevicePath = {
   gEndEntire\r
 };\r
 \r
-STATIC VENDOR_UART_DEVICE_PATH gXenConsoleDevicePath = {\r
+STATIC VENDOR_UART_DEVICE_PATH  gXenConsoleDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     EDKII_SERIAL_PORT_LIB_VENDOR_GUID\r
@@ -160,8 +159,8 @@ STATIC VENDOR_UART_DEVICE_PATH gXenConsoleDevicePath = {
       MESSAGING_DEVICE_PATH,\r
       MSG_UART_DP,\r
       {\r
-        (UINT8) (sizeof (UART_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (UART_DEVICE_PATH)),\r
+        (UINT8)((sizeof (UART_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     0,\r
@@ -177,9 +176,9 @@ STATIC VENDOR_UART_DEVICE_PATH gXenConsoleDevicePath = {
 //\r
 // Predefined platform default console device path\r
 //\r
-PLATFORM_CONSOLE_CONNECT_ENTRY   gPlatformConsole[] = {\r
+PLATFORM_CONSOLE_CONNECT_ENTRY  gPlatformConsole[] = {\r
   {\r
-    (EFI_DEVICE_PATH_PROTOCOL *) &gDebugAgentUartDevicePath,\r
+    (EFI_DEVICE_PATH_PROTOCOL *)&gDebugAgentUartDevicePath,\r
     (CONSOLE_OUT | CONSOLE_IN | STD_ERROR)\r
   },\r
   {\r
@@ -196,7 +195,7 @@ PLATFORM_CONSOLE_CONNECT_ENTRY   gPlatformConsole[] = {
   }\r
 };\r
 \r
-PLATFORM_CONSOLE_CONNECT_ENTRY   gXenPlatformConsole[] = {\r
+PLATFORM_CONSOLE_CONNECT_ENTRY  gXenPlatformConsole[] = {\r
   {\r
     (EFI_DEVICE_PATH_PROTOCOL *)&gXenConsoleDevicePath,\r
     (CONSOLE_OUT | CONSOLE_IN | STD_ERROR)\r
@@ -210,5 +209,4 @@ PLATFORM_CONSOLE_CONNECT_ENTRY   gXenPlatformConsole[] = {
 //\r
 // Predefined platform connect sequence\r
 //\r
-EFI_DEVICE_PATH_PROTOCOL    *gPlatformConnectSequence[] = { NULL };\r
-\r
+EFI_DEVICE_PATH_PROTOCOL  *gPlatformConnectSequence[] = { NULL };\r
index c6255921779ea67caf592d23f134f95dd4a49d25..1e66e3c452583ce53ccda6706fabbb187efc44ed 100644 (file)
 #include <Library/ReportStatusCodeLib.h>\r
 #include <Library/UefiLib.h>\r
 \r
-\r
 EFI_STATUS\r
 TryRunningQemuKernel (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_HANDLE                KernelImageHandle;\r
+  EFI_STATUS  Status;\r
+  EFI_HANDLE  KernelImageHandle;\r
 \r
   Status = QemuLoadKernelImage (&KernelImageHandle);\r
   if (EFI_ERROR (Status)) {\r
@@ -30,18 +29,24 @@ TryRunningQemuKernel (
   //\r
   // Signal the EVT_SIGNAL_READY_TO_BOOT event\r
   //\r
-  EfiSignalEventReadyToBoot();\r
+  EfiSignalEventReadyToBoot ();\r
 \r
-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE,\r
-    (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT));\r
+  REPORT_STATUS_CODE (\r
+    EFI_PROGRESS_CODE,\r
+    (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT)\r
+    );\r
 \r
   //\r
   // Start the image.\r
   //\r
   Status = QemuStartKernelImage (&KernelImageHandle);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: QemuStartKernelImage(): %r\n", __FUNCTION__,\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: QemuStartKernelImage(): %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
   }\r
 \r
   QemuUnloadKernelImage (KernelImageHandle);\r
index bf9119807a6c453174b6c03bd17a1b1dda1ede3e..94013646b107cd8625150d21bef8717f00cc2743 100644 (file)
@@ -15,7 +15,7 @@
 //\r
 // The constant value that is read from the debug I/O port\r
 //\r
-#define BOCHS_DEBUG_PORT_MAGIC    0xE9\r
+#define BOCHS_DEBUG_PORT_MAGIC  0xE9\r
 \r
 /**\r
   Return the result of detecting the debug I/O port device.\r
index dffb20822d185c3285de6c962eeea23bcb05dbeb..4e25f198aa76ed6859e4b5c53a545ba7dc911d69 100644 (file)
@@ -27,7 +27,7 @@
 // VA_LIST can not initialize to NULL for all compiler, so we use this to\r
 // indicate a null VA_LIST\r
 //\r
-VA_LIST     mVaListNull;\r
+VA_LIST  mVaListNull;\r
 \r
 /**\r
   Prints a debug message to the debug output device if the specified error level is enabled.\r
@@ -52,14 +52,13 @@ DebugPrint (
   ...\r
   )\r
 {\r
-  VA_LIST         Marker;\r
+  VA_LIST  Marker;\r
 \r
   VA_START (Marker, Format);\r
   DebugVPrint (ErrorLevel, Format, Marker);\r
   VA_END (Marker);\r
 }\r
 \r
-\r
 /**\r
   Prints a debug message to the debug output device if the specified\r
   error level is enabled base on Null-terminated format string and a\r
@@ -79,14 +78,14 @@ DebugPrint (
 **/\r
 VOID\r
 DebugPrintMarker (\r
-  IN  UINTN         ErrorLevel,\r
-  IN  CONST CHAR8   *Format,\r
-  IN  VA_LIST       VaListMarker,\r
-  IN  BASE_LIST     BaseListMarker\r
+  IN  UINTN        ErrorLevel,\r
+  IN  CONST CHAR8  *Format,\r
+  IN  VA_LIST      VaListMarker,\r
+  IN  BASE_LIST    BaseListMarker\r
   )\r
 {\r
-  CHAR8    Buffer[MAX_DEBUG_MESSAGE_LENGTH];\r
-  UINTN    Length;\r
+  CHAR8  Buffer[MAX_DEBUG_MESSAGE_LENGTH];\r
+  UINTN  Length;\r
 \r
   //\r
   // If Format is NULL, then ASSERT().\r
@@ -96,8 +95,9 @@ DebugPrintMarker (
   //\r
   // Check if the global mask disables this message or the device is inactive\r
   //\r
-  if ((ErrorLevel & GetDebugPrintErrorLevel ()) == 0 ||\r
-      !PlatformDebugLibIoPortFound ()) {\r
+  if (((ErrorLevel & GetDebugPrintErrorLevel ()) == 0) ||\r
+      !PlatformDebugLibIoPortFound ())\r
+  {\r
     return;\r
   }\r
 \r
@@ -116,7 +116,6 @@ DebugPrintMarker (
   IoWriteFifo8 (PcdGet16 (PcdDebugIoPort), Length, Buffer);\r
 }\r
 \r
-\r
 /**\r
   Prints a debug message to the debug output device if the specified\r
   error level is enabled.\r
@@ -135,15 +134,14 @@ DebugPrintMarker (
 VOID\r
 EFIAPI\r
 DebugVPrint (\r
-  IN  UINTN         ErrorLevel,\r
-  IN  CONST CHAR8   *Format,\r
-  IN  VA_LIST       VaListMarker\r
+  IN  UINTN        ErrorLevel,\r
+  IN  CONST CHAR8  *Format,\r
+  IN  VA_LIST      VaListMarker\r
   )\r
 {\r
   DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);\r
 }\r
 \r
-\r
 /**\r
   Prints a debug message to the debug output device if the specified\r
   error level is enabled.\r
@@ -164,15 +162,14 @@ DebugVPrint (
 VOID\r
 EFIAPI\r
 DebugBPrint (\r
-  IN  UINTN         ErrorLevel,\r
-  IN  CONST CHAR8   *Format,\r
-  IN  BASE_LIST     BaseListMarker\r
+  IN  UINTN        ErrorLevel,\r
+  IN  CONST CHAR8  *Format,\r
+  IN  BASE_LIST    BaseListMarker\r
   )\r
 {\r
   DebugPrintMarker (ErrorLevel, Format, mVaListNull, BaseListMarker);\r
 }\r
 \r
-\r
 /**\r
   Prints an assert message containing a filename, line number, and description.\r
   This may be followed by a breakpoint or a dead loop.\r
@@ -208,8 +205,14 @@ DebugAssert (
   //\r
   // Generate the ASSERT() message in Ascii format\r
   //\r
-  Length = AsciiSPrint (Buffer, sizeof Buffer, "ASSERT %a(%Lu): %a\n",\r
-             FileName, (UINT64)LineNumber, Description);\r
+  Length = AsciiSPrint (\r
+             Buffer,\r
+             sizeof Buffer,\r
+             "ASSERT %a(%Lu): %a\n",\r
+             FileName,\r
+             (UINT64)LineNumber,\r
+             Description\r
+             );\r
 \r
   //\r
   // Send the print string to the debug I/O port, if present\r
@@ -221,14 +224,13 @@ DebugAssert (
   //\r
   // Generate a Breakpoint, DeadLoop, or NOP based on PCD settings\r
   //\r
-  if ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED) != 0) {\r
+  if ((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED) != 0) {\r
     CpuBreakpoint ();\r
-  } else if ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED) != 0) {\r
+  } else if ((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED) != 0) {\r
     CpuDeadLoop ();\r
   }\r
 }\r
 \r
-\r
 /**\r
   Fills a target buffer with PcdDebugClearMemoryValue, and returns the target buffer.\r
 \r
@@ -259,10 +261,9 @@ DebugClearMemory (
   //\r
   // SetMem() checks for the the ASSERT() condition on Length and returns Buffer\r
   //\r
-  return SetMem (Buffer, Length, PcdGet8(PcdDebugClearMemoryValue));\r
+  return SetMem (Buffer, Length, PcdGet8 (PcdDebugClearMemoryValue));\r
 }\r
 \r
-\r
 /**\r
   Returns TRUE if ASSERT() macros are enabled.\r
 \r
@@ -279,10 +280,9 @@ DebugAssertEnabled (
   VOID\r
   )\r
 {\r
-  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);\r
+  return (BOOLEAN)((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);\r
 }\r
 \r
-\r
 /**\r
   Returns TRUE if DEBUG() macros are enabled.\r
 \r
@@ -299,10 +299,9 @@ DebugPrintEnabled (
   VOID\r
   )\r
 {\r
-  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);\r
+  return (BOOLEAN)((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);\r
 }\r
 \r
-\r
 /**\r
   Returns TRUE if DEBUG_CODE() macros are enabled.\r
 \r
@@ -319,10 +318,9 @@ DebugCodeEnabled (
   VOID\r
   )\r
 {\r
-  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);\r
+  return (BOOLEAN)((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);\r
 }\r
 \r
-\r
 /**\r
   Returns TRUE if DEBUG_CLEAR_MEMORY() macro is enabled.\r
 \r
@@ -339,7 +337,7 @@ DebugClearMemoryEnabled (
   VOID\r
   )\r
 {\r
-  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);\r
+  return (BOOLEAN)((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);\r
 }\r
 \r
 /**\r
@@ -354,8 +352,8 @@ DebugClearMemoryEnabled (
 BOOLEAN\r
 EFIAPI\r
 DebugPrintLevelEnabled (\r
-  IN  CONST UINTN        ErrorLevel\r
+  IN  CONST UINTN  ErrorLevel\r
   )\r
 {\r
-  return (BOOLEAN) ((ErrorLevel & PcdGet32(PcdFixedDebugPrintErrorLevel)) != 0);\r
+  return (BOOLEAN)((ErrorLevel & PcdGet32 (PcdFixedDebugPrintErrorLevel)) != 0);\r
 }\r
index 8c466e64e0a6e10112d296429a2e7ac2d3565049..45207faf5cb2fd8af5547aa94b793df18cbe9651 100644 (file)
 //\r
 // Set to TRUE if the debug I/O port has been checked\r
 //\r
-STATIC BOOLEAN mDebugIoPortChecked = FALSE;\r
+STATIC BOOLEAN  mDebugIoPortChecked = FALSE;\r
 \r
 //\r
 // Set to TRUE if the debug I/O port is enabled\r
 //\r
-STATIC BOOLEAN mDebugIoPortFound = FALSE;\r
+STATIC BOOLEAN  mDebugIoPortFound = FALSE;\r
 \r
 /**\r
   This constructor function must not do anything.\r
@@ -58,8 +58,9 @@ PlatformDebugLibIoPortFound (
   )\r
 {\r
   if (!mDebugIoPortChecked) {\r
-    mDebugIoPortFound = PlatformDebugLibIoPortDetect ();\r
+    mDebugIoPortFound   = PlatformDebugLibIoPortDetect ();\r
     mDebugIoPortChecked = TRUE;\r
   }\r
+\r
   return mDebugIoPortFound;\r
 }\r
index 8ef7416d3ee9c5633d1989ebcb139e7a2454a1e6..89a50d79c354599384e3e60b635ad88bbdf34e83 100644 (file)
@@ -9,7 +9,6 @@
 #include "PiDxe.h"\r
 #include <Library/PlatformFvbLib.h>\r
 \r
-\r
 /**\r
   This function will be called following a call to the\r
   EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Read function.\r
 VOID\r
 EFIAPI\r
 PlatformFvbDataRead (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN        EFI_LBA                             Lba,\r
-  IN        UINTN                               Offset,\r
-  IN        UINTN                               NumBytes,\r
-  IN        UINT8                               *Buffer\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN        EFI_LBA                              Lba,\r
+  IN        UINTN                                Offset,\r
+  IN        UINTN                                NumBytes,\r
+  IN        UINT8                                *Buffer\r
   )\r
 {\r
 }\r
 \r
-\r
 /**\r
   This function will be called following a call to the\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL Write function.\r
@@ -50,16 +48,15 @@ PlatformFvbDataRead (
 VOID\r
 EFIAPI\r
 PlatformFvbDataWritten (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN        EFI_LBA                             Lba,\r
-  IN        UINTN                               Offset,\r
-  IN        UINTN                               NumBytes,\r
-  IN        UINT8                               *Buffer\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN        EFI_LBA                              Lba,\r
+  IN        UINTN                                Offset,\r
+  IN        UINTN                                NumBytes,\r
+  IN        UINT8                                *Buffer\r
   )\r
 {\r
 }\r
 \r
-\r
 /**\r
   This function will be called following a call to the\r
   EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Erase function.\r
@@ -74,10 +71,8 @@ PlatformFvbDataWritten (
 VOID\r
 EFIAPI\r
 PlatformFvbBlocksErased (\r
-  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,\r
-  IN  VA_LIST       List\r
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL  *This,\r
+  IN  VA_LIST                                    List\r
   )\r
 {\r
 }\r
-\r
-\r
index 7ce236326fb4937093b4db656fac08787eab3ea0..33cad3897994ebf4a13784b61cd0d79a89650fca 100644 (file)
@@ -16,19 +16,29 @@ SetPxeBcPcds (
   VOID\r
   )\r
 {\r
-  BOOLEAN       FwCfgBool;\r
-  RETURN_STATUS PcdStatus;\r
+  BOOLEAN        FwCfgBool;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
-  if (!RETURN_ERROR (QemuFwCfgParseBool ("opt/org.tianocore/IPv4PXESupport",\r
-                       &FwCfgBool))) {\r
+  if (!RETURN_ERROR (\r
+         QemuFwCfgParseBool (\r
+           "opt/org.tianocore/IPv4PXESupport",\r
+           &FwCfgBool\r
+           )\r
+         ))\r
+  {\r
     PcdStatus = PcdSet8S (PcdIPv4PXESupport, FwCfgBool);\r
     if (RETURN_ERROR (PcdStatus)) {\r
       return PcdStatus;\r
     }\r
   }\r
 \r
-  if (!RETURN_ERROR (QemuFwCfgParseBool ("opt/org.tianocore/IPv6PXESupport",\r
-                       &FwCfgBool))) {\r
+  if (!RETURN_ERROR (\r
+         QemuFwCfgParseBool (\r
+           "opt/org.tianocore/IPv6PXESupport",\r
+           &FwCfgBool\r
+           )\r
+         ))\r
+  {\r
     PcdStatus = PcdSet8S (PcdIPv6PXESupport, FwCfgBool);\r
     if (RETURN_ERROR (PcdStatus)) {\r
       return PcdStatus;\r
index 25d5494047abc60aacf3d2a6d25c4a504b9727e4..37d488e01c2a1a7d1cf1baa04c34efe58c85abaa 100644 (file)
 // BusNumbers is NULL.\r
 //\r
 struct EXTRA_ROOT_BUS_MAP_STRUCT {\r
-  UINT32 *BusNumbers;\r
-  UINTN  Count;\r
+  UINT32    *BusNumbers;\r
+  UINTN     Count;\r
 };\r
 \r
-\r
 /**\r
   An ORDERED_COLLECTION_USER_COMPARE function that compares root bridge\r
   protocol device paths based on UID.\r
@@ -51,12 +50,12 @@ STATIC
 INTN\r
 EFIAPI\r
 RootBridgePathCompare (\r
-  IN CONST VOID *UserStruct1,\r
-  IN CONST VOID *UserStruct2\r
+  IN CONST VOID  *UserStruct1,\r
+  IN CONST VOID  *UserStruct2\r
   )\r
 {\r
-  CONST ACPI_HID_DEVICE_PATH *Acpi1;\r
-  CONST ACPI_HID_DEVICE_PATH *Acpi2;\r
+  CONST ACPI_HID_DEVICE_PATH  *Acpi1;\r
+  CONST ACPI_HID_DEVICE_PATH  *Acpi2;\r
 \r
   Acpi1 = UserStruct1;\r
   Acpi2 = UserStruct2;\r
@@ -66,7 +65,6 @@ RootBridgePathCompare (
          0;\r
 }\r
 \r
-\r
 /**\r
   An ORDERED_COLLECTION_KEY_COMPARE function that compares a root bridge\r
   protocol device path against a UID.\r
@@ -86,12 +84,12 @@ STATIC
 INTN\r
 EFIAPI\r
 RootBridgePathKeyCompare (\r
-  IN CONST VOID *StandaloneKey,\r
-  IN CONST VOID *UserStruct\r
+  IN CONST VOID  *StandaloneKey,\r
+  IN CONST VOID  *UserStruct\r
   )\r
 {\r
-  CONST UINT32               *Uid;\r
-  CONST ACPI_HID_DEVICE_PATH *Acpi;\r
+  CONST UINT32                *Uid;\r
+  CONST ACPI_HID_DEVICE_PATH  *Acpi;\r
 \r
   Uid  = StandaloneKey;\r
   Acpi = UserStruct;\r
@@ -101,7 +99,6 @@ RootBridgePathKeyCompare (
          0;\r
 }\r
 \r
-\r
 /**\r
   Create a structure that maps the relative positions of PCI root buses to bus\r
   numbers.\r
@@ -129,31 +126,37 @@ RootBridgePathKeyCompare (
 **/\r
 EFI_STATUS\r
 CreateExtraRootBusMap (\r
-  OUT EXTRA_ROOT_BUS_MAP **ExtraRootBusMap\r
+  OUT EXTRA_ROOT_BUS_MAP  **ExtraRootBusMap\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  UINTN                    NumHandles;\r
-  EFI_HANDLE               *Handles;\r
-  ORDERED_COLLECTION       *Collection;\r
-  EXTRA_ROOT_BUS_MAP       *Map;\r
-  UINTN                    Idx;\r
-  ORDERED_COLLECTION_ENTRY *Entry, *Entry2;\r
+  EFI_STATUS                Status;\r
+  UINTN                     NumHandles;\r
+  EFI_HANDLE                *Handles;\r
+  ORDERED_COLLECTION        *Collection;\r
+  EXTRA_ROOT_BUS_MAP        *Map;\r
+  UINTN                     Idx;\r
+  ORDERED_COLLECTION_ENTRY  *Entry, *Entry2;\r
 \r
   //\r
   // Handles and Collection are temporary / helper variables, while in Map we\r
   // build the return value.\r
   //\r
 \r
-  Status = gBS->LocateHandleBuffer (ByProtocol,\r
-                  &gEfiPciRootBridgeIoProtocolGuid, NULL /* SearchKey */,\r
-                  &NumHandles, &Handles);\r
-  if (EFI_ERROR (Status))  {\r
+  Status = gBS->LocateHandleBuffer (\r
+                  ByProtocol,\r
+                  &gEfiPciRootBridgeIoProtocolGuid,\r
+                  NULL /* SearchKey */,\r
+                  &NumHandles,\r
+                  &Handles\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Collection = OrderedCollectionInit (RootBridgePathCompare,\r
-                 RootBridgePathKeyCompare);\r
+  Collection = OrderedCollectionInit (\r
+                 RootBridgePathCompare,\r
+                 RootBridgePathKeyCompare\r
+                 );\r
   if (Collection == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeHandles;\r
@@ -169,10 +172,13 @@ CreateExtraRootBusMap (
   // Collect the ACPI device path protocols of the root bridges.\r
   //\r
   for (Idx = 0; Idx < NumHandles; ++Idx) {\r
-    EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+    EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r
-    Status = gBS->HandleProtocol (Handles[Idx], &gEfiDevicePathProtocolGuid,\r
-                    (VOID**)&DevicePath);\r
+    Status = gBS->HandleProtocol (\r
+                    Handles[Idx],\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    (VOID **)&DevicePath\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       goto FreeMap;\r
     }\r
@@ -182,14 +188,16 @@ CreateExtraRootBusMap (
     // nonzero (ie. the root bridge that the bus number belongs to is "extra",\r
     // not the main one). In that case, link the device path into Collection.\r
     //\r
-    if (DevicePathType (DevicePath) == ACPI_DEVICE_PATH &&\r
-        DevicePathSubType (DevicePath) == ACPI_DP &&\r
-        ((ACPI_HID_DEVICE_PATH *)DevicePath)->HID == EISA_PNP_ID(0x0A03) &&\r
-        ((ACPI_HID_DEVICE_PATH *)DevicePath)->UID > 0) {\r
+    if ((DevicePathType (DevicePath) == ACPI_DEVICE_PATH) &&\r
+        (DevicePathSubType (DevicePath) == ACPI_DP) &&\r
+        (((ACPI_HID_DEVICE_PATH *)DevicePath)->HID == EISA_PNP_ID (0x0A03)) &&\r
+        (((ACPI_HID_DEVICE_PATH *)DevicePath)->UID > 0))\r
+    {\r
       Status = OrderedCollectionInsert (Collection, NULL, DevicePath);\r
       if (EFI_ERROR (Status)) {\r
         goto FreeMap;\r
       }\r
+\r
       ++Map->Count;\r
     }\r
   }\r
@@ -208,24 +216,29 @@ CreateExtraRootBusMap (
   //\r
   // Now collect the bus numbers of the extra PCI root buses into Map.\r
   //\r
-  Idx = 0;\r
+  Idx   = 0;\r
   Entry = OrderedCollectionMin (Collection);\r
   while (Idx < Map->Count) {\r
-    ACPI_HID_DEVICE_PATH *Acpi;\r
+    ACPI_HID_DEVICE_PATH  *Acpi;\r
 \r
     ASSERT (Entry != NULL);\r
-    Acpi = OrderedCollectionUserStruct (Entry);\r
+    Acpi                 = OrderedCollectionUserStruct (Entry);\r
     Map->BusNumbers[Idx] = Acpi->UID;\r
-    DEBUG ((DEBUG_VERBOSE,\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
       "%a: extra bus position 0x%Lx maps to bus number (UID) 0x%x\n",\r
-      __FUNCTION__, (UINT64)(Idx + 1), Acpi->UID));\r
+      __FUNCTION__,\r
+      (UINT64)(Idx + 1),\r
+      Acpi->UID\r
+      ));\r
     ++Idx;\r
     Entry = OrderedCollectionNext (Entry);\r
   }\r
+\r
   ASSERT (Entry == NULL);\r
 \r
   *ExtraRootBusMap = Map;\r
-  Status = EFI_SUCCESS;\r
+  Status           = EFI_SUCCESS;\r
 \r
   //\r
   // Fall through in order to release temporaries.\r
@@ -236,15 +249,18 @@ FreeMap:
     if (Map->BusNumbers != NULL) {\r
       FreePool (Map->BusNumbers);\r
     }\r
+\r
     FreePool (Map);\r
   }\r
 \r
 FreeCollection:\r
   for (Entry = OrderedCollectionMin (Collection); Entry != NULL;\r
-       Entry = Entry2) {\r
+       Entry = Entry2)\r
+  {\r
     Entry2 = OrderedCollectionNext (Entry);\r
     OrderedCollectionDelete (Collection, Entry, NULL);\r
   }\r
+\r
   OrderedCollectionUninit (Collection);\r
 \r
 FreeHandles:\r
@@ -253,7 +269,6 @@ FreeHandles:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Release a map created with CreateExtraRootBusMap().\r
 \r
@@ -261,12 +276,13 @@ FreeHandles:
 */\r
 VOID\r
 DestroyExtraRootBusMap (\r
-  IN EXTRA_ROOT_BUS_MAP *ExtraRootBusMap\r
+  IN EXTRA_ROOT_BUS_MAP  *ExtraRootBusMap\r
   )\r
 {\r
   if (ExtraRootBusMap->BusNumbers != NULL) {\r
     FreePool (ExtraRootBusMap->BusNumbers);\r
   }\r
+\r
   FreePool (ExtraRootBusMap);\r
 }\r
 \r
@@ -291,17 +307,19 @@ DestroyExtraRootBusMap (
 **/\r
 EFI_STATUS\r
 MapRootBusPosToBusNr (\r
-  IN  CONST EXTRA_ROOT_BUS_MAP *ExtraRootBusMap,\r
-  IN  UINT64                   RootBusPos,\r
-  OUT UINT32                   *RootBusNr\r
+  IN  CONST EXTRA_ROOT_BUS_MAP  *ExtraRootBusMap,\r
+  IN  UINT64                    RootBusPos,\r
+  OUT UINT32                    *RootBusNr\r
   )\r
 {\r
   if (RootBusPos == 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   if (RootBusPos > ExtraRootBusMap->Count) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   *RootBusNr = ExtraRootBusMap->BusNumbers[(UINTN)RootBusPos - 1];\r
   return EFI_SUCCESS;\r
 }\r
index 3b79fbdc7f1f004d305291d16025db2c809b574f..7c4a338693daacff914a96c01df0c1eb7eb59f55 100644 (file)
@@ -16,19 +16,19 @@ typedef struct EXTRA_ROOT_BUS_MAP_STRUCT EXTRA_ROOT_BUS_MAP;
 \r
 EFI_STATUS\r
 CreateExtraRootBusMap (\r
-  OUT EXTRA_ROOT_BUS_MAP **ExtraRootBusMap\r
+  OUT EXTRA_ROOT_BUS_MAP  **ExtraRootBusMap\r
   );\r
 \r
 VOID\r
 DestroyExtraRootBusMap (\r
-  IN EXTRA_ROOT_BUS_MAP *ExtraRootBusMap\r
+  IN EXTRA_ROOT_BUS_MAP  *ExtraRootBusMap\r
   );\r
 \r
 EFI_STATUS\r
 MapRootBusPosToBusNr (\r
-  IN  CONST EXTRA_ROOT_BUS_MAP *ExtraRootBusMap,\r
-  IN  UINT64                   RootBusPos,\r
-  OUT UINT32                   *RootBusNr\r
+  IN  CONST EXTRA_ROOT_BUS_MAP  *ExtraRootBusMap,\r
+  IN  UINT64                    RootBusPos,\r
+  OUT UINT32                    *RootBusNr\r
   );\r
 \r
 #endif\r
index ceffb17fa62298439c4c4d4a12d02b758b0cffac..b5768285d8c8aaa8221e31c6edaea9e35e61dac3 100644 (file)
 /**\r
   OpenFirmware to UEFI device path translation output buffer size in CHAR16's.\r
 **/\r
-#define TRANSLATION_OUTPUT_SIZE 0x100\r
+#define TRANSLATION_OUTPUT_SIZE  0x100\r
 \r
 /**\r
   Output buffer size for OpenFirmware to UEFI device path fragment translation,\r
   in CHAR16's, for a sequence of PCI bridges.\r
 **/\r
-#define BRIDGE_TRANSLATION_OUTPUT_SIZE 0x40\r
+#define BRIDGE_TRANSLATION_OUTPUT_SIZE  0x40\r
 \r
 /**\r
   Numbers of nodes in OpenFirmware device paths that are required and examined.\r
 **/\r
-#define REQUIRED_PCI_OFW_NODES  2\r
-#define REQUIRED_MMIO_OFW_NODES 1\r
-#define EXAMINED_OFW_NODES      6\r
-\r
+#define REQUIRED_PCI_OFW_NODES   2\r
+#define REQUIRED_MMIO_OFW_NODES  1\r
+#define EXAMINED_OFW_NODES       6\r
 \r
 /**\r
   Simple character classification routines, corresponding to POSIX class names\r
@@ -49,7 +48,7 @@
 STATIC\r
 BOOLEAN\r
 IsAlnum (\r
-  IN  CHAR8 Chr\r
+  IN  CHAR8  Chr\r
   )\r
 {\r
   return (('0' <= Chr && Chr <= '9') ||\r
@@ -58,11 +57,10 @@ IsAlnum (
           );\r
 }\r
 \r
-\r
 STATIC\r
 BOOLEAN\r
 IsDriverNamePunct (\r
-  IN  CHAR8 Chr\r
+  IN  CHAR8  Chr\r
   )\r
 {\r
   return (Chr == ',' ||  Chr == '.' || Chr == '_' ||\r
@@ -70,27 +68,24 @@ IsDriverNamePunct (
           );\r
 }\r
 \r
-\r
 STATIC\r
 BOOLEAN\r
 IsPrintNotDelim (\r
-  IN  CHAR8 Chr\r
+  IN  CHAR8  Chr\r
   )\r
 {\r
   return (32 <= Chr && Chr <= 126 &&\r
           Chr != '/' && Chr != '@' && Chr != ':');\r
 }\r
 \r
-\r
 /**\r
   Utility types and functions.\r
 **/\r
 typedef struct {\r
-  CONST CHAR8 *Ptr; // not necessarily NUL-terminated\r
-  UINTN       Len;  // number of non-NUL characters\r
+  CONST CHAR8    *Ptr; // not necessarily NUL-terminated\r
+  UINTN          Len;  // number of non-NUL characters\r
 } SUBSTRING;\r
 \r
-\r
 /**\r
 \r
   Check if Substring and String have identical contents.\r
@@ -109,12 +104,12 @@ typedef struct {
 STATIC\r
 BOOLEAN\r
 SubstringEq (\r
-  IN  SUBSTRING   Substring,\r
-  IN  CONST CHAR8 *String\r
+  IN  SUBSTRING    Substring,\r
+  IN  CONST CHAR8  *String\r
   )\r
 {\r
-  UINTN       Pos;\r
-  CONST CHAR8 *Chr;\r
+  UINTN        Pos;\r
+  CONST CHAR8  *Chr;\r
 \r
   Pos = 0;\r
   Chr = String;\r
@@ -127,7 +122,6 @@ SubstringEq (
   return (BOOLEAN)(Pos == Substring.Len && *Chr == '\0');\r
 }\r
 \r
-\r
 /**\r
 \r
   Parse a comma-separated list of hexadecimal integers into the elements of an\r
@@ -175,38 +169,41 @@ ParseUnitAddressHexList (
   IN OUT  UINTN      *NumResults\r
   )\r
 {\r
-  UINTN         Entry;    // number of entry currently being parsed\r
-  UINT64        EntryVal; // value being constructed for current entry\r
-  CHAR8         PrevChr;  // UnitAddress character previously checked\r
-  UINTN         Pos;      // current position within UnitAddress\r
-  RETURN_STATUS Status;\r
+  UINTN          Entry;    // number of entry currently being parsed\r
+  UINT64         EntryVal; // value being constructed for current entry\r
+  CHAR8          PrevChr;  // UnitAddress character previously checked\r
+  UINTN          Pos;      // current position within UnitAddress\r
+  RETURN_STATUS  Status;\r
 \r
   Entry    = 0;\r
   EntryVal = 0;\r
   PrevChr  = ',';\r
 \r
   for (Pos = 0; Pos < UnitAddress.Len; ++Pos) {\r
-    CHAR8 Chr;\r
-    INT8  Val;\r
+    CHAR8  Chr;\r
+    INT8   Val;\r
 \r
     Chr = UnitAddress.Ptr[Pos];\r
     Val = ('a' <= Chr && Chr <= 'f') ? (Chr - 'a' + 10) :\r
           ('A' <= Chr && Chr <= 'F') ? (Chr - 'A' + 10) :\r
-          ('0' <= Chr && Chr <= '9') ? (Chr - '0'     ) :\r
+          ('0' <= Chr && Chr <= '9') ? (Chr - '0') :\r
           -1;\r
 \r
     if (Val >= 0) {\r
       if (EntryVal > 0xFFFFFFFFFFFFFFFull) {\r
         return RETURN_INVALID_PARAMETER;\r
       }\r
+\r
       EntryVal = LShiftU64 (EntryVal, 4) | Val;\r
     } else if (Chr == ',') {\r
       if (PrevChr == ',') {\r
         return RETURN_INVALID_PARAMETER;\r
       }\r
+\r
       if (Entry < *NumResults) {\r
         Result[Entry] = EntryVal;\r
       }\r
+\r
       ++Entry;\r
       EntryVal = 0;\r
     } else {\r
@@ -219,41 +216,40 @@ ParseUnitAddressHexList (
   if (PrevChr == ',') {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
+\r
   if (Entry < *NumResults) {\r
     Result[Entry] = EntryVal;\r
-    Status = RETURN_SUCCESS;\r
+    Status        = RETURN_SUCCESS;\r
   } else {\r
     Status = RETURN_BUFFER_TOO_SMALL;\r
   }\r
+\r
   ++Entry;\r
 \r
   *NumResults = Entry;\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   A simple array of Boot Option ID's.\r
 **/\r
 typedef struct {\r
-  UINT16 *Data;\r
-  UINTN  Allocated;\r
-  UINTN  Produced;\r
+  UINT16    *Data;\r
+  UINTN     Allocated;\r
+  UINTN     Produced;\r
 } BOOT_ORDER;\r
 \r
-\r
 /**\r
   Array element tracking an enumerated boot option that has the\r
   LOAD_OPTION_ACTIVE attribute.\r
 **/\r
 typedef struct {\r
-  CONST EFI_BOOT_MANAGER_LOAD_OPTION *BootOption; // reference only, no\r
-                                                  //   ownership\r
-  BOOLEAN                            Appended;    // has been added to a\r
-                                                  //   BOOT_ORDER?\r
+  CONST EFI_BOOT_MANAGER_LOAD_OPTION    *BootOption; // reference only, no\r
+                                                     //   ownership\r
+  BOOLEAN                               Appended;    // has been added to a\r
+                                                     //   BOOT_ORDER?\r
 } ACTIVE_OPTION;\r
 \r
-\r
 /**\r
 \r
   Append an active boot option to BootOrder, reallocating the latter if needed.\r
@@ -273,35 +269,35 @@ typedef struct {
 STATIC\r
 RETURN_STATUS\r
 BootOrderAppend (\r
-  IN OUT  BOOT_ORDER    *BootOrder,\r
-  IN OUT  ACTIVE_OPTION *ActiveOption\r
+  IN OUT  BOOT_ORDER     *BootOrder,\r
+  IN OUT  ACTIVE_OPTION  *ActiveOption\r
   )\r
 {\r
   if (BootOrder->Produced == BootOrder->Allocated) {\r
-    UINTN  AllocatedNew;\r
-    UINT16 *DataNew;\r
+    UINTN   AllocatedNew;\r
+    UINT16  *DataNew;\r
 \r
     ASSERT (BootOrder->Allocated > 0);\r
     AllocatedNew = BootOrder->Allocated * 2;\r
-    DataNew = ReallocatePool (\r
-                BootOrder->Allocated * sizeof (*BootOrder->Data),\r
-                AllocatedNew         * sizeof (*DataNew),\r
-                BootOrder->Data\r
-                );\r
+    DataNew      = ReallocatePool (\r
+                     BootOrder->Allocated * sizeof (*BootOrder->Data),\r
+                     AllocatedNew         * sizeof (*DataNew),\r
+                     BootOrder->Data\r
+                     );\r
     if (DataNew == NULL) {\r
       return RETURN_OUT_OF_RESOURCES;\r
     }\r
+\r
     BootOrder->Allocated = AllocatedNew;\r
     BootOrder->Data      = DataNew;\r
   }\r
 \r
   BootOrder->Data[BootOrder->Produced++] =\r
-                               (UINT16) ActiveOption->BootOption->OptionNumber;\r
+    (UINT16)ActiveOption->BootOption->OptionNumber;\r
   ActiveOption->Appended = TRUE;\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
 \r
   Create an array of ACTIVE_OPTION elements for a boot option array.\r
@@ -330,14 +326,14 @@ BootOrderAppend (
 STATIC\r
 RETURN_STATUS\r
 CollectActiveOptions (\r
-  IN   CONST EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions,\r
-  IN   UINTN                              BootOptionCount,\r
-  OUT  ACTIVE_OPTION                      **ActiveOption,\r
-  OUT  UINTN                              *Count\r
+  IN   CONST EFI_BOOT_MANAGER_LOAD_OPTION  *BootOptions,\r
+  IN   UINTN                               BootOptionCount,\r
+  OUT  ACTIVE_OPTION                       **ActiveOption,\r
+  OUT  UINTN                               *Count\r
   )\r
 {\r
-  UINTN Index;\r
-  UINTN ScanMode;\r
+  UINTN  Index;\r
+  UINTN  ScanMode;\r
 \r
   *ActiveOption = NULL;\r
 \r
@@ -354,6 +350,7 @@ CollectActiveOptions (
           (*ActiveOption)[*Count].BootOption = &BootOptions[Index];\r
           (*ActiveOption)[*Count].Appended   = FALSE;\r
         }\r
+\r
         ++*Count;\r
       }\r
     }\r
@@ -362,26 +359,26 @@ CollectActiveOptions (
       if (*Count == 0) {\r
         return RETURN_NOT_FOUND;\r
       }\r
+\r
       *ActiveOption = AllocatePool (*Count * sizeof **ActiveOption);\r
       if (*ActiveOption == NULL) {\r
         return RETURN_OUT_OF_RESOURCES;\r
       }\r
     }\r
   }\r
+\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   OpenFirmware device path node\r
 **/\r
 typedef struct {\r
-  SUBSTRING DriverName;\r
-  SUBSTRING UnitAddress;\r
-  SUBSTRING DeviceArguments;\r
+  SUBSTRING    DriverName;\r
+  SUBSTRING    UnitAddress;\r
+  SUBSTRING    DeviceArguments;\r
 } OFW_NODE;\r
 \r
-\r
 /**\r
 \r
   Parse an OpenFirmware device path node into the caller-allocated OFW_NODE\r
@@ -430,24 +427,24 @@ typedef struct {
 STATIC\r
 RETURN_STATUS\r
 ParseOfwNode (\r
-  IN OUT  CONST CHAR8 **Ptr,\r
-  OUT     OFW_NODE    *OfwNode,\r
-  OUT     BOOLEAN     *IsFinal\r
+  IN OUT  CONST CHAR8  **Ptr,\r
+  OUT     OFW_NODE     *OfwNode,\r
+  OUT     BOOLEAN      *IsFinal\r
   )\r
 {\r
   //\r
   // A leading slash is expected. End of string is tolerated.\r
   //\r
   switch (**Ptr) {\r
-  case '\0':\r
-    return RETURN_NOT_FOUND;\r
+    case '\0':\r
+      return RETURN_NOT_FOUND;\r
 \r
-  case '/':\r
-    ++*Ptr;\r
-    break;\r
+    case '/':\r
+      ++*Ptr;\r
+      break;\r
 \r
-  default:\r
-    return RETURN_INVALID_PARAMETER;\r
+    default:\r
+      return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
@@ -457,22 +454,23 @@ ParseOfwNode (
   OfwNode->DriverName.Len = 0;\r
   while (OfwNode->DriverName.Len < 32 &&\r
          (IsAlnum (**Ptr) || IsDriverNamePunct (**Ptr))\r
-         ) {\r
+         )\r
+  {\r
     ++*Ptr;\r
     ++OfwNode->DriverName.Len;\r
   }\r
 \r
-  if (OfwNode->DriverName.Len == 0 || OfwNode->DriverName.Len == 32) {\r
+  if ((OfwNode->DriverName.Len == 0) || (OfwNode->DriverName.Len == 32)) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
-\r
   //\r
   // unit-address\r
   //\r
   if (**Ptr != '@') {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
+\r
   ++*Ptr;\r
 \r
   OfwNode->UnitAddress.Ptr = *Ptr;\r
@@ -486,7 +484,6 @@ ParseOfwNode (
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
-\r
   //\r
   // device-arguments, may be omitted\r
   //\r
@@ -503,43 +500,43 @@ ParseOfwNode (
     if (OfwNode->DeviceArguments.Len == 0) {\r
       return RETURN_INVALID_PARAMETER;\r
     }\r
-  }\r
-  else {\r
+  } else {\r
     OfwNode->DeviceArguments.Ptr = NULL;\r
   }\r
 \r
   switch (**Ptr) {\r
-  case '\n':\r
-    ++*Ptr;\r
+    case '\n':\r
+      ++*Ptr;\r
     //\r
     // fall through\r
     //\r
 \r
-  case '\0':\r
-    *IsFinal = TRUE;\r
-    break;\r
+    case '\0':\r
+      *IsFinal = TRUE;\r
+      break;\r
 \r
-  case '/':\r
-    *IsFinal = FALSE;\r
-    break;\r
+    case '/':\r
+      *IsFinal = FALSE;\r
+      break;\r
 \r
-  default:\r
-    return RETURN_INVALID_PARAMETER;\r
+    default:\r
+      return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
   DEBUG ((\r
     DEBUG_VERBOSE,\r
     "%a: DriverName=\"%.*a\" UnitAddress=\"%.*a\" DeviceArguments=\"%.*a\"\n",\r
     __FUNCTION__,\r
-    OfwNode->DriverName.Len, OfwNode->DriverName.Ptr,\r
-    OfwNode->UnitAddress.Len, OfwNode->UnitAddress.Ptr,\r
+    OfwNode->DriverName.Len,\r
+    OfwNode->DriverName.Ptr,\r
+    OfwNode->UnitAddress.Len,\r
+    OfwNode->UnitAddress.Ptr,\r
     OfwNode->DeviceArguments.Len,\r
     OfwNode->DeviceArguments.Ptr == NULL ? "" : OfwNode->DeviceArguments.Ptr\r
     ));\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
 \r
   Translate a PCI-like array of OpenFirmware device nodes to a UEFI device path\r
@@ -584,21 +581,21 @@ ParseOfwNode (
 STATIC\r
 RETURN_STATUS\r
 TranslatePciOfwNodes (\r
-  IN      CONST OFW_NODE           *OfwNode,\r
-  IN      UINTN                    NumNodes,\r
-  IN      CONST EXTRA_ROOT_BUS_MAP *ExtraPciRoots,\r
-  OUT     CHAR16                   *Translated,\r
-  IN OUT  UINTN                    *TranslatedSize\r
+  IN      CONST OFW_NODE            *OfwNode,\r
+  IN      UINTN                     NumNodes,\r
+  IN      CONST EXTRA_ROOT_BUS_MAP  *ExtraPciRoots,\r
+  OUT     CHAR16                    *Translated,\r
+  IN OUT  UINTN                     *TranslatedSize\r
   )\r
 {\r
-  UINT32 PciRoot;\r
-  CHAR8  *Comma;\r
-  UINTN  FirstNonBridge;\r
-  CHAR16 Bridges[BRIDGE_TRANSLATION_OUTPUT_SIZE];\r
-  UINTN  BridgesLen;\r
-  UINT64 PciDevFun[2];\r
-  UINTN  NumEntries;\r
-  UINTN  Written;\r
+  UINT32  PciRoot;\r
+  CHAR8   *Comma;\r
+  UINTN   FirstNonBridge;\r
+  CHAR16  Bridges[BRIDGE_TRANSLATION_OUTPUT_SIZE];\r
+  UINTN   BridgesLen;\r
+  UINT64  PciDevFun[2];\r
+  UINTN   NumEntries;\r
+  UINTN   Written;\r
 \r
   //\r
   // Resolve the PCI root bus number.\r
@@ -613,18 +610,22 @@ TranslatePciOfwNodes (
   //              ^\r
   //              root bus serial number (not PCI bus number)\r
   //\r
-  if (NumNodes < REQUIRED_PCI_OFW_NODES ||\r
+  if ((NumNodes < REQUIRED_PCI_OFW_NODES) ||\r
       !SubstringEq (OfwNode[0].DriverName, "pci")\r
-      ) {\r
+      )\r
+  {\r
     return RETURN_UNSUPPORTED;\r
   }\r
 \r
   PciRoot = 0;\r
-  Comma = ScanMem8 (OfwNode[0].UnitAddress.Ptr, OfwNode[0].UnitAddress.Len,\r
-            ',');\r
+  Comma   = ScanMem8 (\r
+              OfwNode[0].UnitAddress.Ptr,\r
+              OfwNode[0].UnitAddress.Len,\r
+              ','\r
+              );\r
   if (Comma != NULL) {\r
-    SUBSTRING PciRootSerialSubString;\r
-    UINT64    PciRootSerial;\r
+    SUBSTRING  PciRootSerialSubString;\r
+    UINT64     PciRootSerial;\r
 \r
     //\r
     // Parse the root bus serial number from the unit address after the comma.\r
@@ -634,16 +635,28 @@ TranslatePciOfwNodes (
                                  (PciRootSerialSubString.Ptr -\r
                                   OfwNode[0].UnitAddress.Ptr);\r
     NumEntries = 1;\r
-    if (RETURN_ERROR (ParseUnitAddressHexList (PciRootSerialSubString,\r
-                      &PciRootSerial, &NumEntries))) {\r
+    if (RETURN_ERROR (\r
+          ParseUnitAddressHexList (\r
+            PciRootSerialSubString,\r
+            &PciRootSerial,\r
+            &NumEntries\r
+            )\r
+          ))\r
+    {\r
       return RETURN_UNSUPPORTED;\r
     }\r
 \r
     //\r
     // Map the extra root bus's serial number to its actual bus number.\r
     //\r
-    if (EFI_ERROR (MapRootBusPosToBusNr (ExtraPciRoots, PciRootSerial,\r
-                     &PciRoot))) {\r
+    if (EFI_ERROR (\r
+          MapRootBusPosToBusNr (\r
+            ExtraPciRoots,\r
+            PciRootSerial,\r
+            &PciRoot\r
+            )\r
+          ))\r
+    {\r
       return RETURN_PROTOCOL_ERROR;\r
     }\r
   }\r
@@ -660,26 +673,35 @@ TranslatePciOfwNodes (
   //   Pci(0x1E,0x0)\r
   //\r
   FirstNonBridge = 1;\r
-  Bridges[0] = L'\0';\r
-  BridgesLen = 0;\r
+  Bridges[0]     = L'\0';\r
+  BridgesLen     = 0;\r
   do {\r
-    UINT64 BridgeDevFun[2];\r
-    UINTN  BridgesFreeBytes;\r
+    UINT64  BridgeDevFun[2];\r
+    UINTN   BridgesFreeBytes;\r
 \r
     if (!SubstringEq (OfwNode[FirstNonBridge].DriverName, "pci-bridge")) {\r
       break;\r
     }\r
 \r
     BridgeDevFun[1] = 0;\r
-    NumEntries = sizeof BridgeDevFun / sizeof BridgeDevFun[0];\r
-    if (ParseUnitAddressHexList (OfwNode[FirstNonBridge].UnitAddress,\r
-          BridgeDevFun, &NumEntries) != RETURN_SUCCESS) {\r
+    NumEntries      = sizeof BridgeDevFun / sizeof BridgeDevFun[0];\r
+    if (ParseUnitAddressHexList (\r
+          OfwNode[FirstNonBridge].UnitAddress,\r
+          BridgeDevFun,\r
+          &NumEntries\r
+          ) != RETURN_SUCCESS)\r
+    {\r
       return RETURN_UNSUPPORTED;\r
     }\r
 \r
     BridgesFreeBytes = sizeof Bridges - BridgesLen * sizeof Bridges[0];\r
-    Written = UnicodeSPrintAsciiFormat (Bridges + BridgesLen, BridgesFreeBytes,\r
-                "/Pci(0x%Lx,0x%Lx)", BridgeDevFun[0], BridgeDevFun[1]);\r
+    Written          = UnicodeSPrintAsciiFormat (\r
+                         Bridges + BridgesLen,\r
+                         BridgesFreeBytes,\r
+                         "/Pci(0x%Lx,0x%Lx)",\r
+                         BridgeDevFun[0],\r
+                         BridgeDevFun[1]\r
+                         );\r
     BridgesLen += Written;\r
 \r
     //\r
@@ -701,21 +723,23 @@ TranslatePciOfwNodes (
   // Parse the OFW nodes starting with the first non-bridge node.\r
   //\r
   PciDevFun[1] = 0;\r
-  NumEntries = ARRAY_SIZE (PciDevFun);\r
+  NumEntries   = ARRAY_SIZE (PciDevFun);\r
   if (ParseUnitAddressHexList (\r
         OfwNode[FirstNonBridge].UnitAddress,\r
         PciDevFun,\r
         &NumEntries\r
         ) != RETURN_SUCCESS\r
-      ) {\r
+      )\r
+  {\r
     return RETURN_UNSUPPORTED;\r
   }\r
 \r
-  if (NumNodes >= FirstNonBridge + 3 &&\r
+  if ((NumNodes >= FirstNonBridge + 3) &&\r
       SubstringEq (OfwNode[FirstNonBridge + 0].DriverName, "ide") &&\r
       SubstringEq (OfwNode[FirstNonBridge + 1].DriverName, "drive") &&\r
       SubstringEq (OfwNode[FirstNonBridge + 2].DriverName, "disk")\r
-      ) {\r
+      )\r
+  {\r
     //\r
     // OpenFirmware device path (IDE disk, IDE CD-ROM):\r
     //\r
@@ -732,42 +756,44 @@ TranslatePciOfwNodes (
     //                                                ^\r
     //                                                fixed LUN\r
     //\r
-    UINT64 Secondary;\r
-    UINT64 Slave;\r
+    UINT64  Secondary;\r
+    UINT64  Slave;\r
 \r
     NumEntries = 1;\r
-    if (ParseUnitAddressHexList (\r
-          OfwNode[FirstNonBridge + 1].UnitAddress,\r
-          &Secondary,\r
-          &NumEntries\r
-          ) != RETURN_SUCCESS ||\r
-        Secondary > 1 ||\r
-        ParseUnitAddressHexList (\r
-          OfwNode[FirstNonBridge + 2].UnitAddress,\r
-          &Slave,\r
-          &NumEntries // reuse after previous single-element call\r
-          ) != RETURN_SUCCESS ||\r
-        Slave > 1\r
-        ) {\r
+    if ((ParseUnitAddressHexList (\r
+           OfwNode[FirstNonBridge + 1].UnitAddress,\r
+           &Secondary,\r
+           &NumEntries\r
+           ) != RETURN_SUCCESS) ||\r
+        (Secondary > 1) ||\r
+        (ParseUnitAddressHexList (\r
+           OfwNode[FirstNonBridge + 2].UnitAddress,\r
+           &Slave,\r
+           &NumEntries // reuse after previous single-element call\r
+           ) != RETURN_SUCCESS) ||\r
+        (Slave > 1)\r
+        )\r
+    {\r
       return RETURN_UNSUPPORTED;\r
     }\r
 \r
     Written = UnicodeSPrintAsciiFormat (\r
-      Translated,\r
-      *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
-      "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/Ata(%a,%a,0x0)",\r
-      PciRoot,\r
-      Bridges,\r
-      PciDevFun[0],\r
-      PciDevFun[1],\r
-      Secondary ? "Secondary" : "Primary",\r
-      Slave ? "Slave" : "Master"\r
-      );\r
-  } else if (NumNodes >= FirstNonBridge + 3 &&\r
-      SubstringEq (OfwNode[FirstNonBridge + 0].DriverName, "pci8086,2922") &&\r
-      SubstringEq (OfwNode[FirstNonBridge + 1].DriverName, "drive") &&\r
-      SubstringEq (OfwNode[FirstNonBridge + 2].DriverName, "disk")\r
-      ) {\r
+                Translated,\r
+                *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
+                "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/Ata(%a,%a,0x0)",\r
+                PciRoot,\r
+                Bridges,\r
+                PciDevFun[0],\r
+                PciDevFun[1],\r
+                Secondary ? "Secondary" : "Primary",\r
+                Slave ? "Slave" : "Master"\r
+                );\r
+  } else if ((NumNodes >= FirstNonBridge + 3) &&\r
+             SubstringEq (OfwNode[FirstNonBridge + 0].DriverName, "pci8086,2922") &&\r
+             SubstringEq (OfwNode[FirstNonBridge + 1].DriverName, "drive") &&\r
+             SubstringEq (OfwNode[FirstNonBridge + 2].DriverName, "disk")\r
+             )\r
+  {\r
     //\r
     // OpenFirmware device path (Q35 SATA disk and CD-ROM):\r
     //\r
@@ -787,30 +813,36 @@ TranslatePciOfwNodes (
     //                                   |   always 0xFFFF on Q35\r
     //                                   channel (port) number\r
     //\r
-    UINT64 Channel;\r
+    UINT64  Channel;\r
 \r
     NumEntries = 1;\r
-    if (RETURN_ERROR (ParseUnitAddressHexList (\r
-                        OfwNode[FirstNonBridge + 1].UnitAddress, &Channel,\r
-                        &NumEntries))) {\r
+    if (RETURN_ERROR (\r
+          ParseUnitAddressHexList (\r
+            OfwNode[FirstNonBridge + 1].UnitAddress,\r
+            &Channel,\r
+            &NumEntries\r
+            )\r
+          ))\r
+    {\r
       return RETURN_UNSUPPORTED;\r
     }\r
 \r
     Written = UnicodeSPrintAsciiFormat (\r
-      Translated,\r
-      *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
-      "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/Sata(0x%Lx,0xFFFF,0x0)",\r
-      PciRoot,\r
-      Bridges,\r
-      PciDevFun[0],\r
-      PciDevFun[1],\r
-      Channel\r
-      );\r
-  } else if (NumNodes >= FirstNonBridge + 3 &&\r
+                Translated,\r
+                *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
+                "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/Sata(0x%Lx,0xFFFF,0x0)",\r
+                PciRoot,\r
+                Bridges,\r
+                PciDevFun[0],\r
+                PciDevFun[1],\r
+                Channel\r
+                );\r
+  } else if ((NumNodes >= FirstNonBridge + 3) &&\r
              SubstringEq (OfwNode[FirstNonBridge + 0].DriverName, "isa") &&\r
              SubstringEq (OfwNode[FirstNonBridge + 1].DriverName, "fdc") &&\r
              SubstringEq (OfwNode[FirstNonBridge + 2].DriverName, "floppy")\r
-             ) {\r
+             )\r
+  {\r
     //\r
     // OpenFirmware device path (floppy disk):\r
     //\r
@@ -827,33 +859,35 @@ TranslatePciOfwNodes (
     //                                    ^\r
     //                                    ACPI UID\r
     //\r
-    UINT64 AcpiUid;\r
+    UINT64  AcpiUid;\r
 \r
     NumEntries = 1;\r
-    if (ParseUnitAddressHexList (\r
-          OfwNode[FirstNonBridge + 2].UnitAddress,\r
-          &AcpiUid,\r
-          &NumEntries\r
-          ) != RETURN_SUCCESS ||\r
-        AcpiUid > 1\r
-        ) {\r
+    if ((ParseUnitAddressHexList (\r
+           OfwNode[FirstNonBridge + 2].UnitAddress,\r
+           &AcpiUid,\r
+           &NumEntries\r
+           ) != RETURN_SUCCESS) ||\r
+        (AcpiUid > 1)\r
+        )\r
+    {\r
       return RETURN_UNSUPPORTED;\r
     }\r
 \r
     Written = UnicodeSPrintAsciiFormat (\r
-      Translated,\r
-      *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
-      "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/Floppy(0x%Lx)",\r
-      PciRoot,\r
-      Bridges,\r
-      PciDevFun[0],\r
-      PciDevFun[1],\r
-      AcpiUid\r
-      );\r
-  } else if (NumNodes >= FirstNonBridge + 2 &&\r
+                Translated,\r
+                *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
+                "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/Floppy(0x%Lx)",\r
+                PciRoot,\r
+                Bridges,\r
+                PciDevFun[0],\r
+                PciDevFun[1],\r
+                AcpiUid\r
+                );\r
+  } else if ((NumNodes >= FirstNonBridge + 2) &&\r
              SubstringEq (OfwNode[FirstNonBridge + 0].DriverName, "scsi") &&\r
              SubstringEq (OfwNode[FirstNonBridge + 1].DriverName, "disk")\r
-             ) {\r
+             )\r
+  {\r
     //\r
     // OpenFirmware device path (virtio-blk disk):\r
     //\r
@@ -870,19 +904,20 @@ TranslatePciOfwNodes (
     //   PciRoot(0x0)/Pci(0x6,0x3) -- if PCI function is present and nonzero\r
     //\r
     Written = UnicodeSPrintAsciiFormat (\r
-      Translated,\r
-      *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
-      "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)",\r
-      PciRoot,\r
-      Bridges,\r
-      PciDevFun[0],\r
-      PciDevFun[1]\r
-      );\r
-  } else if (NumNodes >= FirstNonBridge + 3 &&\r
+                Translated,\r
+                *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
+                "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)",\r
+                PciRoot,\r
+                Bridges,\r
+                PciDevFun[0],\r
+                PciDevFun[1]\r
+                );\r
+  } else if ((NumNodes >= FirstNonBridge + 3) &&\r
              SubstringEq (OfwNode[FirstNonBridge + 0].DriverName, "scsi") &&\r
              SubstringEq (OfwNode[FirstNonBridge + 1].DriverName, "channel") &&\r
              SubstringEq (OfwNode[FirstNonBridge + 2].DriverName, "disk")\r
-             ) {\r
+             )\r
+  {\r
     //\r
     // OpenFirmware device path (virtio-scsi disk):\r
     //\r
@@ -901,34 +936,36 @@ TranslatePciOfwNodes (
     //   PciRoot(0x0)/Pci(0x7,0x3)/Scsi(0x2,0x3)\r
     //                                -- if PCI function is present and nonzero\r
     //\r
-    UINT64 TargetLun[2];\r
+    UINT64  TargetLun[2];\r
 \r
     TargetLun[1] = 0;\r
-    NumEntries = ARRAY_SIZE (TargetLun);\r
+    NumEntries   = ARRAY_SIZE (TargetLun);\r
     if (ParseUnitAddressHexList (\r
           OfwNode[FirstNonBridge + 2].UnitAddress,\r
           TargetLun,\r
           &NumEntries\r
           ) != RETURN_SUCCESS\r
-        ) {\r
+        )\r
+    {\r
       return RETURN_UNSUPPORTED;\r
     }\r
 \r
     Written = UnicodeSPrintAsciiFormat (\r
-      Translated,\r
-      *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
-      "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/Scsi(0x%Lx,0x%Lx)",\r
-      PciRoot,\r
-      Bridges,\r
-      PciDevFun[0],\r
-      PciDevFun[1],\r
-      TargetLun[0],\r
-      TargetLun[1]\r
-      );\r
-  } else if (NumNodes >= FirstNonBridge + 2 &&\r
-      SubstringEq (OfwNode[FirstNonBridge + 0].DriverName, "pci8086,5845") &&\r
-      SubstringEq (OfwNode[FirstNonBridge + 1].DriverName, "namespace")\r
-      ) {\r
+                Translated,\r
+                *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
+                "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/Scsi(0x%Lx,0x%Lx)",\r
+                PciRoot,\r
+                Bridges,\r
+                PciDevFun[0],\r
+                PciDevFun[1],\r
+                TargetLun[0],\r
+                TargetLun[1]\r
+                );\r
+  } else if ((NumNodes >= FirstNonBridge + 2) &&\r
+             SubstringEq (OfwNode[FirstNonBridge + 0].DriverName, "pci8086,5845") &&\r
+             SubstringEq (OfwNode[FirstNonBridge + 1].DriverName, "namespace")\r
+             )\r
+  {\r
     //\r
     // OpenFirmware device path (NVMe device):\r
     //\r
@@ -948,41 +985,49 @@ TranslatePciOfwNodes (
     //                                  |   in address order\r
     //                                  namespace ID\r
     //\r
-    UINT64 Namespace[2];\r
-    UINTN  RequiredEntries;\r
-    UINT8  *Eui64;\r
+    UINT64  Namespace[2];\r
+    UINTN   RequiredEntries;\r
+    UINT8   *Eui64;\r
 \r
     RequiredEntries = ARRAY_SIZE (Namespace);\r
-    NumEntries = RequiredEntries;\r
-    if (ParseUnitAddressHexList (\r
-          OfwNode[FirstNonBridge + 1].UnitAddress,\r
-          Namespace,\r
-          &NumEntries\r
-          ) != RETURN_SUCCESS ||\r
-        NumEntries != RequiredEntries ||\r
-        Namespace[0] == 0 ||\r
-        Namespace[0] >= MAX_UINT32\r
-        ) {\r
+    NumEntries      = RequiredEntries;\r
+    if ((ParseUnitAddressHexList (\r
+           OfwNode[FirstNonBridge + 1].UnitAddress,\r
+           Namespace,\r
+           &NumEntries\r
+           ) != RETURN_SUCCESS) ||\r
+        (NumEntries != RequiredEntries) ||\r
+        (Namespace[0] == 0) ||\r
+        (Namespace[0] >= MAX_UINT32)\r
+        )\r
+    {\r
       return RETURN_UNSUPPORTED;\r
     }\r
 \r
-    Eui64 = (UINT8 *)&Namespace[1];\r
+    Eui64   = (UINT8 *)&Namespace[1];\r
     Written = UnicodeSPrintAsciiFormat (\r
-      Translated,\r
-      *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
-      "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/"\r
-      "NVMe(0x%Lx,%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)",\r
-      PciRoot,\r
-      Bridges,\r
-      PciDevFun[0],\r
-      PciDevFun[1],\r
-      Namespace[0],\r
-      Eui64[7], Eui64[6], Eui64[5], Eui64[4],\r
-      Eui64[3], Eui64[2], Eui64[1], Eui64[0]\r
-      );\r
-  } else if (NumNodes >= FirstNonBridge + 2 &&\r
+                Translated,\r
+                *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
+                "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/"\r
+                "NVMe(0x%Lx,%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)",\r
+                PciRoot,\r
+                Bridges,\r
+                PciDevFun[0],\r
+                PciDevFun[1],\r
+                Namespace[0],\r
+                Eui64[7],\r
+                Eui64[6],\r
+                Eui64[5],\r
+                Eui64[4],\r
+                Eui64[3],\r
+                Eui64[2],\r
+                Eui64[1],\r
+                Eui64[0]\r
+                );\r
+  } else if ((NumNodes >= FirstNonBridge + 2) &&\r
              SubstringEq (OfwNode[FirstNonBridge + 0].DriverName, "usb") &&\r
-             SubstringEq (OfwNode[FirstNonBridge + 1].DriverName, "storage")) {\r
+             SubstringEq (OfwNode[FirstNonBridge + 1].DriverName, "storage"))\r
+  {\r
     //\r
     // OpenFirmware device path (usb-storage device in XHCI port):\r
     //\r
@@ -1001,16 +1046,16 @@ TranslatePciOfwNodes (
     //                        |        XHCI port number in 0-based notation\r
     //                        0x0 if PCI function is 0, or absent from OFW\r
     //\r
-    RETURN_STATUS ParseStatus;\r
-    UINT64        OneBasedXhciPort;\r
+    RETURN_STATUS  ParseStatus;\r
+    UINT64         OneBasedXhciPort;\r
 \r
-    NumEntries = 1;\r
+    NumEntries  = 1;\r
     ParseStatus = ParseUnitAddressHexList (\r
                     OfwNode[FirstNonBridge + 1].UnitAddress,\r
                     &OneBasedXhciPort,\r
                     &NumEntries\r
                     );\r
-    if (RETURN_ERROR (ParseStatus) || OneBasedXhciPort == 0) {\r
+    if (RETURN_ERROR (ParseStatus) || (OneBasedXhciPort == 0)) {\r
       return RETURN_UNSUPPORTED;\r
     }\r
 \r
@@ -1039,14 +1084,14 @@ TranslatePciOfwNodes (
     //   PciRoot(0x0)/Pci(0x3,0x2)\r
     //\r
     Written = UnicodeSPrintAsciiFormat (\r
-      Translated,\r
-      *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
-      "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)",\r
-      PciRoot,\r
-      Bridges,\r
-      PciDevFun[0],\r
-      PciDevFun[1]\r
-      );\r
+                Translated,\r
+                *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
+                "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)",\r
+                PciRoot,\r
+                Bridges,\r
+                PciDevFun[0],\r
+                PciDevFun[1]\r
+                );\r
   }\r
 \r
   //\r
@@ -1062,17 +1107,15 @@ TranslatePciOfwNodes (
   return RETURN_BUFFER_TOO_SMALL;\r
 }\r
 \r
-\r
 //\r
 // A type providing easy raw access to the base address of a virtio-mmio\r
 // transport.\r
 //\r
 typedef union {\r
-  UINT64 Uint64;\r
-  UINT8  Raw[8];\r
+  UINT64    Uint64;\r
+  UINT8     Raw[8];\r
 } VIRTIO_MMIO_BASE_ADDRESS;\r
 \r
-\r
 /**\r
 \r
   Translate an MMIO-like array of OpenFirmware device nodes to a UEFI device\r
@@ -1108,43 +1151,56 @@ typedef union {
 STATIC\r
 RETURN_STATUS\r
 TranslateMmioOfwNodes (\r
-  IN      CONST OFW_NODE *OfwNode,\r
-  IN      UINTN          NumNodes,\r
-  OUT     CHAR16         *Translated,\r
-  IN OUT  UINTN          *TranslatedSize\r
+  IN      CONST OFW_NODE  *OfwNode,\r
+  IN      UINTN           NumNodes,\r
+  OUT     CHAR16          *Translated,\r
+  IN OUT  UINTN           *TranslatedSize\r
   )\r
 {\r
-  VIRTIO_MMIO_BASE_ADDRESS VirtioMmioBase;\r
-  CHAR16                   VenHwString[60 + 1];\r
-  UINTN                    NumEntries;\r
-  UINTN                    Written;\r
+  VIRTIO_MMIO_BASE_ADDRESS  VirtioMmioBase;\r
+  CHAR16                    VenHwString[60 + 1];\r
+  UINTN                     NumEntries;\r
+  UINTN                     Written;\r
 \r
   //\r
   // Get the base address of the virtio-mmio transport.\r
   //\r
-  if (NumNodes < REQUIRED_MMIO_OFW_NODES ||\r
+  if ((NumNodes < REQUIRED_MMIO_OFW_NODES) ||\r
       !SubstringEq (OfwNode[0].DriverName, "virtio-mmio")\r
-      ) {\r
+      )\r
+  {\r
     return RETURN_UNSUPPORTED;\r
   }\r
+\r
   NumEntries = 1;\r
   if (ParseUnitAddressHexList (\r
         OfwNode[0].UnitAddress,\r
         &VirtioMmioBase.Uint64,\r
         &NumEntries\r
         ) != RETURN_SUCCESS\r
-      ) {\r
+      )\r
+  {\r
     return RETURN_UNSUPPORTED;\r
   }\r
 \r
-  UnicodeSPrintAsciiFormat (VenHwString, sizeof VenHwString,\r
-    "VenHw(%g,%02X%02X%02X%02X%02X%02X%02X%02X)", &gVirtioMmioTransportGuid,\r
-    VirtioMmioBase.Raw[0], VirtioMmioBase.Raw[1], VirtioMmioBase.Raw[2],\r
-    VirtioMmioBase.Raw[3], VirtioMmioBase.Raw[4], VirtioMmioBase.Raw[5],\r
-    VirtioMmioBase.Raw[6], VirtioMmioBase.Raw[7]);\r
-\r
-  if (NumNodes >= 2 &&\r
-      SubstringEq (OfwNode[1].DriverName, "disk")) {\r
+  UnicodeSPrintAsciiFormat (\r
+    VenHwString,\r
+    sizeof VenHwString,\r
+    "VenHw(%g,%02X%02X%02X%02X%02X%02X%02X%02X)",\r
+    &gVirtioMmioTransportGuid,\r
+    VirtioMmioBase.Raw[0],\r
+    VirtioMmioBase.Raw[1],\r
+    VirtioMmioBase.Raw[2],\r
+    VirtioMmioBase.Raw[3],\r
+    VirtioMmioBase.Raw[4],\r
+    VirtioMmioBase.Raw[5],\r
+    VirtioMmioBase.Raw[6],\r
+    VirtioMmioBase.Raw[7]\r
+    );\r
+\r
+  if ((NumNodes >= 2) &&\r
+      SubstringEq (OfwNode[1].DriverName, "disk"))\r
+  {\r
     //\r
     // OpenFirmware device path (virtio-blk disk):\r
     //\r
@@ -1163,9 +1219,10 @@ TranslateMmioOfwNodes (
                 "%s",\r
                 VenHwString\r
                 );\r
-  } else if (NumNodes >= 3 &&\r
+  } else if ((NumNodes >= 3) &&\r
              SubstringEq (OfwNode[1].DriverName, "channel") &&\r
-             SubstringEq (OfwNode[2].DriverName, "disk")) {\r
+             SubstringEq (OfwNode[2].DriverName, "disk"))\r
+  {\r
     //\r
     // OpenFirmware device path (virtio-scsi disk):\r
     //\r
@@ -1180,16 +1237,17 @@ TranslateMmioOfwNodes (
     //\r
     //   <VenHwString>/Scsi(0x2,0x3)\r
     //\r
-    UINT64 TargetLun[2];\r
+    UINT64  TargetLun[2];\r
 \r
     TargetLun[1] = 0;\r
-    NumEntries = ARRAY_SIZE (TargetLun);\r
+    NumEntries   = ARRAY_SIZE (TargetLun);\r
     if (ParseUnitAddressHexList (\r
           OfwNode[2].UnitAddress,\r
           TargetLun,\r
           &NumEntries\r
           ) != RETURN_SUCCESS\r
-        ) {\r
+        )\r
+    {\r
       return RETURN_UNSUPPORTED;\r
     }\r
 \r
@@ -1201,8 +1259,9 @@ TranslateMmioOfwNodes (
                 TargetLun[0],\r
                 TargetLun[1]\r
                 );\r
-  } else if (NumNodes >= 2 &&\r
-             SubstringEq (OfwNode[1].DriverName, "ethernet-phy")) {\r
+  } else if ((NumNodes >= 2) &&\r
+             SubstringEq (OfwNode[1].DriverName, "ethernet-phy"))\r
+  {\r
     //\r
     // OpenFirmware device path (virtio-net NIC):\r
     //\r
@@ -1238,7 +1297,6 @@ TranslateMmioOfwNodes (
   return RETURN_BUFFER_TOO_SMALL;\r
 }\r
 \r
-\r
 /**\r
 \r
   Translate an array of OpenFirmware device nodes to a UEFI device path\r
@@ -1283,26 +1341,38 @@ TranslateMmioOfwNodes (
 STATIC\r
 RETURN_STATUS\r
 TranslateOfwNodes (\r
-  IN      CONST OFW_NODE           *OfwNode,\r
-  IN      UINTN                    NumNodes,\r
-  IN      CONST EXTRA_ROOT_BUS_MAP *ExtraPciRoots,\r
-  OUT     CHAR16                   *Translated,\r
-  IN OUT  UINTN                    *TranslatedSize\r
+  IN      CONST OFW_NODE            *OfwNode,\r
+  IN      UINTN                     NumNodes,\r
+  IN      CONST EXTRA_ROOT_BUS_MAP  *ExtraPciRoots,\r
+  OUT     CHAR16                    *Translated,\r
+  IN OUT  UINTN                     *TranslatedSize\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
+  RETURN_STATUS  Status;\r
 \r
   Status = RETURN_UNSUPPORTED;\r
 \r
   if (FeaturePcdGet (PcdQemuBootOrderPciTranslation)) {\r
-    Status = TranslatePciOfwNodes (OfwNode, NumNodes, ExtraPciRoots,\r
-               Translated, TranslatedSize);\r
+    Status = TranslatePciOfwNodes (\r
+               OfwNode,\r
+               NumNodes,\r
+               ExtraPciRoots,\r
+               Translated,\r
+               TranslatedSize\r
+               );\r
   }\r
-  if (Status == RETURN_UNSUPPORTED &&\r
-      FeaturePcdGet (PcdQemuBootOrderMmioTranslation)) {\r
-    Status = TranslateMmioOfwNodes (OfwNode, NumNodes, Translated,\r
-               TranslatedSize);\r
+\r
+  if ((Status == RETURN_UNSUPPORTED) &&\r
+      FeaturePcdGet (PcdQemuBootOrderMmioTranslation))\r
+  {\r
+    Status = TranslateMmioOfwNodes (\r
+               OfwNode,\r
+               NumNodes,\r
+               Translated,\r
+               TranslatedSize\r
+               );\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -1368,22 +1438,22 @@ TranslateOfwNodes (
 STATIC\r
 RETURN_STATUS\r
 TranslateOfwPath (\r
-  IN OUT  CONST CHAR8              **Ptr,\r
-  IN      CONST EXTRA_ROOT_BUS_MAP *ExtraPciRoots,\r
-  OUT     CHAR16                   *Translated,\r
-  IN OUT  UINTN                    *TranslatedSize\r
+  IN OUT  CONST CHAR8               **Ptr,\r
+  IN      CONST EXTRA_ROOT_BUS_MAP  *ExtraPciRoots,\r
+  OUT     CHAR16                    *Translated,\r
+  IN OUT  UINTN                     *TranslatedSize\r
   )\r
 {\r
-  UINTN         NumNodes;\r
-  RETURN_STATUS Status;\r
-  OFW_NODE      Node[EXAMINED_OFW_NODES];\r
-  BOOLEAN       IsFinal;\r
-  OFW_NODE      Skip;\r
+  UINTN          NumNodes;\r
+  RETURN_STATUS  Status;\r
+  OFW_NODE       Node[EXAMINED_OFW_NODES];\r
+  BOOLEAN        IsFinal;\r
+  OFW_NODE       Skip;\r
 \r
-  IsFinal = FALSE;\r
+  IsFinal  = FALSE;\r
   NumNodes = 0;\r
   if (AsciiStrCmp (*Ptr, "HALT") == 0) {\r
-    *Ptr += 4;\r
+    *Ptr  += 4;\r
     Status = RETURN_NOT_FOUND;\r
   } else {\r
     Status = ParseOfwNode (Ptr, &Node[NumNodes], &IsFinal);\r
@@ -1404,16 +1474,16 @@ TranslateOfwPath (
   }\r
 \r
   switch (Status) {\r
-  case RETURN_SUCCESS:\r
-    ++NumNodes;\r
-    break;\r
+    case RETURN_SUCCESS:\r
+      ++NumNodes;\r
+      break;\r
 \r
-  case RETURN_INVALID_PARAMETER:\r
-    DEBUG ((DEBUG_VERBOSE, "%a: parse error\n", __FUNCTION__));\r
-    return RETURN_INVALID_PARAMETER;\r
+    case RETURN_INVALID_PARAMETER:\r
+      DEBUG ((DEBUG_VERBOSE, "%a: parse error\n", __FUNCTION__));\r
+      return RETURN_INVALID_PARAMETER;\r
 \r
-  default:\r
-    ASSERT (0);\r
+    default:\r
+      ASSERT (0);\r
   }\r
 \r
   Status = TranslateOfwNodes (\r
@@ -1421,32 +1491,36 @@ TranslateOfwPath (
              NumNodes < EXAMINED_OFW_NODES ? NumNodes : EXAMINED_OFW_NODES,\r
              ExtraPciRoots,\r
              Translated,\r
-             TranslatedSize);\r
+             TranslatedSize\r
+             );\r
   switch (Status) {\r
-  case RETURN_SUCCESS:\r
-    DEBUG ((DEBUG_VERBOSE, "%a: success: \"%s\"\n", __FUNCTION__, Translated));\r
-    break;\r
+    case RETURN_SUCCESS:\r
+      DEBUG ((DEBUG_VERBOSE, "%a: success: \"%s\"\n", __FUNCTION__, Translated));\r
+      break;\r
 \r
-  case RETURN_BUFFER_TOO_SMALL:\r
-    DEBUG ((DEBUG_VERBOSE, "%a: buffer too small\n", __FUNCTION__));\r
-    break;\r
+    case RETURN_BUFFER_TOO_SMALL:\r
+      DEBUG ((DEBUG_VERBOSE, "%a: buffer too small\n", __FUNCTION__));\r
+      break;\r
 \r
-  case RETURN_UNSUPPORTED:\r
-    DEBUG ((DEBUG_VERBOSE, "%a: unsupported\n", __FUNCTION__));\r
-    break;\r
+    case RETURN_UNSUPPORTED:\r
+      DEBUG ((DEBUG_VERBOSE, "%a: unsupported\n", __FUNCTION__));\r
+      break;\r
 \r
-  case RETURN_PROTOCOL_ERROR:\r
-    DEBUG ((DEBUG_VERBOSE, "%a: logic error / system state mismatch\n",\r
-      __FUNCTION__));\r
-    break;\r
+    case RETURN_PROTOCOL_ERROR:\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: logic error / system state mismatch\n",\r
+        __FUNCTION__\r
+        ));\r
+      break;\r
 \r
-  default:\r
-    ASSERT (0);\r
+    default:\r
+      ASSERT (0);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Connect devices based on the boot order retrieved from QEMU.\r
 \r
@@ -1481,16 +1555,16 @@ ConnectDevicesFromQemu (
   VOID\r
   )\r
 {\r
-  RETURN_STATUS        Status;\r
-  FIRMWARE_CONFIG_ITEM FwCfgItem;\r
-  UINTN                FwCfgSize;\r
-  CHAR8                *FwCfg;\r
-  EFI_STATUS           EfiStatus;\r
-  EXTRA_ROOT_BUS_MAP   *ExtraPciRoots;\r
-  CONST CHAR8          *FwCfgPtr;\r
-  UINTN                NumConnected;\r
-  UINTN                TranslatedSize;\r
-  CHAR16               Translated[TRANSLATION_OUTPUT_SIZE];\r
+  RETURN_STATUS         Status;\r
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;\r
+  UINTN                 FwCfgSize;\r
+  CHAR8                 *FwCfg;\r
+  EFI_STATUS            EfiStatus;\r
+  EXTRA_ROOT_BUS_MAP    *ExtraPciRoots;\r
+  CONST CHAR8           *FwCfgPtr;\r
+  UINTN                 NumConnected;\r
+  UINTN                 TranslatedSize;\r
+  CHAR16                Translated[TRANSLATION_OUTPUT_SIZE];\r
 \r
   Status = QemuFwCfgFindFile ("bootorder", &FwCfgItem, &FwCfgSize);\r
   if (RETURN_ERROR (Status)) {\r
@@ -1512,6 +1586,7 @@ ConnectDevicesFromQemu (
     Status = RETURN_INVALID_PARAMETER;\r
     goto FreeFwCfg;\r
   }\r
+\r
   DEBUG ((DEBUG_VERBOSE, "%a: FwCfg:\n", __FUNCTION__));\r
   DEBUG ((DEBUG_VERBOSE, "%a\n", FwCfg));\r
   DEBUG ((DEBUG_VERBOSE, "%a: FwCfg: <end>\n", __FUNCTION__));\r
@@ -1529,14 +1604,18 @@ ConnectDevicesFromQemu (
   //\r
   // Translate each OpenFirmware path to a UEFI devpath prefix.\r
   //\r
-  FwCfgPtr = FwCfg;\r
-  NumConnected = 0;\r
+  FwCfgPtr       = FwCfg;\r
+  NumConnected   = 0;\r
   TranslatedSize = ARRAY_SIZE (Translated);\r
-  Status = TranslateOfwPath (&FwCfgPtr, ExtraPciRoots, Translated,\r
-             &TranslatedSize);\r
+  Status         = TranslateOfwPath (\r
+                     &FwCfgPtr,\r
+                     ExtraPciRoots,\r
+                     Translated,\r
+                     &TranslatedSize\r
+                     );\r
   while (!RETURN_ERROR (Status)) {\r
-    EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
-    EFI_HANDLE               Controller;\r
+    EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+    EFI_HANDLE                Controller;\r
 \r
     //\r
     // Convert the UEFI devpath prefix to binary representation.\r
@@ -1547,6 +1626,7 @@ ConnectDevicesFromQemu (
       Status = RETURN_OUT_OF_RESOURCES;\r
       goto FreeExtraPciRoots;\r
     }\r
+\r
     //\r
     // Advance along DevicePath, connecting the nodes individually, and asking\r
     // drivers not to produce sibling nodes. Retrieve the controller handle\r
@@ -1559,6 +1639,7 @@ ConnectDevicesFromQemu (
       Status = (RETURN_STATUS)EfiStatus;\r
       goto FreeExtraPciRoots;\r
     }\r
+\r
     //\r
     // Because QEMU's OFW devpaths have lesser expressive power than UEFI\r
     // devpaths (i.e., DevicePath is considered a prefix), connect the tree\r
@@ -1566,22 +1647,31 @@ ConnectDevicesFromQemu (
     // (EFI_NOT_FOUND), that's OK.\r
     //\r
     EfiStatus = gBS->ConnectController (Controller, NULL, NULL, TRUE);\r
-    if (EFI_ERROR (EfiStatus) && EfiStatus != EFI_NOT_FOUND) {\r
+    if (EFI_ERROR (EfiStatus) && (EfiStatus != EFI_NOT_FOUND)) {\r
       Status = (RETURN_STATUS)EfiStatus;\r
       goto FreeExtraPciRoots;\r
     }\r
+\r
     ++NumConnected;\r
     //\r
     // Move to the next OFW devpath.\r
     //\r
     TranslatedSize = ARRAY_SIZE (Translated);\r
-    Status = TranslateOfwPath (&FwCfgPtr, ExtraPciRoots, Translated,\r
-               &TranslatedSize);\r
+    Status         = TranslateOfwPath (\r
+                       &FwCfgPtr,\r
+                       ExtraPciRoots,\r
+                       Translated,\r
+                       &TranslatedSize\r
+                       );\r
   }\r
 \r
-  if (Status == RETURN_NOT_FOUND && NumConnected > 0) {\r
-    DEBUG ((DEBUG_INFO, "%a: %Lu OpenFirmware device path(s) connected\n",\r
-      __FUNCTION__, (UINT64)NumConnected));\r
+  if ((Status == RETURN_NOT_FOUND) && (NumConnected > 0)) {\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: %Lu OpenFirmware device path(s) connected\n",\r
+      __FUNCTION__,\r
+      (UINT64)NumConnected\r
+      ));\r
     Status = RETURN_SUCCESS;\r
   }\r
 \r
@@ -1596,7 +1686,6 @@ FreeFwCfg:
   return Status;\r
 }\r
 \r
-\r
 /**\r
 \r
   Convert the UEFI DevicePath to full text representation with DevPathToText,\r
@@ -1623,19 +1712,19 @@ FreeFwCfg:
 STATIC\r
 BOOLEAN\r
 Match (\r
-  IN  CONST CHAR16                           *Translated,\r
-  IN  UINTN                                  TranslatedLength,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL               *DevicePath\r
+  IN  CONST CHAR16              *Translated,\r
+  IN  UINTN                     TranslatedLength,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r
   )\r
 {\r
-  CHAR16                   *Converted;\r
-  BOOLEAN                  Result;\r
-  VOID                     *FileBuffer;\r
-  UINTN                    FileSize;\r
-  EFI_DEVICE_PATH_PROTOCOL *AbsDevicePath;\r
-  CHAR16                   *AbsConverted;\r
-  BOOLEAN                  Shortform;\r
-  EFI_DEVICE_PATH_PROTOCOL *Node;\r
+  CHAR16                    *Converted;\r
+  BOOLEAN                   Result;\r
+  VOID                      *FileBuffer;\r
+  UINTN                     FileSize;\r
+  EFI_DEVICE_PATH_PROTOCOL  *AbsDevicePath;\r
+  CHAR16                    *AbsConverted;\r
+  BOOLEAN                   Shortform;\r
+  EFI_DEVICE_PATH_PROTOCOL  *Node;\r
 \r
   Converted = ConvertDevicePathToText (\r
                 DevicePath,\r
@@ -1646,37 +1735,42 @@ Match (
     return FALSE;\r
   }\r
 \r
-  Result = FALSE;\r
+  Result    = FALSE;\r
   Shortform = FALSE;\r
   //\r
   // Expand the short-form device path to full device path\r
   //\r
   if ((DevicePathType (DevicePath) == MEDIA_DEVICE_PATH) &&\r
-      (DevicePathSubType (DevicePath) == MEDIA_HARDDRIVE_DP)) {\r
+      (DevicePathSubType (DevicePath) == MEDIA_HARDDRIVE_DP))\r
+  {\r
     //\r
     // Harddrive shortform device path\r
     //\r
     Shortform = TRUE;\r
   } else if ((DevicePathType (DevicePath) == MEDIA_DEVICE_PATH) &&\r
-             (DevicePathSubType (DevicePath) == MEDIA_FILEPATH_DP)) {\r
+             (DevicePathSubType (DevicePath) == MEDIA_FILEPATH_DP))\r
+  {\r
     //\r
     // File-path shortform device path\r
     //\r
     Shortform = TRUE;\r
   } else if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&\r
-             (DevicePathSubType (DevicePath) == MSG_URI_DP)) {\r
+             (DevicePathSubType (DevicePath) == MSG_URI_DP))\r
+  {\r
     //\r
     // URI shortform device path\r
     //\r
     Shortform = TRUE;\r
   } else {\r
     for ( Node = DevicePath\r
-        ; !IsDevicePathEnd (Node)\r
-        ; Node = NextDevicePathNode (Node)\r
-        ) {\r
+          ; !IsDevicePathEnd (Node)\r
+          ; Node = NextDevicePathNode (Node)\r
+          )\r
+    {\r
       if ((DevicePathType (Node) == MESSAGING_DEVICE_PATH) &&\r
           ((DevicePathSubType (Node) == MSG_USB_CLASS_DP) ||\r
-           (DevicePathSubType (Node) == MSG_USB_WWID_DP))) {\r
+           (DevicePathSubType (Node) == MSG_USB_WWID_DP)))\r
+      {\r
         Shortform = TRUE;\r
         break;\r
       }\r
@@ -1689,20 +1783,27 @@ Match (
   //\r
   if (Shortform) {\r
     FileBuffer = EfiBootManagerGetLoadOptionBuffer (\r
-                   DevicePath, &AbsDevicePath, &FileSize\r
+                   DevicePath,\r
+                   &AbsDevicePath,\r
+                   &FileSize\r
                    );\r
     if (FileBuffer == NULL) {\r
       goto Exit;\r
     }\r
+\r
     FreePool (FileBuffer);\r
     AbsConverted = ConvertDevicePathToText (AbsDevicePath, FALSE, FALSE);\r
     FreePool (AbsDevicePath);\r
     if (AbsConverted == NULL) {\r
       goto Exit;\r
     }\r
-    DEBUG ((DEBUG_VERBOSE,\r
+\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
       "%a: expanded relative device path \"%s\" for prefix matching\n",\r
-      __FUNCTION__, Converted));\r
+      __FUNCTION__,\r
+      Converted\r
+      ));\r
     FreePool (Converted);\r
     Converted = AbsConverted;\r
   }\r
@@ -1723,7 +1824,6 @@ Exit:
   return Result;\r
 }\r
 \r
-\r
 /**\r
   Append some of the unselected active boot options to the boot order.\r
 \r
@@ -1753,27 +1853,27 @@ Exit:
 STATIC\r
 RETURN_STATUS\r
 BootOrderComplete (\r
-  IN OUT  BOOT_ORDER    *BootOrder,\r
-  IN OUT  ACTIVE_OPTION *ActiveOption,\r
-  IN      UINTN         ActiveCount\r
+  IN OUT  BOOT_ORDER     *BootOrder,\r
+  IN OUT  ACTIVE_OPTION  *ActiveOption,\r
+  IN      UINTN          ActiveCount\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
-  UINTN         Idx;\r
+  RETURN_STATUS  Status;\r
+  UINTN          Idx;\r
 \r
   Status = RETURN_SUCCESS;\r
-  Idx = 0;\r
+  Idx    = 0;\r
   while (!RETURN_ERROR (Status) && Idx < ActiveCount) {\r
     if (!ActiveOption[Idx].Appended) {\r
-      CONST EFI_BOOT_MANAGER_LOAD_OPTION *Current;\r
-      CONST EFI_DEVICE_PATH_PROTOCOL     *FirstNode;\r
+      CONST EFI_BOOT_MANAGER_LOAD_OPTION  *Current;\r
+      CONST EFI_DEVICE_PATH_PROTOCOL      *FirstNode;\r
 \r
-      Current = ActiveOption[Idx].BootOption;\r
+      Current   = ActiveOption[Idx].BootOption;\r
       FirstNode = Current->FilePath;\r
       if (FirstNode != NULL) {\r
-        CHAR16        *Converted;\r
-        STATIC CHAR16 ConvFallBack[] = L"<unable to convert>";\r
-        BOOLEAN       Keep;\r
+        CHAR16         *Converted;\r
+        STATIC CHAR16  ConvFallBack[] = L"<unable to convert>";\r
+        BOOLEAN        Keep;\r
 \r
         Converted = ConvertDevicePathToText (FirstNode, FALSE, FALSE);\r
         if (Converted == NULL) {\r
@@ -1781,19 +1881,22 @@ BootOrderComplete (
         }\r
 \r
         Keep = TRUE;\r
-        if (DevicePathType(FirstNode) == MEDIA_DEVICE_PATH &&\r
-            DevicePathSubType(FirstNode) == MEDIA_HARDDRIVE_DP) {\r
+        if ((DevicePathType (FirstNode) == MEDIA_DEVICE_PATH) &&\r
+            (DevicePathSubType (FirstNode) == MEDIA_HARDDRIVE_DP))\r
+        {\r
           //\r
           // drop HD()\r
           //\r
           Keep = FALSE;\r
-        } else if (DevicePathType(FirstNode) == ACPI_DEVICE_PATH &&\r
-                   DevicePathSubType(FirstNode) == ACPI_DP) {\r
-          ACPI_HID_DEVICE_PATH *Acpi;\r
-\r
-          Acpi = (ACPI_HID_DEVICE_PATH *) FirstNode;\r
-          if ((Acpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST &&\r
-              EISA_ID_TO_NUM (Acpi->HID) == 0x0a03) {\r
+        } else if ((DevicePathType (FirstNode) == ACPI_DEVICE_PATH) &&\r
+                   (DevicePathSubType (FirstNode) == ACPI_DP))\r
+        {\r
+          ACPI_HID_DEVICE_PATH  *Acpi;\r
+\r
+          Acpi = (ACPI_HID_DEVICE_PATH *)FirstNode;\r
+          if (((Acpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) &&\r
+              (EISA_ID_TO_NUM (Acpi->HID) == 0x0a03))\r
+          {\r
             //\r
             // drop PciRoot() if we enabled the user to select PCI-like boot\r
             // options, by providing translation for such OFW device path\r
@@ -1801,9 +1904,10 @@ BootOrderComplete (
             //\r
             Keep = !FeaturePcdGet (PcdQemuBootOrderPciTranslation);\r
           }\r
-        } else if (DevicePathType(FirstNode) == HARDWARE_DEVICE_PATH &&\r
-                   DevicePathSubType(FirstNode) == HW_VENDOR_DP) {\r
-          VENDOR_DEVICE_PATH *VenHw;\r
+        } else if ((DevicePathType (FirstNode) == HARDWARE_DEVICE_PATH) &&\r
+                   (DevicePathSubType (FirstNode) == HW_VENDOR_DP))\r
+        {\r
+          VENDOR_DEVICE_PATH  *VenHw;\r
 \r
           VenHw = (VENDOR_DEVICE_PATH *)FirstNode;\r
           if (CompareGuid (&VenHw->Guid, &gVirtioMmioTransportGuid)) {\r
@@ -1818,12 +1922,20 @@ BootOrderComplete (
         if (Keep) {\r
           Status = BootOrderAppend (BootOrder, &ActiveOption[Idx]);\r
           if (!RETURN_ERROR (Status)) {\r
-            DEBUG ((DEBUG_VERBOSE, "%a: keeping \"%s\"\n", __FUNCTION__,\r
-              Converted));\r
+            DEBUG ((\r
+              DEBUG_VERBOSE,\r
+              "%a: keeping \"%s\"\n",\r
+              __FUNCTION__,\r
+              Converted\r
+              ));\r
           }\r
         } else {\r
-          DEBUG ((DEBUG_VERBOSE, "%a: dropping \"%s\"\n", __FUNCTION__,\r
-            Converted));\r
+          DEBUG ((\r
+            DEBUG_VERBOSE,\r
+            "%a: dropping \"%s\"\n",\r
+            __FUNCTION__,\r
+            Converted\r
+            ));\r
         }\r
 \r
         if (Converted != ConvFallBack) {\r
@@ -1831,12 +1943,13 @@ BootOrderComplete (
         }\r
       }\r
     }\r
+\r
     ++Idx;\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Delete Boot#### variables that stand for such active boot options that have\r
   been dropped (ie. have not been selected by either matching or "survival\r
@@ -1851,24 +1964,30 @@ BootOrderComplete (
 STATIC\r
 VOID\r
 PruneBootVariables (\r
-  IN  CONST ACTIVE_OPTION *ActiveOption,\r
-  IN  UINTN               ActiveCount\r
+  IN  CONST ACTIVE_OPTION  *ActiveOption,\r
+  IN  UINTN                ActiveCount\r
   )\r
 {\r
-  UINTN Idx;\r
+  UINTN  Idx;\r
 \r
   for (Idx = 0; Idx < ActiveCount; ++Idx) {\r
     if (!ActiveOption[Idx].Appended) {\r
-      CHAR16 VariableName[9];\r
+      CHAR16  VariableName[9];\r
 \r
-      UnicodeSPrintAsciiFormat (VariableName, sizeof VariableName, "Boot%04x",\r
-        ActiveOption[Idx].BootOption->OptionNumber);\r
+      UnicodeSPrintAsciiFormat (\r
+        VariableName,\r
+        sizeof VariableName,\r
+        "Boot%04x",\r
+        ActiveOption[Idx].BootOption->OptionNumber\r
+        );\r
 \r
       //\r
       // "The space consumed by the deleted variable may not be available until\r
       // the next power cycle", but that's good enough.\r
       //\r
-      gRT->SetVariable (VariableName, &gEfiGlobalVariableGuid,\r
+      gRT->SetVariable (\r
+             VariableName,\r
+             &gEfiGlobalVariableGuid,\r
              0,   // Attributes, 0 means deletion\r
              0,   // DataSize, 0 means deletion\r
              NULL // Data\r
@@ -1877,7 +1996,6 @@ PruneBootVariables (
   }\r
 }\r
 \r
-\r
 /**\r
 \r
   Set the boot order based on configuration retrieved from QEMU.\r
@@ -1912,22 +2030,22 @@ SetBootOrderFromQemu (
   VOID\r
   )\r
 {\r
-  RETURN_STATUS                    Status;\r
-  FIRMWARE_CONFIG_ITEM             FwCfgItem;\r
-  UINTN                            FwCfgSize;\r
-  CHAR8                            *FwCfg;\r
-  CONST CHAR8                      *FwCfgPtr;\r
+  RETURN_STATUS         Status;\r
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;\r
+  UINTN                 FwCfgSize;\r
+  CHAR8                 *FwCfg;\r
+  CONST CHAR8           *FwCfgPtr;\r
 \r
-  BOOT_ORDER                       BootOrder;\r
-  ACTIVE_OPTION                    *ActiveOption;\r
-  UINTN                            ActiveCount;\r
+  BOOT_ORDER     BootOrder;\r
+  ACTIVE_OPTION  *ActiveOption;\r
+  UINTN          ActiveCount;\r
 \r
-  EXTRA_ROOT_BUS_MAP               *ExtraPciRoots;\r
+  EXTRA_ROOT_BUS_MAP  *ExtraPciRoots;\r
 \r
-  UINTN                            TranslatedSize;\r
-  CHAR16                           Translated[TRANSLATION_OUTPUT_SIZE];\r
-  EFI_BOOT_MANAGER_LOAD_OPTION     *BootOptions;\r
-  UINTN                            BootOptionCount;\r
+  UINTN                         TranslatedSize;\r
+  CHAR16                        Translated[TRANSLATION_OUTPUT_SIZE];\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  *BootOptions;\r
+  UINTN                         BootOptionCount;\r
 \r
   Status = QemuFwCfgFindFile ("bootorder", &FwCfgItem, &FwCfgSize);\r
   if (Status != RETURN_SUCCESS) {\r
@@ -1957,16 +2075,17 @@ SetBootOrderFromQemu (
 \r
   BootOrder.Produced  = 0;\r
   BootOrder.Allocated = 1;\r
-  BootOrder.Data = AllocatePool (\r
-                     BootOrder.Allocated * sizeof (*BootOrder.Data)\r
-                     );\r
+  BootOrder.Data      = AllocatePool (\r
+                          BootOrder.Allocated * sizeof (*BootOrder.Data)\r
+                          );\r
   if (BootOrder.Data == NULL) {\r
     Status = RETURN_OUT_OF_RESOURCES;\r
     goto ErrorFreeFwCfg;\r
   }\r
 \r
   BootOptions = EfiBootManagerGetLoadOptions (\r
-                  &BootOptionCount, LoadOptionTypeBoot\r
+                  &BootOptionCount,\r
+                  LoadOptionTypeBoot\r
                   );\r
   if (BootOptions == NULL) {\r
     Status = RETURN_NOT_FOUND;\r
@@ -1974,7 +2093,10 @@ SetBootOrderFromQemu (
   }\r
 \r
   Status = CollectActiveOptions (\r
-             BootOptions, BootOptionCount, &ActiveOption, &ActiveCount\r
+             BootOptions,\r
+             BootOptionCount,\r
+             &ActiveOption,\r
+             &ActiveCount\r
              );\r
   if (RETURN_ERROR (Status)) {\r
     goto ErrorFreeBootOptions;\r
@@ -1993,14 +2115,19 @@ SetBootOrderFromQemu (
   // translate each OpenFirmware path\r
   //\r
   TranslatedSize = ARRAY_SIZE (Translated);\r
-  Status = TranslateOfwPath (&FwCfgPtr, ExtraPciRoots, Translated,\r
-             &TranslatedSize);\r
+  Status         = TranslateOfwPath (\r
+                     &FwCfgPtr,\r
+                     ExtraPciRoots,\r
+                     Translated,\r
+                     &TranslatedSize\r
+                     );\r
   while (Status == RETURN_SUCCESS ||\r
          Status == RETURN_UNSUPPORTED ||\r
          Status == RETURN_PROTOCOL_ERROR ||\r
-         Status == RETURN_BUFFER_TOO_SMALL) {\r
+         Status == RETURN_BUFFER_TOO_SMALL)\r
+  {\r
     if (Status == RETURN_SUCCESS) {\r
-      UINTN Idx;\r
+      UINTN  Idx;\r
 \r
       //\r
       // match translated OpenFirmware path against all active boot options\r
@@ -2012,7 +2139,8 @@ SetBootOrderFromQemu (
               TranslatedSize, // contains length, not size, in CHAR16's here\r
               ActiveOption[Idx].BootOption->FilePath\r
               )\r
-            ) {\r
+            )\r
+        {\r
           //\r
           // match found, store ID and continue with next OpenFirmware path\r
           //\r
@@ -2025,11 +2153,15 @@ SetBootOrderFromQemu (
     }   // translation successful\r
 \r
     TranslatedSize = ARRAY_SIZE (Translated);\r
-    Status = TranslateOfwPath (&FwCfgPtr, ExtraPciRoots, Translated,\r
-               &TranslatedSize);\r
+    Status         = TranslateOfwPath (\r
+                       &FwCfgPtr,\r
+                       ExtraPciRoots,\r
+                       Translated,\r
+                       &TranslatedSize\r
+                       );\r
   } // scanning of OpenFirmware paths done\r
 \r
-  if (Status == RETURN_NOT_FOUND && BootOrder.Produced > 0) {\r
+  if ((Status == RETURN_NOT_FOUND) && (BootOrder.Produced > 0)) {\r
     //\r
     // No more OpenFirmware paths, some matches found: rewrite BootOrder NvVar.\r
     // Some of the active boot options that have not been selected over fw_cfg\r
@@ -2048,14 +2180,18 @@ SetBootOrderFromQemu (
                     L"BootOrder",\r
                     &gEfiGlobalVariableGuid,\r
                     EFI_VARIABLE_NON_VOLATILE |\r
-                      EFI_VARIABLE_BOOTSERVICE_ACCESS |\r
-                      EFI_VARIABLE_RUNTIME_ACCESS,\r
+                    EFI_VARIABLE_BOOTSERVICE_ACCESS |\r
+                    EFI_VARIABLE_RUNTIME_ACCESS,\r
                     BootOrder.Produced * sizeof (*BootOrder.Data),\r
                     BootOrder.Data\r
                     );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: setting BootOrder: %r\n", __FUNCTION__,\r
-        Status));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: setting BootOrder: %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       goto ErrorFreeExtraPciRoots;\r
     }\r
 \r
@@ -2083,7 +2219,6 @@ ErrorFreeFwCfg:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Calculate the number of seconds we should be showing the FrontPage progress\r
   bar for.\r
@@ -2096,8 +2231,8 @@ GetFrontPageTimeoutFromQemu (
   VOID\r
   )\r
 {\r
-  FIRMWARE_CONFIG_ITEM BootMenuWaitItem;\r
-  UINTN                BootMenuWaitSize;\r
+  FIRMWARE_CONFIG_ITEM  BootMenuWaitItem;\r
+  UINTN                 BootMenuWaitSize;\r
 \r
   QemuFwCfgSelectItem (QemuFwCfgItemBootMenu);\r
   if (QemuFwCfgRead16 () == 0) {\r
@@ -2108,20 +2243,27 @@ GetFrontPageTimeoutFromQemu (
     return PcdGet16 (PcdPlatformBootTimeOut);\r
   }\r
 \r
-  if (RETURN_ERROR (QemuFwCfgFindFile ("etc/boot-menu-wait", &BootMenuWaitItem,\r
-                      &BootMenuWaitSize)) ||\r
-      BootMenuWaitSize != sizeof (UINT16)) {\r
+  if (RETURN_ERROR (\r
+        QemuFwCfgFindFile (\r
+          "etc/boot-menu-wait",\r
+          &BootMenuWaitItem,\r
+          &BootMenuWaitSize\r
+          )\r
+        ) ||\r
+      (BootMenuWaitSize != sizeof (UINT16)))\r
+  {\r
     //\r
     // "-boot menu=on" was specified without "splash-time=N". In this case,\r
     // return three seconds if the platform default would cause us to skip the\r
     // front page, and return the platform default otherwise.\r
     //\r
-    UINT16 Timeout;\r
+    UINT16  Timeout;\r
 \r
     Timeout = PcdGet16 (PcdPlatformBootTimeOut);\r
     if (Timeout == 0) {\r
       Timeout = 3;\r
     }\r
+\r
     return Timeout;\r
   }\r
 \r
index 0182c9235cac8c39a9ee2a211e25d548eb176ad1..f5787cd24d380a5776539dc37fd60eaa027eb307 100644 (file)
 \r
 #include "QemuFwCfgLibInternal.h"\r
 \r
-STATIC BOOLEAN mQemuFwCfgSupported = FALSE;\r
-STATIC BOOLEAN mQemuFwCfgDmaSupported;\r
+STATIC BOOLEAN  mQemuFwCfgSupported = FALSE;\r
+STATIC BOOLEAN  mQemuFwCfgDmaSupported;\r
 \r
-STATIC EDKII_IOMMU_PROTOCOL        *mIoMmuProtocol;\r
+STATIC EDKII_IOMMU_PROTOCOL  *mIoMmuProtocol;\r
 \r
 /**\r
   Returns a boolean indicating if the firmware configuration interface\r
@@ -47,21 +47,20 @@ QemuFwCfgIsAvailable (
   return InternalQemuFwCfgIsAvailable ();\r
 }\r
 \r
-\r
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgInitialize (\r
   VOID\r
   )\r
 {\r
-  UINT32 Signature;\r
-  UINT32 Revision;\r
+  UINT32  Signature;\r
+  UINT32  Revision;\r
 \r
   //\r
   // Enable the access routines while probing to see if it is supported.\r
   // For probing we always use the IO Port (IoReadFifo8()) access method.\r
   //\r
-  mQemuFwCfgSupported = TRUE;\r
+  mQemuFwCfgSupported    = TRUE;\r
   mQemuFwCfgDmaSupported = FALSE;\r
 \r
   QemuFwCfgSelectItem (QemuFwCfgItemSignature);\r
@@ -72,7 +71,8 @@ QemuFwCfgInitialize (
   DEBUG ((DEBUG_INFO, "FW CFG Revision: 0x%x\n", Revision));\r
   if ((Signature != SIGNATURE_32 ('Q', 'E', 'M', 'U')) ||\r
       (Revision < 1)\r
-     ) {\r
+      )\r
+  {\r
     DEBUG ((DEBUG_INFO, "QemuFwCfg interface not supported.\n"));\r
     mQemuFwCfgSupported = FALSE;\r
     return RETURN_SUCCESS;\r
@@ -86,18 +86,24 @@ QemuFwCfgInitialize (
   }\r
 \r
   if (mQemuFwCfgDmaSupported && MemEncryptSevIsEnabled ()) {\r
-    EFI_STATUS   Status;\r
+    EFI_STATUS  Status;\r
 \r
     //\r
     // IoMmuDxe driver must have installed the IOMMU protocol. If we are not\r
     // able to locate the protocol then something must have gone wrong.\r
     //\r
-    Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL,\r
-                    (VOID **)&mIoMmuProtocol);\r
+    Status = gBS->LocateProtocol (\r
+                    &gEdkiiIoMmuProtocolGuid,\r
+                    NULL,\r
+                    (VOID **)&mIoMmuProtocol\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR,\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
         "QemuFwCfgSevDma %a:%a Failed to locate IOMMU protocol.\n",\r
-        gEfiCallerBaseName, __FUNCTION__));\r
+        gEfiCallerBaseName,\r
+        __FUNCTION__\r
+        ));\r
       ASSERT (FALSE);\r
       CpuDeadLoop ();\r
     }\r
@@ -106,7 +112,6 @@ QemuFwCfgInitialize (
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Returns a boolean indicating if the firmware configuration interface is\r
   available for library-internal purposes.\r
@@ -148,8 +153,8 @@ InternalQemuFwCfgDmaIsAvailable (
 STATIC\r
 VOID\r
 AllocFwCfgDmaAccessBuffer (\r
-  OUT   VOID     **Access,\r
-  OUT   VOID     **MapInfo\r
+  OUT   VOID  **Access,\r
+  OUT   VOID  **MapInfo\r
   )\r
 {\r
   UINTN                 Size;\r
@@ -159,7 +164,7 @@ AllocFwCfgDmaAccessBuffer (
   EFI_PHYSICAL_ADDRESS  DmaAddress;\r
   VOID                  *Mapping;\r
 \r
-  Size = sizeof (FW_CFG_DMA_ACCESS);\r
+  Size     = sizeof (FW_CFG_DMA_ACCESS);\r
   NumPages = EFI_SIZE_TO_PAGES (Size);\r
 \r
   //\r
@@ -176,9 +181,12 @@ AllocFwCfgDmaAccessBuffer (
                              EDKII_IOMMU_ATTRIBUTE_DUAL_ADDRESS_CYCLE\r
                              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a:%a failed to allocate FW_CFG_DMA_ACCESS\n", gEfiCallerBaseName,\r
-      __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a failed to allocate FW_CFG_DMA_ACCESS\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
@@ -202,9 +210,12 @@ AllocFwCfgDmaAccessBuffer (
                              );\r
   if (EFI_ERROR (Status)) {\r
     mIoMmuProtocol->FreeBuffer (mIoMmuProtocol, NumPages, HostAddress);\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a:%a failed to Map() FW_CFG_DMA_ACCESS\n", gEfiCallerBaseName,\r
-      __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a failed to Map() FW_CFG_DMA_ACCESS\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
@@ -212,14 +223,19 @@ AllocFwCfgDmaAccessBuffer (
   if (Size < sizeof (FW_CFG_DMA_ACCESS)) {\r
     mIoMmuProtocol->Unmap (mIoMmuProtocol, Mapping);\r
     mIoMmuProtocol->FreeBuffer (mIoMmuProtocol, NumPages, HostAddress);\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a:%a failed to Map() - requested 0x%Lx got 0x%Lx\n", gEfiCallerBaseName,\r
-      __FUNCTION__, (UINT64)sizeof (FW_CFG_DMA_ACCESS), (UINT64)Size));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a failed to Map() - requested 0x%Lx got 0x%Lx\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      (UINT64)sizeof (FW_CFG_DMA_ACCESS),\r
+      (UINT64)Size\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
 \r
-  *Access = HostAddress;\r
+  *Access  = HostAddress;\r
   *MapInfo = Mapping;\r
 }\r
 \r
@@ -231,8 +247,8 @@ AllocFwCfgDmaAccessBuffer (
 STATIC\r
 VOID\r
 FreeFwCfgDmaAccessBuffer (\r
-  IN  VOID    *Access,\r
-  IN  VOID    *Mapping\r
+  IN  VOID  *Access,\r
+  IN  VOID  *Mapping\r
   )\r
 {\r
   UINTN       NumPages;\r
@@ -242,18 +258,26 @@ FreeFwCfgDmaAccessBuffer (
 \r
   Status = mIoMmuProtocol->Unmap (mIoMmuProtocol, Mapping);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a:%a failed to UnMap() Mapping 0x%Lx\n", gEfiCallerBaseName,\r
-      __FUNCTION__, (UINT64)(UINTN)Mapping));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a failed to UnMap() Mapping 0x%Lx\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      (UINT64)(UINTN)Mapping\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
 \r
   Status = mIoMmuProtocol->FreeBuffer (mIoMmuProtocol, NumPages, Access);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a:%a failed to Free() 0x%Lx\n", gEfiCallerBaseName, __FUNCTION__,\r
-      (UINT64)(UINTN)Access));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a failed to Free() 0x%Lx\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      (UINT64)(UINTN)Access\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
@@ -274,41 +298,51 @@ MapFwCfgDmaDataBuffer (
   OUT VOID                  **MapInfo\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  UINTN                   NumberOfBytes;\r
-  VOID                    *Mapping;\r
-  EFI_PHYSICAL_ADDRESS    PhysicalAddress;\r
+  EFI_STATUS            Status;\r
+  UINTN                 NumberOfBytes;\r
+  VOID                  *Mapping;\r
+  EFI_PHYSICAL_ADDRESS  PhysicalAddress;\r
 \r
   NumberOfBytes = Size;\r
-  Status = mIoMmuProtocol->Map (\r
-                             mIoMmuProtocol,\r
-                             (IsWrite ?\r
-                              EdkiiIoMmuOperationBusMasterRead64 :\r
-                              EdkiiIoMmuOperationBusMasterWrite64),\r
-                             HostAddress,\r
-                             &NumberOfBytes,\r
-                             &PhysicalAddress,\r
-                             &Mapping\r
-                             );\r
+  Status        = mIoMmuProtocol->Map (\r
+                                    mIoMmuProtocol,\r
+                                    (IsWrite ?\r
+                                     EdkiiIoMmuOperationBusMasterRead64 :\r
+                                     EdkiiIoMmuOperationBusMasterWrite64),\r
+                                    HostAddress,\r
+                                    &NumberOfBytes,\r
+                                    &PhysicalAddress,\r
+                                    &Mapping\r
+                                    );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a:%a failed to Map() Address 0x%Lx Size 0x%Lx\n", gEfiCallerBaseName,\r
-      __FUNCTION__, (UINT64)(UINTN)HostAddress, (UINT64)Size));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a failed to Map() Address 0x%Lx Size 0x%Lx\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      (UINT64)(UINTN)HostAddress,\r
+      (UINT64)Size\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
 \r
   if (NumberOfBytes < Size) {\r
     mIoMmuProtocol->Unmap (mIoMmuProtocol, Mapping);\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a:%a failed to Map() - requested 0x%x got 0x%Lx\n", gEfiCallerBaseName,\r
-      __FUNCTION__, Size, (UINT64)NumberOfBytes));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a failed to Map() - requested 0x%x got 0x%Lx\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Size,\r
+      (UINT64)NumberOfBytes\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
 \r
   *DeviceAddress = PhysicalAddress;\r
-  *MapInfo = Mapping;\r
+  *MapInfo       = Mapping;\r
 }\r
 \r
 STATIC\r
@@ -321,9 +355,13 @@ UnmapFwCfgDmaDataBuffer (
 \r
   Status = mIoMmuProtocol->Unmap (mIoMmuProtocol, Mapping);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a:%a failed to UnMap() Mapping 0x%Lx\n", gEfiCallerBaseName,\r
-      __FUNCTION__, (UINT64)(UINTN)Mapping));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a failed to UnMap() Mapping 0x%Lx\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      (UINT64)(UINTN)Mapping\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
@@ -346,29 +384,31 @@ UnmapFwCfgDmaDataBuffer (
 **/\r
 VOID\r
 InternalQemuFwCfgDmaBytes (\r
-  IN     UINT32   Size,\r
-  IN OUT VOID     *Buffer OPTIONAL,\r
-  IN     UINT32   Control\r
+  IN     UINT32  Size,\r
+  IN OUT VOID    *Buffer OPTIONAL,\r
+  IN     UINT32  Control\r
   )\r
 {\r
-  volatile FW_CFG_DMA_ACCESS LocalAccess;\r
-  volatile FW_CFG_DMA_ACCESS *Access;\r
-  UINT32                     AccessHigh, AccessLow;\r
-  UINT32                     Status;\r
-  VOID                       *AccessMapping, *DataMapping;\r
-  VOID                       *DataBuffer;\r
-\r
-  ASSERT (Control == FW_CFG_DMA_CTL_WRITE || Control == FW_CFG_DMA_CTL_READ ||\r
-    Control == FW_CFG_DMA_CTL_SKIP);\r
+  volatile FW_CFG_DMA_ACCESS  LocalAccess;\r
+  volatile FW_CFG_DMA_ACCESS  *Access;\r
+  UINT32                      AccessHigh, AccessLow;\r
+  UINT32                      Status;\r
+  VOID                        *AccessMapping, *DataMapping;\r
+  VOID                        *DataBuffer;\r
+\r
+  ASSERT (\r
+    Control == FW_CFG_DMA_CTL_WRITE || Control == FW_CFG_DMA_CTL_READ ||\r
+    Control == FW_CFG_DMA_CTL_SKIP\r
+    );\r
 \r
   if (Size == 0) {\r
     return;\r
   }\r
 \r
-  Access = &LocalAccess;\r
+  Access        = &LocalAccess;\r
   AccessMapping = NULL;\r
-  DataMapping = NULL;\r
-  DataBuffer = Buffer;\r
+  DataMapping   = NULL;\r
+  DataBuffer    = Buffer;\r
 \r
   //\r
   // When SEV is enabled, map Buffer to DMA address before issuing the DMA\r
@@ -397,7 +437,7 @@ InternalQemuFwCfgDmaBytes (
         &DataMapping\r
         );\r
 \r
-      DataBuffer = (VOID *) (UINTN) DataBufferAddress;\r
+      DataBuffer = (VOID *)(UINTN)DataBufferAddress;\r
     }\r
   }\r
 \r
@@ -416,7 +456,7 @@ InternalQemuFwCfgDmaBytes (
   //\r
   AccessHigh = (UINT32)RShiftU64 ((UINTN)Access, 32);\r
   AccessLow  = (UINT32)(UINTN)Access;\r
-  IoWrite32 (FW_CFG_IO_DMA_ADDRESS,     SwapBytes32 (AccessHigh));\r
+  IoWrite32 (FW_CFG_IO_DMA_ADDRESS, SwapBytes32 (AccessHigh));\r
   IoWrite32 (FW_CFG_IO_DMA_ADDRESS + 4, SwapBytes32 (AccessLow));\r
 \r
   //\r
index 4ef78b7a8b651009e4ccd1e24e315419de74e2d0..8e8f54ba3facfe558520b9835603337269e0a6fd 100644 (file)
@@ -19,7 +19,6 @@
 \r
 #include "QemuFwCfgLibInternal.h"\r
 \r
-\r
 /**\r
   Selects a firmware configuration item for reading.\r
 \r
 VOID\r
 EFIAPI\r
 QemuFwCfgSelectItem (\r
-  IN FIRMWARE_CONFIG_ITEM   QemuFwCfgItem\r
+  IN FIRMWARE_CONFIG_ITEM  QemuFwCfgItem\r
   )\r
 {\r
-  DEBUG ((DEBUG_INFO, "Select Item: 0x%x\n", (UINT16)(UINTN) QemuFwCfgItem));\r
-  IoWrite16 (FW_CFG_IO_SELECTOR, (UINT16)(UINTN) QemuFwCfgItem);\r
+  DEBUG ((DEBUG_INFO, "Select Item: 0x%x\n", (UINT16)(UINTN)QemuFwCfgItem));\r
+  IoWrite16 (FW_CFG_IO_SELECTOR, (UINT16)(UINTN)QemuFwCfgItem);\r
 }\r
 \r
 /**\r
@@ -49,18 +48,18 @@ QemuFwCfgSelectItem (
 VOID\r
 EFIAPI\r
 InternalQemuFwCfgReadBytes (\r
-  IN UINTN                  Size,\r
-  IN VOID                   *Buffer  OPTIONAL\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer  OPTIONAL\r
   )\r
 {\r
-  if (InternalQemuFwCfgDmaIsAvailable () && Size <= MAX_UINT32) {\r
+  if (InternalQemuFwCfgDmaIsAvailable () && (Size <= MAX_UINT32)) {\r
     InternalQemuFwCfgDmaBytes ((UINT32)Size, Buffer, FW_CFG_DMA_CTL_READ);\r
     return;\r
   }\r
+\r
   IoReadFifo8 (FW_CFG_IO_DATA, Size, Buffer);\r
 }\r
 \r
-\r
 /**\r
   Reads firmware configuration bytes into a buffer\r
 \r
@@ -75,8 +74,8 @@ InternalQemuFwCfgReadBytes (
 VOID\r
 EFIAPI\r
 QemuFwCfgReadBytes (\r
-  IN UINTN                  Size,\r
-  IN VOID                   *Buffer\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer\r
   )\r
 {\r
   if (InternalQemuFwCfgIsAvailable ()) {\r
@@ -100,20 +99,20 @@ QemuFwCfgReadBytes (
 VOID\r
 EFIAPI\r
 QemuFwCfgWriteBytes (\r
-  IN UINTN                  Size,\r
-  IN VOID                   *Buffer\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer\r
   )\r
 {\r
   if (InternalQemuFwCfgIsAvailable ()) {\r
-    if (InternalQemuFwCfgDmaIsAvailable () && Size <= MAX_UINT32) {\r
+    if (InternalQemuFwCfgDmaIsAvailable () && (Size <= MAX_UINT32)) {\r
       InternalQemuFwCfgDmaBytes ((UINT32)Size, Buffer, FW_CFG_DMA_CTL_WRITE);\r
       return;\r
     }\r
+\r
     IoWriteFifo8 (FW_CFG_IO_DATA, Size, Buffer);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Skip bytes in the firmware configuration item.\r
 \r
@@ -126,17 +125,17 @@ QemuFwCfgWriteBytes (
 VOID\r
 EFIAPI\r
 QemuFwCfgSkipBytes (\r
-  IN UINTN                  Size\r
+  IN UINTN  Size\r
   )\r
 {\r
-  UINTN ChunkSize;\r
-  UINT8 SkipBuffer[256];\r
+  UINTN  ChunkSize;\r
+  UINT8  SkipBuffer[256];\r
 \r
   if (!InternalQemuFwCfgIsAvailable ()) {\r
     return;\r
   }\r
 \r
-  if (InternalQemuFwCfgDmaIsAvailable () && Size <= MAX_UINT32) {\r
+  if (InternalQemuFwCfgDmaIsAvailable () && (Size <= MAX_UINT32)) {\r
     InternalQemuFwCfgDmaBytes ((UINT32)Size, NULL, FW_CFG_DMA_CTL_SKIP);\r
     return;\r
   }\r
@@ -157,7 +156,6 @@ QemuFwCfgSkipBytes (
   }\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT8 firmware configuration value\r
 \r
@@ -170,14 +168,13 @@ QemuFwCfgRead8 (
   VOID\r
   )\r
 {\r
-  UINT8 Result;\r
+  UINT8  Result;\r
 \r
   QemuFwCfgReadBytes (sizeof (Result), &Result);\r
 \r
   return Result;\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT16 firmware configuration value\r
 \r
@@ -190,14 +187,13 @@ QemuFwCfgRead16 (
   VOID\r
   )\r
 {\r
-  UINT16 Result;\r
+  UINT16  Result;\r
 \r
   QemuFwCfgReadBytes (sizeof (Result), &Result);\r
 \r
   return Result;\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT32 firmware configuration value\r
 \r
@@ -210,14 +206,13 @@ QemuFwCfgRead32 (
   VOID\r
   )\r
 {\r
-  UINT32 Result;\r
+  UINT32  Result;\r
 \r
   QemuFwCfgReadBytes (sizeof (Result), &Result);\r
 \r
   return Result;\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT64 firmware configuration value\r
 \r
@@ -230,14 +225,13 @@ QemuFwCfgRead64 (
   VOID\r
   )\r
 {\r
-  UINT64 Result;\r
+  UINT64  Result;\r
 \r
   QemuFwCfgReadBytes (sizeof (Result), &Result);\r
 \r
   return Result;\r
 }\r
 \r
-\r
 /**\r
   Find the configuration item corresponding to the firmware configuration file.\r
 \r
@@ -259,8 +253,8 @@ QemuFwCfgFindFile (
   OUT  UINTN                 *Size\r
   )\r
 {\r
-  UINT32 Count;\r
-  UINT32 Idx;\r
+  UINT32  Count;\r
+  UINT32  Idx;\r
 \r
   if (!InternalQemuFwCfgIsAvailable ()) {\r
     return RETURN_UNSUPPORTED;\r
@@ -270,15 +264,15 @@ QemuFwCfgFindFile (
   Count = SwapBytes32 (QemuFwCfgRead32 ());\r
 \r
   for (Idx = 0; Idx < Count; ++Idx) {\r
-    UINT32 FileSize;\r
-    UINT16 FileSelect;\r
-    UINT16 FileReserved;\r
-    CHAR8  FName[QEMU_FW_CFG_FNAME_SIZE];\r
+    UINT32  FileSize;\r
+    UINT16  FileSelect;\r
+    UINT16  FileReserved;\r
+    CHAR8   FName[QEMU_FW_CFG_FNAME_SIZE];\r
 \r
     FileSize     = QemuFwCfgRead32 ();\r
     FileSelect   = QemuFwCfgRead16 ();\r
     FileReserved = QemuFwCfgRead16 ();\r
-    (VOID) FileReserved; /* Force a do-nothing reference. */\r
+    (VOID)FileReserved;  /* Force a do-nothing reference. */\r
     InternalQemuFwCfgReadBytes (sizeof (FName), FName);\r
 \r
     if (AsciiStrCmp (Name, FName) == 0) {\r
index 1fa80686e0bd370dc603d8dae51ddbe09616aa93..0b77cad1c0301af865c1ef57265e97ee77cf0914 100644 (file)
@@ -25,7 +25,6 @@ InternalQemuFwCfgIsAvailable (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Returns a boolean indicating whether QEMU provides the DMA-like access method\r
   for fw_cfg.\r
@@ -55,9 +54,9 @@ InternalQemuFwCfgDmaIsAvailable (
 **/\r
 VOID\r
 InternalQemuFwCfgDmaBytes (\r
-  IN     UINT32   Size,\r
-  IN OUT VOID     *Buffer OPTIONAL,\r
-  IN     UINT32   Control\r
+  IN     UINT32  Size,\r
+  IN OUT VOID    *Buffer OPTIONAL,\r
+  IN     UINT32  Control\r
   );\r
 \r
 #endif\r
index 457eba82fa6f6f72cf34ac6ea796bb9e05cbc611..583d8a8e9f41a7298748b13ca0fceb86bc2efdf9 100644 (file)
@@ -20,9 +20,9 @@
 \r
 #include <Protocol/FdtClient.h>\r
 \r
-STATIC UINTN mFwCfgSelectorAddress;\r
-STATIC UINTN mFwCfgDataAddress;\r
-STATIC UINTN mFwCfgDmaAddress;\r
+STATIC UINTN  mFwCfgSelectorAddress;\r
+STATIC UINTN  mFwCfgDataAddress;\r
+STATIC UINTN  mFwCfgDmaAddress;\r
 \r
 /**\r
   Reads firmware configuration bytes into a buffer\r
@@ -32,7 +32,7 @@ STATIC UINTN mFwCfgDmaAddress;
 \r
 **/\r
 typedef\r
-VOID (EFIAPI READ_BYTES_FUNCTION) (\r
+VOID(EFIAPI READ_BYTES_FUNCTION)(\r
   IN UINTN Size,\r
   IN VOID  *Buffer OPTIONAL\r
   );\r
@@ -45,7 +45,7 @@ VOID (EFIAPI READ_BYTES_FUNCTION) (
 \r
 **/\r
 typedef\r
-VOID (EFIAPI WRITE_BYTES_FUNCTION) (\r
+VOID(EFIAPI WRITE_BYTES_FUNCTION)(\r
   IN UINTN Size,\r
   IN VOID  *Buffer OPTIONAL\r
   );\r
@@ -57,27 +57,26 @@ VOID (EFIAPI WRITE_BYTES_FUNCTION) (
 \r
 **/\r
 typedef\r
-VOID (EFIAPI SKIP_BYTES_FUNCTION) (\r
+VOID(EFIAPI SKIP_BYTES_FUNCTION)(\r
   IN UINTN Size\r
   );\r
 \r
 //\r
 // Forward declaration of the two implementations we have.\r
 //\r
-STATIC READ_BYTES_FUNCTION MmioReadBytes;\r
-STATIC WRITE_BYTES_FUNCTION MmioWriteBytes;\r
-STATIC SKIP_BYTES_FUNCTION MmioSkipBytes;\r
-STATIC READ_BYTES_FUNCTION DmaReadBytes;\r
-STATIC WRITE_BYTES_FUNCTION DmaWriteBytes;\r
-STATIC SKIP_BYTES_FUNCTION DmaSkipBytes;\r
+STATIC READ_BYTES_FUNCTION   MmioReadBytes;\r
+STATIC WRITE_BYTES_FUNCTION  MmioWriteBytes;\r
+STATIC SKIP_BYTES_FUNCTION   MmioSkipBytes;\r
+STATIC READ_BYTES_FUNCTION   DmaReadBytes;\r
+STATIC WRITE_BYTES_FUNCTION  DmaWriteBytes;\r
+STATIC SKIP_BYTES_FUNCTION   DmaSkipBytes;\r
 \r
 //\r
 // These correspond to the implementation we detect at runtime.\r
 //\r
-STATIC READ_BYTES_FUNCTION *InternalQemuFwCfgReadBytes = MmioReadBytes;\r
-STATIC WRITE_BYTES_FUNCTION *InternalQemuFwCfgWriteBytes = MmioWriteBytes;\r
-STATIC SKIP_BYTES_FUNCTION *InternalQemuFwCfgSkipBytes = MmioSkipBytes;\r
-\r
+STATIC READ_BYTES_FUNCTION   *InternalQemuFwCfgReadBytes  = MmioReadBytes;\r
+STATIC WRITE_BYTES_FUNCTION  *InternalQemuFwCfgWriteBytes = MmioWriteBytes;\r
+STATIC SKIP_BYTES_FUNCTION   *InternalQemuFwCfgSkipBytes  = MmioSkipBytes;\r
 \r
 /**\r
   Returns a boolean indicating if the firmware configuration interface\r
@@ -98,36 +97,46 @@ QemuFwCfgIsAvailable (
   return (BOOLEAN)(mFwCfgSelectorAddress != 0 && mFwCfgDataAddress != 0);\r
 }\r
 \r
-\r
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgInitialize (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  FDT_CLIENT_PROTOCOL           *FdtClient;\r
-  CONST UINT64                  *Reg;\r
-  UINT32                        RegSize;\r
-  UINTN                         AddressCells, SizeCells;\r
-  UINT64                        FwCfgSelectorAddress;\r
-  UINT64                        FwCfgSelectorSize;\r
-  UINT64                        FwCfgDataAddress;\r
-  UINT64                        FwCfgDataSize;\r
-  UINT64                        FwCfgDmaAddress;\r
-  UINT64                        FwCfgDmaSize;\r
-\r
-  Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL,\r
-                  (VOID **)&FdtClient);\r
+  EFI_STATUS           Status;\r
+  FDT_CLIENT_PROTOCOL  *FdtClient;\r
+  CONST UINT64         *Reg;\r
+  UINT32               RegSize;\r
+  UINTN                AddressCells, SizeCells;\r
+  UINT64               FwCfgSelectorAddress;\r
+  UINT64               FwCfgSelectorSize;\r
+  UINT64               FwCfgDataAddress;\r
+  UINT64               FwCfgDataSize;\r
+  UINT64               FwCfgDmaAddress;\r
+  UINT64               FwCfgDmaSize;\r
+\r
+  Status = gBS->LocateProtocol (\r
+                  &gFdtClientProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&FdtClient\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = FdtClient->FindCompatibleNodeReg (FdtClient, "qemu,fw-cfg-mmio",\r
-                         (CONST VOID **)&Reg, &AddressCells, &SizeCells,\r
-                         &RegSize);\r
+  Status = FdtClient->FindCompatibleNodeReg (\r
+                        FdtClient,\r
+                        "qemu,fw-cfg-mmio",\r
+                        (CONST VOID **)&Reg,\r
+                        &AddressCells,\r
+                        &SizeCells,\r
+                        &RegSize\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_WARN,\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
       "%a: No 'qemu,fw-cfg-mmio' compatible DT node found (Status == %r)\n",\r
-      __FUNCTION__, Status));\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -156,8 +165,12 @@ QemuFwCfgInitialize (
   mFwCfgSelectorAddress = FwCfgSelectorAddress;\r
   mFwCfgDataAddress     = FwCfgDataAddress;\r
 \r
-  DEBUG ((DEBUG_INFO, "Found FwCfg @ 0x%Lx/0x%Lx\n", FwCfgSelectorAddress,\r
-    FwCfgDataAddress));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "Found FwCfg @ 0x%Lx/0x%Lx\n",\r
+    FwCfgSelectorAddress,\r
+    FwCfgDataAddress\r
+    ));\r
 \r
   if (SwapBytes64 (Reg[1]) >= 0x18) {\r
     FwCfgDmaAddress = FwCfgDataAddress + 0x10;\r
@@ -174,7 +187,7 @@ QemuFwCfgInitialize (
   }\r
 \r
   if (QemuFwCfgIsAvailable ()) {\r
-    UINT32 Signature;\r
+    UINT32  Signature;\r
 \r
     QemuFwCfgSelectItem (QemuFwCfgItemSignature);\r
     Signature = QemuFwCfgRead32 ();\r
@@ -184,15 +197,15 @@ QemuFwCfgInitialize (
       // feature bitmap (which we read without DMA) to confirm the feature.\r
       //\r
       if (FwCfgDmaAddress != 0) {\r
-        UINT32 Features;\r
+        UINT32  Features;\r
 \r
         QemuFwCfgSelectItem (QemuFwCfgItemInterfaceVersion);\r
         Features = QemuFwCfgRead32 ();\r
         if ((Features & FW_CFG_F_DMA) != 0) {\r
-          mFwCfgDmaAddress = FwCfgDmaAddress;\r
-          InternalQemuFwCfgReadBytes = DmaReadBytes;\r
+          mFwCfgDmaAddress            = FwCfgDmaAddress;\r
+          InternalQemuFwCfgReadBytes  = DmaReadBytes;\r
           InternalQemuFwCfgWriteBytes = DmaWriteBytes;\r
-          InternalQemuFwCfgSkipBytes = DmaSkipBytes;\r
+          InternalQemuFwCfgSkipBytes  = DmaSkipBytes;\r
         }\r
       }\r
     } else {\r
@@ -200,10 +213,10 @@ QemuFwCfgInitialize (
       mFwCfgDataAddress     = 0;\r
     }\r
   }\r
+\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Selects a firmware configuration item for reading.\r
 \r
@@ -216,7 +229,7 @@ QemuFwCfgInitialize (
 VOID\r
 EFIAPI\r
 QemuFwCfgSelectItem (\r
-  IN FIRMWARE_CONFIG_ITEM QemuFwCfgItem\r
+  IN FIRMWARE_CONFIG_ITEM  QemuFwCfgItem\r
   )\r
 {\r
   if (QemuFwCfgIsAvailable ()) {\r
@@ -224,7 +237,6 @@ QemuFwCfgSelectItem (
   }\r
 }\r
 \r
-\r
 /**\r
   Slow READ_BYTES_FUNCTION.\r
 **/\r
@@ -232,50 +244,53 @@ STATIC
 VOID\r
 EFIAPI\r
 MmioReadBytes (\r
-  IN UINTN Size,\r
-  IN VOID  *Buffer OPTIONAL\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer OPTIONAL\r
   )\r
 {\r
-  UINTN Left;\r
-  UINT8 *Ptr;\r
-  UINT8 *End;\r
+  UINTN  Left;\r
+  UINT8  *Ptr;\r
+  UINT8  *End;\r
 \r
-#if defined(MDE_CPU_AARCH64) || defined(MDE_CPU_RISCV64)\r
+ #if defined (MDE_CPU_AARCH64) || defined (MDE_CPU_RISCV64)\r
   Left = Size & 7;\r
-#else\r
+ #else\r
   Left = Size & 3;\r
-#endif\r
+ #endif\r
 \r
   Size -= Left;\r
-  Ptr = Buffer;\r
-  End = Ptr + Size;\r
+  Ptr   = Buffer;\r
+  End   = Ptr + Size;\r
 \r
-#if defined(MDE_CPU_AARCH64) || defined(MDE_CPU_RISCV64)\r
+ #if defined (MDE_CPU_AARCH64) || defined (MDE_CPU_RISCV64)\r
   while (Ptr < End) {\r
     *(UINT64 *)Ptr = MmioRead64 (mFwCfgDataAddress);\r
-    Ptr += 8;\r
+    Ptr           += 8;\r
   }\r
+\r
   if (Left & 4) {\r
     *(UINT32 *)Ptr = MmioRead32 (mFwCfgDataAddress);\r
-    Ptr += 4;\r
+    Ptr           += 4;\r
   }\r
-#else\r
+\r
+ #else\r
   while (Ptr < End) {\r
     *(UINT32 *)Ptr = MmioRead32 (mFwCfgDataAddress);\r
-    Ptr += 4;\r
+    Ptr           += 4;\r
   }\r
-#endif\r
+\r
+ #endif\r
 \r
   if (Left & 2) {\r
     *(UINT16 *)Ptr = MmioRead16 (mFwCfgDataAddress);\r
-    Ptr += 2;\r
+    Ptr           += 2;\r
   }\r
+\r
   if (Left & 1) {\r
     *Ptr = MmioRead8 (mFwCfgDataAddress);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Transfer an array of bytes, or skip a number of bytes, using the DMA\r
   interface.\r
@@ -294,16 +309,18 @@ MmioReadBytes (
 STATIC\r
 VOID\r
 DmaTransferBytes (\r
-  IN     UINTN  Size,\r
-  IN OUT VOID   *Buffer OPTIONAL,\r
-  IN     UINT32 Control\r
+  IN     UINTN   Size,\r
+  IN OUT VOID    *Buffer OPTIONAL,\r
+  IN     UINT32  Control\r
   )\r
 {\r
-  volatile FW_CFG_DMA_ACCESS Access;\r
-  UINT32                     Status;\r
+  volatile FW_CFG_DMA_ACCESS  Access;\r
+  UINT32                      Status;\r
 \r
-  ASSERT (Control == FW_CFG_DMA_CTL_WRITE || Control == FW_CFG_DMA_CTL_READ ||\r
-    Control == FW_CFG_DMA_CTL_SKIP);\r
+  ASSERT (\r
+    Control == FW_CFG_DMA_CTL_WRITE || Control == FW_CFG_DMA_CTL_READ ||\r
+    Control == FW_CFG_DMA_CTL_SKIP\r
+    );\r
 \r
   if (Size == 0) {\r
     return;\r
@@ -323,11 +340,11 @@ DmaTransferBytes (
   //\r
   // This will fire off the transfer.\r
   //\r
-#if defined(MDE_CPU_AARCH64) || defined(MDE_CPU_RISCV64)\r
+ #if defined (MDE_CPU_AARCH64) || defined (MDE_CPU_RISCV64)\r
   MmioWrite64 (mFwCfgDmaAddress, SwapBytes64 ((UINT64)&Access));\r
-#else\r
+ #else\r
   MmioWrite32 ((UINT32)(mFwCfgDmaAddress + 4), SwapBytes32 ((UINT32)&Access));\r
-#endif\r
+ #endif\r
 \r
   //\r
   // We shouldn't look at Access.Control before starting the transfer.\r
@@ -345,7 +362,6 @@ DmaTransferBytes (
   MemoryFence ();\r
 }\r
 \r
-\r
 /**\r
   Fast READ_BYTES_FUNCTION.\r
 **/\r
@@ -353,14 +369,13 @@ STATIC
 VOID\r
 EFIAPI\r
 DmaReadBytes (\r
-  IN UINTN Size,\r
-  IN VOID  *Buffer OPTIONAL\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer OPTIONAL\r
   )\r
 {\r
   DmaTransferBytes (Size, Buffer, FW_CFG_DMA_CTL_READ);\r
 }\r
 \r
-\r
 /**\r
   Reads firmware configuration bytes into a buffer\r
 \r
@@ -374,8 +389,8 @@ DmaReadBytes (
 VOID\r
 EFIAPI\r
 QemuFwCfgReadBytes (\r
-  IN UINTN Size,\r
-  IN VOID  *Buffer\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer\r
   )\r
 {\r
   if (QemuFwCfgIsAvailable ()) {\r
@@ -385,7 +400,6 @@ QemuFwCfgReadBytes (
   }\r
 }\r
 \r
-\r
 /**\r
   Slow WRITE_BYTES_FUNCTION.\r
 **/\r
@@ -393,18 +407,17 @@ STATIC
 VOID\r
 EFIAPI\r
 MmioWriteBytes (\r
-  IN UINTN Size,\r
-  IN VOID  *Buffer OPTIONAL\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer OPTIONAL\r
   )\r
 {\r
-  UINTN Idx;\r
+  UINTN  Idx;\r
 \r
   for (Idx = 0; Idx < Size; ++Idx) {\r
     MmioWrite8 (mFwCfgDataAddress, ((UINT8 *)Buffer)[Idx]);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Fast WRITE_BYTES_FUNCTION.\r
 **/\r
@@ -412,14 +425,13 @@ STATIC
 VOID\r
 EFIAPI\r
 DmaWriteBytes (\r
-  IN UINTN Size,\r
-  IN VOID  *Buffer OPTIONAL\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer OPTIONAL\r
   )\r
 {\r
   DmaTransferBytes (Size, Buffer, FW_CFG_DMA_CTL_WRITE);\r
 }\r
 \r
-\r
 /**\r
   Write firmware configuration bytes from a buffer\r
 \r
@@ -433,8 +445,8 @@ DmaWriteBytes (
 VOID\r
 EFIAPI\r
 QemuFwCfgWriteBytes (\r
-  IN UINTN                  Size,\r
-  IN VOID                   *Buffer\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer\r
   )\r
 {\r
   if (QemuFwCfgIsAvailable ()) {\r
@@ -442,7 +454,6 @@ QemuFwCfgWriteBytes (
   }\r
 }\r
 \r
-\r
 /**\r
   Slow SKIP_BYTES_FUNCTION.\r
 **/\r
@@ -450,11 +461,11 @@ STATIC
 VOID\r
 EFIAPI\r
 MmioSkipBytes (\r
-  IN UINTN Size\r
+  IN UINTN  Size\r
   )\r
 {\r
-  UINTN ChunkSize;\r
-  UINT8 SkipBuffer[256];\r
+  UINTN  ChunkSize;\r
+  UINT8  SkipBuffer[256];\r
 \r
   //\r
   // Emulate the skip by reading data in chunks, and throwing it away. The\r
@@ -470,7 +481,6 @@ MmioSkipBytes (
   }\r
 }\r
 \r
-\r
 /**\r
   Fast SKIP_BYTES_FUNCTION.\r
 **/\r
@@ -478,13 +488,12 @@ STATIC
 VOID\r
 EFIAPI\r
 DmaSkipBytes (\r
-  IN UINTN Size\r
+  IN UINTN  Size\r
   )\r
 {\r
   DmaTransferBytes (Size, NULL, FW_CFG_DMA_CTL_SKIP);\r
 }\r
 \r
-\r
 /**\r
   Skip bytes in the firmware configuration item.\r
 \r
@@ -497,7 +506,7 @@ DmaSkipBytes (
 VOID\r
 EFIAPI\r
 QemuFwCfgSkipBytes (\r
-  IN UINTN Size\r
+  IN UINTN  Size\r
   )\r
 {\r
   if (QemuFwCfgIsAvailable ()) {\r
@@ -505,7 +514,6 @@ QemuFwCfgSkipBytes (
   }\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT8 firmware configuration value\r
 \r
@@ -518,13 +526,12 @@ QemuFwCfgRead8 (
   VOID\r
   )\r
 {\r
-  UINT8 Result;\r
+  UINT8  Result;\r
 \r
   QemuFwCfgReadBytes (sizeof Result, &Result);\r
   return Result;\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT16 firmware configuration value\r
 \r
@@ -537,13 +544,12 @@ QemuFwCfgRead16 (
   VOID\r
   )\r
 {\r
-  UINT16 Result;\r
+  UINT16  Result;\r
 \r
   QemuFwCfgReadBytes (sizeof Result, &Result);\r
   return Result;\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT32 firmware configuration value\r
 \r
@@ -556,13 +562,12 @@ QemuFwCfgRead32 (
   VOID\r
   )\r
 {\r
-  UINT32 Result;\r
+  UINT32  Result;\r
 \r
   QemuFwCfgReadBytes (sizeof Result, &Result);\r
   return Result;\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT64 firmware configuration value\r
 \r
@@ -575,13 +580,12 @@ QemuFwCfgRead64 (
   VOID\r
   )\r
 {\r
-  UINT64 Result;\r
+  UINT64  Result;\r
 \r
   QemuFwCfgReadBytes (sizeof Result, &Result);\r
   return Result;\r
 }\r
 \r
-\r
 /**\r
   Find the configuration item corresponding to the firmware configuration file.\r
 \r
@@ -603,8 +607,8 @@ QemuFwCfgFindFile (
   OUT  UINTN                 *Size\r
   )\r
 {\r
-  UINT32 Count;\r
-  UINT32 Idx;\r
+  UINT32  Count;\r
+  UINT32  Idx;\r
 \r
   if (!QemuFwCfgIsAvailable ()) {\r
     return RETURN_UNSUPPORTED;\r
@@ -614,9 +618,9 @@ QemuFwCfgFindFile (
   Count = SwapBytes32 (QemuFwCfgRead32 ());\r
 \r
   for (Idx = 0; Idx < Count; ++Idx) {\r
-    UINT32 FileSize;\r
-    UINT16 FileSelect;\r
-    CHAR8  FName[QEMU_FW_CFG_FNAME_SIZE];\r
+    UINT32  FileSize;\r
+    UINT16  FileSelect;\r
+    CHAR8   FName[QEMU_FW_CFG_FNAME_SIZE];\r
 \r
     FileSize   = QemuFwCfgRead32 ();\r
     FileSelect = QemuFwCfgRead16 ();\r
@@ -624,7 +628,7 @@ QemuFwCfgFindFile (
     InternalQemuFwCfgReadBytes (sizeof (FName), FName);\r
 \r
     if (AsciiStrCmp (Name, FName) == 0) {\r
-      *Item = (FIRMWARE_CONFIG_ITEM) SwapBytes16 (FileSelect);\r
+      *Item = (FIRMWARE_CONFIG_ITEM)SwapBytes16 (FileSelect);\r
       *Size = SwapBytes32 (FileSize);\r
       return RETURN_SUCCESS;\r
     }\r
index edd97db49d4ace872eccc62b7c7d093bf620782d..6a85ed65a02453e63ce208b5ee5f912fcc2c9847 100644 (file)
@@ -32,7 +32,6 @@ QemuFwCfgIsAvailable (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Selects a firmware configuration item for reading.\r
 \r
@@ -45,13 +44,12 @@ QemuFwCfgIsAvailable (
 VOID\r
 EFIAPI\r
 QemuFwCfgSelectItem (\r
-  IN FIRMWARE_CONFIG_ITEM   QemuFwCfgItem\r
+  IN FIRMWARE_CONFIG_ITEM  QemuFwCfgItem\r
   )\r
 {\r
   ASSERT (FALSE);\r
 }\r
 \r
-\r
 /**\r
   Reads firmware configuration bytes into a buffer\r
 \r
@@ -66,14 +64,13 @@ QemuFwCfgSelectItem (
 VOID\r
 EFIAPI\r
 QemuFwCfgReadBytes (\r
-  IN UINTN                  Size,\r
-  IN VOID                   *Buffer  OPTIONAL\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer  OPTIONAL\r
   )\r
 {\r
   ASSERT (FALSE);\r
 }\r
 \r
-\r
 /**\r
   Writes firmware configuration bytes from a buffer\r
 \r
@@ -88,14 +85,13 @@ QemuFwCfgReadBytes (
 VOID\r
 EFIAPI\r
 QemuFwCfgWriteBytes (\r
-  IN UINTN                  Size,\r
-  IN VOID                   *Buffer\r
+  IN UINTN  Size,\r
+  IN VOID   *Buffer\r
   )\r
 {\r
   ASSERT (FALSE);\r
 }\r
 \r
-\r
 /**\r
   Skip bytes in the firmware configuration item.\r
 \r
@@ -108,13 +104,12 @@ QemuFwCfgWriteBytes (
 VOID\r
 EFIAPI\r
 QemuFwCfgSkipBytes (\r
-  IN UINTN                  Size\r
+  IN UINTN  Size\r
   )\r
 {\r
   ASSERT (FALSE);\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT8 firmware configuration value\r
 \r
@@ -131,7 +126,6 @@ QemuFwCfgRead8 (
   return 0;\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT16 firmware configuration value\r
 \r
@@ -148,7 +142,6 @@ QemuFwCfgRead16 (
   return 0;\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT32 firmware configuration value\r
 \r
@@ -165,7 +158,6 @@ QemuFwCfgRead32 (
   return 0;\r
 }\r
 \r
-\r
 /**\r
   Reads a UINT64 firmware configuration value\r
 \r
@@ -182,7 +174,6 @@ QemuFwCfgRead64 (
   return 0;\r
 }\r
 \r
-\r
 /**\r
   Find the configuration item corresponding to the firmware configuration file.\r
 \r
@@ -206,4 +197,3 @@ QemuFwCfgFindFile (
 {\r
   return RETURN_UNSUPPORTED;\r
 }\r
-\r
index ecabd88fab66a2472d34a8e7c08d31c057fad9b3..f696fb7cacaab15ff4c07d188daa36a6af8c87ed 100644 (file)
@@ -17,9 +17,8 @@
 \r
 #include "QemuFwCfgLibInternal.h"\r
 \r
-STATIC BOOLEAN mQemuFwCfgSupported = FALSE;\r
-STATIC BOOLEAN mQemuFwCfgDmaSupported;\r
-\r
+STATIC BOOLEAN  mQemuFwCfgSupported = FALSE;\r
+STATIC BOOLEAN  mQemuFwCfgDmaSupported;\r
 \r
 /**\r
   Returns a boolean indicating if the firmware configuration interface\r
@@ -40,21 +39,20 @@ QemuFwCfgIsAvailable (
   return InternalQemuFwCfgIsAvailable ();\r
 }\r
 \r
-\r
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgInitialize (\r
   VOID\r
   )\r
 {\r
-  UINT32 Signature;\r
-  UINT32 Revision;\r
+  UINT32  Signature;\r
+  UINT32  Revision;\r
 \r
   //\r
   // Enable the access routines while probing to see if it is supported.\r
   // For probing we always use the IO Port (IoReadFifo8()) access method.\r
   //\r
-  mQemuFwCfgSupported = TRUE;\r
+  mQemuFwCfgSupported    = TRUE;\r
   mQemuFwCfgDmaSupported = FALSE;\r
 \r
   QemuFwCfgSelectItem (QemuFwCfgItemSignature);\r
@@ -65,7 +63,8 @@ QemuFwCfgInitialize (
   DEBUG ((DEBUG_INFO, "FW CFG Revision: 0x%x\n", Revision));\r
   if ((Signature != SIGNATURE_32 ('Q', 'E', 'M', 'U')) ||\r
       (Revision < 1)\r
-     ) {\r
+      )\r
+  {\r
     DEBUG ((DEBUG_INFO, "QemuFwCfg interface not supported.\n"));\r
     mQemuFwCfgSupported = FALSE;\r
     return RETURN_SUCCESS;\r
@@ -87,10 +86,10 @@ QemuFwCfgInitialize (
       DEBUG ((DEBUG_INFO, "QemuFwCfg interface (DMA) is supported.\n"));\r
     }\r
   }\r
+\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Returns a boolean indicating if the firmware configuration interface is\r
   available for library-internal purposes.\r
@@ -140,17 +139,19 @@ InternalQemuFwCfgDmaIsAvailable (
 **/\r
 VOID\r
 InternalQemuFwCfgDmaBytes (\r
-  IN     UINT32   Size,\r
-  IN OUT VOID     *Buffer OPTIONAL,\r
-  IN     UINT32   Control\r
+  IN     UINT32  Size,\r
+  IN OUT VOID    *Buffer OPTIONAL,\r
+  IN     UINT32  Control\r
   )\r
 {\r
-  volatile FW_CFG_DMA_ACCESS Access;\r
-  UINT32                     AccessHigh, AccessLow;\r
-  UINT32                     Status;\r
+  volatile FW_CFG_DMA_ACCESS  Access;\r
+  UINT32                      AccessHigh, AccessLow;\r
+  UINT32                      Status;\r
 \r
-  ASSERT (Control == FW_CFG_DMA_CTL_WRITE || Control == FW_CFG_DMA_CTL_READ ||\r
-    Control == FW_CFG_DMA_CTL_SKIP);\r
+  ASSERT (\r
+    Control == FW_CFG_DMA_CTL_WRITE || Control == FW_CFG_DMA_CTL_READ ||\r
+    Control == FW_CFG_DMA_CTL_SKIP\r
+    );\r
 \r
   if (Size == 0) {\r
     return;\r
@@ -177,7 +178,7 @@ InternalQemuFwCfgDmaBytes (
   //\r
   AccessHigh = (UINT32)RShiftU64 ((UINTN)&Access, 32);\r
   AccessLow  = (UINT32)(UINTN)&Access;\r
-  IoWrite32 (FW_CFG_IO_DMA_ADDRESS,     SwapBytes32 (AccessHigh));\r
+  IoWrite32 (FW_CFG_IO_DMA_ADDRESS, SwapBytes32 (AccessHigh));\r
   IoWrite32 (FW_CFG_IO_DMA_ADDRESS + 4, SwapBytes32 (AccessLow));\r
 \r
   //\r
@@ -198,4 +199,3 @@ InternalQemuFwCfgDmaBytes (
   //\r
   MemoryFence ();\r
 }\r
-\r
index 94e8e92180cfcd7967dd799c2d49e7a347023963..63cfee934795e115fb5054a4d1435e5c127a6133 100644 (file)
@@ -33,8 +33,8 @@ QemuFwCfgIsAvailable (
   VOID\r
   )\r
 {\r
-  UINT32 Signature;\r
-  UINT32 Revision;\r
+  UINT32  Signature;\r
+  UINT32  Revision;\r
 \r
   QemuFwCfgSelectItem (QemuFwCfgItemSignature);\r
   Signature = QemuFwCfgRead32 ();\r
@@ -44,7 +44,8 @@ QemuFwCfgIsAvailable (
   DEBUG ((DEBUG_INFO, "FW CFG Revision: 0x%x\n", Revision));\r
   if ((Signature != SIGNATURE_32 ('Q', 'E', 'M', 'U')) ||\r
       (Revision < 1)\r
-     ) {\r
+      )\r
+  {\r
     DEBUG ((DEBUG_INFO, "QemuFwCfg interface not supported.\n"));\r
     return FALSE;\r
   }\r
@@ -53,7 +54,6 @@ QemuFwCfgIsAvailable (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Returns a boolean indicating if the firmware configuration interface is\r
   available for library-internal purposes.\r
@@ -108,9 +108,9 @@ InternalQemuFwCfgDmaIsAvailable (
 **/\r
 VOID\r
 InternalQemuFwCfgDmaBytes (\r
-  IN     UINT32   Size,\r
-  IN OUT VOID     *Buffer OPTIONAL,\r
-  IN     UINT32   Control\r
+  IN     UINT32  Size,\r
+  IN OUT VOID    *Buffer OPTIONAL,\r
+  IN     UINT32  Control\r
   )\r
 {\r
   //\r
index aad359d83d0f2d50037b61d51d6caebe16adff4f..b0356a2e25224e607a0f57400c4e518d25f98bb5 100644 (file)
@@ -33,7 +33,6 @@ QemuFwCfgS3Enabled (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Install the client module's FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION callback for\r
   when the production of ACPI S3 Boot Script opcodes becomes possible.\r
@@ -91,13 +90,12 @@ QemuFwCfgS3Enabled (
 \r
   @return                          Error codes from underlying functions.\r
 **/\r
-\r
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
-  IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
-  IN OUT VOID                                 *Context           OPTIONAL,\r
-  IN     UINTN                                ScratchBufferSize\r
+  IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION  *Callback,\r
+  IN OUT VOID                                  *Context           OPTIONAL,\r
+  IN     UINTN                                 ScratchBufferSize\r
   )\r
 {\r
   ASSERT (FALSE);\r
index 3ec6209ba4bd3abfdef20d4f3ae11ce6fdf60f29..3c1b28ba2b683a3f541ec411e72de427441dc664 100644 (file)
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptWriteBytes (\r
-  IN INT32 FirmwareConfigItem,\r
-  IN UINTN NumberOfBytes\r
+  IN INT32  FirmwareConfigItem,\r
+  IN UINTN  NumberOfBytes\r
   )\r
 {\r
   ASSERT (FALSE);\r
   return RETURN_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,\r
   and transfer data from it.\r
@@ -104,15 +103,14 @@ QemuFwCfgS3ScriptWriteBytes (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptReadBytes (\r
-  IN INT32 FirmwareConfigItem,\r
-  IN UINTN NumberOfBytes\r
+  IN INT32  FirmwareConfigItem,\r
+  IN UINTN  NumberOfBytes\r
   )\r
 {\r
   ASSERT (FALSE);\r
   return RETURN_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,\r
   and increase its offset.\r
@@ -148,15 +146,14 @@ QemuFwCfgS3ScriptReadBytes (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptSkipBytes (\r
-  IN INT32 FirmwareConfigItem,\r
-  IN UINTN NumberOfBytes\r
+  IN INT32  FirmwareConfigItem,\r
+  IN UINTN  NumberOfBytes\r
   )\r
 {\r
   ASSERT (FALSE);\r
   return RETURN_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that check a value in ScratchBuffer.\r
 \r
@@ -210,10 +207,10 @@ QemuFwCfgS3ScriptSkipBytes (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptCheckValue (\r
-  IN VOID   *ScratchData,\r
-  IN UINT8  ValueSize,\r
-  IN UINT64 ValueMask,\r
-  IN UINT64 Value\r
+  IN VOID    *ScratchData,\r
+  IN UINT8   ValueSize,\r
+  IN UINT64  ValueMask,\r
+  IN UINT64  Value\r
   )\r
 {\r
   ASSERT (FALSE);\r
index 4dcf4b1298863ee462299ef0fc6337a1cf6038e1..5706fa9be46af0865aaee9c5ceb84400ca0de283 100644 (file)
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Protocol/S3SaveState.h>\r
 \r
-\r
 //\r
 // Event to signal when the S3SaveState protocol interface is installed.\r
 //\r
-STATIC EFI_EVENT mS3SaveStateInstalledEvent;\r
+STATIC EFI_EVENT  mS3SaveStateInstalledEvent;\r
 \r
 //\r
 // Reference to the S3SaveState protocol interface, after it is installed.\r
 //\r
-STATIC EFI_S3_SAVE_STATE_PROTOCOL *mS3SaveState;\r
+STATIC EFI_S3_SAVE_STATE_PROTOCOL  *mS3SaveState;\r
 \r
 //\r
 // The control structure is allocated in reserved memory, aligned at 8 bytes.\r
 // The client-requested ScratchBuffer will be allocated adjacently, also\r
 // aligned at 8 bytes.\r
 //\r
-#define RESERVED_MEM_ALIGNMENT 8\r
+#define RESERVED_MEM_ALIGNMENT  8\r
 \r
-STATIC FW_CFG_DMA_ACCESS *mDmaAccess;\r
-STATIC VOID              *mScratchBuffer;\r
-STATIC UINTN             mScratchBufferSize;\r
+STATIC FW_CFG_DMA_ACCESS  *mDmaAccess;\r
+STATIC VOID               *mScratchBuffer;\r
+STATIC UINTN              mScratchBufferSize;\r
 \r
 //\r
 // Callback provided by the client, for appending ACPI S3 Boot Script opcodes.\r
 // To be called from S3SaveStateInstalledNotify().\r
 //\r
-STATIC FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *mCallback;\r
-\r
+STATIC FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION  *mCallback;\r
 \r
 /**\r
   Event notification function for mS3SaveStateInstalledEvent.\r
@@ -50,32 +48,40 @@ STATIC
 VOID\r
 EFIAPI\r
 S3SaveStateInstalledNotify (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   ASSERT (Event == mS3SaveStateInstalledEvent);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiS3SaveStateProtocolGuid,\r
-                  NULL /* Registration */, (VOID **)&mS3SaveState);\r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiS3SaveStateProtocolGuid,\r
+                  NULL /* Registration */,\r
+                  (VOID **)&mS3SaveState\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return;\r
   }\r
 \r
   ASSERT (mCallback != NULL);\r
 \r
-  DEBUG ((DEBUG_INFO, "%a: %a: DmaAccess@0x%Lx ScratchBuffer@[0x%Lx+0x%Lx]\n",\r
-    gEfiCallerBaseName, __FUNCTION__, (UINT64)(UINTN)mDmaAccess,\r
-    (UINT64)(UINTN)mScratchBuffer, (UINT64)mScratchBufferSize));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: %a: DmaAccess@0x%Lx ScratchBuffer@[0x%Lx+0x%Lx]\n",\r
+    gEfiCallerBaseName,\r
+    __FUNCTION__,\r
+    (UINT64)(UINTN)mDmaAccess,\r
+    (UINT64)(UINTN)mScratchBuffer,\r
+    (UINT64)mScratchBufferSize\r
+    ));\r
   mCallback (Context, mScratchBuffer);\r
 \r
   gBS->CloseEvent (mS3SaveStateInstalledEvent);\r
   mS3SaveStateInstalledEvent = NULL;\r
 }\r
 \r
-\r
 /**\r
   Install the client module's FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION callback for\r
   when the production of ACPI S3 Boot Script opcodes becomes possible.\r
@@ -136,13 +142,13 @@ S3SaveStateInstalledNotify (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
-  IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
-  IN OUT VOID                                 *Context           OPTIONAL,\r
-  IN     UINTN                                ScratchBufferSize\r
+  IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION  *Callback,\r
+  IN OUT VOID                                  *Context           OPTIONAL,\r
+  IN     UINTN                                 ScratchBufferSize\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  VOID       *Registration;\r
+  EFI_STATUS  Status;\r
+  VOID        *Registration;\r
 \r
   //\r
   // Basic fw_cfg is certainly available, as we can only be here after a\r
@@ -151,8 +157,12 @@ QemuFwCfgS3CallWhenBootScriptReady (
   ASSERT (QemuFwCfgIsAvailable ());\r
   QemuFwCfgSelectItem (QemuFwCfgItemInterfaceVersion);\r
   if ((QemuFwCfgRead32 () & FW_CFG_F_DMA) == 0) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: fw_cfg DMA unavailable\n",\r
-      gEfiCallerBaseName, __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: fw_cfg DMA unavailable\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     return RETURN_NOT_FOUND;\r
   }\r
 \r
@@ -161,37 +171,69 @@ QemuFwCfgS3CallWhenBootScriptReady (
   // client data together.\r
   //\r
   if (ScratchBufferSize >\r
-      MAX_UINT32 - (RESERVED_MEM_ALIGNMENT - 1) - sizeof *mDmaAccess) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: ScratchBufferSize too big: %Lu\n",\r
-      gEfiCallerBaseName, __FUNCTION__, (UINT64)ScratchBufferSize));\r
+      MAX_UINT32 - (RESERVED_MEM_ALIGNMENT - 1) - sizeof *mDmaAccess)\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: ScratchBufferSize too big: %Lu\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      (UINT64)ScratchBufferSize\r
+      ));\r
     return RETURN_BAD_BUFFER_SIZE;\r
   }\r
-  mDmaAccess = AllocateReservedPool ((RESERVED_MEM_ALIGNMENT - 1) +\r
-                 sizeof *mDmaAccess + ScratchBufferSize);\r
+\r
+  mDmaAccess = AllocateReservedPool (\r
+                 (RESERVED_MEM_ALIGNMENT - 1) +\r
+                 sizeof *mDmaAccess + ScratchBufferSize\r
+                 );\r
   if (mDmaAccess == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: AllocateReservedPool(): out of resources\n",\r
-      gEfiCallerBaseName, __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: AllocateReservedPool(): out of resources\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     return RETURN_OUT_OF_RESOURCES;\r
   }\r
+\r
   mDmaAccess = ALIGN_POINTER (mDmaAccess, RESERVED_MEM_ALIGNMENT);\r
 \r
   //\r
   // Set up a protocol notify for EFI_S3_SAVE_STATE_PROTOCOL. Forward the\r
   // client's Context to the callback.\r
   //\r
-  Status = gBS->CreateEvent (EVT_NOTIFY_SIGNAL, TPL_CALLBACK,\r
-                  S3SaveStateInstalledNotify, Context,\r
-                  &mS3SaveStateInstalledEvent);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  S3SaveStateInstalledNotify,\r
+                  Context,\r
+                  &mS3SaveStateInstalledEvent\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: CreateEvent(): %r\n", gEfiCallerBaseName,\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: CreateEvent(): %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     goto FreeDmaAccess;\r
   }\r
-  Status = gBS->RegisterProtocolNotify (&gEfiS3SaveStateProtocolGuid,\r
-                  mS3SaveStateInstalledEvent, &Registration);\r
+\r
+  Status = gBS->RegisterProtocolNotify (\r
+                  &gEfiS3SaveStateProtocolGuid,\r
+                  mS3SaveStateInstalledEvent,\r
+                  &Registration\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: RegisterProtocolNotify(): %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: RegisterProtocolNotify(): %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     goto CloseEvent;\r
   }\r
 \r
@@ -201,26 +243,31 @@ QemuFwCfgS3CallWhenBootScriptReady (
   // integral multiple of RESERVED_MEM_ALIGNMENT.\r
   //\r
   ASSERT (sizeof *mDmaAccess % RESERVED_MEM_ALIGNMENT == 0);\r
-  mScratchBuffer = mDmaAccess + 1;\r
+  mScratchBuffer     = mDmaAccess + 1;\r
   mScratchBufferSize = ScratchBufferSize;\r
-  mCallback = Callback;\r
+  mCallback          = Callback;\r
 \r
   //\r
   // Kick the event; EFI_S3_SAVE_STATE_PROTOCOL could be available already.\r
   //\r
   Status = gBS->SignalEvent (mS3SaveStateInstalledEvent);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: SignalEvent(): %r\n", gEfiCallerBaseName,\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: SignalEvent(): %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     goto NullGlobals;\r
   }\r
 \r
   return RETURN_SUCCESS;\r
 \r
 NullGlobals:\r
-  mScratchBuffer = NULL;\r
+  mScratchBuffer     = NULL;\r
   mScratchBufferSize = 0;\r
-  mCallback = NULL;\r
+  mCallback          = NULL;\r
 \r
 CloseEvent:\r
   gBS->CloseEvent (mS3SaveStateInstalledEvent);\r
@@ -233,7 +280,6 @@ FreeDmaAccess:
   return (RETURN_STATUS)Status;\r
 }\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,\r
   and transfer data to it.\r
@@ -277,22 +323,23 @@ FreeDmaAccess:
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptWriteBytes (\r
-  IN INT32 FirmwareConfigItem,\r
-  IN UINTN NumberOfBytes\r
+  IN INT32  FirmwareConfigItem,\r
+  IN UINTN  NumberOfBytes\r
   )\r
 {\r
-  UINTN      Count;\r
-  EFI_STATUS Status;\r
-  UINT64     AccessAddress;\r
-  UINT32     ControlPollData;\r
-  UINT32     ControlPollMask;\r
+  UINTN       Count;\r
+  EFI_STATUS  Status;\r
+  UINT64      AccessAddress;\r
+  UINT32      ControlPollData;\r
+  UINT32      ControlPollMask;\r
 \r
   ASSERT (mDmaAccess != NULL);\r
   ASSERT (mS3SaveState != NULL);\r
 \r
-  if (FirmwareConfigItem < -1 || FirmwareConfigItem > MAX_UINT16) {\r
+  if ((FirmwareConfigItem < -1) || (FirmwareConfigItem > MAX_UINT16)) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
+\r
   if (NumberOfBytes > mScratchBufferSize) {\r
     return RETURN_BAD_BUFFER_SIZE;\r
   }\r
@@ -305,6 +352,7 @@ QemuFwCfgS3ScriptWriteBytes (
     mDmaAccess->Control |= FW_CFG_DMA_CTL_SELECT;\r
     mDmaAccess->Control |= (UINT32)FirmwareConfigItem << 16;\r
   }\r
+\r
   mDmaAccess->Control = SwapBytes32 (mDmaAccess->Control);\r
 \r
   //\r
@@ -321,7 +369,7 @@ QemuFwCfgS3ScriptWriteBytes (
   // script. When executed at S3 resume, this opcode will restore all of them\r
   // in-place.\r
   //\r
-  Count = (UINTN)mScratchBuffer + NumberOfBytes - (UINTN)mDmaAccess;\r
+  Count  = (UINTN)mScratchBuffer + NumberOfBytes - (UINTN)mDmaAccess;\r
   Status = mS3SaveState->Write (\r
                            mS3SaveState,                     // This\r
                            EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE, // OpCode\r
@@ -331,8 +379,13 @@ QemuFwCfgS3ScriptWriteBytes (
                            (VOID *)mDmaAccess                // Buffer\r
                            );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return (RETURN_STATUS)Status;\r
   }\r
 \r
@@ -343,17 +396,22 @@ QemuFwCfgS3ScriptWriteBytes (
   // transfer.\r
   //\r
   AccessAddress = SwapBytes64 ((UINTN)mDmaAccess);\r
-  Status = mS3SaveState->Write (\r
-                           mS3SaveState,                    // This\r
-                           EFI_BOOT_SCRIPT_IO_WRITE_OPCODE, // OpCode\r
-                           EfiBootScriptWidthUint32,        // Width\r
-                           (UINT64)FW_CFG_IO_DMA_ADDRESS,   // Address\r
-                           (UINTN)2,                        // Count\r
-                           (VOID *)&AccessAddress           // Buffer\r
-                           );\r
+  Status        = mS3SaveState->Write (\r
+                                  mS3SaveState,                    // This\r
+                                  EFI_BOOT_SCRIPT_IO_WRITE_OPCODE, // OpCode\r
+                                  EfiBootScriptWidthUint32,        // Width\r
+                                  (UINT64)FW_CFG_IO_DMA_ADDRESS,   // Address\r
+                                  (UINTN)2,                        // Count\r
+                                  (VOID *)&AccessAddress           // Buffer\r
+                                  );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: EFI_BOOT_SCRIPT_IO_WRITE_OPCODE: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: EFI_BOOT_SCRIPT_IO_WRITE_OPCODE: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return (RETURN_STATUS)Status;\r
   }\r
 \r
@@ -364,25 +422,29 @@ QemuFwCfgS3ScriptWriteBytes (
   //\r
   ControlPollData = 0;\r
   ControlPollMask = MAX_UINT32;\r
-  Status = mS3SaveState->Write (\r
-                           mS3SaveState,                        // This\r
-                           EFI_BOOT_SCRIPT_MEM_POLL_OPCODE,     // OpCode\r
-                           EfiBootScriptWidthUint32,            // Width\r
-                           (UINT64)(UINTN)&mDmaAccess->Control, // Address\r
-                           (VOID *)&ControlPollData,            // Data\r
-                           (VOID *)&ControlPollMask,            // DataMask\r
-                           MAX_UINT64                           // Delay\r
-                           );\r
+  Status          = mS3SaveState->Write (\r
+                                    mS3SaveState,                        // This\r
+                                    EFI_BOOT_SCRIPT_MEM_POLL_OPCODE,     // OpCode\r
+                                    EfiBootScriptWidthUint32,            // Width\r
+                                    (UINT64)(UINTN)&mDmaAccess->Control, // Address\r
+                                    (VOID *)&ControlPollData,            // Data\r
+                                    (VOID *)&ControlPollMask,            // DataMask\r
+                                    MAX_UINT64                           // Delay\r
+                                    );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return (RETURN_STATUS)Status;\r
   }\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,\r
   and transfer data from it.\r
@@ -425,21 +487,22 @@ QemuFwCfgS3ScriptWriteBytes (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptReadBytes (\r
-  IN INT32 FirmwareConfigItem,\r
-  IN UINTN NumberOfBytes\r
+  IN INT32  FirmwareConfigItem,\r
+  IN UINTN  NumberOfBytes\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT64     AccessAddress;\r
-  UINT32     ControlPollData;\r
-  UINT32     ControlPollMask;\r
+  EFI_STATUS  Status;\r
+  UINT64      AccessAddress;\r
+  UINT32      ControlPollData;\r
+  UINT32      ControlPollMask;\r
 \r
   ASSERT (mDmaAccess != NULL);\r
   ASSERT (mS3SaveState != NULL);\r
 \r
-  if (FirmwareConfigItem < -1 || FirmwareConfigItem > MAX_UINT16) {\r
+  if ((FirmwareConfigItem < -1) || (FirmwareConfigItem > MAX_UINT16)) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
+\r
   if (NumberOfBytes > mScratchBufferSize) {\r
     return RETURN_BAD_BUFFER_SIZE;\r
   }\r
@@ -452,6 +515,7 @@ QemuFwCfgS3ScriptReadBytes (
     mDmaAccess->Control |= FW_CFG_DMA_CTL_SELECT;\r
     mDmaAccess->Control |= (UINT32)FirmwareConfigItem << 16;\r
   }\r
+\r
   mDmaAccess->Control = SwapBytes32 (mDmaAccess->Control);\r
 \r
   //\r
@@ -476,8 +540,13 @@ QemuFwCfgS3ScriptReadBytes (
                            (VOID *)mDmaAccess                // Buffer\r
                            );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return (RETURN_STATUS)Status;\r
   }\r
 \r
@@ -488,17 +557,22 @@ QemuFwCfgS3ScriptReadBytes (
   // transfer.\r
   //\r
   AccessAddress = SwapBytes64 ((UINTN)mDmaAccess);\r
-  Status = mS3SaveState->Write (\r
-                           mS3SaveState,                    // This\r
-                           EFI_BOOT_SCRIPT_IO_WRITE_OPCODE, // OpCode\r
-                           EfiBootScriptWidthUint32,        // Width\r
-                           (UINT64)FW_CFG_IO_DMA_ADDRESS,   // Address\r
-                           (UINTN)2,                        // Count\r
-                           (VOID *)&AccessAddress           // Buffer\r
-                           );\r
+  Status        = mS3SaveState->Write (\r
+                                  mS3SaveState,                    // This\r
+                                  EFI_BOOT_SCRIPT_IO_WRITE_OPCODE, // OpCode\r
+                                  EfiBootScriptWidthUint32,        // Width\r
+                                  (UINT64)FW_CFG_IO_DMA_ADDRESS,   // Address\r
+                                  (UINTN)2,                        // Count\r
+                                  (VOID *)&AccessAddress           // Buffer\r
+                                  );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: EFI_BOOT_SCRIPT_IO_WRITE_OPCODE: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: EFI_BOOT_SCRIPT_IO_WRITE_OPCODE: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return (RETURN_STATUS)Status;\r
   }\r
 \r
@@ -509,25 +583,29 @@ QemuFwCfgS3ScriptReadBytes (
   //\r
   ControlPollData = 0;\r
   ControlPollMask = MAX_UINT32;\r
-  Status = mS3SaveState->Write (\r
-                           mS3SaveState,                        // This\r
-                           EFI_BOOT_SCRIPT_MEM_POLL_OPCODE,     // OpCode\r
-                           EfiBootScriptWidthUint32,            // Width\r
-                           (UINT64)(UINTN)&mDmaAccess->Control, // Address\r
-                           (VOID *)&ControlPollData,            // Data\r
-                           (VOID *)&ControlPollMask,            // DataMask\r
-                           MAX_UINT64                           // Delay\r
-                           );\r
+  Status          = mS3SaveState->Write (\r
+                                    mS3SaveState,                        // This\r
+                                    EFI_BOOT_SCRIPT_MEM_POLL_OPCODE,     // OpCode\r
+                                    EfiBootScriptWidthUint32,            // Width\r
+                                    (UINT64)(UINTN)&mDmaAccess->Control, // Address\r
+                                    (VOID *)&ControlPollData,            // Data\r
+                                    (VOID *)&ControlPollMask,            // DataMask\r
+                                    MAX_UINT64                           // Delay\r
+                                    );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return (RETURN_STATUS)Status;\r
   }\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,\r
   and increase its offset.\r
@@ -563,21 +641,22 @@ QemuFwCfgS3ScriptReadBytes (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptSkipBytes (\r
-  IN INT32 FirmwareConfigItem,\r
-  IN UINTN NumberOfBytes\r
+  IN INT32  FirmwareConfigItem,\r
+  IN UINTN  NumberOfBytes\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT64     AccessAddress;\r
-  UINT32     ControlPollData;\r
-  UINT32     ControlPollMask;\r
+  EFI_STATUS  Status;\r
+  UINT64      AccessAddress;\r
+  UINT32      ControlPollData;\r
+  UINT32      ControlPollMask;\r
 \r
   ASSERT (mDmaAccess != NULL);\r
   ASSERT (mS3SaveState != NULL);\r
 \r
-  if (FirmwareConfigItem < -1 || FirmwareConfigItem > MAX_UINT16) {\r
+  if ((FirmwareConfigItem < -1) || (FirmwareConfigItem > MAX_UINT16)) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
+\r
   if (NumberOfBytes > MAX_UINT32) {\r
     return RETURN_BAD_BUFFER_SIZE;\r
   }\r
@@ -590,9 +669,10 @@ QemuFwCfgS3ScriptSkipBytes (
     mDmaAccess->Control |= FW_CFG_DMA_CTL_SELECT;\r
     mDmaAccess->Control |= (UINT32)FirmwareConfigItem << 16;\r
   }\r
+\r
   mDmaAccess->Control = SwapBytes32 (mDmaAccess->Control);\r
 \r
-  mDmaAccess->Length = SwapBytes32 ((UINT32)NumberOfBytes);\r
+  mDmaAccess->Length  = SwapBytes32 ((UINT32)NumberOfBytes);\r
   mDmaAccess->Address = 0;\r
 \r
   //\r
@@ -608,8 +688,13 @@ QemuFwCfgS3ScriptSkipBytes (
                            (VOID *)mDmaAccess                // Buffer\r
                            );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return (RETURN_STATUS)Status;\r
   }\r
 \r
@@ -620,17 +705,22 @@ QemuFwCfgS3ScriptSkipBytes (
   // transfer.\r
   //\r
   AccessAddress = SwapBytes64 ((UINTN)mDmaAccess);\r
-  Status = mS3SaveState->Write (\r
-                           mS3SaveState,                    // This\r
-                           EFI_BOOT_SCRIPT_IO_WRITE_OPCODE, // OpCode\r
-                           EfiBootScriptWidthUint32,        // Width\r
-                           (UINT64)FW_CFG_IO_DMA_ADDRESS,   // Address\r
-                           (UINTN)2,                        // Count\r
-                           (VOID *)&AccessAddress           // Buffer\r
-                           );\r
+  Status        = mS3SaveState->Write (\r
+                                  mS3SaveState,                    // This\r
+                                  EFI_BOOT_SCRIPT_IO_WRITE_OPCODE, // OpCode\r
+                                  EfiBootScriptWidthUint32,        // Width\r
+                                  (UINT64)FW_CFG_IO_DMA_ADDRESS,   // Address\r
+                                  (UINTN)2,                        // Count\r
+                                  (VOID *)&AccessAddress           // Buffer\r
+                                  );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: EFI_BOOT_SCRIPT_IO_WRITE_OPCODE: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: EFI_BOOT_SCRIPT_IO_WRITE_OPCODE: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return (RETURN_STATUS)Status;\r
   }\r
 \r
@@ -641,25 +731,29 @@ QemuFwCfgS3ScriptSkipBytes (
   //\r
   ControlPollData = 0;\r
   ControlPollMask = MAX_UINT32;\r
-  Status = mS3SaveState->Write (\r
-                           mS3SaveState,                        // This\r
-                           EFI_BOOT_SCRIPT_MEM_POLL_OPCODE,     // OpCode\r
-                           EfiBootScriptWidthUint32,            // Width\r
-                           (UINT64)(UINTN)&mDmaAccess->Control, // Address\r
-                           (VOID *)&ControlPollData,            // Data\r
-                           (VOID *)&ControlPollMask,            // DataMask\r
-                           MAX_UINT64                           // Delay\r
-                           );\r
+  Status          = mS3SaveState->Write (\r
+                                    mS3SaveState,                        // This\r
+                                    EFI_BOOT_SCRIPT_MEM_POLL_OPCODE,     // OpCode\r
+                                    EfiBootScriptWidthUint32,            // Width\r
+                                    (UINT64)(UINTN)&mDmaAccess->Control, // Address\r
+                                    (VOID *)&ControlPollData,            // Data\r
+                                    (VOID *)&ControlPollMask,            // DataMask\r
+                                    MAX_UINT64                           // Delay\r
+                                    );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return (RETURN_STATUS)Status;\r
   }\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Produce ACPI S3 Boot Script opcodes that check a value in ScratchBuffer.\r
 \r
@@ -713,41 +807,42 @@ QemuFwCfgS3ScriptSkipBytes (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3ScriptCheckValue (\r
-  IN VOID   *ScratchData,\r
-  IN UINT8  ValueSize,\r
-  IN UINT64 ValueMask,\r
-  IN UINT64 Value\r
+  IN VOID    *ScratchData,\r
+  IN UINT8   ValueSize,\r
+  IN UINT64  ValueMask,\r
+  IN UINT64  Value\r
   )\r
 {\r
-  EFI_BOOT_SCRIPT_WIDTH Width;\r
-  EFI_STATUS            Status;\r
+  EFI_BOOT_SCRIPT_WIDTH  Width;\r
+  EFI_STATUS             Status;\r
 \r
   ASSERT (mS3SaveState != NULL);\r
 \r
   switch (ValueSize) {\r
-  case 1:\r
-    Width = EfiBootScriptWidthUint8;\r
-    break;\r
+    case 1:\r
+      Width = EfiBootScriptWidthUint8;\r
+      break;\r
 \r
-  case 2:\r
-    Width = EfiBootScriptWidthUint16;\r
-    break;\r
+    case 2:\r
+      Width = EfiBootScriptWidthUint16;\r
+      break;\r
 \r
-  case 4:\r
-    Width = EfiBootScriptWidthUint32;\r
-    break;\r
+    case 4:\r
+      Width = EfiBootScriptWidthUint32;\r
+      break;\r
 \r
-  case 8:\r
-    Width = EfiBootScriptWidthUint64;\r
-    break;\r
+    case 8:\r
+      Width = EfiBootScriptWidthUint64;\r
+      break;\r
 \r
-  default:\r
-    return RETURN_INVALID_PARAMETER;\r
+    default:\r
+      return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
-  if (ValueSize < 8 &&\r
-      (RShiftU64 (ValueMask, ValueSize * 8) > 0 ||\r
-       RShiftU64 (Value, ValueSize * 8) > 0)) {\r
+  if ((ValueSize < 8) &&\r
+      ((RShiftU64 (ValueMask, ValueSize * 8) > 0) ||\r
+       (RShiftU64 (Value, ValueSize * 8) > 0)))\r
+  {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
@@ -758,7 +853,8 @@ QemuFwCfgS3ScriptCheckValue (
   if (((UINTN)ScratchData < (UINTN)mScratchBuffer) ||\r
       ((UINTN)ScratchData > MAX_UINTN - ValueSize) ||\r
       ((UINTN)ScratchData + ValueSize >\r
-       (UINTN)mScratchBuffer + mScratchBufferSize)) {\r
+       (UINTN)mScratchBuffer + mScratchBufferSize))\r
+  {\r
     return RETURN_BAD_BUFFER_SIZE;\r
   }\r
 \r
@@ -777,8 +873,13 @@ QemuFwCfgS3ScriptCheckValue (
                            MAX_UINT64                       // Delay\r
                            );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return (RETURN_STATUS)Status;\r
   }\r
 \r
index bf1accd9466ff0cc2124a65ab709e7982f075b70..78a8f154426c1cfb48511b39265dd810d15a7b5f 100644 (file)
@@ -71,9 +71,9 @@
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
-  IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
-  IN OUT VOID                                 *Context           OPTIONAL,\r
-  IN     UINTN                                ScratchBufferSize\r
+  IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION  *Callback,\r
+  IN OUT VOID                                  *Context           OPTIONAL,\r
+  IN     UINTN                                 ScratchBufferSize\r
   )\r
 {\r
   return RETURN_UNSUPPORTED;\r
index 5557c70aa3ad6dc03ef2aded555e53e97c891041..270f0503367c54b9406869f1e01b25736a9f3ad5 100644 (file)
@@ -27,16 +27,17 @@ QemuFwCfgS3Enabled (
   VOID\r
   )\r
 {\r
-  RETURN_STATUS        Status;\r
-  FIRMWARE_CONFIG_ITEM FwCfgItem;\r
-  UINTN                FwCfgSize;\r
-  UINT8                SystemStates[6];\r
+  RETURN_STATUS         Status;\r
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;\r
+  UINTN                 FwCfgSize;\r
+  UINT8                 SystemStates[6];\r
 \r
   Status = QemuFwCfgFindFile ("etc/system-states", &FwCfgItem, &FwCfgSize);\r
-  if (Status != RETURN_SUCCESS || FwCfgSize != sizeof SystemStates) {\r
+  if ((Status != RETURN_SUCCESS) || (FwCfgSize != sizeof SystemStates)) {\r
     return FALSE;\r
   }\r
+\r
   QemuFwCfgSelectItem (FwCfgItem);\r
   QemuFwCfgReadBytes (sizeof SystemStates, SystemStates);\r
-  return (BOOLEAN) (SystemStates[3] & BIT7);\r
+  return (BOOLEAN)(SystemStates[3] & BIT7);\r
 }\r
index 5ca22fcf0dee736e0698f6ba4bb0b6772c73126f..c9e0091b82d1253ddbe137523d10b068b5ef2e6e 100644 (file)
 // Size of the longest valid BOOL string (see the "mTrueString" and\r
 // "mFalseString" arrays below), including the terminating NUL.\r
 //\r
-#define BOOL_STRING_MAX_SIZE (sizeof "disabled")\r
+#define BOOL_STRING_MAX_SIZE  (sizeof "disabled")\r
 \r
 //\r
 // Length of "\r\n", not including the terminating NUL.\r
 //\r
-#define CRLF_LENGTH (sizeof "\r\n" - 1)\r
+#define CRLF_LENGTH  (sizeof "\r\n" - 1)\r
 \r
 //\r
 // Words recognized as representing TRUE or FALSE.\r
 //\r
-STATIC CONST CHAR8 * CONST mTrueString[] = {\r
+STATIC CONST CHAR8 *CONST  mTrueString[] = {\r
   "true", "yes", "y", "enable", "enabled", "1"\r
 };\r
-STATIC CONST CHAR8 * CONST mFalseString[] = {\r
+STATIC CONST CHAR8 *CONST  mFalseString[] = {\r
   "false", "no", "n", "disable", "disabled", "0"\r
 };\r
 \r
@@ -85,14 +85,14 @@ STATIC CONST CHAR8 * CONST mFalseString[] = {
 STATIC\r
 RETURN_STATUS\r
 QemuFwCfgGetAsString (\r
-  IN     CONST CHAR8 *FileName,\r
-  IN OUT UINTN       *BufferSize,\r
-  OUT    CHAR8       *Buffer\r
+  IN     CONST CHAR8  *FileName,\r
+  IN OUT UINTN        *BufferSize,\r
+  OUT    CHAR8        *Buffer\r
   )\r
 {\r
-  RETURN_STATUS        Status;\r
-  FIRMWARE_CONFIG_ITEM FwCfgItem;\r
-  UINTN                FwCfgSize;\r
+  RETURN_STATUS         Status;\r
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;\r
+  UINTN                 FwCfgSize;\r
 \r
   if (!QemuFwCfgIsAvailable ()) {\r
     return RETURN_UNSUPPORTED;\r
@@ -102,6 +102,7 @@ QemuFwCfgGetAsString (
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   if (FwCfgSize > *BufferSize) {\r
     return RETURN_PROTOCOL_ERROR;\r
   }\r
@@ -112,18 +113,20 @@ QemuFwCfgGetAsString (
   //\r
   // If Buffer is already NUL-terminated due to fw_cfg contents, we're done.\r
   //\r
-  if (FwCfgSize > 0 && Buffer[FwCfgSize - 1] == '\0') {\r
+  if ((FwCfgSize > 0) && (Buffer[FwCfgSize - 1] == '\0')) {\r
     *BufferSize = FwCfgSize;\r
     return RETURN_SUCCESS;\r
   }\r
+\r
   //\r
   // Otherwise, append a NUL byte to Buffer (if we have room for it).\r
   //\r
   if (FwCfgSize == *BufferSize) {\r
     return RETURN_PROTOCOL_ERROR;\r
   }\r
+\r
   Buffer[FwCfgSize] = '\0';\r
-  *BufferSize = FwCfgSize + 1;\r
+  *BufferSize       = FwCfgSize + 1;\r
   return RETURN_SUCCESS;\r
 }\r
 \r
@@ -142,25 +145,26 @@ QemuFwCfgGetAsString (
 STATIC\r
 VOID\r
 StripNewline (\r
-  IN OUT UINTN *BufferSize,\r
-  IN OUT CHAR8 *Buffer\r
+  IN OUT UINTN  *BufferSize,\r
+  IN OUT CHAR8  *Buffer\r
   )\r
 {\r
-  UINTN InSize, OutSize;\r
+  UINTN  InSize, OutSize;\r
 \r
-  InSize = *BufferSize;\r
+  InSize  = *BufferSize;\r
   OutSize = InSize;\r
 \r
-  if (InSize >= 3 &&\r
-      Buffer[InSize - 3] == '\r' && Buffer[InSize - 2] == '\n') {\r
+  if ((InSize >= 3) &&\r
+      (Buffer[InSize - 3] == '\r') && (Buffer[InSize - 2] == '\n'))\r
+  {\r
     OutSize = InSize - 2;\r
-  } else if (InSize >= 2 && Buffer[InSize - 2] == '\n') {\r
+  } else if ((InSize >= 2) && (Buffer[InSize - 2] == '\n')) {\r
     OutSize = InSize - 1;\r
   }\r
 \r
   if (OutSize < InSize) {\r
     Buffer[OutSize - 1] = '\0';\r
-    *BufferSize = OutSize;\r
+    *BufferSize         = OutSize;\r
   }\r
 }\r
 \r
@@ -203,20 +207,20 @@ StripNewline (
 STATIC\r
 RETURN_STATUS\r
 QemuFwCfgParseUint64WithLimit (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  IN  UINT64      Limit,\r
-  OUT UINT64      *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  IN  UINT64       Limit,\r
+  OUT UINT64       *Value\r
   )\r
 {\r
-  UINTN         Uint64StringSize;\r
-  CHAR8         Uint64String[UINT64_STRING_MAX_SIZE + CRLF_LENGTH];\r
-  RETURN_STATUS Status;\r
-  CHAR8         *EndPointer;\r
-  UINT64        Uint64;\r
+  UINTN          Uint64StringSize;\r
+  CHAR8          Uint64String[UINT64_STRING_MAX_SIZE + CRLF_LENGTH];\r
+  RETURN_STATUS  Status;\r
+  CHAR8          *EndPointer;\r
+  UINT64         Uint64;\r
 \r
   Uint64StringSize = sizeof Uint64String;\r
-  Status = QemuFwCfgGetAsString (FileName, &Uint64StringSize, Uint64String);\r
+  Status           = QemuFwCfgGetAsString (FileName, &Uint64StringSize, Uint64String);\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -228,6 +232,7 @@ QemuFwCfgParseUint64WithLimit (
   } else {\r
     Status = AsciiStrDecimalToUint64S (Uint64String, &EndPointer, &Uint64);\r
   }\r
+\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -236,7 +241,7 @@ QemuFwCfgParseUint64WithLimit (
   // Report a wire protocol error if the subject sequence is empty, or trailing\r
   // garbage is present, or Limit is not honored.\r
   //\r
-  if (EndPointer == Uint64String || *EndPointer != '\0' || Uint64 > Limit) {\r
+  if ((EndPointer == Uint64String) || (*EndPointer != '\0') || (Uint64 > Limit)) {\r
     return RETURN_PROTOCOL_ERROR;\r
   }\r
 \r
@@ -263,17 +268,17 @@ QemuFwCfgSimpleParserInit (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseBool (\r
-  IN  CONST CHAR8 *FileName,\r
-  OUT BOOLEAN     *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  OUT BOOLEAN      *Value\r
   )\r
 {\r
-  UINTN         BoolStringSize;\r
-  CHAR8         BoolString[BOOL_STRING_MAX_SIZE + CRLF_LENGTH];\r
-  RETURN_STATUS Status;\r
-  UINTN         Idx;\r
+  UINTN          BoolStringSize;\r
+  CHAR8          BoolString[BOOL_STRING_MAX_SIZE + CRLF_LENGTH];\r
+  RETURN_STATUS  Status;\r
+  UINTN          Idx;\r
 \r
   BoolStringSize = sizeof BoolString;\r
-  Status = QemuFwCfgGetAsString (FileName, &BoolStringSize, BoolString);\r
+  Status         = QemuFwCfgGetAsString (FileName, &BoolStringSize, BoolString);\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -300,19 +305,24 @@ QemuFwCfgParseBool (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseUint8 (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  OUT UINT8       *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  OUT UINT8        *Value\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
-  UINT64        Uint64;\r
-\r
-  Status = QemuFwCfgParseUint64WithLimit (FileName, ParseAsHex, MAX_UINT8,\r
-             &Uint64);\r
+  RETURN_STATUS  Status;\r
+  UINT64         Uint64;\r
+\r
+  Status = QemuFwCfgParseUint64WithLimit (\r
+             FileName,\r
+             ParseAsHex,\r
+             MAX_UINT8,\r
+             &Uint64\r
+             );\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   *Value = (UINT8)Uint64;\r
   return RETURN_SUCCESS;\r
 }\r
@@ -320,19 +330,24 @@ QemuFwCfgParseUint8 (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseUint16 (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  OUT UINT16      *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  OUT UINT16       *Value\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
-  UINT64        Uint64;\r
-\r
-  Status = QemuFwCfgParseUint64WithLimit (FileName, ParseAsHex, MAX_UINT16,\r
-             &Uint64);\r
+  RETURN_STATUS  Status;\r
+  UINT64         Uint64;\r
+\r
+  Status = QemuFwCfgParseUint64WithLimit (\r
+             FileName,\r
+             ParseAsHex,\r
+             MAX_UINT16,\r
+             &Uint64\r
+             );\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   *Value = (UINT16)Uint64;\r
   return RETURN_SUCCESS;\r
 }\r
@@ -340,19 +355,24 @@ QemuFwCfgParseUint16 (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseUint32 (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  OUT UINT32      *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  OUT UINT32       *Value\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
-  UINT64        Uint64;\r
-\r
-  Status = QemuFwCfgParseUint64WithLimit (FileName, ParseAsHex, MAX_UINT32,\r
-             &Uint64);\r
+  RETURN_STATUS  Status;\r
+  UINT64         Uint64;\r
+\r
+  Status = QemuFwCfgParseUint64WithLimit (\r
+             FileName,\r
+             ParseAsHex,\r
+             MAX_UINT32,\r
+             &Uint64\r
+             );\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   *Value = (UINT32)Uint64;\r
   return RETURN_SUCCESS;\r
 }\r
@@ -360,19 +380,24 @@ QemuFwCfgParseUint32 (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseUint64 (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  OUT UINT64      *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  OUT UINT64       *Value\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
-  UINT64        Uint64;\r
-\r
-  Status = QemuFwCfgParseUint64WithLimit (FileName, ParseAsHex, MAX_UINT64,\r
-             &Uint64);\r
+  RETURN_STATUS  Status;\r
+  UINT64         Uint64;\r
+\r
+  Status = QemuFwCfgParseUint64WithLimit (\r
+             FileName,\r
+             ParseAsHex,\r
+             MAX_UINT64,\r
+             &Uint64\r
+             );\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   *Value = Uint64;\r
   return RETURN_SUCCESS;\r
 }\r
@@ -380,19 +405,24 @@ QemuFwCfgParseUint64 (
 RETURN_STATUS\r
 EFIAPI\r
 QemuFwCfgParseUintn (\r
-  IN  CONST CHAR8 *FileName,\r
-  IN  BOOLEAN     ParseAsHex,\r
-  OUT UINTN       *Value\r
+  IN  CONST CHAR8  *FileName,\r
+  IN  BOOLEAN      ParseAsHex,\r
+  OUT UINTN        *Value\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
-  UINT64        Uint64;\r
-\r
-  Status = QemuFwCfgParseUint64WithLimit (FileName, ParseAsHex, MAX_UINTN,\r
-             &Uint64);\r
+  RETURN_STATUS  Status;\r
+  UINT64         Uint64;\r
+\r
+  Status = QemuFwCfgParseUint64WithLimit (\r
+             FileName,\r
+             ParseAsHex,\r
+             MAX_UINTN,\r
+             &Uint64\r
+             );\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   *Value = (UINTN)Uint64;\r
   return RETURN_SUCCESS;\r
 }\r
index 21c80e43230cb2360ac7c3dce778feb4b2d3d5ab..29abd57fa7995caac4b29432380bc8cbaceb365a 100644 (file)
@@ -28,21 +28,21 @@ ResetShutdown (
   VOID\r
   )\r
 {\r
-  UINT16 AcpiPmBaseAddress;\r
-  UINT16 HostBridgeDevId;\r
+  UINT16  AcpiPmBaseAddress;\r
+  UINT16  HostBridgeDevId;\r
 \r
   AcpiPmBaseAddress = 0;\r
-  HostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID);\r
+  HostBridgeDevId   = PciRead16 (OVMF_HOSTBRIDGE_DID);\r
   switch (HostBridgeDevId) {\r
-  case INTEL_82441_DEVICE_ID:\r
-    AcpiPmBaseAddress = PIIX4_PMBA_VALUE;\r
-    break;\r
-  case INTEL_Q35_MCH_DEVICE_ID:\r
-    AcpiPmBaseAddress = ICH9_PMBASE_VALUE;\r
-    break;\r
-  default:\r
-    ASSERT (FALSE);\r
-    CpuDeadLoop ();\r
+    case INTEL_82441_DEVICE_ID:\r
+      AcpiPmBaseAddress = PIIX4_PMBA_VALUE;\r
+      break;\r
+    case INTEL_Q35_MCH_DEVICE_ID:\r
+      AcpiPmBaseAddress = ICH9_PMBASE_VALUE;\r
+      break;\r
+    default:\r
+      ASSERT (FALSE);\r
+      CpuDeadLoop ();\r
   }\r
 \r
   IoBitFieldWrite16 (AcpiPmBaseAddress + 4, 10, 13, 0);\r
index 5a75c32df36150e5f11995f2c0498ea7c7d72e61..a0db8b50bf839bff81529c0fe66bec8eb103d756 100644 (file)
 #include <Library/ResetSystemLib.h> // ResetShutdown()\r
 #include <OvmfPlatforms.h>          // PIIX4_PMBA_VALUE\r
 \r
-STATIC UINT16 mAcpiPmBaseAddress;\r
+STATIC UINT16  mAcpiPmBaseAddress;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 DxeResetInit (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  UINT16 HostBridgeDevId;\r
+  UINT16  HostBridgeDevId;\r
 \r
   HostBridgeDevId = PcdGet16 (PcdOvmfHostBridgePciDevId);\r
   switch (HostBridgeDevId) {\r
-  case INTEL_82441_DEVICE_ID:\r
-    mAcpiPmBaseAddress = PIIX4_PMBA_VALUE;\r
-    break;\r
-  case INTEL_Q35_MCH_DEVICE_ID:\r
-    mAcpiPmBaseAddress = ICH9_PMBASE_VALUE;\r
-    break;\r
-  default:\r
-    ASSERT (FALSE);\r
-    CpuDeadLoop ();\r
-    return EFI_UNSUPPORTED;\r
+    case INTEL_82441_DEVICE_ID:\r
+      mAcpiPmBaseAddress = PIIX4_PMBA_VALUE;\r
+      break;\r
+    case INTEL_Q35_MCH_DEVICE_ID:\r
+      mAcpiPmBaseAddress = ICH9_PMBASE_VALUE;\r
+      break;\r
+    default:\r
+      ASSERT (FALSE);\r
+      CpuDeadLoop ();\r
+      return EFI_UNSUPPORTED;\r
   }\r
 \r
   return EFI_SUCCESS;\r
index 0de8b39f54086a2c59d1ae51f51550d7c197ed21..a31fd0e7bbbed4faa32ee84cac00041282f36afc 100644 (file)
@@ -37,8 +37,11 @@ DxeResetSystemLibMicrovmConstructor (
     return RETURN_UNSUPPORTED;\r
   }\r
 \r
-  Status = gDS->SetMemorySpaceAttributes (Address, SIZE_4KB,\r
-                                          Descriptor.Attributes | EFI_MEMORY_RUNTIME);\r
+  Status = gDS->SetMemorySpaceAttributes (\r
+                  Address,\r
+                  SIZE_4KB,\r
+                  Descriptor.Attributes | EFI_MEMORY_RUNTIME\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_INFO, "%a: SetMemorySpaceAttributes failed\n", __FUNCTION__));\r
     return RETURN_UNSUPPORTED;\r
index fe51f53d1df2d057aeb959fb7161e579b4359f13..9d1314d553a274cb2d913b4c453af2001bb2bba7 100644 (file)
@@ -52,7 +52,6 @@ ResetWarm (
   CpuDeadLoop ();\r
 }\r
 \r
-\r
 /**\r
   This function causes a systemwide reset. The exact type of the reset is\r
   defined by the EFI_GUID that follows the Null-terminated Unicode string\r
@@ -68,8 +67,8 @@ ResetWarm (
 VOID\r
 EFIAPI\r
 ResetPlatformSpecific (\r
-  IN UINTN   DataSize,\r
-  IN VOID    *ResetData\r
+  IN UINTN  DataSize,\r
+  IN VOID   *ResetData\r
   )\r
 {\r
   ResetCold ();\r
@@ -91,30 +90,30 @@ ResetPlatformSpecific (
 VOID\r
 EFIAPI\r
 ResetSystem (\r
-  IN EFI_RESET_TYPE               ResetType,\r
-  IN EFI_STATUS                   ResetStatus,\r
-  IN UINTN                        DataSize,\r
-  IN VOID                         *ResetData OPTIONAL\r
+  IN EFI_RESET_TYPE  ResetType,\r
+  IN EFI_STATUS      ResetStatus,\r
+  IN UINTN           DataSize,\r
+  IN VOID            *ResetData OPTIONAL\r
   )\r
 {\r
   switch (ResetType) {\r
-  case EfiResetWarm:\r
-    ResetWarm ();\r
-    break;\r
+    case EfiResetWarm:\r
+      ResetWarm ();\r
+      break;\r
 \r
-  case EfiResetCold:\r
-    ResetCold ();\r
-    break;\r
+    case EfiResetCold:\r
+      ResetCold ();\r
+      break;\r
 \r
-  case EfiResetShutdown:\r
-    ResetShutdown ();\r
-    break;\r
+    case EfiResetShutdown:\r
+      ResetShutdown ();\r
+      break;\r
 \r
-  case EfiResetPlatformSpecific:\r
-    ResetPlatformSpecific (DataSize, ResetData);\r
-    break;\r
+    case EfiResetPlatformSpecific:\r
+      ResetPlatformSpecific (DataSize, ResetData);\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 }\r
index 94dc894ded73e4bb633a344ac8cd2df93016fd09..44fe929e937dcef35276b8b1d69e1b3cfc0abc30 100644 (file)
 #include <Library/UefiRuntimeLib.h> // EfiGoneVirtual()\r
 #include <OvmfPlatforms.h>          // PIIX4_PMBA_VALUE\r
 \r
-static UINTN MicrovmGedBase (VOID)\r
+static UINTN\r
+MicrovmGedBase (\r
+  VOID\r
+  )\r
 {\r
-  VOID *Address = (VOID*)(UINTN) MICROVM_GED_MMIO_BASE_REGS;\r
+  VOID  *Address = (VOID *)(UINTN)MICROVM_GED_MMIO_BASE_REGS;\r
 \r
   if (EfiGoneVirtual ()) {\r
     EfiConvertPointer (0, &Address);\r
@@ -27,63 +30,82 @@ static UINTN MicrovmGedBase (VOID)
     DEBUG ((DEBUG_INFO, "%a: physical -> 0x%x\n", __FUNCTION__, Address));\r
   }\r
 \r
-  return (UINTN) Address;\r
+  return (UINTN)Address;\r
 }\r
 \r
-static VOID MicrovmReset (VOID)\r
+static VOID\r
+MicrovmReset (\r
+  VOID\r
+  )\r
 {\r
-  UINTN Address = MicrovmGedBase();\r
+  UINTN  Address = MicrovmGedBase ();\r
 \r
   DEBUG ((DEBUG_INFO, "%a: microvm reset via ged\n", __FUNCTION__));\r
-  MmioWrite8 (Address + MICROVM_ACPI_GED_REG_RESET,\r
-              MICROVM_ACPI_GED_RESET_VALUE);\r
+  MmioWrite8 (\r
+    Address + MICROVM_ACPI_GED_REG_RESET,\r
+    MICROVM_ACPI_GED_RESET_VALUE\r
+    );\r
   CpuDeadLoop ();\r
 }\r
 \r
-static VOID MicrovmShutdown (VOID)\r
+static VOID\r
+MicrovmShutdown (\r
+  VOID\r
+  )\r
 {\r
-  UINTN Address = MicrovmGedBase();\r
+  UINTN  Address = MicrovmGedBase ();\r
 \r
   DEBUG ((DEBUG_INFO, "%a: microvm poweroff via ged\n", __FUNCTION__));\r
-  MmioWrite8 (Address + MICROVM_ACPI_GED_REG_SLEEP_CTL,\r
-              (1 << 5) /* enable bit */ |\r
-              (5 << 2) /* typ == S5  */);\r
+  MmioWrite8 (\r
+    Address + MICROVM_ACPI_GED_REG_SLEEP_CTL,\r
+    (1 << 5) /* enable bit */ |\r
+    (5 << 2)           /* typ == S5  */\r
+    );\r
   CpuDeadLoop ();\r
 }\r
 \r
-VOID EFIAPI ResetCold (VOID)\r
+VOID EFIAPI\r
+ResetCold (\r
+  VOID\r
+  )\r
 {\r
-  MicrovmReset();\r
+  MicrovmReset ();\r
 }\r
 \r
-VOID EFIAPI ResetWarm (VOID)\r
+VOID EFIAPI\r
+ResetWarm (\r
+  VOID\r
+  )\r
 {\r
-  MicrovmReset();\r
+  MicrovmReset ();\r
 }\r
 \r
 VOID\r
 EFIAPI\r
 ResetPlatformSpecific (\r
-  IN UINTN   DataSize,\r
-  IN VOID    *ResetData\r
+  IN UINTN  DataSize,\r
+  IN VOID   *ResetData\r
   )\r
 {\r
-  MicrovmReset();\r
+  MicrovmReset ();\r
 }\r
 \r
 VOID\r
 EFIAPI\r
 ResetSystem (\r
-  IN EFI_RESET_TYPE               ResetType,\r
-  IN EFI_STATUS                   ResetStatus,\r
-  IN UINTN                        DataSize,\r
-  IN VOID                         *ResetData OPTIONAL\r
+  IN EFI_RESET_TYPE  ResetType,\r
+  IN EFI_STATUS      ResetStatus,\r
+  IN UINTN           DataSize,\r
+  IN VOID            *ResetData OPTIONAL\r
   )\r
 {\r
-  MicrovmReset();\r
+  MicrovmReset ();\r
 }\r
 \r
-VOID EFIAPI ResetShutdown (VOID)\r
+VOID EFIAPI\r
+ResetShutdown (\r
+  VOID\r
+  )\r
 {\r
-  MicrovmShutdown();\r
+  MicrovmShutdown ();\r
 }\r
index 777b93f1a02912475fa6e67dd43f37eff2e9ba54..c70b4556b7f2abf10683ad52b812d09b7ff73a5d 100644 (file)
@@ -25,7 +25,6 @@
 \r
 **/\r
 \r
-\r
 /**\r
   Unpacks the next variable from the buffer\r
 \r
 STATIC\r
 EFI_STATUS\r
 UnpackVariableFromBuffer (\r
-  IN  VOID     *Buffer,\r
-  IN  UINTN    MaxSize,\r
-  OUT CHAR16   **Name,\r
-  OUT UINT32   *NameSize,\r
-  OUT EFI_GUID **Guid,\r
-  OUT UINT32   *Attributes,\r
-  OUT UINT32   *DataSize,\r
-  OUT VOID     **Data,\r
-  OUT UINTN    *SizeUsed\r
+  IN  VOID      *Buffer,\r
+  IN  UINTN     MaxSize,\r
+  OUT CHAR16    **Name,\r
+  OUT UINT32    *NameSize,\r
+  OUT EFI_GUID  **Guid,\r
+  OUT UINT32    *Attributes,\r
+  OUT UINT32    *DataSize,\r
+  OUT VOID      **Data,\r
+  OUT UINTN     *SizeUsed\r
   )\r
 {\r
   UINT8  *BytePtr;\r
   UINTN  Offset;\r
 \r
-  BytePtr = (UINT8*)Buffer;\r
-  Offset = 0;\r
+  BytePtr = (UINT8 *)Buffer;\r
+  Offset  = 0;\r
 \r
-  *NameSize = *(UINT32*) (BytePtr + Offset);\r
-  Offset = Offset + sizeof (UINT32);\r
+  *NameSize = *(UINT32 *)(BytePtr + Offset);\r
+  Offset    = Offset + sizeof (UINT32);\r
 \r
   if (Offset > MaxSize) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  *Name = (CHAR16*) (BytePtr + Offset);\r
-  Offset = Offset + *(UINT32*)BytePtr;\r
+  *Name  = (CHAR16 *)(BytePtr + Offset);\r
+  Offset = Offset + *(UINT32 *)BytePtr;\r
   if (Offset > MaxSize) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  *Guid = (EFI_GUID*) (BytePtr + Offset);\r
+  *Guid  = (EFI_GUID *)(BytePtr + Offset);\r
   Offset = Offset + sizeof (EFI_GUID);\r
   if (Offset > MaxSize) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  *Attributes = *(UINT32*) (BytePtr + Offset);\r
-  Offset = Offset + sizeof (UINT32);\r
+  *Attributes = *(UINT32 *)(BytePtr + Offset);\r
+  Offset      = Offset + sizeof (UINT32);\r
   if (Offset > MaxSize) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  *DataSize = *(UINT32*) (BytePtr + Offset);\r
-  Offset = Offset + sizeof (UINT32);\r
+  *DataSize = *(UINT32 *)(BytePtr + Offset);\r
+  Offset    = Offset + sizeof (UINT32);\r
   if (Offset > MaxSize) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  *Data = (VOID*) (BytePtr + Offset);\r
+  *Data  = (VOID *)(BytePtr + Offset);\r
   Offset = Offset + *DataSize;\r
   if (Offset > MaxSize) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -108,7 +107,6 @@ UnpackVariableFromBuffer (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Iterates through the variables in the buffer, and calls a callback\r
   function for each variable found.\r
@@ -130,34 +128,35 @@ IterateVariablesInBuffer (
   IN UINTN                                      MaxSize\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
-  UINTN         TotalSizeUsed;\r
-  UINTN         SizeUsed;\r
-\r
-  CHAR16        *Name;\r
-  UINT32        NameSize;\r
-  CHAR16        *AlignedName;\r
-  UINT32        AlignedNameMaxSize;\r
-  EFI_GUID      *Guid;\r
-  UINT32        Attributes;\r
-  UINT32        DataSize;\r
-  VOID          *Data;\r
-\r
-  SizeUsed = 0;\r
-  AlignedName = NULL;\r
+  RETURN_STATUS  Status;\r
+  UINTN          TotalSizeUsed;\r
+  UINTN          SizeUsed;\r
+\r
+  CHAR16    *Name;\r
+  UINT32    NameSize;\r
+  CHAR16    *AlignedName;\r
+  UINT32    AlignedNameMaxSize;\r
+  EFI_GUID  *Guid;\r
+  UINT32    Attributes;\r
+  UINT32    DataSize;\r
+  VOID      *Data;\r
+\r
+  SizeUsed           = 0;\r
+  AlignedName        = NULL;\r
   AlignedNameMaxSize = 0;\r
-  Name = NULL;\r
-  Guid = NULL;\r
-  Attributes = 0;\r
-  DataSize = 0;\r
-  Data = NULL;\r
+  Name               = NULL;\r
+  Guid               = NULL;\r
+  Attributes         = 0;\r
+  DataSize           = 0;\r
+  Data               = NULL;\r
 \r
   for (\r
-    Status = EFI_SUCCESS, TotalSizeUsed = 0;\r
-    !EFI_ERROR (Status) && (TotalSizeUsed < MaxSize);\r
-    ) {\r
+       Status = EFI_SUCCESS, TotalSizeUsed = 0;\r
+       !EFI_ERROR (Status) && (TotalSizeUsed < MaxSize);\r
+       )\r
+  {\r
     Status = UnpackVariableFromBuffer (\r
-               (VOID*) ((UINT8*) Buffer + TotalSizeUsed),\r
+               (VOID *)((UINT8 *)Buffer + TotalSizeUsed),\r
                (MaxSize - TotalSizeUsed),\r
                &Name,\r
                &NameSize,\r
@@ -179,11 +178,14 @@ IterateVariablesInBuffer (
       if (AlignedName != NULL) {\r
         FreePool (AlignedName);\r
       }\r
+\r
       AlignedName = AllocatePool (NameSize);\r
     }\r
+\r
     if (AlignedName == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     CopyMem (AlignedName, Name, NameSize);\r
 \r
     TotalSizeUsed = TotalSizeUsed + SizeUsed;\r
@@ -191,15 +193,14 @@ IterateVariablesInBuffer (
     //\r
     // Run the callback function\r
     //\r
-    Status = (*CallbackFunction) (\r
-               CallbackContext,\r
-               AlignedName,\r
-               Guid,\r
-               Attributes,\r
-               DataSize,\r
-               Data\r
-               );\r
-\r
+    Status = (*CallbackFunction)(\r
+  CallbackContext,\r
+  AlignedName,\r
+  Guid,\r
+  Attributes,\r
+  DataSize,\r
+  Data\r
+  );\r
   }\r
 \r
   if (AlignedName != NULL) {\r
@@ -222,38 +223,36 @@ IterateVariablesInBuffer (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 STATIC\r
 RETURN_STATUS\r
 EFIAPI\r
 IterateVariablesCallbackNop (\r
-  IN  VOID                         *Context,\r
-  IN  CHAR16                       *VariableName,\r
-  IN  EFI_GUID                     *VendorGuid,\r
-  IN  UINT32                       Attributes,\r
-  IN  UINTN                        DataSize,\r
-  IN  VOID                         *Data\r
+  IN  VOID      *Context,\r
+  IN  CHAR16    *VariableName,\r
+  IN  EFI_GUID  *VendorGuid,\r
+  IN  UINT32    Attributes,\r
+  IN  UINTN     DataSize,\r
+  IN  VOID      *Data\r
   )\r
 {\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 STATIC\r
 RETURN_STATUS\r
 EFIAPI\r
 IterateVariablesCallbackSetInInstance (\r
-  IN  VOID                         *Context,\r
-  IN  CHAR16                       *VariableName,\r
-  IN  EFI_GUID                     *VendorGuid,\r
-  IN  UINT32                       Attributes,\r
-  IN  UINTN                        DataSize,\r
-  IN  VOID                         *Data\r
+  IN  VOID      *Context,\r
+  IN  CHAR16    *VariableName,\r
+  IN  EFI_GUID  *VendorGuid,\r
+  IN  UINT32    Attributes,\r
+  IN  UINTN     DataSize,\r
+  IN  VOID      *Data\r
   )\r
 {\r
   EFI_HANDLE  Instance;\r
 \r
-  Instance = (EFI_HANDLE) Context;\r
+  Instance = (EFI_HANDLE)Context;\r
 \r
   return SerializeVariablesAddVariable (\r
            Instance,\r
@@ -265,47 +264,54 @@ IterateVariablesCallbackSetInInstance (
            );\r
 }\r
 \r
-\r
 STATIC\r
 RETURN_STATUS\r
 EFIAPI\r
 IterateVariablesCallbackSetSystemVariable (\r
-  IN  VOID                         *Context,\r
-  IN  CHAR16                       *VariableName,\r
-  IN  EFI_GUID                     *VendorGuid,\r
-  IN  UINT32                       Attributes,\r
-  IN  UINTN                        DataSize,\r
-  IN  VOID                         *Data\r
+  IN  VOID      *Context,\r
+  IN  CHAR16    *VariableName,\r
+  IN  EFI_GUID  *VendorGuid,\r
+  IN  UINT32    Attributes,\r
+  IN  UINTN     DataSize,\r
+  IN  VOID      *Data\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  STATIC CONST UINT32 AuthMask =\r
-                        EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS |\r
-                        EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS;\r
+  EFI_STATUS           Status;\r
+  STATIC CONST UINT32  AuthMask =\r
+    EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS |\r
+    EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS;\r
 \r
   Status = gRT->SetVariable (\r
-             VariableName,\r
-             VendorGuid,\r
-             Attributes,\r
-             DataSize,\r
-             Data\r
-             );\r
-\r
-  if (Status == EFI_SECURITY_VIOLATION && (Attributes & AuthMask) != 0) {\r
-    DEBUG ((DEBUG_WARN, "%a: setting authenticated variable \"%s\" "\r
-            "failed with EFI_SECURITY_VIOLATION, ignoring\n", __FUNCTION__,\r
-            VariableName));\r
+                  VariableName,\r
+                  VendorGuid,\r
+                  Attributes,\r
+                  DataSize,\r
+                  Data\r
+                  );\r
+\r
+  if ((Status == EFI_SECURITY_VIOLATION) && ((Attributes & AuthMask) != 0)) {\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
+      "%a: setting authenticated variable \"%s\" "\r
+      "failed with EFI_SECURITY_VIOLATION, ignoring\n",\r
+      __FUNCTION__,\r
+      VariableName\r
+      ));\r
     Status = EFI_SUCCESS;\r
   } else if (Status == EFI_WRITE_PROTECTED) {\r
-    DEBUG ((DEBUG_WARN, "%a: setting ReadOnly variable \"%s\" "\r
-            "failed with EFI_WRITE_PROTECTED, ignoring\n", __FUNCTION__,\r
-            VariableName));\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
+      "%a: setting ReadOnly variable \"%s\" "\r
+      "failed with EFI_WRITE_PROTECTED, ignoring\n",\r
+      __FUNCTION__,\r
+      VariableName\r
+      ));\r
     Status = EFI_SUCCESS;\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 RETURN_STATUS\r
 EnsureExtraBufferSpace (\r
@@ -313,8 +319,8 @@ EnsureExtraBufferSpace (
   IN  UINTN        Size\r
   )\r
 {\r
-  VOID *NewBuffer;\r
-  UINTN NewSize;\r
+  VOID   *NewBuffer;\r
+  UINTN  NewSize;\r
 \r
   NewSize = Instance->DataSize + Size;\r
   if (NewSize <= Instance->BufferSize) {\r
@@ -336,13 +342,12 @@ EnsureExtraBufferSpace (
     FreePool (Instance->BufferPtr);\r
   }\r
 \r
-  Instance->BufferPtr = NewBuffer;\r
+  Instance->BufferPtr  = NewBuffer;\r
   Instance->BufferSize = NewSize;\r
 \r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 STATIC\r
 VOID\r
 AppendToBuffer (\r
@@ -351,7 +356,7 @@ AppendToBuffer (
   IN  UINTN        Size\r
   )\r
 {\r
-  UINTN NewSize;\r
+  UINTN  NewSize;\r
 \r
   ASSERT (Instance != NULL);\r
   ASSERT (Data != NULL);\r
@@ -360,7 +365,7 @@ AppendToBuffer (
   ASSERT ((Instance->DataSize + Size) <= Instance->BufferSize);\r
 \r
   CopyMem (\r
-    (VOID*) (((UINT8*) (Instance->BufferPtr)) + Instance->DataSize),\r
+    (VOID *)(((UINT8 *)(Instance->BufferPtr)) + Instance->DataSize),\r
     Data,\r
     Size\r
     );\r
@@ -368,7 +373,6 @@ AppendToBuffer (
   Instance->DataSize = NewSize;\r
 }\r
 \r
-\r
 /**\r
   Creates a new variable serialization instance\r
 \r
@@ -383,7 +387,7 @@ AppendToBuffer (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesNewInstance (\r
-  OUT EFI_HANDLE                      *Handle\r
+  OUT EFI_HANDLE  *Handle\r
   )\r
 {\r
   SV_INSTANCE  *New;\r
@@ -395,11 +399,10 @@ SerializeVariablesNewInstance (
 \r
   New->Signature = SV_SIGNATURE;\r
 \r
-  *Handle = (EFI_HANDLE) New;\r
+  *Handle = (EFI_HANDLE)New;\r
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Free memory associated with a variable serialization instance\r
 \r
@@ -414,10 +417,10 @@ SerializeVariablesNewInstance (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesFreeInstance (\r
-  IN EFI_HANDLE Handle\r
+  IN EFI_HANDLE  Handle\r
   )\r
 {\r
-  SV_INSTANCE    *Instance;\r
+  SV_INSTANCE  *Instance;\r
 \r
   Instance = SV_FROM_HANDLE (Handle);\r
 \r
@@ -436,7 +439,6 @@ SerializeVariablesFreeInstance (
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Creates a new variable serialization instance using the given\r
   binary representation of the variables to fill the new instance\r
@@ -457,12 +459,12 @@ SerializeVariablesFreeInstance (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesNewInstanceFromBuffer (\r
-  OUT EFI_HANDLE                          *Handle,\r
-  IN  VOID                                *Buffer,\r
-  IN  UINTN                               Size\r
+  OUT EFI_HANDLE  *Handle,\r
+  IN  VOID        *Buffer,\r
+  IN  UINTN       Size\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
+  RETURN_STATUS  Status;\r
 \r
   Status = SerializeVariablesNewInstance (Handle);\r
   if (RETURN_ERROR (Status)) {\r
@@ -482,7 +484,7 @@ SerializeVariablesNewInstanceFromBuffer (
 \r
   Status = IterateVariablesInBuffer (\r
              IterateVariablesCallbackSetInInstance,\r
-             (VOID*) *Handle,\r
+             (VOID *)*Handle,\r
              Buffer,\r
              Size\r
              );\r
@@ -494,7 +496,6 @@ SerializeVariablesNewInstanceFromBuffer (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Iterates all variables found with RuntimeServices GetNextVariableName\r
 \r
@@ -512,40 +513,40 @@ SerializeVariablesNewInstanceFromBuffer (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesIterateSystemVariables (\r
-  IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK CallbackFunction,\r
-  IN VOID                                      *Context\r
+  IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK  CallbackFunction,\r
+  IN VOID                                       *Context\r
   )\r
 {\r
-  RETURN_STATUS               Status;\r
-  UINTN                       VariableNameBufferSize;\r
-  UINTN                       VariableNameSize;\r
-  CHAR16                      *VariableName;\r
-  EFI_GUID                    VendorGuid;\r
-  UINTN                       VariableDataBufferSize;\r
-  UINTN                       VariableDataSize;\r
-  VOID                        *VariableData;\r
-  UINT32                      VariableAttributes;\r
-  VOID                        *NewBuffer;\r
+  RETURN_STATUS  Status;\r
+  UINTN          VariableNameBufferSize;\r
+  UINTN          VariableNameSize;\r
+  CHAR16         *VariableName;\r
+  EFI_GUID       VendorGuid;\r
+  UINTN          VariableDataBufferSize;\r
+  UINTN          VariableDataSize;\r
+  VOID           *VariableData;\r
+  UINT32         VariableAttributes;\r
+  VOID           *NewBuffer;\r
 \r
   //\r
   // Initialize the variable name and data buffer variables.\r
   //\r
   VariableNameBufferSize = sizeof (CHAR16);\r
-  VariableName = AllocateZeroPool (VariableNameBufferSize);\r
+  VariableName           = AllocateZeroPool (VariableNameBufferSize);\r
 \r
   VariableDataBufferSize = 0;\r
-  VariableData = NULL;\r
+  VariableData           = NULL;\r
 \r
-  for (;;) {\r
+  for ( ; ;) {\r
     //\r
     // Get the next variable name and guid\r
     //\r
     VariableNameSize = VariableNameBufferSize;\r
-    Status = gRT->GetNextVariableName (\r
-                    &VariableNameSize,\r
-                    VariableName,\r
-                    &VendorGuid\r
-                    );\r
+    Status           = gRT->GetNextVariableName (\r
+                              &VariableNameSize,\r
+                              VariableName,\r
+                              &VendorGuid\r
+                              );\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
       //\r
       // The currently allocated VariableName buffer is too small,\r
@@ -557,11 +558,13 @@ SerializeVariablesIterateSystemVariables (
         Status = EFI_OUT_OF_RESOURCES;\r
         break;\r
       }\r
+\r
       CopyMem (NewBuffer, VariableName, VariableNameBufferSize);\r
       if (VariableName != NULL) {\r
         FreePool (VariableName);\r
       }\r
-      VariableName = NewBuffer;\r
+\r
+      VariableName           = NewBuffer;\r
       VariableNameBufferSize = VariableNameSize;\r
 \r
       //\r
@@ -578,6 +581,7 @@ SerializeVariablesIterateSystemVariables (
       if (Status == EFI_NOT_FOUND) {\r
         Status = EFI_SUCCESS;\r
       }\r
+\r
       break;\r
     }\r
 \r
@@ -585,13 +589,13 @@ SerializeVariablesIterateSystemVariables (
     // Get the variable data and attributes\r
     //\r
     VariableDataSize = VariableDataBufferSize;\r
-    Status = gRT->GetVariable (\r
-                    VariableName,\r
-                    &VendorGuid,\r
-                    &VariableAttributes,\r
-                    &VariableDataSize,\r
-                    VariableData\r
-                    );\r
+    Status           = gRT->GetVariable (\r
+                              VariableName,\r
+                              &VendorGuid,\r
+                              &VariableAttributes,\r
+                              &VariableDataSize,\r
+                              VariableData\r
+                              );\r
     if (Status == EFI_BUFFER_TOO_SMALL) {\r
       //\r
       // The currently allocated VariableData buffer is too small,\r
@@ -599,14 +603,16 @@ SerializeVariablesIterateSystemVariables (
       //\r
       if (VariableDataBufferSize != 0) {\r
         FreePool (VariableData);\r
-        VariableData = NULL;\r
+        VariableData           = NULL;\r
         VariableDataBufferSize = 0;\r
       }\r
+\r
       VariableData = AllocatePool (VariableDataSize);\r
       if (VariableData == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         break;\r
       }\r
+\r
       VariableDataBufferSize = VariableDataSize;\r
 \r
       //\r
@@ -620,6 +626,7 @@ SerializeVariablesIterateSystemVariables (
                       VariableData\r
                       );\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       break;\r
     }\r
@@ -627,18 +634,17 @@ SerializeVariablesIterateSystemVariables (
     //\r
     // Run the callback function\r
     //\r
-    Status = (*CallbackFunction) (\r
-               Context,\r
-               VariableName,\r
-               &VendorGuid,\r
-               VariableAttributes,\r
-               VariableDataSize,\r
-               VariableData\r
-               );\r
+    Status = (*CallbackFunction)(\r
+  Context,\r
+  VariableName,\r
+  &VendorGuid,\r
+  VariableAttributes,\r
+  VariableDataSize,\r
+  VariableData\r
+  );\r
     if (EFI_ERROR (Status)) {\r
       break;\r
     }\r
-\r
   }\r
 \r
   if (VariableName != NULL) {\r
@@ -652,7 +658,6 @@ SerializeVariablesIterateSystemVariables (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Iterates all variables found in the variable serialization instance\r
 \r
@@ -671,12 +676,12 @@ SerializeVariablesIterateSystemVariables (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesIterateInstanceVariables (\r
-  IN EFI_HANDLE                                Handle,\r
-  IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK CallbackFunction,\r
-  IN VOID                                      *Context\r
+  IN EFI_HANDLE                                 Handle,\r
+  IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK  CallbackFunction,\r
+  IN VOID                                       *Context\r
   )\r
 {\r
-  SV_INSTANCE    *Instance;\r
+  SV_INSTANCE  *Instance;\r
 \r
   Instance = SV_FROM_HANDLE (Handle);\r
 \r
@@ -692,7 +697,6 @@ SerializeVariablesIterateInstanceVariables (
   }\r
 }\r
 \r
-\r
 /**\r
   Sets all variables found in the variable serialization instance\r
 \r
@@ -708,7 +712,7 @@ SerializeVariablesIterateInstanceVariables (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesSetSerializedVariables (\r
-  IN EFI_HANDLE                       Handle\r
+  IN EFI_HANDLE  Handle\r
   )\r
 {\r
   return SerializeVariablesIterateInstanceVariables (\r
@@ -718,7 +722,6 @@ SerializeVariablesSetSerializedVariables (
            );\r
 }\r
 \r
-\r
 /**\r
   Adds a variable to the variable serialization instance\r
 \r
@@ -740,12 +743,12 @@ SerializeVariablesSetSerializedVariables (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesAddVariable (\r
-  IN EFI_HANDLE                   Handle,\r
-  IN CHAR16                       *VariableName,\r
-  IN EFI_GUID                     *VendorGuid,\r
-  IN UINT32                       Attributes,\r
-  IN UINTN                        DataSize,\r
-  IN VOID                         *Data\r
+  IN EFI_HANDLE  Handle,\r
+  IN CHAR16      *VariableName,\r
+  IN EFI_GUID    *VendorGuid,\r
+  IN UINT32      Attributes,\r
+  IN UINTN       DataSize,\r
+  IN VOID        *Data\r
   )\r
 {\r
   RETURN_STATUS  Status;\r
@@ -757,10 +760,11 @@ SerializeVariablesAddVariable (
   Instance = SV_FROM_HANDLE (Handle);\r
 \r
   if ((Instance->Signature != SV_SIGNATURE) ||\r
-      (VariableName == NULL) || (VendorGuid == NULL) || (Data == NULL)) {\r
+      (VariableName == NULL) || (VendorGuid == NULL) || (Data == NULL))\r
+  {\r
   }\r
 \r
-  SerializedNameSize = (UINT32) StrSize (VariableName);\r
+  SerializedNameSize = (UINT32)StrSize (VariableName);\r
 \r
   SerializedSize =\r
     sizeof (SerializedNameSize) +\r
@@ -781,28 +785,28 @@ SerializeVariablesAddVariable (
   //\r
   // Add name size (UINT32)\r
   //\r
-  AppendToBuffer (Instance, (VOID*) &SerializedNameSize, sizeof (SerializedNameSize));\r
+  AppendToBuffer (Instance, (VOID *)&SerializedNameSize, sizeof (SerializedNameSize));\r
 \r
   //\r
   // Add variable unicode name string\r
   //\r
-  AppendToBuffer (Instance, (VOID*) VariableName, SerializedNameSize);\r
+  AppendToBuffer (Instance, (VOID *)VariableName, SerializedNameSize);\r
 \r
   //\r
   // Add variable GUID\r
   //\r
-  AppendToBuffer (Instance, (VOID*) VendorGuid, sizeof (*VendorGuid));\r
+  AppendToBuffer (Instance, (VOID *)VendorGuid, sizeof (*VendorGuid));\r
 \r
   //\r
   // Add variable attributes\r
   //\r
-  AppendToBuffer (Instance, (VOID*) &Attributes, sizeof (Attributes));\r
+  AppendToBuffer (Instance, (VOID *)&Attributes, sizeof (Attributes));\r
 \r
   //\r
   // Add variable data size (UINT32)\r
   //\r
-  SerializedDataSize = (UINT32) DataSize;\r
-  AppendToBuffer (Instance, (VOID*) &SerializedDataSize, sizeof (SerializedDataSize));\r
+  SerializedDataSize = (UINT32)DataSize;\r
+  AppendToBuffer (Instance, (VOID *)&SerializedDataSize, sizeof (SerializedDataSize));\r
 \r
   //\r
   // Add variable data\r
@@ -812,7 +816,6 @@ SerializeVariablesAddVariable (
   return RETURN_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Serializes the variables known to this instance into the\r
   provided buffer.\r
@@ -839,12 +842,12 @@ SerializeVariablesAddVariable (
 RETURN_STATUS\r
 EFIAPI\r
 SerializeVariablesToBuffer (\r
-  IN     EFI_HANDLE                       Handle,\r
-  OUT    VOID                             *Buffer,\r
-  IN OUT UINTN                            *Size\r
+  IN     EFI_HANDLE  Handle,\r
+  OUT    VOID        *Buffer,\r
+  IN OUT UINTN       *Size\r
   )\r
 {\r
-  SV_INSTANCE    *Instance;\r
+  SV_INSTANCE  *Instance;\r
 \r
   Instance = SV_FROM_HANDLE (Handle);\r
 \r
@@ -866,4 +869,3 @@ SerializeVariablesToBuffer (
 \r
   return RETURN_SUCCESS;\r
 }\r
-\r
index 966fab77b274dcd9c59177763de457f364427175..7afa74ff6f9fdd17d0adcc0fd47587aa1584aeb1 100644 (file)
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 \r
-#define SV_FROM_HANDLE(a)       CR (a, SV_INSTANCE, Signature, SV_SIGNATURE)\r
-#define SV_SIGNATURE            SIGNATURE_32 ('S', 'V', 'A', 'R')\r
+#define SV_FROM_HANDLE(a)  CR (a, SV_INSTANCE, Signature, SV_SIGNATURE)\r
+#define SV_SIGNATURE  SIGNATURE_32 ('S', 'V', 'A', 'R')\r
 \r
 typedef struct {\r
-  UINT32                              Signature;\r
-  VOID                                *BufferPtr;\r
-  UINTN                               BufferSize;\r
-  UINTN                               DataSize;\r
+  UINT32    Signature;\r
+  VOID      *BufferPtr;\r
+  UINTN     BufferSize;\r
+  UINTN     DataSize;\r
 } SV_INSTANCE;\r
 \r
 #endif\r
-\r
index 4d2c23cfb39f346cc9b8be46aab75c60b95b0718..69c2d3640037fcf25477d8944a5eca66e9b246d0 100644 (file)
@@ -20,8 +20,8 @@
 #include <Library/QemuFwCfgLib.h>\r
 \r
 typedef union {\r
-  SMBIOS_TABLE_ENTRY_POINT     V2;\r
-  SMBIOS_TABLE_3_0_ENTRY_POINT V3;\r
+  SMBIOS_TABLE_ENTRY_POINT        V2;\r
+  SMBIOS_TABLE_3_0_ENTRY_POINT    V3;\r
 } QEMU_SMBIOS_ANCHOR;\r
 \r
 RETURN_STATUS\r
@@ -30,11 +30,11 @@ DetectSmbiosVersion (
   VOID\r
   )\r
 {\r
-  FIRMWARE_CONFIG_ITEM Anchor, Tables;\r
-  UINTN                AnchorSize, TablesSize;\r
-  QEMU_SMBIOS_ANCHOR   QemuAnchor;\r
-  UINT16               SmbiosVersion;\r
-  RETURN_STATUS        PcdStatus;\r
+  FIRMWARE_CONFIG_ITEM  Anchor, Tables;\r
+  UINTN                 AnchorSize, TablesSize;\r
+  QEMU_SMBIOS_ANCHOR    QemuAnchor;\r
+  UINT16                SmbiosVersion;\r
+  RETURN_STATUS         PcdStatus;\r
 \r
   if (PcdGetBool (PcdQemuSmbiosValidated)) {\r
     //\r
@@ -45,53 +45,76 @@ DetectSmbiosVersion (
     return RETURN_SUCCESS;\r
   }\r
 \r
-  if (RETURN_ERROR (QemuFwCfgFindFile (\r
-                      "etc/smbios/smbios-anchor", &Anchor, &AnchorSize)) ||\r
-      RETURN_ERROR (QemuFwCfgFindFile (\r
-                      "etc/smbios/smbios-tables", &Tables, &TablesSize)) ||\r
-      TablesSize == 0) {\r
+  if (RETURN_ERROR (\r
+        QemuFwCfgFindFile (\r
+          "etc/smbios/smbios-anchor",\r
+          &Anchor,\r
+          &AnchorSize\r
+          )\r
+        ) ||\r
+      RETURN_ERROR (\r
+        QemuFwCfgFindFile (\r
+          "etc/smbios/smbios-tables",\r
+          &Tables,\r
+          &TablesSize\r
+          )\r
+        ) ||\r
+      (TablesSize == 0))\r
+  {\r
     return RETURN_SUCCESS;\r
   }\r
 \r
   QemuFwCfgSelectItem (Anchor);\r
 \r
   switch (AnchorSize) {\r
-  case sizeof QemuAnchor.V2:\r
-    QemuFwCfgReadBytes (AnchorSize, &QemuAnchor);\r
-\r
-    if (QemuAnchor.V2.MajorVersion != 2 ||\r
-        QemuAnchor.V2.TableLength != TablesSize ||\r
-        CompareMem (QemuAnchor.V2.AnchorString, "_SM_", 4) != 0 ||\r
-        CompareMem (QemuAnchor.V2.IntermediateAnchorString, "_DMI_", 5) != 0) {\r
-      return RETURN_SUCCESS;\r
-    }\r
-    SmbiosVersion = (UINT16)(QemuAnchor.V2.MajorVersion << 8 |\r
-                             QemuAnchor.V2.MinorVersion);\r
-    break;\r
-\r
-  case sizeof QemuAnchor.V3:\r
-    QemuFwCfgReadBytes (AnchorSize, &QemuAnchor);\r
-\r
-    if (QemuAnchor.V3.MajorVersion != 3 ||\r
-        QemuAnchor.V3.TableMaximumSize != TablesSize ||\r
-        CompareMem (QemuAnchor.V3.AnchorString, "_SM3_", 5) != 0) {\r
+    case sizeof QemuAnchor.V2:\r
+      QemuFwCfgReadBytes (AnchorSize, &QemuAnchor);\r
+\r
+      if ((QemuAnchor.V2.MajorVersion != 2) ||\r
+          (QemuAnchor.V2.TableLength != TablesSize) ||\r
+          (CompareMem (QemuAnchor.V2.AnchorString, "_SM_", 4) != 0) ||\r
+          (CompareMem (QemuAnchor.V2.IntermediateAnchorString, "_DMI_", 5) != 0))\r
+      {\r
+        return RETURN_SUCCESS;\r
+      }\r
+\r
+      SmbiosVersion = (UINT16)(QemuAnchor.V2.MajorVersion << 8 |\r
+                               QemuAnchor.V2.MinorVersion);\r
+      break;\r
+\r
+    case sizeof QemuAnchor.V3:\r
+      QemuFwCfgReadBytes (AnchorSize, &QemuAnchor);\r
+\r
+      if ((QemuAnchor.V3.MajorVersion != 3) ||\r
+          (QemuAnchor.V3.TableMaximumSize != TablesSize) ||\r
+          (CompareMem (QemuAnchor.V3.AnchorString, "_SM3_", 5) != 0))\r
+      {\r
+        return RETURN_SUCCESS;\r
+      }\r
+\r
+      SmbiosVersion = (UINT16)(QemuAnchor.V3.MajorVersion << 8 |\r
+                               QemuAnchor.V3.MinorVersion);\r
+\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "%a: SMBIOS 3.x DocRev from QEMU: 0x%02x\n",\r
+        __FUNCTION__,\r
+        QemuAnchor.V3.DocRev\r
+        ));\r
+      PcdStatus = PcdSet8S (PcdSmbiosDocRev, QemuAnchor.V3.DocRev);\r
+      ASSERT_RETURN_ERROR (PcdStatus);\r
+      break;\r
+\r
+    default:\r
       return RETURN_SUCCESS;\r
-    }\r
-    SmbiosVersion = (UINT16)(QemuAnchor.V3.MajorVersion << 8 |\r
-                             QemuAnchor.V3.MinorVersion);\r
-\r
-    DEBUG ((DEBUG_INFO, "%a: SMBIOS 3.x DocRev from QEMU: 0x%02x\n",\r
-      __FUNCTION__, QemuAnchor.V3.DocRev));\r
-    PcdStatus = PcdSet8S (PcdSmbiosDocRev, QemuAnchor.V3.DocRev);\r
-    ASSERT_RETURN_ERROR (PcdStatus);\r
-    break;\r
-\r
-  default:\r
-    return RETURN_SUCCESS;\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO, "%a: SMBIOS version from QEMU: 0x%04x\n", __FUNCTION__,\r
-    SmbiosVersion));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: SMBIOS version from QEMU: 0x%04x\n",\r
+    __FUNCTION__,\r
+    SmbiosVersion\r
+    ));\r
   PcdStatus = PcdSet16S (PcdSmbiosVersion, SmbiosVersion);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
index c7cc5b0389c82b5b5fbf541e7315360f2243eccc..9297cc5fa93a47641310d8d7f1272b201f6baf8e 100644 (file)
@@ -25,7 +25,7 @@
 //\r
 // EFER register LMA bit\r
 //\r
-#define LMA BIT10\r
+#define LMA  BIT10\r
 \r
 /**\r
   The constructor function\r
@@ -88,9 +88,9 @@ SmmCpuFeaturesInitializeProcessor (
   // Configure SMBASE.\r
   //\r
   CpuState = (QEMU_SMRAM_SAVE_STATE_MAP *)(UINTN)(\r
-                                            SMM_DEFAULT_SMBASE +\r
-                                            SMRAM_SAVE_STATE_MAP_OFFSET\r
-                                            );\r
+                                                  SMM_DEFAULT_SMBASE +\r
+                                                  SMRAM_SAVE_STATE_MAP_OFFSET\r
+                                                  );\r
   if ((CpuState->x86.SMMRevId & 0xFFFF) == 0) {\r
     CpuState->x86.SMBASE = (UINT32)CpuHotPlugData->SmBase[CpuIndex];\r
   } else {\r
@@ -142,13 +142,13 @@ SmmCpuFeaturesHookReturnFromSmm (
   IN UINT64                NewInstructionPointer\r
   )\r
 {\r
-  UINT64                      OriginalInstructionPointer;\r
-  QEMU_SMRAM_SAVE_STATE_MAP   *CpuSaveState;\r
+  UINT64                     OriginalInstructionPointer;\r
+  QEMU_SMRAM_SAVE_STATE_MAP  *CpuSaveState;\r
 \r
   CpuSaveState = (QEMU_SMRAM_SAVE_STATE_MAP *)CpuState;\r
   if ((CpuSaveState->x86.SMMRevId & 0xFFFF) == 0) {\r
     OriginalInstructionPointer = (UINT64)CpuSaveState->x86._EIP;\r
-    CpuSaveState->x86._EIP = (UINT32)NewInstructionPointer;\r
+    CpuSaveState->x86._EIP     = (UINT32)NewInstructionPointer;\r
     //\r
     // Clear the auto HALT restart flag so the RSM instruction returns\r
     // program control to the instruction following the HLT instruction.\r
@@ -163,6 +163,7 @@ SmmCpuFeaturesHookReturnFromSmm (
     } else {\r
       CpuSaveState->x64._RIP = (UINT32)NewInstructionPointer;\r
     }\r
+\r
     //\r
     // Clear the auto HALT restart flag so the RSM instruction returns\r
     // program control to the instruction following the HLT instruction.\r
@@ -171,10 +172,11 @@ SmmCpuFeaturesHookReturnFromSmm (
       CpuSaveState->x64.AutoHALTRestart &= ~BIT0;\r
     }\r
   }\r
+\r
   return OriginalInstructionPointer;\r
 }\r
 \r
-STATIC CPU_HOT_EJECT_DATA *mCpuHotEjectData = NULL;\r
+STATIC CPU_HOT_EJECT_DATA  *mCpuHotEjectData = NULL;\r
 \r
 /**\r
   Initialize mCpuHotEjectData if PcdCpuMaxLogicalProcessorNumber > 1.\r
@@ -208,7 +210,8 @@ InitCpuHotEjectData (
 \r
   if (RETURN_ERROR (SafeUintnMult (MaxNumberOfCpus, sizeof (UINT64), &Size)) ||\r
       RETURN_ERROR (SafeUintnAdd (Size, sizeof (*mCpuHotEjectData), &Size)) ||\r
-      RETURN_ERROR (SafeUintnAdd (Size, sizeof (UINT64) - 1, &Size))) {\r
+      RETURN_ERROR (SafeUintnAdd (Size, sizeof (UINT64) - 1, &Size)))\r
+  {\r
     DEBUG ((DEBUG_ERROR, "%a: invalid CPU_HOT_EJECT_DATA\n", __FUNCTION__));\r
     goto Fatal;\r
   }\r
@@ -219,11 +222,13 @@ InitCpuHotEjectData (
     goto Fatal;\r
   }\r
 \r
-  mCpuHotEjectData->Handler = NULL;\r
+  mCpuHotEjectData->Handler     = NULL;\r
   mCpuHotEjectData->ArrayLength = MaxNumberOfCpus;\r
 \r
-  mCpuHotEjectData->QemuSelectorMap = ALIGN_POINTER (mCpuHotEjectData + 1,\r
-                                        sizeof (UINT64));\r
+  mCpuHotEjectData->QemuSelectorMap = ALIGN_POINTER (\r
+                                        mCpuHotEjectData + 1,\r
+                                        sizeof (UINT64)\r
+                                        );\r
   //\r
   // We use mCpuHotEjectData->QemuSelectorMap to map\r
   // ProcessorNum -> QemuSelector. Initialize to invalid values.\r
@@ -235,8 +240,10 @@ InitCpuHotEjectData (
   //\r
   // Expose address of CPU Hot eject Data structure\r
   //\r
-  PcdStatus = PcdSet64S (PcdCpuHotEjectDataAddress,\r
-                (UINTN)(VOID *)mCpuHotEjectData);\r
+  PcdStatus = PcdSet64S (\r
+                PcdCpuHotEjectDataAddress,\r
+                (UINTN)(VOID *)mCpuHotEjectData\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   return;\r
@@ -258,10 +265,9 @@ SmmCpuFeaturesSmmRelocationComplete (
   VOID\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINTN      MapPagesBase;\r
-  UINTN      MapPagesCount;\r
-\r
+  EFI_STATUS  Status;\r
+  UINTN       MapPagesBase;\r
+  UINTN       MapPagesCount;\r
 \r
   InitCpuHotEjectData ();\r
 \r
@@ -286,8 +292,12 @@ SmmCpuFeaturesSmmRelocationComplete (
              MapPagesCount  // NumPages\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: MemEncryptSevSetPageEncMask(): %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: MemEncryptSevSetPageEncMask(): %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
@@ -458,7 +468,7 @@ SmmCpuFeaturesRendezvousExit (
   //\r
 \r
   if (mCpuHotEjectData != NULL) {\r
-    CPU_HOT_EJECT_HANDLER Handler;\r
+    CPU_HOT_EJECT_HANDLER  Handler;\r
 \r
     //\r
     // As the comment above mentions, mCpuHotEjectData->Handler might be\r
@@ -477,7 +487,7 @@ SmmCpuFeaturesRendezvousExit (
     // ordered-after the AllCpusInSync loop by using a MemoryFence() with\r
     // acquire semantics.\r
     //\r
-    MemoryFence();\r
+    MemoryFence ();\r
 \r
     Handler = mCpuHotEjectData->Handler;\r
 \r
@@ -564,21 +574,21 @@ SmmCpuFeaturesSetSmmRegister (
 /// Macro used to simplify the lookup table entries of type\r
 /// CPU_SMM_SAVE_STATE_LOOKUP_ENTRY\r
 ///\r
-#define SMM_CPU_OFFSET(Field) OFFSET_OF (QEMU_SMRAM_SAVE_STATE_MAP, Field)\r
+#define SMM_CPU_OFFSET(Field)  OFFSET_OF (QEMU_SMRAM_SAVE_STATE_MAP, Field)\r
 \r
 ///\r
 /// Macro used to simplify the lookup table entries of type\r
 /// CPU_SMM_SAVE_STATE_REGISTER_RANGE\r
 ///\r
-#define SMM_REGISTER_RANGE(Start, End) { Start, End, End - Start + 1 }\r
+#define SMM_REGISTER_RANGE(Start, End)  { Start, End, End - Start + 1 }\r
 \r
 ///\r
 /// Structure used to describe a range of registers\r
 ///\r
 typedef struct {\r
-  EFI_SMM_SAVE_STATE_REGISTER  Start;\r
-  EFI_SMM_SAVE_STATE_REGISTER  End;\r
-  UINTN                        Length;\r
+  EFI_SMM_SAVE_STATE_REGISTER    Start;\r
+  EFI_SMM_SAVE_STATE_REGISTER    End;\r
+  UINTN                          Length;\r
 } CPU_SMM_SAVE_STATE_REGISTER_RANGE;\r
 \r
 ///\r
@@ -586,22 +596,22 @@ typedef struct {
 /// associated with each supported EFI_SMM_SAVE_STATE_REGISTER value\r
 ///\r
 \r
-#define SMM_SAVE_STATE_REGISTER_FIRST_INDEX             1\r
+#define SMM_SAVE_STATE_REGISTER_FIRST_INDEX  1\r
 \r
 typedef struct {\r
-  UINT8   Width32;\r
-  UINT8   Width64;\r
-  UINT16  Offset32;\r
-  UINT16  Offset64Lo;\r
-  UINT16  Offset64Hi;\r
-  BOOLEAN Writeable;\r
+  UINT8      Width32;\r
+  UINT8      Width64;\r
+  UINT16     Offset32;\r
+  UINT16     Offset64Lo;\r
+  UINT16     Offset64Hi;\r
+  BOOLEAN    Writeable;\r
 } CPU_SMM_SAVE_STATE_LOOKUP_ENTRY;\r
 \r
 ///\r
 /// Table used by GetRegisterIndex() to convert an EFI_SMM_SAVE_STATE_REGISTER\r
 /// value to an index into a table of type CPU_SMM_SAVE_STATE_LOOKUP_ENTRY\r
 ///\r
-STATIC CONST CPU_SMM_SAVE_STATE_REGISTER_RANGE mSmmCpuRegisterRanges[] = {\r
+STATIC CONST CPU_SMM_SAVE_STATE_REGISTER_RANGE  mSmmCpuRegisterRanges[] = {\r
   SMM_REGISTER_RANGE (\r
     EFI_SMM_SAVE_STATE_REGISTER_GDTBASE,\r
     EFI_SMM_SAVE_STATE_REGISTER_LDTINFO\r
@@ -614,14 +624,14 @@ STATIC CONST CPU_SMM_SAVE_STATE_REGISTER_RANGE mSmmCpuRegisterRanges[] = {
     EFI_SMM_SAVE_STATE_REGISTER_RFLAGS,\r
     EFI_SMM_SAVE_STATE_REGISTER_CR4\r
     ),\r
-  { (EFI_SMM_SAVE_STATE_REGISTER)0, (EFI_SMM_SAVE_STATE_REGISTER)0, 0 }\r
+  { (EFI_SMM_SAVE_STATE_REGISTER)0,     (EFI_SMM_SAVE_STATE_REGISTER)0,0 }\r
 };\r
 \r
 ///\r
 /// Lookup table used to retrieve the widths and offsets associated with each\r
 /// supported EFI_SMM_SAVE_STATE_REGISTER value\r
 ///\r
-STATIC CONST CPU_SMM_SAVE_STATE_LOOKUP_ENTRY mSmmCpuWidthOffset[] = {\r
+STATIC CONST CPU_SMM_SAVE_STATE_LOOKUP_ENTRY  mSmmCpuWidthOffset[] = {\r
   {\r
     0,                                    // Width32\r
     0,                                    // Width64\r
@@ -1001,13 +1011,17 @@ GetRegisterIndex (
 \r
   for (Index = 0, Offset = SMM_SAVE_STATE_REGISTER_FIRST_INDEX;\r
        mSmmCpuRegisterRanges[Index].Length != 0;\r
-       Index++) {\r
-    if (Register >= mSmmCpuRegisterRanges[Index].Start &&\r
-        Register <= mSmmCpuRegisterRanges[Index].End) {\r
+       Index++)\r
+  {\r
+    if ((Register >= mSmmCpuRegisterRanges[Index].Start) &&\r
+        (Register <= mSmmCpuRegisterRanges[Index].End))\r
+    {\r
       return Register - mSmmCpuRegisterRanges[Index].Start + Offset;\r
     }\r
+\r
     Offset += mSmmCpuRegisterRanges[Index].Length;\r
   }\r
+\r
   return 0;\r
 }\r
 \r
@@ -1037,10 +1051,10 @@ GetRegisterIndex (
 STATIC\r
 EFI_STATUS\r
 ReadSaveStateRegisterByIndex (\r
-  IN UINTN   CpuIndex,\r
-  IN UINTN   RegisterIndex,\r
-  IN UINTN   Width,\r
-  OUT VOID   *Buffer\r
+  IN UINTN  CpuIndex,\r
+  IN UINTN  RegisterIndex,\r
+  IN UINTN  Width,\r
+  OUT VOID  *Buffer\r
   )\r
 {\r
   QEMU_SMRAM_SAVE_STATE_MAP  *CpuSaveState;\r
@@ -1067,7 +1081,7 @@ ReadSaveStateRegisterByIndex (
     //\r
     // Write return buffer\r
     //\r
-    ASSERT(CpuSaveState != NULL);\r
+    ASSERT (CpuSaveState != NULL);\r
     CopyMem (\r
       Buffer,\r
       (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Offset32,\r
@@ -1109,6 +1123,7 @@ ReadSaveStateRegisterByIndex (
         );\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -1139,7 +1154,7 @@ SmmCpuFeaturesReadSaveStateRegister (
   OUT VOID                         *Buffer\r
   )\r
 {\r
-  UINTN                       RegisterIndex;\r
+  UINTN                      RegisterIndex;\r
   QEMU_SMRAM_SAVE_STATE_MAP  *CpuSaveState;\r
 \r
   //\r
@@ -1215,7 +1230,7 @@ SmmCpuFeaturesWriteSaveStateRegister (
   IN CONST VOID                   *Buffer\r
   )\r
 {\r
-  UINTN                       RegisterIndex;\r
+  UINTN                      RegisterIndex;\r
   QEMU_SMRAM_SAVE_STATE_MAP  *CpuSaveState;\r
 \r
   //\r
@@ -1272,6 +1287,7 @@ SmmCpuFeaturesWriteSaveStateRegister (
     if (Width > mSmmCpuWidthOffset[RegisterIndex].Width32) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     //\r
     // Write SMM State register\r
     //\r
@@ -1317,6 +1333,7 @@ SmmCpuFeaturesWriteSaveStateRegister (
         );\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -1357,9 +1374,8 @@ SmmCpuFeaturesCompleteSmmReadyToLock (
 VOID *\r
 EFIAPI\r
 SmmCpuFeaturesAllocatePageTableMemory (\r
-  IN UINTN           Pages\r
+  IN UINTN  Pages\r
   )\r
 {\r
   return NULL;\r
 }\r
-\r
index c88a95c6deffe6757148c3d7631ac1f45e43046e..4df057101e8b51730a5e23a3f554c2f102f5ca35 100644 (file)
@@ -75,13 +75,13 @@ ClearTopLevelSmiStatus (
 EFI_STATUS\r
 EFIAPI\r
 PlatformSmmBspElection (\r
-  OUT BOOLEAN     *IsBsp\r
+  OUT BOOLEAN  *IsBsp\r
   )\r
 {\r
-  MSR_IA32_APIC_BASE_REGISTER ApicBaseMsr;\r
+  MSR_IA32_APIC_BASE_REGISTER  ApicBaseMsr;\r
 \r
   ApicBaseMsr.Uint64 = AsmReadMsr64 (MSR_IA32_APIC_BASE);\r
-  *IsBsp = (BOOLEAN)(ApicBaseMsr.Bits.BSP == 1);\r
+  *IsBsp             = (BOOLEAN)(ApicBaseMsr.Bits.BSP == 1);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -105,10 +105,10 @@ PlatformSmmBspElection (
 EFI_STATUS\r
 EFIAPI\r
 GetPlatformPageTableAttribute (\r
-  IN  UINT64                Address,\r
-  IN OUT SMM_PAGE_SIZE_TYPE *PageSize,\r
-  IN OUT UINTN              *NumOfPages,\r
-  IN OUT UINTN              *PageAttribute\r
+  IN  UINT64                 Address,\r
+  IN OUT SMM_PAGE_SIZE_TYPE  *PageSize,\r
+  IN OUT UINTN               *NumOfPages,\r
+  IN OUT UINTN               *PageAttribute\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
index 52455dd3505f5f767573790a65e827d85d08d8ba..f664256c21aadc11269d0e2cd1dd1cde98b1617b 100644 (file)
@@ -12,7 +12,7 @@
 VOID\r
 EFIAPI\r
 Tcg2PhysicalPresenceLibProcessRequest (\r
-  IN      TPM2B_AUTH                     *PlatformAuth  OPTIONAL\r
+  IN      TPM2B_AUTH  *PlatformAuth  OPTIONAL\r
   )\r
 {\r
   //\r
index 80aad5a3735a998d0ea2aff57132f87cfcaa7b97..403802025156f5d0f6a815f1aa353fb9166f1d82 100644 (file)
@@ -36,14 +36,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include <Library/Tcg2PhysicalPresenceLib.h>\r
 \r
-#define CONFIRM_BUFFER_SIZE         4096\r
+#define CONFIRM_BUFFER_SIZE  4096\r
 \r
-EFI_HII_HANDLE mTcg2PpStringPackHandle;\r
+EFI_HII_HANDLE  mTcg2PpStringPackHandle;\r
 \r
-#define TPM_PPI_FLAGS (QEMU_TPM_PPI_FUNC_ALLOWED_USR_REQ)\r
-\r
-STATIC volatile QEMU_TPM_PPI *mPpi;\r
+#define TPM_PPI_FLAGS  (QEMU_TPM_PPI_FUNC_ALLOWED_USR_REQ)\r
 \r
+STATIC volatile QEMU_TPM_PPI  *mPpi;\r
 \r
 /**\r
   Reads QEMU PPI config from fw_cfg.\r
@@ -56,12 +55,12 @@ STATIC volatile QEMU_TPM_PPI *mPpi;
 STATIC\r
 EFI_STATUS\r
 QemuTpmReadConfig (\r
-  OUT QEMU_FWCFG_TPM_CONFIG *Config\r
+  OUT QEMU_FWCFG_TPM_CONFIG  *Config\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  FIRMWARE_CONFIG_ITEM FwCfgItem;\r
-  UINTN                FwCfgSize;\r
+  EFI_STATUS            Status;\r
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;\r
+  UINTN                 FwCfgSize;\r
 \r
   Status = QemuFwCfgFindFile ("etc/tpm/config", &FwCfgItem, &FwCfgSize);\r
   if (EFI_ERROR (Status)) {\r
@@ -77,7 +76,6 @@ QemuTpmReadConfig (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Initializes QEMU PPI memory region.\r
 \r
@@ -90,11 +88,11 @@ QemuTpmInitPPI (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  QEMU_FWCFG_TPM_CONFIG           Config;\r
-  EFI_PHYSICAL_ADDRESS            PpiAddress64;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor;\r
-  UINTN                           Idx;\r
+  EFI_STATUS                       Status;\r
+  QEMU_FWCFG_TPM_CONFIG            Config;\r
+  EFI_PHYSICAL_ADDRESS             PpiAddress64;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  Descriptor;\r
+  UINTN                            Idx;\r
 \r
   if (mPpi != NULL) {\r
     return EFI_SUCCESS;\r
@@ -114,19 +112,22 @@ QemuTpmInitPPI (
 \r
   PpiAddress64 = (UINTN)mPpi;\r
   if ((PpiAddress64 & ~(UINT64)EFI_PAGE_MASK) !=\r
-      ((PpiAddress64 + sizeof *mPpi - 1) & ~(UINT64)EFI_PAGE_MASK)) {\r
+      ((PpiAddress64 + sizeof *mPpi - 1) & ~(UINT64)EFI_PAGE_MASK))\r
+  {\r
     DEBUG ((DEBUG_ERROR, "[TPM2PP] mPpi crosses a page boundary\n"));\r
     goto InvalidPpiAddress;\r
   }\r
 \r
   Status = gDS->GetMemorySpaceDescriptor (PpiAddress64, &Descriptor);\r
-  if (EFI_ERROR (Status) && Status != EFI_NOT_FOUND) {\r
+  if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) {\r
     ASSERT_EFI_ERROR (Status);\r
     goto InvalidPpiAddress;\r
   }\r
+\r
   if (!EFI_ERROR (Status) &&\r
-      (Descriptor.GcdMemoryType != EfiGcdMemoryTypeMemoryMappedIo &&\r
-       Descriptor.GcdMemoryType != EfiGcdMemoryTypeNonExistent)) {\r
+      ((Descriptor.GcdMemoryType != EfiGcdMemoryTypeMemoryMappedIo) &&\r
+       (Descriptor.GcdMemoryType != EfiGcdMemoryTypeNonExistent)))\r
+  {\r
     DEBUG ((DEBUG_ERROR, "[TPM2PP] mPpi has an invalid memory type\n"));\r
     goto InvalidPpiAddress;\r
   }\r
@@ -134,24 +135,25 @@ QemuTpmInitPPI (
   for (Idx = 0; Idx < ARRAY_SIZE (mPpi->Func); Idx++) {\r
     mPpi->Func[Idx] = 0;\r
   }\r
+\r
   if (Config.TpmVersion == QEMU_TPM_VERSION_2) {\r
-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_NO_ACTION] = TPM_PPI_FLAGS;\r
-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_CLEAR] = TPM_PPI_FLAGS;\r
-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR] = TPM_PPI_FLAGS;\r
-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_2] = TPM_PPI_FLAGS;\r
-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_3] = TPM_PPI_FLAGS;\r
-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_SET_PCR_BANKS] = TPM_PPI_FLAGS;\r
-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_CHANGE_EPS] = TPM_PPI_FLAGS;\r
-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_LOG_ALL_DIGESTS] = TPM_PPI_FLAGS;\r
-    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_BLOCK_SID] = TPM_PPI_FLAGS;\r
+    mPpi->Func[TCG2_PHYSICAL_PRESENCE_NO_ACTION]         = TPM_PPI_FLAGS;\r
+    mPpi->Func[TCG2_PHYSICAL_PRESENCE_CLEAR]             = TPM_PPI_FLAGS;\r
+    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR]      = TPM_PPI_FLAGS;\r
+    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_2]    = TPM_PPI_FLAGS;\r
+    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_3]    = TPM_PPI_FLAGS;\r
+    mPpi->Func[TCG2_PHYSICAL_PRESENCE_SET_PCR_BANKS]     = TPM_PPI_FLAGS;\r
+    mPpi->Func[TCG2_PHYSICAL_PRESENCE_CHANGE_EPS]        = TPM_PPI_FLAGS;\r
+    mPpi->Func[TCG2_PHYSICAL_PRESENCE_LOG_ALL_DIGESTS]   = TPM_PPI_FLAGS;\r
+    mPpi->Func[TCG2_PHYSICAL_PRESENCE_ENABLE_BLOCK_SID]  = TPM_PPI_FLAGS;\r
     mPpi->Func[TCG2_PHYSICAL_PRESENCE_DISABLE_BLOCK_SID] = TPM_PPI_FLAGS;\r
   }\r
 \r
   if (mPpi->In == 0) {\r
-    mPpi->In = 1;\r
-    mPpi->Request = TCG2_PHYSICAL_PRESENCE_NO_ACTION;\r
+    mPpi->In          = 1;\r
+    mPpi->Request     = TCG2_PHYSICAL_PRESENCE_NO_ACTION;\r
     mPpi->LastRequest = TCG2_PHYSICAL_PRESENCE_NO_ACTION;\r
-    mPpi->NextStep = TCG2_PHYSICAL_PRESENCE_NO_ACTION;\r
+    mPpi->NextStep    = TCG2_PHYSICAL_PRESENCE_NO_ACTION;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -161,7 +163,6 @@ InvalidPpiAddress:
   return EFI_PROTOCOL_ERROR;\r
 }\r
 \r
-\r
 /**\r
   Get string by string id from HII Interface.\r
 \r
@@ -174,13 +175,12 @@ InvalidPpiAddress:
 STATIC\r
 CHAR16 *\r
 Tcg2PhysicalPresenceGetStringById (\r
-  IN  EFI_STRING_ID   Id\r
+  IN  EFI_STRING_ID  Id\r
   )\r
 {\r
   return HiiGetString (mTcg2PpStringPackHandle, Id, NULL);\r
 }\r
 \r
-\r
 /**\r
   Send ClearControl and Clear command to TPM.\r
 \r
@@ -195,12 +195,12 @@ Tcg2PhysicalPresenceGetStringById (
 EFI_STATUS\r
 EFIAPI\r
 Tpm2CommandClear (\r
-  IN TPM2B_AUTH                *PlatformAuth  OPTIONAL\r
+  IN TPM2B_AUTH  *PlatformAuth  OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  TPMS_AUTH_COMMAND         *AuthSession;\r
-  TPMS_AUTH_COMMAND         LocalAuthSession;\r
+  EFI_STATUS         Status;\r
+  TPMS_AUTH_COMMAND  *AuthSession;\r
+  TPMS_AUTH_COMMAND  LocalAuthSession;\r
 \r
   if (PlatformAuth == NULL) {\r
     AuthSession = NULL;\r
@@ -208,7 +208,7 @@ Tpm2CommandClear (
     AuthSession = &LocalAuthSession;\r
     ZeroMem (&LocalAuthSession, sizeof (LocalAuthSession));\r
     LocalAuthSession.sessionHandle = TPM_RS_PW;\r
-    LocalAuthSession.hmac.size = PlatformAuth->size;\r
+    LocalAuthSession.hmac.size     = PlatformAuth->size;\r
     CopyMem (LocalAuthSession.hmac.buffer, PlatformAuth->buffer, PlatformAuth->size);\r
   }\r
 \r
@@ -218,6 +218,7 @@ Tpm2CommandClear (
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
+\r
   DEBUG ((DEBUG_INFO, "Tpm2Clear ... \n"));\r
   Status = Tpm2Clear (TPM_RH_PLATFORM, AuthSession);\r
   DEBUG ((DEBUG_INFO, "Tpm2Clear - %r\n", Status));\r
@@ -227,7 +228,6 @@ Done:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Change EPS.\r
 \r
@@ -238,12 +238,12 @@ Done:
 STATIC\r
 EFI_STATUS\r
 Tpm2CommandChangeEps (\r
-  IN TPM2B_AUTH                *PlatformAuth  OPTIONAL\r
+  IN TPM2B_AUTH  *PlatformAuth  OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  TPMS_AUTH_COMMAND         *AuthSession;\r
-  TPMS_AUTH_COMMAND         LocalAuthSession;\r
+  EFI_STATUS         Status;\r
+  TPMS_AUTH_COMMAND  *AuthSession;\r
+  TPMS_AUTH_COMMAND  LocalAuthSession;\r
 \r
   if (PlatformAuth == NULL) {\r
     AuthSession = NULL;\r
@@ -251,18 +251,17 @@ Tpm2CommandChangeEps (
     AuthSession = &LocalAuthSession;\r
     ZeroMem (&LocalAuthSession, sizeof (LocalAuthSession));\r
     LocalAuthSession.sessionHandle = TPM_RS_PW;\r
-    LocalAuthSession.hmac.size = PlatformAuth->size;\r
+    LocalAuthSession.hmac.size     = PlatformAuth->size;\r
     CopyMem (LocalAuthSession.hmac.buffer, PlatformAuth->buffer, PlatformAuth->size);\r
   }\r
 \r
   Status = Tpm2ChangeEPS (TPM_RH_PLATFORM, AuthSession);\r
   DEBUG ((DEBUG_INFO, "Tpm2ChangeEPS - %r\n", Status));\r
 \r
-  ZeroMem (&LocalAuthSession.hmac, sizeof(LocalAuthSession.hmac));\r
+  ZeroMem (&LocalAuthSession.hmac, sizeof (LocalAuthSession.hmac));\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Execute physical presence operation requested by the OS.\r
 \r
@@ -278,14 +277,14 @@ Tpm2CommandChangeEps (
 STATIC\r
 UINT32\r
 Tcg2ExecutePhysicalPresence (\r
-  IN      TPM2B_AUTH                       *PlatformAuth   OPTIONAL,\r
-  IN      UINT32                           CommandCode,\r
-  IN      UINT32                           CommandParameter\r
+  IN      TPM2B_AUTH  *PlatformAuth   OPTIONAL,\r
+  IN      UINT32      CommandCode,\r
+  IN      UINT32      CommandParameter\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_TCG2_EVENT_ALGORITHM_BITMAP   TpmHashAlgorithmBitmap;\r
-  UINT32                            ActivePcrBanks;\r
+  EFI_STATUS                       Status;\r
+  EFI_TCG2_EVENT_ALGORITHM_BITMAP  TpmHashAlgorithmBitmap;\r
+  UINT32                           ActivePcrBanks;\r
 \r
   switch (CommandCode) {\r
     case TCG2_PHYSICAL_PRESENCE_CLEAR:\r
@@ -309,8 +308,8 @@ Tcg2ExecutePhysicalPresence (
       //    Firmware has to ensure that at least one PCR banks is active.\r
       // If not, an error is returned and no action is taken.\r
       //\r
-      if (CommandParameter == 0 || (CommandParameter & (~TpmHashAlgorithmBitmap)) != 0) {\r
-        DEBUG((DEBUG_ERROR, "PCR banks %x to allocate are not supported by TPM. Skip operation\n", CommandParameter));\r
+      if ((CommandParameter == 0) || ((CommandParameter & (~TpmHashAlgorithmBitmap)) != 0)) {\r
+        DEBUG ((DEBUG_ERROR, "PCR banks %x to allocate are not supported by TPM. Skip operation\n", CommandParameter));\r
         return TCG_PP_OPERATION_RESPONSE_BIOS_FAILURE;\r
       }\r
 \r
@@ -348,7 +347,6 @@ Tcg2ExecutePhysicalPresence (
   }\r
 }\r
 \r
-\r
 /**\r
   Read the specified key for user confirmation.\r
 \r
@@ -361,12 +359,12 @@ Tcg2ExecutePhysicalPresence (
 STATIC\r
 BOOLEAN\r
 Tcg2ReadUserKey (\r
-  IN     BOOLEAN                    CautionKey\r
+  IN     BOOLEAN  CautionKey\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_INPUT_KEY                     Key;\r
-  UINT16                            InputKey;\r
+  EFI_STATUS     Status;\r
+  EFI_INPUT_KEY  Key;\r
+  UINT16         InputKey;\r
 \r
   InputKey = 0;\r
   do {\r
@@ -376,9 +374,11 @@ Tcg2ReadUserKey (
       if (Key.ScanCode == SCAN_ESC) {\r
         InputKey = Key.ScanCode;\r
       }\r
+\r
       if ((Key.ScanCode == SCAN_F10) && !CautionKey) {\r
         InputKey = Key.ScanCode;\r
       }\r
+\r
       if ((Key.ScanCode == SCAN_F12) && CautionKey) {\r
         InputKey = Key.ScanCode;\r
       }\r
@@ -392,7 +392,6 @@ Tcg2ReadUserKey (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Fill Buffer With BootHashAlg.\r
 \r
@@ -414,35 +413,43 @@ Tcg2FillBufferWithBootHashAlg (
     if (Buffer[0] != 0) {\r
       StrnCatS (Buffer, BufferSize / sizeof (CHAR16), L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
     }\r
+\r
     StrnCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA1", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
   }\r
+\r
   if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA256) != 0) {\r
     if (Buffer[0] != 0) {\r
       StrnCatS (Buffer, BufferSize / sizeof (CHAR16), L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
     }\r
+\r
     StrnCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA256", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
   }\r
+\r
   if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA384) != 0) {\r
     if (Buffer[0] != 0) {\r
       StrnCatS (Buffer, BufferSize / sizeof (CHAR16), L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
     }\r
+\r
     StrnCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA384", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
   }\r
+\r
   if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SHA512) != 0) {\r
     if (Buffer[0] != 0) {\r
       StrnCatS (Buffer, BufferSize / sizeof (CHAR16), L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
     }\r
+\r
     StrnCatS (Buffer, BufferSize / sizeof (CHAR16), L"SHA512", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
   }\r
+\r
   if ((BootHashAlg & EFI_TCG2_BOOT_HASH_ALG_SM3_256) != 0) {\r
     if (Buffer[0] != 0) {\r
       StrnCatS (Buffer, BufferSize / sizeof (CHAR16), L", ", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
     }\r
+\r
     StrnCatS (Buffer, BufferSize / sizeof (CHAR16), L"SM3_256", (BufferSize / sizeof (CHAR16)) - StrLen (Buffer) - 1);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Display the confirm text and get user confirmation.\r
 \r
@@ -455,8 +462,8 @@ Tcg2FillBufferWithBootHashAlg (
 STATIC\r
 BOOLEAN\r
 Tcg2UserConfirm (\r
-  IN      UINT32                    TpmPpCommand,\r
-  IN      UINT32                    TpmPpCommandParameter\r
+  IN      UINT32  TpmPpCommand,\r
+  IN      UINT32  TpmPpCommandParameter\r
   )\r
 {\r
   CHAR16                            *ConfirmText;\r
@@ -485,13 +492,12 @@ Tcg2UserConfirm (
   ASSERT (mTcg2PpStringPackHandle != NULL);\r
 \r
   switch (TpmPpCommand) {\r
-\r
     case TCG2_PHYSICAL_PRESENCE_CLEAR:\r
     case TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR:\r
     case TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_2:\r
     case TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_3:\r
       CautionKey = TRUE;\r
-      TmpStr2 = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TPM_CLEAR));\r
+      TmpStr2    = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TPM_CLEAR));\r
 \r
       TmpStr1 = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TPM_HEAD_STR));\r
       UnicodeSPrint (ConfirmText, BufSize, TmpStr1, TmpStr2);\r
@@ -505,14 +511,14 @@ Tcg2UserConfirm (
       break;\r
 \r
     case TCG2_PHYSICAL_PRESENCE_SET_PCR_BANKS:\r
-      Status = gBS->LocateProtocol (&gEfiTcg2ProtocolGuid, NULL, (VOID **) &Tcg2Protocol);\r
+      Status = gBS->LocateProtocol (&gEfiTcg2ProtocolGuid, NULL, (VOID **)&Tcg2Protocol);\r
       ASSERT_EFI_ERROR (Status);\r
 \r
-      ProtocolCapability.Size = sizeof(ProtocolCapability);\r
-      Status = Tcg2Protocol->GetCapability (\r
-                               Tcg2Protocol,\r
-                               &ProtocolCapability\r
-                               );\r
+      ProtocolCapability.Size = sizeof (ProtocolCapability);\r
+      Status                  = Tcg2Protocol->GetCapability (\r
+                                                Tcg2Protocol,\r
+                                                &ProtocolCapability\r
+                                                );\r
       ASSERT_EFI_ERROR (Status);\r
 \r
       Status = Tcg2Protocol->GetActivePcrBanks (\r
@@ -522,7 +528,7 @@ Tcg2UserConfirm (
       ASSERT_EFI_ERROR (Status);\r
 \r
       CautionKey = TRUE;\r
-      TmpStr2 = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TPM_SET_PCR_BANKS));\r
+      TmpStr2    = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TPM_SET_PCR_BANKS));\r
 \r
       TmpStr1 = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TPM_HEAD_STR));\r
       UnicodeSPrint (ConfirmText, BufSize, TmpStr1, TmpStr2);\r
@@ -536,8 +542,8 @@ Tcg2UserConfirm (
       StrnCatS (ConfirmText, BufSize / sizeof (CHAR16), TmpStr1, (BufSize / sizeof (CHAR16)) - StrLen (ConfirmText) - 1);\r
       FreePool (TmpStr1);\r
 \r
-      Tcg2FillBufferWithBootHashAlg (TempBuffer, sizeof(TempBuffer), TpmPpCommandParameter);\r
-      Tcg2FillBufferWithBootHashAlg (TempBuffer2, sizeof(TempBuffer2), CurrentPCRBanks);\r
+      Tcg2FillBufferWithBootHashAlg (TempBuffer, sizeof (TempBuffer), TpmPpCommandParameter);\r
+      Tcg2FillBufferWithBootHashAlg (TempBuffer2, sizeof (TempBuffer2), CurrentPCRBanks);\r
 \r
       TmpStr1 = AllocateZeroPool (BufSize);\r
       ASSERT (TmpStr1 != NULL);\r
@@ -551,7 +557,7 @@ Tcg2UserConfirm (
 \r
     case TCG2_PHYSICAL_PRESENCE_CHANGE_EPS:\r
       CautionKey = TRUE;\r
-      TmpStr2 = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TPM_CHANGE_EPS));\r
+      TmpStr2    = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TPM_CHANGE_EPS));\r
 \r
       TmpStr1 = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TPM_HEAD_STR));\r
       UnicodeSPrint (ConfirmText, BufSize, TmpStr1, TmpStr2);\r
@@ -602,6 +608,7 @@ Tcg2UserConfirm (
     } else {\r
       TmpStr1 = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TPM_ACCEPT_KEY));\r
     }\r
+\r
     StrnCatS (ConfirmText, BufSize / sizeof (CHAR16), TmpStr1, (BufSize / sizeof (CHAR16)) - StrLen (ConfirmText) - 1);\r
     FreePool (TmpStr1);\r
 \r
@@ -618,6 +625,7 @@ Tcg2UserConfirm (
     } else {\r
       TmpStr1 = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TCG_STORAGE_ACCEPT_KEY));\r
     }\r
+\r
     StrnCatS (ConfirmText, BufSize / sizeof (CHAR16), TmpStr1, (BufSize / sizeof (CHAR16)) - StrLen (ConfirmText) - 1);\r
     FreePool (TmpStr1);\r
 \r
@@ -629,6 +637,7 @@ Tcg2UserConfirm (
 \r
     TmpStr1 = Tcg2PhysicalPresenceGetStringById (STRING_TOKEN (TCG_STORAGE_REJECT_KEY));\r
   }\r
+\r
   BufSize -= StrSize (ConfirmText);\r
   UnicodeSPrint (ConfirmText + StrLen (ConfirmText), BufSize, TmpStr1, TmpStr2);\r
 \r
@@ -650,7 +659,6 @@ Tcg2UserConfirm (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Check if there is a valid physical presence command request. Also updates parameter value\r
   to whether the requested physical presence command already confirmed by user\r
@@ -667,11 +675,11 @@ Tcg2UserConfirm (
 STATIC\r
 BOOLEAN\r
 Tcg2HaveValidTpmRequest  (\r
-  OUT     BOOLEAN                          *RequestConfirmed\r
+  OUT     BOOLEAN  *RequestConfirmed\r
   )\r
 {\r
-  EFI_TCG2_PROTOCOL                 *Tcg2Protocol;\r
-  EFI_STATUS                        Status;\r
+  EFI_TCG2_PROTOCOL  *Tcg2Protocol;\r
+  EFI_STATUS         Status;\r
 \r
   *RequestConfirmed = FALSE;\r
 \r
@@ -679,7 +687,7 @@ Tcg2HaveValidTpmRequest  (
     //\r
     // Need TCG2 protocol.\r
     //\r
-    Status = gBS->LocateProtocol (&gEfiTcg2ProtocolGuid, NULL, (VOID **) &Tcg2Protocol);\r
+    Status = gBS->LocateProtocol (&gEfiTcg2ProtocolGuid, NULL, (VOID **)&Tcg2Protocol);\r
     if (EFI_ERROR (Status)) {\r
       return FALSE;\r
     }\r
@@ -714,7 +722,6 @@ Tcg2HaveValidTpmRequest  (
   return TRUE;\r
 }\r
 \r
-\r
 /**\r
   Check and execute the requested physical presence command.\r
 \r
@@ -723,10 +730,10 @@ Tcg2HaveValidTpmRequest  (
 STATIC\r
 VOID\r
 Tcg2ExecutePendingTpmRequest (\r
-  IN      TPM2B_AUTH                       *PlatformAuth OPTIONAL\r
+  IN      TPM2B_AUTH  *PlatformAuth OPTIONAL\r
   )\r
 {\r
-  BOOLEAN                           RequestConfirmed;\r
+  BOOLEAN  RequestConfirmed;\r
 \r
   if (mPpi->Request == TCG2_PHYSICAL_PRESENCE_NO_ACTION) {\r
     //\r
@@ -744,8 +751,9 @@ Tcg2ExecutePendingTpmRequest (
     } else {\r
       mPpi->Response = TCG_PP_OPERATION_RESPONSE_BIOS_FAILURE;\r
     }\r
-    mPpi->LastRequest = mPpi->Request;\r
-    mPpi->Request = TCG2_PHYSICAL_PRESENCE_NO_ACTION;\r
+\r
+    mPpi->LastRequest      = mPpi->Request;\r
+    mPpi->Request          = TCG2_PHYSICAL_PRESENCE_NO_ACTION;\r
     mPpi->RequestParameter = 0;\r
     return;\r
   }\r
@@ -763,17 +771,17 @@ Tcg2ExecutePendingTpmRequest (
   mPpi->Response = TCG_PP_OPERATION_RESPONSE_USER_ABORT;\r
   if (RequestConfirmed) {\r
     mPpi->Response = Tcg2ExecutePhysicalPresence (\r
-                                                  PlatformAuth,\r
-                                                  mPpi->Request,\r
-                                                  mPpi->RequestParameter\r
-                                                  );\r
+                       PlatformAuth,\r
+                       mPpi->Request,\r
+                       mPpi->RequestParameter\r
+                       );\r
   }\r
 \r
   //\r
   // Clear request\r
   //\r
-  mPpi->LastRequest = mPpi->Request;\r
-  mPpi->Request = TCG2_PHYSICAL_PRESENCE_NO_ACTION;\r
+  mPpi->LastRequest      = mPpi->Request;\r
+  mPpi->Request          = TCG2_PHYSICAL_PRESENCE_NO_ACTION;\r
   mPpi->RequestParameter = 0;\r
 \r
   if (mPpi->Response == TCG_PP_OPERATION_RESPONSE_USER_ABORT) {\r
@@ -784,24 +792,25 @@ Tcg2ExecutePendingTpmRequest (
   // Reset system to make new TPM settings in effect\r
   //\r
   switch (mPpi->LastRequest) {\r
-  case TCG2_PHYSICAL_PRESENCE_CLEAR:\r
-  case TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR:\r
-  case TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_2:\r
-  case TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_3:\r
-  case TCG2_PHYSICAL_PRESENCE_SET_PCR_BANKS:\r
-  case TCG2_PHYSICAL_PRESENCE_CHANGE_EPS:\r
-  case TCG2_PHYSICAL_PRESENCE_LOG_ALL_DIGESTS:\r
-    break;\r
-\r
-  case TCG2_PHYSICAL_PRESENCE_ENABLE_BLOCK_SID:\r
-  case TCG2_PHYSICAL_PRESENCE_DISABLE_BLOCK_SID:\r
-    break;\r
-\r
-  default:\r
-    if (mPpi->Request != TCG2_PHYSICAL_PRESENCE_NO_ACTION) {\r
+    case TCG2_PHYSICAL_PRESENCE_CLEAR:\r
+    case TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR:\r
+    case TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_2:\r
+    case TCG2_PHYSICAL_PRESENCE_ENABLE_CLEAR_3:\r
+    case TCG2_PHYSICAL_PRESENCE_SET_PCR_BANKS:\r
+    case TCG2_PHYSICAL_PRESENCE_CHANGE_EPS:\r
+    case TCG2_PHYSICAL_PRESENCE_LOG_ALL_DIGESTS:\r
       break;\r
-    }\r
-    return;\r
+\r
+    case TCG2_PHYSICAL_PRESENCE_ENABLE_BLOCK_SID:\r
+    case TCG2_PHYSICAL_PRESENCE_DISABLE_BLOCK_SID:\r
+      break;\r
+\r
+    default:\r
+      if (mPpi->Request != TCG2_PHYSICAL_PRESENCE_NO_ACTION) {\r
+        break;\r
+      }\r
+\r
+      return;\r
   }\r
 \r
   Print (L"Rebooting system to make TPM2 settings in effect\n");\r
@@ -809,7 +818,6 @@ Tcg2ExecutePendingTpmRequest (
   ASSERT (FALSE);\r
 }\r
 \r
-\r
 /**\r
    Check and execute the pending TPM request.\r
 \r
@@ -826,15 +834,15 @@ Tcg2ExecutePendingTpmRequest (
 VOID\r
 EFIAPI\r
 Tcg2PhysicalPresenceLibProcessRequest (\r
-  IN      TPM2B_AUTH                     *PlatformAuth  OPTIONAL\r
+  IN      TPM2B_AUTH  *PlatformAuth  OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = QemuTpmInitPPI ();\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_INFO, "[TPM2PP] no PPI\n"));\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -842,14 +850,13 @@ Tcg2PhysicalPresenceLibProcessRequest (
   //\r
   if (GetBootModeHob () == BOOT_ON_S4_RESUME) {\r
     DEBUG ((DEBUG_INFO, "S4 Resume, Skip TPM PP process!\n"));\r
-    return ;\r
+    return;\r
   }\r
 \r
   DEBUG ((DEBUG_INFO, "[TPM2PP] PPRequest=%x (PPRequestParameter=%x)\n", mPpi->Request, mPpi->RequestParameter));\r
   Tcg2ExecutePendingTpmRequest (PlatformAuth);\r
 }\r
 \r
-\r
 /**\r
   The handler for TPM physical presence function:\r
   Return TPM Operation Response to OS Environment.\r
@@ -862,11 +869,11 @@ Tcg2PhysicalPresenceLibProcessRequest (
 UINT32\r
 EFIAPI\r
 Tcg2PhysicalPresenceLibReturnOperationResponseToOsFunction (\r
-  OUT UINT32                *MostRecentRequest,\r
-  OUT UINT32                *Response\r
+  OUT UINT32  *MostRecentRequest,\r
+  OUT UINT32  *Response\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   DEBUG ((DEBUG_INFO, "[TPM2PP] ReturnOperationResponseToOsFunction\n"));\r
 \r
@@ -884,7 +891,6 @@ Tcg2PhysicalPresenceLibReturnOperationResponseToOsFunction (
   return TCG_PP_RETURN_TPM_OPERATION_RESPONSE_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   The handler for TPM physical presence function:\r
   Submit TPM Operation Request to Pre-OS Environment and\r
@@ -901,11 +907,11 @@ Tcg2PhysicalPresenceLibReturnOperationResponseToOsFunction (
 UINT32\r
 EFIAPI\r
 Tcg2PhysicalPresenceLibSubmitRequestToPreOSFunction (\r
-  IN UINT32                 OperationRequest,\r
-  IN UINT32                 RequestParameter\r
+  IN UINT32  OperationRequest,\r
+  IN UINT32  RequestParameter\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   DEBUG ((DEBUG_INFO, "[TPM2PP] SubmitRequestToPreOSFunction, Request = %x, %x\n", OperationRequest, RequestParameter));\r
 \r
@@ -915,7 +921,7 @@ Tcg2PhysicalPresenceLibSubmitRequestToPreOSFunction (
     return TCG_PP_SUBMIT_REQUEST_TO_PREOS_GENERAL_FAILURE;\r
   }\r
 \r
-  mPpi->Request = OperationRequest;\r
+  mPpi->Request          = OperationRequest;\r
   mPpi->RequestParameter = RequestParameter;\r
 \r
   return TCG_PP_SUBMIT_REQUEST_TO_PREOS_SUCCESS;\r
index 14b6a2a5408b716a70dac3936a47b4b02864201f..e22de4f5d48e85465995b0799cf2b2b3811771a0 100644 (file)
@@ -36,16 +36,23 @@ SetCaCerts (
   VOID\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  FIRMWARE_CONFIG_ITEM HttpsCaCertsItem;\r
-  UINTN                HttpsCaCertsSize;\r
-  VOID                 *HttpsCaCerts;\r
+  EFI_STATUS            Status;\r
+  FIRMWARE_CONFIG_ITEM  HttpsCaCertsItem;\r
+  UINTN                 HttpsCaCertsSize;\r
+  VOID                  *HttpsCaCerts;\r
 \r
-  Status = QemuFwCfgFindFile ("etc/edk2/https/cacerts", &HttpsCaCertsItem,\r
-             &HttpsCaCertsSize);\r
+  Status = QemuFwCfgFindFile (\r
+             "etc/edk2/https/cacerts",\r
+             &HttpsCaCertsItem,\r
+             &HttpsCaCertsSize\r
+             );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_VERBOSE, "%a:%a: not touching CA cert list\n",\r
-      gEfiCallerBaseName, __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "%a:%a: not touching CA cert list\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     return;\r
   }\r
 \r
@@ -72,23 +79,36 @@ SetCaCerts (
     //\r
     // This is fatal.\r
     //\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: failed to delete %g:\"%s\"\n",\r
-      gEfiCallerBaseName, __FUNCTION__, &gEfiTlsCaCertificateGuid,\r
-      EFI_TLS_CA_CERTIFICATE_VARIABLE));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: failed to delete %g:\"%s\"\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      &gEfiTlsCaCertificateGuid,\r
+      EFI_TLS_CA_CERTIFICATE_VARIABLE\r
+      ));\r
     ASSERT_EFI_ERROR (Status);\r
     CpuDeadLoop ();\r
   }\r
 \r
   if (HttpsCaCertsSize == 0) {\r
-    DEBUG ((DEBUG_VERBOSE, "%a:%a: applied empty CA cert list\n",\r
-      gEfiCallerBaseName, __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "%a:%a: applied empty CA cert list\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     return;\r
   }\r
 \r
   HttpsCaCerts = AllocatePool (HttpsCaCertsSize);\r
   if (HttpsCaCerts == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: failed to allocate HttpsCaCerts\n",\r
-      gEfiCallerBaseName, __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: failed to allocate HttpsCaCerts\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     return;\r
   }\r
 \r
@@ -103,14 +123,25 @@ SetCaCerts (
                   HttpsCaCerts                     // Data\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: failed to set %g:\"%s\": %r\n",\r
-      gEfiCallerBaseName, __FUNCTION__, &gEfiTlsCaCertificateGuid,\r
-      EFI_TLS_CA_CERTIFICATE_VARIABLE, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: failed to set %g:\"%s\": %r\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      &gEfiTlsCaCertificateGuid,\r
+      EFI_TLS_CA_CERTIFICATE_VARIABLE,\r
+      Status\r
+      ));\r
     goto FreeHttpsCaCerts;\r
   }\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a:%a: stored CA cert list (%Lu byte(s))\n",\r
-    gEfiCallerBaseName, __FUNCTION__, (UINT64)HttpsCaCertsSize));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a:%a: stored CA cert list (%Lu byte(s))\n",\r
+    gEfiCallerBaseName,\r
+    __FUNCTION__,\r
+    (UINT64)HttpsCaCertsSize\r
+    ));\r
 \r
 FreeHttpsCaCerts:\r
   FreePool (HttpsCaCerts);\r
@@ -130,18 +161,26 @@ SetCipherSuites (
   VOID\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  FIRMWARE_CONFIG_ITEM HttpsCiphersItem;\r
-  UINTN                HttpsCiphersSize;\r
-  VOID                 *HttpsCiphers;\r
+  EFI_STATUS            Status;\r
+  FIRMWARE_CONFIG_ITEM  HttpsCiphersItem;\r
+  UINTN                 HttpsCiphersSize;\r
+  VOID                  *HttpsCiphers;\r
 \r
-  Status = QemuFwCfgFindFile ("etc/edk2/https/ciphers", &HttpsCiphersItem,\r
-             &HttpsCiphersSize);\r
+  Status = QemuFwCfgFindFile (\r
+             "etc/edk2/https/ciphers",\r
+             &HttpsCiphersItem,\r
+             &HttpsCiphersSize\r
+             );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_VERBOSE, "%a:%a: not touching cipher suites\n",\r
-      gEfiCallerBaseName, __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "%a:%a: not touching cipher suites\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     return;\r
   }\r
+\r
   //\r
   // From this point on, any failure is fatal. An ordered cipher preference\r
   // list is available from QEMU, thus we cannot let the firmware attempt HTTPS\r
@@ -161,23 +200,36 @@ SetCipherSuites (
                   NULL                                 // Data\r
                   );\r
   if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) {\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: failed to delete %g:\"%s\"\n",\r
-      gEfiCallerBaseName, __FUNCTION__, &gEdkiiHttpTlsCipherListGuid,\r
-      EDKII_HTTP_TLS_CIPHER_LIST_VARIABLE));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: failed to delete %g:\"%s\"\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      &gEdkiiHttpTlsCipherListGuid,\r
+      EDKII_HTTP_TLS_CIPHER_LIST_VARIABLE\r
+      ));\r
     goto Done;\r
   }\r
 \r
   if (HttpsCiphersSize == 0) {\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: list of cipher suites must not be empty\n",\r
-      gEfiCallerBaseName, __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: list of cipher suites must not be empty\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Done;\r
   }\r
 \r
   HttpsCiphers = AllocatePool (HttpsCiphersSize);\r
   if (HttpsCiphers == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: failed to allocate HttpsCiphers\n",\r
-      gEfiCallerBaseName, __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: failed to allocate HttpsCiphers\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__\r
+      ));\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
   }\r
@@ -193,14 +245,24 @@ SetCipherSuites (
                   HttpsCiphers                         // Data\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a:%a: failed to set %g:\"%s\"\n",\r
-      gEfiCallerBaseName, __FUNCTION__, &gEdkiiHttpTlsCipherListGuid,\r
-      EDKII_HTTP_TLS_CIPHER_LIST_VARIABLE));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a:%a: failed to set %g:\"%s\"\n",\r
+      gEfiCallerBaseName,\r
+      __FUNCTION__,\r
+      &gEdkiiHttpTlsCipherListGuid,\r
+      EDKII_HTTP_TLS_CIPHER_LIST_VARIABLE\r
+      ));\r
     goto FreeHttpsCiphers;\r
   }\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a:%a: stored list of cipher suites (%Lu byte(s))\n",\r
-    gEfiCallerBaseName, __FUNCTION__, (UINT64)HttpsCiphersSize));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a:%a: stored list of cipher suites (%Lu byte(s))\n",\r
+    gEfiCallerBaseName,\r
+    __FUNCTION__,\r
+    (UINT64)HttpsCiphersSize\r
+    ));\r
 \r
 FreeHttpsCiphers:\r
   FreePool (HttpsCiphers);\r
index 2b6835626fe408913cd653a23dabed3357d5d8cb..18bca6046c8b22ae6407456aa625dcd2fd33083f 100644 (file)
@@ -10,7 +10,6 @@
 \r
 #include "UefiPciCapPciIoLib.h"\r
 \r
-\r
 /**\r
   Transfer bytes between the config space of a given PCI device and a memory\r
   buffer.\r
 STATIC\r
 EFI_STATUS\r
 ProtoDevTransferConfig (\r
-  IN     EFI_PCI_IO_PROTOCOL        *PciIo,\r
-  IN     EFI_PCI_IO_PROTOCOL_CONFIG TransferFunction,\r
-  IN     UINT16                     ConfigOffset,\r
-  IN OUT UINT8                      *Buffer,\r
-  IN     UINT16                     Size\r
+  IN     EFI_PCI_IO_PROTOCOL         *PciIo,\r
+  IN     EFI_PCI_IO_PROTOCOL_CONFIG  TransferFunction,\r
+  IN     UINT16                      ConfigOffset,\r
+  IN OUT UINT8                       *Buffer,\r
+  IN     UINT16                      Size\r
   )\r
 {\r
   while (Size > 0) {\r
-    EFI_PCI_IO_PROTOCOL_WIDTH Width;\r
-    UINT16                    Count;\r
-    EFI_STATUS                Status;\r
-    UINT16                    Progress;\r
+    EFI_PCI_IO_PROTOCOL_WIDTH  Width;\r
+    UINT16                     Count;\r
+    EFI_STATUS                 Status;\r
+    UINT16                     Progress;\r
 \r
     //\r
     // Pick the largest access size that is allowed by the remaining transfer\r
@@ -67,29 +66,31 @@ ProtoDevTransferConfig (
     // possible in one iteration of the loop. Otherwise, transfer only one\r
     // unit, to improve the alignment.\r
     //\r
-    if (Size >= 4 && (ConfigOffset & 3) == 0) {\r
+    if ((Size >= 4) && ((ConfigOffset & 3) == 0)) {\r
       Width = EfiPciIoWidthUint32;\r
       Count = Size >> Width;\r
-    } else if (Size >= 2 && (ConfigOffset & 1) == 0) {\r
+    } else if ((Size >= 2) && ((ConfigOffset & 1) == 0)) {\r
       Width = EfiPciIoWidthUint16;\r
       Count = 1;\r
     } else {\r
       Width = EfiPciIoWidthUint8;\r
       Count = 1;\r
     }\r
+\r
     Status = TransferFunction (PciIo, Width, ConfigOffset, Count, Buffer);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     Progress      = Count << Width;\r
     ConfigOffset += Progress;\r
     Buffer       += Progress;\r
     Size         -= Progress;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Read the config space of a given PCI device (both normal and extended).\r
 \r
@@ -121,20 +122,24 @@ STATIC
 RETURN_STATUS\r
 EFIAPI\r
 ProtoDevReadConfig (\r
-  IN  PCI_CAP_DEV *PciDevice,\r
-  IN  UINT16      SourceOffset,\r
-  OUT VOID        *DestinationBuffer,\r
-  IN  UINT16      Size\r
+  IN  PCI_CAP_DEV  *PciDevice,\r
+  IN  UINT16       SourceOffset,\r
+  OUT VOID         *DestinationBuffer,\r
+  IN  UINT16       Size\r
   )\r
 {\r
-  PROTO_DEV *ProtoDev;\r
+  PROTO_DEV  *ProtoDev;\r
 \r
   ProtoDev = PROTO_DEV_FROM_PCI_CAP_DEV (PciDevice);\r
-  return ProtoDevTransferConfig (ProtoDev->PciIo, ProtoDev->PciIo->Pci.Read,\r
-           SourceOffset, DestinationBuffer, Size);\r
+  return ProtoDevTransferConfig (\r
+           ProtoDev->PciIo,\r
+           ProtoDev->PciIo->Pci.Read,\r
+           SourceOffset,\r
+           DestinationBuffer,\r
+           Size\r
+           );\r
 }\r
 \r
-\r
 /**\r
   Write the config space of a given PCI device (both normal and extended).\r
 \r
@@ -166,20 +171,24 @@ STATIC
 RETURN_STATUS\r
 EFIAPI\r
 ProtoDevWriteConfig (\r
-  IN PCI_CAP_DEV *PciDevice,\r
-  IN UINT16      DestinationOffset,\r
-  IN VOID        *SourceBuffer,\r
-  IN UINT16      Size\r
+  IN PCI_CAP_DEV  *PciDevice,\r
+  IN UINT16       DestinationOffset,\r
+  IN VOID         *SourceBuffer,\r
+  IN UINT16       Size\r
   )\r
 {\r
-  PROTO_DEV *ProtoDev;\r
+  PROTO_DEV  *ProtoDev;\r
 \r
   ProtoDev = PROTO_DEV_FROM_PCI_CAP_DEV (PciDevice);\r
-  return ProtoDevTransferConfig (ProtoDev->PciIo, ProtoDev->PciIo->Pci.Write,\r
-           DestinationOffset, SourceBuffer, Size);\r
+  return ProtoDevTransferConfig (\r
+           ProtoDev->PciIo,\r
+           ProtoDev->PciIo->Pci.Write,\r
+           DestinationOffset,\r
+           SourceBuffer,\r
+           Size\r
+           );\r
 }\r
 \r
-\r
 /**\r
   Create a PCI_CAP_DEV object from an EFI_PCI_IO_PROTOCOL instance. The config\r
   space accessors are based upon EFI_PCI_IO_PROTOCOL.Pci.Read() and\r
@@ -197,11 +206,11 @@ ProtoDevWriteConfig (
 EFI_STATUS\r
 EFIAPI\r
 PciCapPciIoDeviceInit (\r
-  IN  EFI_PCI_IO_PROTOCOL *PciIo,\r
-  OUT PCI_CAP_DEV         **PciDevice\r
+  IN  EFI_PCI_IO_PROTOCOL  *PciIo,\r
+  OUT PCI_CAP_DEV          **PciDevice\r
   )\r
 {\r
-  PROTO_DEV *ProtoDev;\r
+  PROTO_DEV  *ProtoDev;\r
 \r
   ProtoDev = AllocatePool (sizeof *ProtoDev);\r
   if (ProtoDev == NULL) {\r
@@ -217,7 +226,6 @@ PciCapPciIoDeviceInit (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Free the resources used by PciDevice.\r
 \r
@@ -227,10 +235,10 @@ PciCapPciIoDeviceInit (
 VOID\r
 EFIAPI\r
 PciCapPciIoDeviceUninit (\r
-  IN PCI_CAP_DEV *PciDevice\r
+  IN PCI_CAP_DEV  *PciDevice\r
   )\r
 {\r
-  PROTO_DEV *ProtoDev;\r
+  PROTO_DEV  *ProtoDev;\r
 \r
   ProtoDev = PROTO_DEV_FROM_PCI_CAP_DEV (PciDevice);\r
   FreePool (ProtoDev);\r
index cfe29d1a294ebb78a174acce61effa1d96b5543f..3ff65966b2b4978f32b477da5deb5df695989475 100644 (file)
 \r
 #include <Library/PciCapPciIoLib.h>\r
 \r
-#define PROTO_DEV_SIG SIGNATURE_64 ('P', 'C', 'P', 'I', 'O', 'P', 'R', 'T')\r
+#define PROTO_DEV_SIG  SIGNATURE_64 ('P', 'C', 'P', 'I', 'O', 'P', 'R', 'T')\r
 \r
 typedef struct {\r
   //\r
   // Signature identifying the derived class.\r
   //\r
-  UINT64 Signature;\r
+  UINT64                 Signature;\r
   //\r
   // Members added by the derived class, specific to the use of\r
   // EFI_PCI_IO_PROTOCOL.\r
   //\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
+  EFI_PCI_IO_PROTOCOL    *PciIo;\r
   //\r
   // Base class.\r
   //\r
-  PCI_CAP_DEV BaseDevice;\r
+  PCI_CAP_DEV            BaseDevice;\r
 } PROTO_DEV;\r
 \r
 #define PROTO_DEV_FROM_PCI_CAP_DEV(PciDevice) \\r
index e09324813c2df8ef83f9e2730d9a6bc1e733e1ed..28041dbec524f29cd4e59227414944387fe368e4 100644 (file)
@@ -17,7 +17,6 @@
 \r
 #include <Library/VirtioLib.h>\r
 \r
-\r
 /**\r
 \r
   Configure a virtio ring.\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioRingInit (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN  UINT16                 QueueSize,\r
-  OUT VRING                  *Ring\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *VirtIo,\r
+  IN  UINT16                  QueueSize,\r
+  OUT VRING                   *Ring\r
   )\r
 {\r
-  EFI_STATUS     Status;\r
-  UINTN          RingSize;\r
-  volatile UINT8 *RingPagesPtr;\r
+  EFI_STATUS      Status;\r
+  UINTN           RingSize;\r
+  volatile UINT8  *RingPagesPtr;\r
 \r
   RingSize = ALIGN_VALUE (\r
                sizeof *Ring->Desc            * QueueSize +\r
@@ -63,66 +62,70 @@ VirtioRingInit (
                sizeof *Ring->Avail.Idx                   +\r
                sizeof *Ring->Avail.Ring      * QueueSize +\r
                sizeof *Ring->Avail.UsedEvent,\r
-               EFI_PAGE_SIZE);\r
+               EFI_PAGE_SIZE\r
+               );\r
 \r
   RingSize += ALIGN_VALUE (\r
                 sizeof *Ring->Used.Flags                  +\r
                 sizeof *Ring->Used.Idx                    +\r
                 sizeof *Ring->Used.UsedElem   * QueueSize +\r
                 sizeof *Ring->Used.AvailEvent,\r
-                EFI_PAGE_SIZE);\r
+                EFI_PAGE_SIZE\r
+                );\r
 \r
   //\r
   // Allocate a shared ring buffer\r
   //\r
   Ring->NumPages = EFI_SIZE_TO_PAGES (RingSize);\r
-  Status = VirtIo->AllocateSharedPages (\r
-                     VirtIo,\r
-                     Ring->NumPages,\r
-                     &Ring->Base\r
-                     );\r
+  Status         = VirtIo->AllocateSharedPages (\r
+                             VirtIo,\r
+                             Ring->NumPages,\r
+                             &Ring->Base\r
+                             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   SetMem (Ring->Base, RingSize, 0x00);\r
   RingPagesPtr = Ring->Base;\r
 \r
-  Ring->Desc = (volatile VOID *) RingPagesPtr;\r
+  Ring->Desc    = (volatile VOID *)RingPagesPtr;\r
   RingPagesPtr += sizeof *Ring->Desc * QueueSize;\r
 \r
-  Ring->Avail.Flags = (volatile VOID *) RingPagesPtr;\r
-  RingPagesPtr += sizeof *Ring->Avail.Flags;\r
+  Ring->Avail.Flags = (volatile VOID *)RingPagesPtr;\r
+  RingPagesPtr     += sizeof *Ring->Avail.Flags;\r
 \r
-  Ring->Avail.Idx = (volatile VOID *) RingPagesPtr;\r
-  RingPagesPtr += sizeof *Ring->Avail.Idx;\r
+  Ring->Avail.Idx = (volatile VOID *)RingPagesPtr;\r
+  RingPagesPtr   += sizeof *Ring->Avail.Idx;\r
 \r
-  Ring->Avail.Ring = (volatile VOID *) RingPagesPtr;\r
-  RingPagesPtr += sizeof *Ring->Avail.Ring * QueueSize;\r
+  Ring->Avail.Ring = (volatile VOID *)RingPagesPtr;\r
+  RingPagesPtr    += sizeof *Ring->Avail.Ring * QueueSize;\r
 \r
-  Ring->Avail.UsedEvent = (volatile VOID *) RingPagesPtr;\r
-  RingPagesPtr += sizeof *Ring->Avail.UsedEvent;\r
+  Ring->Avail.UsedEvent = (volatile VOID *)RingPagesPtr;\r
+  RingPagesPtr         += sizeof *Ring->Avail.UsedEvent;\r
 \r
-  RingPagesPtr = (volatile UINT8 *) Ring->Base +\r
-                 ALIGN_VALUE (RingPagesPtr - (volatile UINT8 *) Ring->Base,\r
-                   EFI_PAGE_SIZE);\r
+  RingPagesPtr = (volatile UINT8 *)Ring->Base +\r
+                 ALIGN_VALUE (\r
+                   RingPagesPtr - (volatile UINT8 *)Ring->Base,\r
+                   EFI_PAGE_SIZE\r
+                   );\r
 \r
-  Ring->Used.Flags = (volatile VOID *) RingPagesPtr;\r
-  RingPagesPtr += sizeof *Ring->Used.Flags;\r
+  Ring->Used.Flags = (volatile VOID *)RingPagesPtr;\r
+  RingPagesPtr    += sizeof *Ring->Used.Flags;\r
 \r
-  Ring->Used.Idx = (volatile VOID *) RingPagesPtr;\r
-  RingPagesPtr += sizeof *Ring->Used.Idx;\r
+  Ring->Used.Idx = (volatile VOID *)RingPagesPtr;\r
+  RingPagesPtr  += sizeof *Ring->Used.Idx;\r
 \r
-  Ring->Used.UsedElem = (volatile VOID *) RingPagesPtr;\r
-  RingPagesPtr += sizeof *Ring->Used.UsedElem * QueueSize;\r
+  Ring->Used.UsedElem = (volatile VOID *)RingPagesPtr;\r
+  RingPagesPtr       += sizeof *Ring->Used.UsedElem * QueueSize;\r
 \r
-  Ring->Used.AvailEvent = (volatile VOID *) RingPagesPtr;\r
-  RingPagesPtr += sizeof *Ring->Used.AvailEvent;\r
+  Ring->Used.AvailEvent = (volatile VOID *)RingPagesPtr;\r
+  RingPagesPtr         += sizeof *Ring->Used.AvailEvent;\r
 \r
   Ring->QueueSize = QueueSize;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
 \r
   Tear down the internal resources of a configured virtio ring.\r
@@ -139,15 +142,14 @@ VirtioRingInit (
 VOID\r
 EFIAPI\r
 VirtioRingUninit (\r
-  IN     VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN OUT VRING                  *Ring\r
+  IN     VIRTIO_DEVICE_PROTOCOL  *VirtIo,\r
+  IN OUT VRING                   *Ring\r
   )\r
 {\r
   VirtIo->FreeSharedPages (VirtIo, Ring->NumPages, Ring->Base);\r
   SetMem (Ring, sizeof *Ring, 0x00);\r
 }\r
 \r
-\r
 /**\r
 \r
   Turn off interrupt notifications from the host, and prepare for appending\r
@@ -163,15 +165,15 @@ VirtioRingUninit (
 VOID\r
 EFIAPI\r
 VirtioPrepare (\r
-  IN OUT VRING        *Ring,\r
-  OUT    DESC_INDICES *Indices\r
+  IN OUT VRING         *Ring,\r
+  OUT    DESC_INDICES  *Indices\r
   )\r
 {\r
   //\r
   // Prepare for virtio-0.9.5, 2.4.2 Receiving Used Buffers From the Device.\r
   // We're going to poll the answer, the host should not send an interrupt.\r
   //\r
-  *Ring->Avail.Flags = (UINT16) VRING_AVAIL_F_NO_INTERRUPT;\r
+  *Ring->Avail.Flags = (UINT16)VRING_AVAIL_F_NO_INTERRUPT;\r
 \r
   //\r
   // Prepare for virtio-0.9.5, 2.4.1 Supplying Buffers to the Device.\r
@@ -224,14 +226,14 @@ VirtioPrepare (
 VOID\r
 EFIAPI\r
 VirtioAppendDesc (\r
-  IN OUT VRING        *Ring,\r
-  IN     UINT64       BufferDeviceAddress,\r
-  IN     UINT32       BufferSize,\r
-  IN     UINT16       Flags,\r
-  IN OUT DESC_INDICES *Indices\r
+  IN OUT VRING         *Ring,\r
+  IN     UINT64        BufferDeviceAddress,\r
+  IN     UINT32        BufferSize,\r
+  IN     UINT16        Flags,\r
+  IN OUT DESC_INDICES  *Indices\r
   )\r
 {\r
-  volatile VRING_DESC *Desc;\r
+  volatile VRING_DESC  *Desc;\r
 \r
   Desc        = &Ring->Desc[Indices->NextDescIdx++ % Ring->QueueSize];\r
   Desc->Addr  = BufferDeviceAddress;\r
@@ -240,7 +242,6 @@ VirtioAppendDesc (
   Desc->Next  = Indices->NextDescIdx % Ring->QueueSize;\r
 }\r
 \r
-\r
 /**\r
 \r
   Notify the host about the descriptor chain just built, and wait until the\r
@@ -271,17 +272,17 @@ VirtioAppendDesc (
 EFI_STATUS\r
 EFIAPI\r
 VirtioFlush (\r
-  IN     VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN     UINT16                 VirtQueueId,\r
-  IN OUT VRING                  *Ring,\r
-  IN     DESC_INDICES           *Indices,\r
-  OUT    UINT32                 *UsedLen    OPTIONAL\r
+  IN     VIRTIO_DEVICE_PROTOCOL  *VirtIo,\r
+  IN     UINT16                  VirtQueueId,\r
+  IN OUT VRING                   *Ring,\r
+  IN     DESC_INDICES            *Indices,\r
+  OUT    UINT32                  *UsedLen    OPTIONAL\r
   )\r
 {\r
-  UINT16     NextAvailIdx;\r
-  UINT16     LastUsedIdx;\r
-  EFI_STATUS Status;\r
-  UINTN      PollPeriodUsecs;\r
+  UINT16      NextAvailIdx;\r
+  UINT16      LastUsedIdx;\r
+  EFI_STATUS  Status;\r
+  UINTN       PollPeriodUsecs;\r
 \r
   //\r
   // virtio-0.9.5, 2.4.1.2 Updating the Available Ring\r
@@ -295,21 +296,21 @@ VirtioFlush (
   // (Due to our lock-step progress, this is where the host will produce the\r
   // used element with the head descriptor's index in it.)\r
   //\r
-  LastUsedIdx = NextAvailIdx;\r
+  LastUsedIdx                                        = NextAvailIdx;\r
   Ring->Avail.Ring[NextAvailIdx++ % Ring->QueueSize] =\r
     Indices->HeadDescIdx % Ring->QueueSize;\r
 \r
   //\r
   // virtio-0.9.5, 2.4.1.3 Updating the Index Field\r
   //\r
-  MemoryFence();\r
+  MemoryFence ();\r
   *Ring->Avail.Idx = NextAvailIdx;\r
 \r
   //\r
   // virtio-0.9.5, 2.4.1.4 Notifying the Device -- gratuitous notifications are\r
   // OK.\r
   //\r
-  MemoryFence();\r
+  MemoryFence ();\r
   Status = VirtIo->SetQueueNotify (VirtIo, VirtQueueId);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -324,20 +325,21 @@ VirtioFlush (
   // Keep slowing down until we reach a poll period of slightly above 1 ms.\r
   //\r
   PollPeriodUsecs = 1;\r
-  MemoryFence();\r
+  MemoryFence ();\r
   while (*Ring->Used.Idx != NextAvailIdx) {\r
     gBS->Stall (PollPeriodUsecs); // calls AcpiTimerLib::MicroSecondDelay\r
 \r
     if (PollPeriodUsecs < 1024) {\r
       PollPeriodUsecs *= 2;\r
     }\r
-    MemoryFence();\r
+\r
+    MemoryFence ();\r
   }\r
 \r
-  MemoryFence();\r
+  MemoryFence ();\r
 \r
   if (UsedLen != NULL) {\r
-    volatile CONST VRING_USED_ELEM *UsedElem;\r
+    volatile CONST VRING_USED_ELEM  *UsedElem;\r
 \r
     UsedElem = &Ring->Used.UsedElem[LastUsedIdx % Ring->QueueSize];\r
     ASSERT (UsedElem->Id == Indices->HeadDescIdx);\r
@@ -347,7 +349,6 @@ VirtioFlush (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
 \r
   Report the feature bits to the VirtIo 1.0 device that the VirtIo 1.0 driver\r
@@ -388,12 +389,12 @@ VirtioFlush (
 EFI_STATUS\r
 EFIAPI\r
 Virtio10WriteFeatures (\r
-  IN     VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN     UINT64                 Features,\r
-  IN OUT UINT8                  *DeviceStatus\r
+  IN     VIRTIO_DEVICE_PROTOCOL  *VirtIo,\r
+  IN     UINT64                  Features,\r
+  IN OUT UINT8                   *DeviceStatus\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) {\r
     return EFI_UNSUPPORTED;\r
@@ -405,7 +406,7 @@ Virtio10WriteFeatures (
   }\r
 \r
   *DeviceStatus |= VSTAT_FEATURES_OK;\r
-  Status = VirtIo->SetDeviceStatus (VirtIo, *DeviceStatus);\r
+  Status         = VirtIo->SetDeviceStatus (VirtIo, *DeviceStatus);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -479,7 +480,7 @@ VirtioMapAllBytesInSharedBuffer (
   UINTN                 Size;\r
   EFI_PHYSICAL_ADDRESS  PhysicalAddress;\r
 \r
-  Size = NumberOfBytes;\r
+  Size   = NumberOfBytes;\r
   Status = VirtIo->MapSharedBuffer (\r
                      VirtIo,\r
                      Operation,\r
@@ -496,7 +497,7 @@ VirtioMapAllBytesInSharedBuffer (
     goto Failed;\r
   }\r
 \r
-  *Mapping = MapInfo;\r
+  *Mapping       = MapInfo;\r
   *DeviceAddress = PhysicalAddress;\r
 \r
   return EFI_SUCCESS;\r
@@ -526,10 +527,10 @@ Failed:
 EFI_STATUS\r
 EFIAPI\r
 VirtioRingMap (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN  VRING                  *Ring,\r
-  OUT UINT64                 *RingBaseShift,\r
-  OUT VOID                   **Mapping\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *VirtIo,\r
+  IN  VRING                   *Ring,\r
+  OUT UINT64                  *RingBaseShift,\r
+  OUT VOID                    **Mapping\r
   )\r
 {\r
   EFI_STATUS            Status;\r
index a97ef9352d0f6069d14a932d14d83e444e7383d0..831dc1736d28ee22f584e02b58cb74f5d0019513 100644 (file)
 \r
 #include "VirtioMmioDevice.h"\r
 \r
-STATIC CONST VIRTIO_DEVICE_PROTOCOL mMmioDeviceProtocolTemplate = {\r
-    0,                                     // Revision\r
-    0,                                     // SubSystemDeviceId\r
-    VirtioMmioGetDeviceFeatures,           // GetDeviceFeatures\r
-    VirtioMmioSetGuestFeatures,            // SetGuestFeatures\r
-    VirtioMmioSetQueueAddress,             // SetQueueAddress\r
-    VirtioMmioSetQueueSel,                 // SetQueueSel\r
-    VirtioMmioSetQueueNotify,              // SetQueueNotify\r
-    VirtioMmioSetQueueAlignment,           // SetQueueAlign\r
-    VirtioMmioSetPageSize,                 // SetPageSize\r
-    VirtioMmioGetQueueSize,                // GetQueueNumMax\r
-    VirtioMmioSetQueueSize,                // SetQueueNum\r
-    VirtioMmioGetDeviceStatus,             // GetDeviceStatus\r
-    VirtioMmioSetDeviceStatus,             // SetDeviceStatus\r
-    VirtioMmioDeviceWrite,                 // WriteDevice\r
-    VirtioMmioDeviceRead,                  // ReadDevice\r
-    VirtioMmioAllocateSharedPages,         // AllocateSharedPages\r
-    VirtioMmioFreeSharedPages,             // FreeSharedPages\r
-    VirtioMmioMapSharedBuffer,             // MapSharedBuffer\r
-    VirtioMmioUnmapSharedBuffer            // UnmapSharedBuffer\r
+STATIC CONST VIRTIO_DEVICE_PROTOCOL  mMmioDeviceProtocolTemplate = {\r
+  0,                                       // Revision\r
+  0,                                       // SubSystemDeviceId\r
+  VirtioMmioGetDeviceFeatures,             // GetDeviceFeatures\r
+  VirtioMmioSetGuestFeatures,              // SetGuestFeatures\r
+  VirtioMmioSetQueueAddress,               // SetQueueAddress\r
+  VirtioMmioSetQueueSel,                   // SetQueueSel\r
+  VirtioMmioSetQueueNotify,                // SetQueueNotify\r
+  VirtioMmioSetQueueAlignment,             // SetQueueAlign\r
+  VirtioMmioSetPageSize,                   // SetPageSize\r
+  VirtioMmioGetQueueSize,                  // GetQueueNumMax\r
+  VirtioMmioSetQueueSize,                  // SetQueueNum\r
+  VirtioMmioGetDeviceStatus,               // GetDeviceStatus\r
+  VirtioMmioSetDeviceStatus,               // SetDeviceStatus\r
+  VirtioMmioDeviceWrite,                   // WriteDevice\r
+  VirtioMmioDeviceRead,                    // ReadDevice\r
+  VirtioMmioAllocateSharedPages,           // AllocateSharedPages\r
+  VirtioMmioFreeSharedPages,               // FreeSharedPages\r
+  VirtioMmioMapSharedBuffer,               // MapSharedBuffer\r
+  VirtioMmioUnmapSharedBuffer              // UnmapSharedBuffer\r
 };\r
 \r
 /**\r
@@ -54,19 +54,22 @@ EFI_STATUS
 EFIAPI\r
 VirtioMmioInit (\r
   IN PHYSICAL_ADDRESS        BaseAddress,\r
-  IN OUT VIRTIO_MMIO_DEVICE *Device\r
+  IN OUT VIRTIO_MMIO_DEVICE  *Device\r
   )\r
 {\r
-  UINT32     MagicValue;\r
+  UINT32  MagicValue;\r
 \r
   //\r
   // Initialize VirtIo Mmio Device\r
   //\r
-  CopyMem (&Device->VirtioDevice, &mMmioDeviceProtocolTemplate,\r
-        sizeof (VIRTIO_DEVICE_PROTOCOL));\r
-  Device->BaseAddress = BaseAddress;\r
+  CopyMem (\r
+    &Device->VirtioDevice,\r
+    &mMmioDeviceProtocolTemplate,\r
+    sizeof (VIRTIO_DEVICE_PROTOCOL)\r
+    );\r
+  Device->BaseAddress                    = BaseAddress;\r
   Device->VirtioDevice.SubSystemDeviceId =\r
-          MmioRead32 (BaseAddress + VIRTIO_MMIO_OFFSET_DEVICE_ID);\r
+    MmioRead32 (BaseAddress + VIRTIO_MMIO_OFFSET_DEVICE_ID);\r
 \r
   //\r
   // Double-check MMIO-specific values\r
@@ -78,24 +81,31 @@ VirtioMmioInit (
 \r
   Device->Version = VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_VERSION);\r
   switch (Device->Version) {\r
-  case VIRTIO_MMIO_DEVICE_VERSION_0_95:\r
-    DEBUG ((DEBUG_INFO, "%a virtio 0.9.5, id %d\n", __FUNCTION__,\r
-            Device->VirtioDevice.SubSystemDeviceId));\r
-    Device->VirtioDevice.Revision = VIRTIO_SPEC_REVISION (0, 9, 5);\r
-    break;\r
-  case VIRTIO_MMIO_DEVICE_VERSION_1_00:\r
-    DEBUG ((DEBUG_INFO, "%a virtio 1.0, id %d\n", __FUNCTION__,\r
-            Device->VirtioDevice.SubSystemDeviceId));\r
-    Device->VirtioDevice.Revision = VIRTIO_SPEC_REVISION (1, 0, 0);\r
-    break;\r
-  default:\r
-    return EFI_UNSUPPORTED;\r
+    case VIRTIO_MMIO_DEVICE_VERSION_0_95:\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "%a virtio 0.9.5, id %d\n",\r
+        __FUNCTION__,\r
+        Device->VirtioDevice.SubSystemDeviceId\r
+        ));\r
+      Device->VirtioDevice.Revision = VIRTIO_SPEC_REVISION (0, 9, 5);\r
+      break;\r
+    case VIRTIO_MMIO_DEVICE_VERSION_1_00:\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "%a virtio 1.0, id %d\n",\r
+        __FUNCTION__,\r
+        Device->VirtioDevice.SubSystemDeviceId\r
+        ));\r
+      Device->VirtioDevice.Revision = VIRTIO_SPEC_REVISION (1, 0, 0);\r
+      break;\r
+    default:\r
+      return EFI_UNSUPPORTED;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
 \r
   Uninitialize the internals of a virtio-mmio device that has been successfully\r
@@ -104,12 +114,11 @@ VirtioMmioInit (
   @param[in, out]  Device  The device to clean up.\r
 \r
 **/\r
-\r
 STATIC\r
 VOID\r
 EFIAPI\r
 VirtioMmioUninit (\r
-  IN VIRTIO_MMIO_DEVICE *Device\r
+  IN VIRTIO_MMIO_DEVICE  *Device\r
   )\r
 {\r
   //\r
@@ -120,16 +129,17 @@ VirtioMmioUninit (
 \r
 EFI_STATUS\r
 VirtioMmioInstallDevice (\r
-  IN PHYSICAL_ADDRESS       BaseAddress,\r
-  IN EFI_HANDLE             Handle\r
+  IN PHYSICAL_ADDRESS  BaseAddress,\r
+  IN EFI_HANDLE        Handle\r
   )\r
 {\r
   EFI_STATUS          Status;\r
-  VIRTIO_MMIO_DEVICE *VirtIo;\r
+  VIRTIO_MMIO_DEVICE  *VirtIo;\r
 \r
   if (!BaseAddress) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   if (Handle == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -152,9 +162,12 @@ VirtioMmioInstallDevice (
   //\r
   // Install VIRTIO_DEVICE_PROTOCOL to Handle\r
   //\r
-  Status = gBS->InstallProtocolInterface (&Handle,\r
-                  &gVirtioDeviceProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  &VirtIo->VirtioDevice);\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &Handle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  EFI_NATIVE_INTERFACE,\r
+                  &VirtIo->VirtioDevice\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto UninitVirtio;\r
   }\r
@@ -171,7 +184,7 @@ FreeVirtioMem:
 \r
 EFI_STATUS\r
 VirtioMmioUninstallDevice (\r
-  IN EFI_HANDLE             DeviceHandle\r
+  IN EFI_HANDLE  DeviceHandle\r
   )\r
 {\r
   VIRTIO_DEVICE_PROTOCOL  *VirtioDevice;\r
@@ -198,9 +211,11 @@ VirtioMmioUninstallDevice (
   //\r
   // Uninstall the protocol interface\r
   //\r
-  Status = gBS->UninstallProtocolInterface (DeviceHandle,\r
-      &gVirtioDeviceProtocolGuid, &MmioDevice->VirtioDevice\r
-      );\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  DeviceHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  &MmioDevice->VirtioDevice\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
index 5ad951f4154a48cd181dd35b536b206a7a5b7694..7298cf582152b09e95677cab89ece99b6fe43008 100644 (file)
 #include <Library/VirtioMmioDeviceLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 \r
-#define VIRTIO_MMIO_DEVICE_SIGNATURE  SIGNATURE_32 ('V', 'M', 'I', 'O')\r
+#define VIRTIO_MMIO_DEVICE_SIGNATURE     SIGNATURE_32 ('V', 'M', 'I', 'O')\r
 #define VIRTIO_MMIO_DEVICE_VERSION_0_95  1\r
 #define VIRTIO_MMIO_DEVICE_VERSION_1_00  2\r
 \r
-\r
 typedef struct {\r
-  UINT32                 Signature;\r
-  UINT32                 Version;\r
-  UINT16                 QueueNum;\r
-  VIRTIO_DEVICE_PROTOCOL VirtioDevice;\r
-  PHYSICAL_ADDRESS       BaseAddress;\r
+  UINT32                    Signature;\r
+  UINT32                    Version;\r
+  UINT16                    QueueNum;\r
+  VIRTIO_DEVICE_PROTOCOL    VirtioDevice;\r
+  PHYSICAL_ADDRESS          BaseAddress;\r
 } VIRTIO_MMIO_DEVICE;\r
 \r
 #define VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE(Device) \\r
@@ -46,27 +45,27 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioDeviceRead (\r
-  IN  VIRTIO_DEVICE_PROTOCOL    *This,\r
-  IN  UINTN                     FieldOFfset,\r
-  IN  UINTN                     FieldSize,\r
-  IN  UINTN                     BufferSize,\r
-  OUT VOID*                     Buffer\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   FieldOFfset,\r
+  IN  UINTN                   FieldSize,\r
+  IN  UINTN                   BufferSize,\r
+  OUT VOID                    *Buffer\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioDeviceWrite (\r
-  IN  VIRTIO_DEVICE_PROTOCOL    *This,\r
-  IN  UINTN                     FieldOffset,\r
-  IN  UINTN                     FieldSize,\r
-  IN  UINT64                    Value\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   FieldOffset,\r
+  IN  UINTN                   FieldSize,\r
+  IN  UINT64                  Value\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioGetDeviceFeatures (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
-  OUT UINT64                *DeviceFeatures\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  OUT UINT64                 *DeviceFeatures\r
   );\r
 \r
 EFI_STATUS\r
@@ -86,28 +85,28 @@ VirtioMmioGetDeviceStatus (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueSize (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                  QueueSize\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetDeviceStatus (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT8                   DeviceStatus\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueNotify (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                  QueueNotify\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueSel (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                  Sel\r
   );\r
 \r
@@ -122,56 +121,56 @@ VirtioMmioSetQueueAddress (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueAlignment (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT32                  Alignment\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetPageSize (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT32                  PageSize\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetGuestFeatures (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT64                  Features\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioAllocateSharedPages (\r
-  IN  VIRTIO_DEVICE_PROTOCOL        *This,\r
-  IN  UINTN                         NumPages,\r
-  OUT VOID                          **HostAddress\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   NumPages,\r
+  OUT VOID                    **HostAddress\r
   );\r
 \r
 VOID\r
 EFIAPI\r
 VirtioMmioFreeSharedPages (\r
-  IN  VIRTIO_DEVICE_PROTOCOL        *This,\r
-  IN  UINTN                         NumPages,\r
-  IN  VOID                          *HostAddress\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   NumPages,\r
+  IN  VOID                    *HostAddress\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioMapSharedBuffer (\r
-  IN      VIRTIO_DEVICE_PROTOCOL        *This,\r
-  IN      VIRTIO_MAP_OPERATION          Operation,\r
-  IN      VOID                          *HostAddress,\r
-  IN OUT  UINTN                         *NumberOfBytes,\r
-  OUT     EFI_PHYSICAL_ADDRESS          *DeviceAddress,\r
-  OUT     VOID                          **Mapping\r
+  IN      VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN      VIRTIO_MAP_OPERATION    Operation,\r
+  IN      VOID                    *HostAddress,\r
+  IN OUT  UINTN                   *NumberOfBytes,\r
+  OUT     EFI_PHYSICAL_ADDRESS    *DeviceAddress,\r
+  OUT     VOID                    **Mapping\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioUnmapSharedBuffer (\r
-  IN  VIRTIO_DEVICE_PROTOCOL        *This,\r
-  IN  VOID                          *Mapping\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  VOID                    *Mapping\r
   );\r
 \r
 #endif // _VIRTIO_MMIO_DEVICE_INTERNAL_H_\r
index b43850e69da9dce196c2c5289954ad87fd65e1c2..8bdf1e1fc3a64b928ec03caf94e59e254cda7e4a 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioGetDeviceFeatures (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
-  OUT UINT64                *DeviceFeatures\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  OUT UINT64                 *DeviceFeatures\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
-  UINT32  LowBits, HighBits;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
+  UINT32              LowBits, HighBits;\r
 \r
   if (DeviceFeatures == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -34,8 +34,8 @@ VirtioMmioGetDeviceFeatures (
     VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES_SEL, 0);\r
     LowBits = VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES);\r
     VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES_SEL, 1);\r
-    HighBits = VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES);\r
-    *DeviceFeatures = LShiftU64(HighBits, 32) | LowBits;\r
+    HighBits        = VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES);\r
+    *DeviceFeatures = LShiftU64 (HighBits, 32) | LowBits;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -48,7 +48,7 @@ VirtioMmioGetQueueSize (
   OUT UINT16                  *QueueNumMax\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   if (QueueNumMax == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -68,7 +68,7 @@ VirtioMmioGetDeviceStatus (
   OUT UINT8                   *DeviceStatus\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   if (DeviceStatus == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -84,11 +84,11 @@ VirtioMmioGetDeviceStatus (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueSize (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                  QueueSize\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -104,11 +104,11 @@ VirtioMmioSetQueueSize (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetDeviceStatus (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT8                   DeviceStatus\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -120,11 +120,11 @@ VirtioMmioSetDeviceStatus (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueNotify (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                  QueueNotify\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -136,11 +136,11 @@ VirtioMmioSetQueueNotify (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueAlignment (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT32                  Alignment\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -152,11 +152,11 @@ VirtioMmioSetQueueAlignment (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetPageSize (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT32                  PageSize\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   if (PageSize != EFI_PAGE_SIZE) {\r
     return EFI_UNSUPPORTED;\r
@@ -174,11 +174,11 @@ VirtioMmioSetPageSize (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueSel (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                  Sel\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -199,36 +199,57 @@ VirtioMmioSetQueueAddress (
   IN UINT64                  RingBaseShift\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
-  UINT64 Address;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
+  UINT64              Address;\r
 \r
   ASSERT (RingBaseShift == 0);\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
   if (Device->Version == VIRTIO_MMIO_DEVICE_VERSION_0_95) {\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_PFN,\r
-      (UINT32)((UINTN)Ring->Base >> EFI_PAGE_SHIFT));\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_PFN,\r
+      (UINT32)((UINTN)Ring->Base >> EFI_PAGE_SHIFT)\r
+      );\r
   } else {\r
     VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_NUM, Device->QueueNum);\r
 \r
     Address = (UINTN)Ring->Base;\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_DESC_LO,\r
-                      (UINT32)Address);\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_DESC_HI,\r
-                      (UINT32)RShiftU64(Address, 32));\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_DESC_LO,\r
+      (UINT32)Address\r
+      );\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_DESC_HI,\r
+      (UINT32)RShiftU64 (Address, 32)\r
+      );\r
 \r
     Address = (UINTN)Ring->Avail.Flags;\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_LO,\r
-                      (UINT32)Address);\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_HI,\r
-                      (UINT32)RShiftU64(Address, 32));\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_LO,\r
+      (UINT32)Address\r
+      );\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_HI,\r
+      (UINT32)RShiftU64 (Address, 32)\r
+      );\r
 \r
     Address = (UINTN)Ring->Used.Flags;\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_USED_LO,\r
-                      (UINT32)Address);\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_USED_HI,\r
-                      (UINT32)RShiftU64(Address, 32));\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_USED_LO,\r
+      (UINT32)Address\r
+      );\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_USED_HI,\r
+      (UINT32)RShiftU64 (Address, 32)\r
+      );\r
 \r
     VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_READY, 1);\r
   }\r
@@ -239,11 +260,11 @@ VirtioMmioSetQueueAddress (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetGuestFeatures (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT64                  Features\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -251,15 +272,25 @@ VirtioMmioSetGuestFeatures (
     if (Features > MAX_UINT32) {\r
       return EFI_UNSUPPORTED;\r
     }\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_GUEST_FEATURES,\r
-                      (UINT32)Features);\r
+\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_GUEST_FEATURES,\r
+      (UINT32)Features\r
+      );\r
   } else {\r
     VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_GUEST_FEATURES_SEL, 0);\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_GUEST_FEATURES,\r
-                      (UINT32)Features);\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_GUEST_FEATURES,\r
+      (UINT32)Features\r
+      );\r
     VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_GUEST_FEATURES_SEL, 1);\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_GUEST_FEATURES,\r
-                      (UINT32)RShiftU64(Features, 32));\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_GUEST_FEATURES,\r
+      (UINT32)RShiftU64 (Features, 32)\r
+      );\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -268,14 +299,14 @@ VirtioMmioSetGuestFeatures (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioDeviceWrite (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
-  IN UINTN                  FieldOffset,\r
-  IN UINTN                  FieldSize,\r
-  IN UINT64                 Value\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN UINTN                   FieldOffset,\r
+  IN UINTN                   FieldSize,\r
+  IN UINT64                  Value\r
   )\r
 {\r
-  UINTN                     DstBaseAddress;\r
-  VIRTIO_MMIO_DEVICE       *Device;\r
+  UINTN               DstBaseAddress;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -283,7 +314,8 @@ VirtioMmioDeviceWrite (
   // Double-check fieldsize\r
   //\r
   if ((FieldSize != 1) && (FieldSize != 2) &&\r
-      (FieldSize != 4) && (FieldSize != 8)) {\r
+      (FieldSize != 4) && (FieldSize != 8))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -291,13 +323,13 @@ VirtioMmioDeviceWrite (
   // Compute base address\r
   //\r
   DstBaseAddress = Device->BaseAddress +\r
-      VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_MMIO + FieldOffset;\r
+                   VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_MMIO + FieldOffset;\r
 \r
   //\r
   // The device-specific memory area of Virtio-MMIO can only be written in\r
   // byte accesses. This is not currently in the Virtio spec.\r
   //\r
-  MmioWriteBuffer8 (DstBaseAddress, FieldSize, (UINT8*)&Value);\r
+  MmioWriteBuffer8 (DstBaseAddress, FieldSize, (UINT8 *)&Value);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -305,15 +337,15 @@ VirtioMmioDeviceWrite (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioDeviceRead (\r
-  IN  VIRTIO_DEVICE_PROTOCOL    *This,\r
-  IN  UINTN                     FieldOffset,\r
-  IN  UINTN                     FieldSize,\r
-  IN  UINTN                     BufferSize,\r
-  OUT VOID                      *Buffer\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   FieldOffset,\r
+  IN  UINTN                   FieldSize,\r
+  IN  UINTN                   BufferSize,\r
+  OUT VOID                    *Buffer\r
   )\r
 {\r
-  UINTN                     SrcBaseAddress;\r
-  VIRTIO_MMIO_DEVICE       *Device;\r
+  UINTN               SrcBaseAddress;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -326,7 +358,8 @@ VirtioMmioDeviceRead (
   // Double-check fieldsize\r
   //\r
   if ((FieldSize != 1) && (FieldSize != 2) &&\r
-      (FieldSize != 4) && (FieldSize != 8)) {\r
+      (FieldSize != 4) && (FieldSize != 8))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -334,7 +367,7 @@ VirtioMmioDeviceRead (
   // Compute base address\r
   //\r
   SrcBaseAddress = Device->BaseAddress +\r
-      VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_MMIO + FieldOffset;\r
+                   VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_MMIO + FieldOffset;\r
 \r
   //\r
   // The device-specific memory area of Virtio-MMIO can only be read in\r
@@ -353,7 +386,7 @@ VirtioMmioAllocateSharedPages (
   OUT VOID                    **HostAddress\r
   )\r
 {\r
-  VOID        *Buffer;\r
+  VOID  *Buffer;\r
 \r
   Buffer = AllocatePages (NumPages);\r
   if (Buffer == NULL) {\r
@@ -386,8 +419,8 @@ VirtioMmioMapSharedBuffer (
   OUT     VOID                    **Mapping\r
   )\r
 {\r
-  *DeviceAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress;\r
-  *Mapping = NULL;\r
+  *DeviceAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)HostAddress;\r
+  *Mapping       = NULL;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -395,8 +428,8 @@ VirtioMmioMapSharedBuffer (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioUnmapSharedBuffer (\r
-  IN VIRTIO_DEVICE_PROTOCOL    *This,\r
-  IN VOID                      *Mapping\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN VOID                    *Mapping\r
   )\r
 {\r
   return EFI_SUCCESS;\r
index fb4942df37ca95f4e72530d22267535b647eed0b..e3d071583750756acb5ae559d843e054c564b1fd 100644 (file)
@@ -54,10 +54,10 @@ VmgExitHandleVc (
   ASSERT (Msr.GhcbInfo.Function == 0);\r
   ASSERT (Msr.Ghcb != 0);\r
 \r
-  Ghcb = Msr.Ghcb;\r
+  Ghcb       = Msr.Ghcb;\r
   GhcbBackup = NULL;\r
 \r
-  SevEsData = (SEV_ES_PER_CPU_DATA *) (Ghcb + 1);\r
+  SevEsData = (SEV_ES_PER_CPU_DATA *)(Ghcb + 1);\r
   SevEsData->VcCount++;\r
 \r
   //\r
@@ -78,7 +78,7 @@ VmgExitHandleVc (
     //   To access the correct backup page, increment the backup page pointer\r
     //   based on the current VcCount.\r
     //\r
-    GhcbBackup = (GHCB *) SevEsData->GhcbBackupPages;\r
+    GhcbBackup  = (GHCB *)SevEsData->GhcbBackupPages;\r
     GhcbBackup += (SevEsData->VcCount - 2);\r
 \r
     CopyMem (GhcbBackup, Ghcb, sizeof (*Ghcb));\r
index 85853d334b35e26e4a86e4abde3a16629a880e39..fe8680f831d917ca55a80f79abb250686d063d3e 100644 (file)
@@ -54,10 +54,10 @@ VmgExitHandleVc (
   ASSERT (Msr.GhcbInfo.Function == 0);\r
   ASSERT (Msr.Ghcb != 0);\r
 \r
-  Ghcb = Msr.Ghcb;\r
+  Ghcb       = Msr.Ghcb;\r
   GhcbBackup = NULL;\r
 \r
-  SevEsData = (SEV_ES_PER_CPU_DATA *) (Ghcb + 1);\r
+  SevEsData = (SEV_ES_PER_CPU_DATA *)(Ghcb + 1);\r
   SevEsData->VcCount++;\r
 \r
   //\r
@@ -84,7 +84,7 @@ VmgExitHandleVc (
     //   To access the correct backup page, increment the backup page pointer\r
     //   based on the current VcCount.\r
     //\r
-    GhcbBackup = (GHCB *) FixedPcdGet32 (PcdOvmfSecGhcbBackupBase);\r
+    GhcbBackup  = (GHCB *)FixedPcdGet32 (PcdOvmfSecGhcbBackupBase);\r
     GhcbBackup += (SevEsData->VcCount - 2);\r
 \r
     CopyMem (GhcbBackup, Ghcb, sizeof (*Ghcb));\r
index bc5cd61d751fbc485bff73aa4ca44cb7461f0396..c20552187074f6fbd7d1f5476a9f79f2fd0fde68 100644 (file)
@@ -28,7 +28,7 @@
 STATIC\r
 UINT64\r
 VmgExitErrorCheck (\r
-  IN GHCB                *Ghcb\r
+  IN GHCB  *Ghcb\r
   )\r
 {\r
   GHCB_EVENT_INJECTION  Event;\r
@@ -36,8 +36,10 @@ VmgExitErrorCheck (
   UINT64                Status;\r
 \r
   ExitInfo.Uint64 = Ghcb->SaveArea.SwExitInfo1;\r
-  ASSERT ((ExitInfo.Elements.Lower32Bits == 0) ||\r
-          (ExitInfo.Elements.Lower32Bits == 1));\r
+  ASSERT (\r
+    (ExitInfo.Elements.Lower32Bits == 0) ||\r
+    (ExitInfo.Elements.Lower32Bits == 1)\r
+    );\r
 \r
   Status = 0;\r
   if (ExitInfo.Elements.Lower32Bits == 0) {\r
@@ -52,14 +54,15 @@ VmgExitErrorCheck (
     //\r
     Event.Uint64 = Ghcb->SaveArea.SwExitInfo2;\r
     if (Event.Elements.Valid &&\r
-        Event.Elements.Type == GHCB_EVENT_INJECTION_TYPE_EXCEPTION) {\r
+        (Event.Elements.Type == GHCB_EVENT_INJECTION_TYPE_EXCEPTION))\r
+    {\r
       switch (Event.Elements.Vector) {\r
-      case GP_EXCEPTION:\r
-      case UD_EXCEPTION:\r
-        //\r
-        // Use returned event as return code\r
-        //\r
-        Status = Event.Uint64;\r
+        case GP_EXCEPTION:\r
+        case UD_EXCEPTION:\r
+          //\r
+          // Use returned event as return code\r
+          //\r
+          Status = Event.Uint64;\r
       }\r
     }\r
   }\r
@@ -67,7 +70,7 @@ VmgExitErrorCheck (
   if (Status == 0) {\r
     GHCB_EVENT_INJECTION  GpEvent;\r
 \r
-    GpEvent.Uint64 = 0;\r
+    GpEvent.Uint64          = 0;\r
     GpEvent.Elements.Vector = GP_EXCEPTION;\r
     GpEvent.Elements.Type   = GHCB_EVENT_INJECTION_TYPE_EXCEPTION;\r
     GpEvent.Elements.Valid  = 1;\r
@@ -100,13 +103,13 @@ VmgExitErrorCheck (
 UINT64\r
 EFIAPI\r
 VmgExit (\r
-  IN OUT GHCB                *Ghcb,\r
-  IN     UINT64              ExitCode,\r
-  IN     UINT64              ExitInfo1,\r
-  IN     UINT64              ExitInfo2\r
+  IN OUT GHCB    *Ghcb,\r
+  IN     UINT64  ExitCode,\r
+  IN     UINT64  ExitInfo1,\r
+  IN     UINT64  ExitInfo2\r
   )\r
 {\r
-  Ghcb->SaveArea.SwExitCode = ExitCode;\r
+  Ghcb->SaveArea.SwExitCode  = ExitCode;\r
   Ghcb->SaveArea.SwExitInfo1 = ExitInfo1;\r
   Ghcb->SaveArea.SwExitInfo2 = ExitInfo2;\r
 \r
@@ -140,8 +143,8 @@ VmgExit (
 VOID\r
 EFIAPI\r
 VmgInit (\r
-  IN OUT GHCB                *Ghcb,\r
-  IN OUT BOOLEAN             *InterruptState\r
+  IN OUT GHCB     *Ghcb,\r
+  IN OUT BOOLEAN  *InterruptState\r
   )\r
 {\r
   //\r
@@ -170,8 +173,8 @@ VmgInit (
 VOID\r
 EFIAPI\r
 VmgDone (\r
-  IN OUT GHCB                *Ghcb,\r
-  IN     BOOLEAN             InterruptState\r
+  IN OUT GHCB     *Ghcb,\r
+  IN     BOOLEAN  InterruptState\r
   )\r
 {\r
   if (InterruptState) {\r
@@ -192,8 +195,8 @@ VmgDone (
 VOID\r
 EFIAPI\r
 VmgSetOffsetValid (\r
-  IN OUT GHCB                *Ghcb,\r
-  IN     GHCB_REGISTER       Offset\r
+  IN OUT GHCB           *Ghcb,\r
+  IN     GHCB_REGISTER  Offset\r
   )\r
 {\r
   UINT32  OffsetIndex;\r
@@ -221,8 +224,8 @@ VmgSetOffsetValid (
 BOOLEAN\r
 EFIAPI\r
 VmgIsOffsetValid (\r
-  IN GHCB                    *Ghcb,\r
-  IN GHCB_REGISTER           Offset\r
+  IN GHCB           *Ghcb,\r
+  IN GHCB_REGISTER  Offset\r
   )\r
 {\r
   UINT32  OffsetIndex;\r
index 41b0c8cc531235baac1affda30444cfefc82b00a..81a93968c85eae73fb4d6a117359dd28e697d106 100644 (file)
@@ -22,7 +22,7 @@
 // Instruction execution mode definition\r
 //\r
 typedef enum {\r
-  LongMode64Bit        = 0,\r
+  LongMode64Bit = 0,\r
   LongModeCompat32Bit,\r
   LongModeCompat16Bit,\r
 } SEV_ES_INSTRUCTION_MODE;\r
@@ -31,7 +31,7 @@ typedef enum {
 // Instruction size definition (for operand and address)\r
 //\r
 typedef enum {\r
-  Size8Bits            = 0,\r
+  Size8Bits = 0,\r
   Size16Bits,\r
   Size32Bits,\r
   Size64Bits,\r
@@ -41,7 +41,7 @@ typedef enum {
 // Intruction segment definition\r
 //\r
 typedef enum {\r
-  SegmentEs            = 0,\r
+  SegmentEs = 0,\r
   SegmentCs,\r
   SegmentSs,\r
   SegmentDs,\r
@@ -53,70 +53,70 @@ typedef enum {
 // Instruction rep function definition\r
 //\r
 typedef enum {\r
-  RepNone              = 0,\r
+  RepNone = 0,\r
   RepZ,\r
   RepNZ,\r
 } SEV_ES_INSTRUCTION_REP;\r
 \r
 typedef struct {\r
-  UINT8  Rm;\r
-  UINT8  Reg;\r
-  UINT8  Mod;\r
+  UINT8    Rm;\r
+  UINT8    Reg;\r
+  UINT8    Mod;\r
 } SEV_ES_INSTRUCTION_MODRM_EXT;\r
 \r
 typedef struct {\r
-  UINT8  Base;\r
-  UINT8  Index;\r
-  UINT8  Scale;\r
+  UINT8    Base;\r
+  UINT8    Index;\r
+  UINT8    Scale;\r
 } SEV_ES_INSTRUCTION_SIB_EXT;\r
 \r
 //\r
 // Instruction opcode definition\r
 //\r
 typedef struct {\r
-  SEV_ES_INSTRUCTION_MODRM_EXT  ModRm;\r
+  SEV_ES_INSTRUCTION_MODRM_EXT    ModRm;\r
 \r
-  SEV_ES_INSTRUCTION_SIB_EXT    Sib;\r
+  SEV_ES_INSTRUCTION_SIB_EXT      Sib;\r
 \r
-  UINTN                         RegData;\r
-  UINTN                         RmData;\r
+  UINTN                           RegData;\r
+  UINTN                           RmData;\r
 } SEV_ES_INSTRUCTION_OPCODE_EXT;\r
 \r
 //\r
 // Instruction parsing context definition\r
 //\r
 typedef struct {\r
-  GHCB                           *Ghcb;\r
+  GHCB                             *Ghcb;\r
 \r
-  SEV_ES_INSTRUCTION_MODE        Mode;\r
-  SEV_ES_INSTRUCTION_SIZE        DataSize;\r
-  SEV_ES_INSTRUCTION_SIZE        AddrSize;\r
-  BOOLEAN                        SegmentSpecified;\r
-  SEV_ES_INSTRUCTION_SEGMENT     Segment;\r
-  SEV_ES_INSTRUCTION_REP         RepMode;\r
+  SEV_ES_INSTRUCTION_MODE          Mode;\r
+  SEV_ES_INSTRUCTION_SIZE          DataSize;\r
+  SEV_ES_INSTRUCTION_SIZE          AddrSize;\r
+  BOOLEAN                          SegmentSpecified;\r
+  SEV_ES_INSTRUCTION_SEGMENT       Segment;\r
+  SEV_ES_INSTRUCTION_REP           RepMode;\r
 \r
-  UINT8                          *Begin;\r
-  UINT8                          *End;\r
+  UINT8                            *Begin;\r
+  UINT8                            *End;\r
 \r
-  UINT8                          *Prefixes;\r
-  UINT8                          *OpCodes;\r
-  UINT8                          *Displacement;\r
-  UINT8                          *Immediate;\r
+  UINT8                            *Prefixes;\r
+  UINT8                            *OpCodes;\r
+  UINT8                            *Displacement;\r
+  UINT8                            *Immediate;\r
 \r
-  INSTRUCTION_REX_PREFIX         RexPrefix;\r
+  INSTRUCTION_REX_PREFIX           RexPrefix;\r
 \r
-  BOOLEAN                        ModRmPresent;\r
-  INSTRUCTION_MODRM              ModRm;\r
+  BOOLEAN                          ModRmPresent;\r
+  INSTRUCTION_MODRM                ModRm;\r
 \r
-  BOOLEAN                        SibPresent;\r
-  INSTRUCTION_SIB                Sib;\r
+  BOOLEAN                          SibPresent;\r
+  INSTRUCTION_SIB                  Sib;\r
 \r
-  UINTN                          PrefixSize;\r
-  UINTN                          OpCodeSize;\r
-  UINTN                          DisplacementSize;\r
-  UINTN                          ImmediateSize;\r
+  UINTN                            PrefixSize;\r
+  UINTN                            OpCodeSize;\r
+  UINTN                            DisplacementSize;\r
+  UINTN                            ImmediateSize;\r
 \r
-  SEV_ES_INSTRUCTION_OPCODE_EXT  Ext;\r
+  SEV_ES_INSTRUCTION_OPCODE_EXT    Ext;\r
 } SEV_ES_INSTRUCTION_DATA;\r
 \r
 //\r
@@ -145,64 +145,65 @@ UINT64
 STATIC\r
 UINT64 *\r
 GetRegisterPointer (\r
-  IN EFI_SYSTEM_CONTEXT_X64   *Regs,\r
-  IN UINT8                    Register\r
+  IN EFI_SYSTEM_CONTEXT_X64  *Regs,\r
+  IN UINT8                   Register\r
   )\r
 {\r
-  UINT64 *Reg;\r
+  UINT64  *Reg;\r
 \r
   switch (Register) {\r
-  case 0:\r
-    Reg = &Regs->Rax;\r
-    break;\r
-  case 1:\r
-    Reg = &Regs->Rcx;\r
-    break;\r
-  case 2:\r
-    Reg = &Regs->Rdx;\r
-    break;\r
-  case 3:\r
-    Reg = &Regs->Rbx;\r
-    break;\r
-  case 4:\r
-    Reg = &Regs->Rsp;\r
-    break;\r
-  case 5:\r
-    Reg = &Regs->Rbp;\r
-    break;\r
-  case 6:\r
-    Reg = &Regs->Rsi;\r
-    break;\r
-  case 7:\r
-    Reg = &Regs->Rdi;\r
-    break;\r
-  case 8:\r
-    Reg = &Regs->R8;\r
-    break;\r
-  case 9:\r
-    Reg = &Regs->R9;\r
-    break;\r
-  case 10:\r
-    Reg = &Regs->R10;\r
-    break;\r
-  case 11:\r
-    Reg = &Regs->R11;\r
-    break;\r
-  case 12:\r
-    Reg = &Regs->R12;\r
-    break;\r
-  case 13:\r
-    Reg = &Regs->R13;\r
-    break;\r
-  case 14:\r
-    Reg = &Regs->R14;\r
-    break;\r
-  case 15:\r
-    Reg = &Regs->R15;\r
-    break;\r
-  default:\r
-    Reg = NULL;\r
+    case 0:\r
+      Reg = &Regs->Rax;\r
+      break;\r
+    case 1:\r
+      Reg = &Regs->Rcx;\r
+      break;\r
+    case 2:\r
+      Reg = &Regs->Rdx;\r
+      break;\r
+    case 3:\r
+      Reg = &Regs->Rbx;\r
+      break;\r
+    case 4:\r
+      Reg = &Regs->Rsp;\r
+      break;\r
+    case 5:\r
+      Reg = &Regs->Rbp;\r
+      break;\r
+    case 6:\r
+      Reg = &Regs->Rsi;\r
+      break;\r
+    case 7:\r
+      Reg = &Regs->Rdi;\r
+      break;\r
+    case 8:\r
+      Reg = &Regs->R8;\r
+      break;\r
+    case 9:\r
+      Reg = &Regs->R9;\r
+      break;\r
+    case 10:\r
+      Reg = &Regs->R10;\r
+      break;\r
+    case 11:\r
+      Reg = &Regs->R11;\r
+      break;\r
+    case 12:\r
+      Reg = &Regs->R12;\r
+      break;\r
+    case 13:\r
+      Reg = &Regs->R13;\r
+      break;\r
+    case 14:\r
+      Reg = &Regs->R14;\r
+      break;\r
+    case 15:\r
+      Reg = &Regs->R15;\r
+      break;\r
+    default:\r
+      Reg = NULL;\r
   }\r
+\r
   ASSERT (Reg != NULL);\r
 \r
   return Reg;\r
@@ -223,8 +224,8 @@ UpdateForDisplacement (
   )\r
 {\r
   InstructionData->DisplacementSize = Size;\r
-  InstructionData->Immediate += Size;\r
-  InstructionData->End += Size;\r
+  InstructionData->Immediate       += Size;\r
+  InstructionData->End             += Size;\r
 }\r
 \r
 /**\r
@@ -277,42 +278,43 @@ GetEffectiveMemoryAddress (
   SEV_ES_INSTRUCTION_OPCODE_EXT  *Ext;\r
   UINT64                         EffectiveAddress;\r
 \r
-  Ext = &InstructionData->Ext;\r
+  Ext              = &InstructionData->Ext;\r
   EffectiveAddress = 0;\r
 \r
   if (IsRipRelative (InstructionData)) {\r
     //\r
     // RIP-relative displacement is a 32-bit signed value\r
     //\r
-    INT32 RipRelative;\r
+    INT32  RipRelative;\r
 \r
-    RipRelative = *(INT32 *) InstructionData->Displacement;\r
+    RipRelative = *(INT32 *)InstructionData->Displacement;\r
 \r
     UpdateForDisplacement (InstructionData, 4);\r
 \r
     //\r
     // Negative displacement is handled by standard UINT64 wrap-around.\r
     //\r
-    return Regs->Rip + (UINT64) RipRelative;\r
+    return Regs->Rip + (UINT64)RipRelative;\r
   }\r
 \r
   switch (Ext->ModRm.Mod) {\r
-  case 1:\r
-    UpdateForDisplacement (InstructionData, 1);\r
-    EffectiveAddress += (UINT64) (*(INT8 *) (InstructionData->Displacement));\r
-    break;\r
-  case 2:\r
-    switch (InstructionData->AddrSize) {\r
-    case Size16Bits:\r
-      UpdateForDisplacement (InstructionData, 2);\r
-      EffectiveAddress += (UINT64) (*(INT16 *) (InstructionData->Displacement));\r
+    case 1:\r
+      UpdateForDisplacement (InstructionData, 1);\r
+      EffectiveAddress += (UINT64)(*(INT8 *)(InstructionData->Displacement));\r
       break;\r
-    default:\r
-      UpdateForDisplacement (InstructionData, 4);\r
-      EffectiveAddress += (UINT64) (*(INT32 *) (InstructionData->Displacement));\r
+    case 2:\r
+      switch (InstructionData->AddrSize) {\r
+        case Size16Bits:\r
+          UpdateForDisplacement (InstructionData, 2);\r
+          EffectiveAddress += (UINT64)(*(INT16 *)(InstructionData->Displacement));\r
+          break;\r
+        default:\r
+          UpdateForDisplacement (InstructionData, 4);\r
+          EffectiveAddress += (UINT64)(*(INT32 *)(InstructionData->Displacement));\r
+          break;\r
+      }\r
+\r
       break;\r
-    }\r
-    break;\r
   }\r
 \r
   if (InstructionData->SibPresent) {\r
@@ -329,14 +331,14 @@ GetEffectiveMemoryAddress (
       //\r
       // Negative displacement is handled by standard UINT64 wrap-around.\r
       //\r
-      EffectiveAddress += (UINT64) Displacement;\r
+      EffectiveAddress += (UINT64)Displacement;\r
     }\r
 \r
     if ((Ext->Sib.Base != 5) || Ext->ModRm.Mod) {\r
       EffectiveAddress += *GetRegisterPointer (Regs, Ext->Sib.Base);\r
     } else {\r
       UpdateForDisplacement (InstructionData, 4);\r
-      EffectiveAddress += (UINT64) (*(INT32 *) (InstructionData->Displacement));\r
+      EffectiveAddress += (UINT64)(*(INT32 *)(InstructionData->Displacement));\r
     }\r
   } else {\r
     EffectiveAddress += *GetRegisterPointer (Regs, Ext->ModRm.Rm);\r
@@ -368,12 +370,12 @@ DecodeModRm (
   INSTRUCTION_SIB                *Sib;\r
 \r
   RexPrefix = &InstructionData->RexPrefix;\r
-  Ext = &InstructionData->Ext;\r
-  ModRm = &InstructionData->ModRm;\r
-  Sib = &InstructionData->Sib;\r
+  Ext       = &InstructionData->Ext;\r
+  ModRm     = &InstructionData->ModRm;\r
+  Sib       = &InstructionData->Sib;\r
 \r
   InstructionData->ModRmPresent = TRUE;\r
-  ModRm->Uint8 = *(InstructionData->End);\r
+  ModRm->Uint8                  = *(InstructionData->End);\r
 \r
   InstructionData->Displacement++;\r
   InstructionData->Immediate++;\r
@@ -390,7 +392,7 @@ DecodeModRm (
   } else {\r
     if (ModRm->Bits.Rm == 4) {\r
       InstructionData->SibPresent = TRUE;\r
-      Sib->Uint8 = *(InstructionData->End);\r
+      Sib->Uint8                  = *(InstructionData->End);\r
 \r
       InstructionData->Displacement++;\r
       InstructionData->Immediate++;\r
@@ -430,11 +432,11 @@ DecodePrefixes (
   //\r
   // Always in 64-bit mode\r
   //\r
-  Mode = LongMode64Bit;\r
+  Mode         = LongMode64Bit;\r
   ModeDataSize = Size32Bits;\r
   ModeAddrSize = Size64Bits;\r
 \r
-  InstructionData->Mode = Mode;\r
+  InstructionData->Mode     = Mode;\r
   InstructionData->DataSize = ModeDataSize;\r
   InstructionData->AddrSize = ModeAddrSize;\r
 \r
@@ -452,61 +454,64 @@ DecodePrefixes (
       if ((*Byte & REX_64BIT_OPERAND_SIZE_MASK) != 0) {\r
         InstructionData->DataSize = Size64Bits;\r
       }\r
+\r
       continue;\r
     }\r
 \r
     switch (*Byte) {\r
-    case OVERRIDE_SEGMENT_CS:\r
-    case OVERRIDE_SEGMENT_DS:\r
-    case OVERRIDE_SEGMENT_ES:\r
-    case OVERRIDE_SEGMENT_SS:\r
-      if (Mode != LongMode64Bit) {\r
+      case OVERRIDE_SEGMENT_CS:\r
+      case OVERRIDE_SEGMENT_DS:\r
+      case OVERRIDE_SEGMENT_ES:\r
+      case OVERRIDE_SEGMENT_SS:\r
+        if (Mode != LongMode64Bit) {\r
+          InstructionData->SegmentSpecified = TRUE;\r
+          InstructionData->Segment          = (*Byte >> 3) & 3;\r
+        }\r
+\r
+        break;\r
+\r
+      case OVERRIDE_SEGMENT_FS:\r
+      case OVERRIDE_SEGMENT_GS:\r
         InstructionData->SegmentSpecified = TRUE;\r
-        InstructionData->Segment = (*Byte >> 3) & 3;\r
-      }\r
-      break;\r
-\r
-    case OVERRIDE_SEGMENT_FS:\r
-    case OVERRIDE_SEGMENT_GS:\r
-      InstructionData->SegmentSpecified = TRUE;\r
-      InstructionData->Segment = *Byte & 7;\r
-      break;\r
-\r
-    case OVERRIDE_OPERAND_SIZE:\r
-      if (InstructionData->RexPrefix.Uint8 == 0) {\r
-        InstructionData->DataSize =\r
-          (Mode == LongMode64Bit)       ? Size16Bits :\r
+        InstructionData->Segment          = *Byte & 7;\r
+        break;\r
+\r
+      case OVERRIDE_OPERAND_SIZE:\r
+        if (InstructionData->RexPrefix.Uint8 == 0) {\r
+          InstructionData->DataSize =\r
+            (Mode == LongMode64Bit)       ? Size16Bits :\r
+            (Mode == LongModeCompat32Bit) ? Size16Bits :\r
+            (Mode == LongModeCompat16Bit) ? Size32Bits : 0;\r
+        }\r
+\r
+        break;\r
+\r
+      case OVERRIDE_ADDRESS_SIZE:\r
+        InstructionData->AddrSize =\r
+          (Mode == LongMode64Bit)       ? Size32Bits :\r
           (Mode == LongModeCompat32Bit) ? Size16Bits :\r
           (Mode == LongModeCompat16Bit) ? Size32Bits : 0;\r
-      }\r
-      break;\r
-\r
-    case OVERRIDE_ADDRESS_SIZE:\r
-      InstructionData->AddrSize =\r
-        (Mode == LongMode64Bit)       ? Size32Bits :\r
-        (Mode == LongModeCompat32Bit) ? Size16Bits :\r
-        (Mode == LongModeCompat16Bit) ? Size32Bits : 0;\r
-      break;\r
+        break;\r
 \r
-    case LOCK_PREFIX:\r
-      break;\r
+      case LOCK_PREFIX:\r
+        break;\r
 \r
-    case REPZ_PREFIX:\r
-      InstructionData->RepMode = RepZ;\r
-      break;\r
+      case REPZ_PREFIX:\r
+        InstructionData->RepMode = RepZ;\r
+        break;\r
 \r
-    case REPNZ_PREFIX:\r
-      InstructionData->RepMode = RepNZ;\r
-      break;\r
+      case REPNZ_PREFIX:\r
+        InstructionData->RepMode = RepNZ;\r
+        break;\r
 \r
-    default:\r
-      InstructionData->OpCodes = Byte;\r
-      InstructionData->OpCodeSize = (*Byte == TWO_BYTE_OPCODE_ESCAPE) ? 2 : 1;\r
+      default:\r
+        InstructionData->OpCodes    = Byte;\r
+        InstructionData->OpCodeSize = (*Byte == TWO_BYTE_OPCODE_ESCAPE) ? 2 : 1;\r
 \r
-      InstructionData->End = Byte + InstructionData->OpCodeSize;\r
-      InstructionData->Displacement = InstructionData->End;\r
-      InstructionData->Immediate = InstructionData->End;\r
-      return;\r
+        InstructionData->End          = Byte + InstructionData->OpCodeSize;\r
+        InstructionData->Displacement = InstructionData->End;\r
+        InstructionData->Immediate    = InstructionData->End;\r
+        return;\r
     }\r
   }\r
 }\r
@@ -527,7 +532,7 @@ InstructionLength (
   IN SEV_ES_INSTRUCTION_DATA  *InstructionData\r
   )\r
 {\r
-  return (UINT64) (InstructionData->End - InstructionData->Begin);\r
+  return (UINT64)(InstructionData->End - InstructionData->Begin);\r
 }\r
 \r
 /**\r
@@ -551,9 +556,9 @@ InitInstructionData (
   )\r
 {\r
   SetMem (InstructionData, sizeof (*InstructionData), 0);\r
-  InstructionData->Ghcb = Ghcb;\r
-  InstructionData->Begin = (UINT8 *) Regs->Rip;\r
-  InstructionData->End = (UINT8 *) Regs->Rip;\r
+  InstructionData->Ghcb  = Ghcb;\r
+  InstructionData->Begin = (UINT8 *)Regs->Rip;\r
+  InstructionData->End   = (UINT8 *)Regs->Rip;\r
 \r
   DecodePrefixes (Regs, InstructionData);\r
 }\r
@@ -585,7 +590,7 @@ UnsupportedExit (
   if (Status == 0) {\r
     GHCB_EVENT_INJECTION  Event;\r
 \r
-    Event.Uint64 = 0;\r
+    Event.Uint64          = 0;\r
     Event.Elements.Vector = GP_EXCEPTION;\r
     Event.Elements.Type   = GHCB_EVENT_INJECTION_TYPE_EXCEPTION;\r
     Event.Elements.Valid  = 1;\r
@@ -643,10 +648,12 @@ ValidateMmioMemory (
   //\r
   // Any state other than unencrypted is an error, issue a #GP.\r
   //\r
-  DEBUG ((DEBUG_ERROR,\r
+  DEBUG ((\r
+    DEBUG_ERROR,\r
     "MMIO using encrypted memory: %lx\n",\r
-    (UINT64) MemoryAddress));\r
-  GpEvent.Uint64 = 0;\r
+    (UINT64)MemoryAddress\r
+    ));\r
+  GpEvent.Uint64          = 0;\r
   GpEvent.Elements.Vector = GP_EXCEPTION;\r
   GpEvent.Elements.Type   = GHCB_EVENT_INJECTION_TYPE_EXCEPTION;\r
   GpEvent.Elements.Valid  = 1;\r
@@ -690,317 +697,322 @@ MmioExit (
   }\r
 \r
   switch (OpCode) {\r
-  //\r
-  // MMIO write (MOV reg/memX, regX)\r
-  //\r
-  case 0x88:\r
-    Bytes = 1;\r
+    //\r
+    // MMIO write (MOV reg/memX, regX)\r
+    //\r
+    case 0x88:\r
+      Bytes = 1;\r
     //\r
     // fall through\r
     //\r
-  case 0x89:\r
-    DecodeModRm (Regs, InstructionData);\r
-    Bytes = ((Bytes != 0) ? Bytes :\r
-             (InstructionData->DataSize == Size16Bits) ? 2 :\r
-             (InstructionData->DataSize == Size32Bits) ? 4 :\r
-             (InstructionData->DataSize == Size64Bits) ? 8 :\r
-             0);\r
-\r
-    if (InstructionData->Ext.ModRm.Mod == 3) {\r
-      //\r
-      // NPF on two register operands???\r
-      //\r
-      return UnsupportedExit (Ghcb, Regs, InstructionData);\r
-    }\r
+    case 0x89:\r
+      DecodeModRm (Regs, InstructionData);\r
+      Bytes = ((Bytes != 0) ? Bytes :\r
+               (InstructionData->DataSize == Size16Bits) ? 2 :\r
+               (InstructionData->DataSize == Size32Bits) ? 4 :\r
+               (InstructionData->DataSize == Size64Bits) ? 8 :\r
+               0);\r
+\r
+      if (InstructionData->Ext.ModRm.Mod == 3) {\r
+        //\r
+        // NPF on two register operands???\r
+        //\r
+        return UnsupportedExit (Ghcb, Regs, InstructionData);\r
+      }\r
 \r
-    Status = ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Bytes);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
+      Status = ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Bytes);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-    ExitInfo1 = InstructionData->Ext.RmData;\r
-    ExitInfo2 = Bytes;\r
-    CopyMem (Ghcb->SharedBuffer, &InstructionData->Ext.RegData, Bytes);\r
+      ExitInfo1 = InstructionData->Ext.RmData;\r
+      ExitInfo2 = Bytes;\r
+      CopyMem (Ghcb->SharedBuffer, &InstructionData->Ext.RegData, Bytes);\r
 \r
-    Ghcb->SaveArea.SwScratch = (UINT64) Ghcb->SharedBuffer;\r
-    VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
-    Status = VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, ExitInfo1, ExitInfo2);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
-    break;\r
+      Ghcb->SaveArea.SwScratch = (UINT64)Ghcb->SharedBuffer;\r
+      VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
+      Status = VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, ExitInfo1, ExitInfo2);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-  //\r
-  // MMIO write (MOV moffsetX, aX)\r
-  //\r
-  case 0xA2:\r
-    Bytes = 1;\r
+      break;\r
+\r
+    //\r
+    // MMIO write (MOV moffsetX, aX)\r
+    //\r
+    case 0xA2:\r
+      Bytes = 1;\r
     //\r
     // fall through\r
     //\r
-  case 0xA3:\r
-    Bytes = ((Bytes != 0) ? Bytes :\r
-             (InstructionData->DataSize == Size16Bits) ? 2 :\r
-             (InstructionData->DataSize == Size32Bits) ? 4 :\r
-             (InstructionData->DataSize == Size64Bits) ? 8 :\r
-             0);\r
+    case 0xA3:\r
+      Bytes = ((Bytes != 0) ? Bytes :\r
+               (InstructionData->DataSize == Size16Bits) ? 2 :\r
+               (InstructionData->DataSize == Size32Bits) ? 4 :\r
+               (InstructionData->DataSize == Size64Bits) ? 8 :\r
+               0);\r
 \r
-    InstructionData->ImmediateSize = (UINTN) (1 << InstructionData->AddrSize);\r
-    InstructionData->End += InstructionData->ImmediateSize;\r
+      InstructionData->ImmediateSize = (UINTN)(1 << InstructionData->AddrSize);\r
+      InstructionData->End          += InstructionData->ImmediateSize;\r
 \r
-    //\r
-    // This code is X64 only, so a possible 8-byte copy to a UINTN is ok.\r
-    // Use a STATIC_ASSERT to be certain the code is being built as X64.\r
-    //\r
-    STATIC_ASSERT (\r
-      sizeof (UINTN) == sizeof (UINT64),\r
-      "sizeof (UINTN) != sizeof (UINT64), this file must be built as X64"\r
-      );\r
-\r
-    Address = 0;\r
-    CopyMem (\r
-      &Address,\r
-      InstructionData->Immediate,\r
-      InstructionData->ImmediateSize\r
-      );\r
-\r
-    Status = ValidateMmioMemory (Ghcb, Address, Bytes);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
+      //\r
+      // This code is X64 only, so a possible 8-byte copy to a UINTN is ok.\r
+      // Use a STATIC_ASSERT to be certain the code is being built as X64.\r
+      //\r
+      STATIC_ASSERT (\r
+        sizeof (UINTN) == sizeof (UINT64),\r
+        "sizeof (UINTN) != sizeof (UINT64), this file must be built as X64"\r
+        );\r
 \r
-    ExitInfo1 = Address;\r
-    ExitInfo2 = Bytes;\r
-    CopyMem (Ghcb->SharedBuffer, &Regs->Rax, Bytes);\r
+      Address = 0;\r
+      CopyMem (\r
+        &Address,\r
+        InstructionData->Immediate,\r
+        InstructionData->ImmediateSize\r
+        );\r
 \r
-    Ghcb->SaveArea.SwScratch = (UINT64) Ghcb->SharedBuffer;\r
-    VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
-    Status = VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, ExitInfo1, ExitInfo2);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
-    break;\r
+      Status = ValidateMmioMemory (Ghcb, Address, Bytes);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-  //\r
-  // MMIO write (MOV reg/memX, immX)\r
-  //\r
-  case 0xC6:\r
-    Bytes = 1;\r
+      ExitInfo1 = Address;\r
+      ExitInfo2 = Bytes;\r
+      CopyMem (Ghcb->SharedBuffer, &Regs->Rax, Bytes);\r
+\r
+      Ghcb->SaveArea.SwScratch = (UINT64)Ghcb->SharedBuffer;\r
+      VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
+      Status = VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, ExitInfo1, ExitInfo2);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
+\r
+      break;\r
+\r
+    //\r
+    // MMIO write (MOV reg/memX, immX)\r
+    //\r
+    case 0xC6:\r
+      Bytes = 1;\r
     //\r
     // fall through\r
     //\r
-  case 0xC7:\r
-    DecodeModRm (Regs, InstructionData);\r
-    Bytes = ((Bytes != 0) ? Bytes :\r
-             (InstructionData->DataSize == Size16Bits) ? 2 :\r
-             (InstructionData->DataSize == Size32Bits) ? 4 :\r
-             0);\r
+    case 0xC7:\r
+      DecodeModRm (Regs, InstructionData);\r
+      Bytes = ((Bytes != 0) ? Bytes :\r
+               (InstructionData->DataSize == Size16Bits) ? 2 :\r
+               (InstructionData->DataSize == Size32Bits) ? 4 :\r
+               0);\r
 \r
-    InstructionData->ImmediateSize = Bytes;\r
-    InstructionData->End += Bytes;\r
+      InstructionData->ImmediateSize = Bytes;\r
+      InstructionData->End          += Bytes;\r
 \r
-    Status = ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Bytes);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
+      Status = ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Bytes);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-    ExitInfo1 = InstructionData->Ext.RmData;\r
-    ExitInfo2 = Bytes;\r
-    CopyMem (Ghcb->SharedBuffer, InstructionData->Immediate, Bytes);\r
+      ExitInfo1 = InstructionData->Ext.RmData;\r
+      ExitInfo2 = Bytes;\r
+      CopyMem (Ghcb->SharedBuffer, InstructionData->Immediate, Bytes);\r
 \r
-    Ghcb->SaveArea.SwScratch = (UINT64) Ghcb->SharedBuffer;\r
-    VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
-    Status = VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, ExitInfo1, ExitInfo2);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
-    break;\r
+      Ghcb->SaveArea.SwScratch = (UINT64)Ghcb->SharedBuffer;\r
+      VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
+      Status = VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, ExitInfo1, ExitInfo2);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-  //\r
-  // MMIO read (MOV regX, reg/memX)\r
-  //\r
-  case 0x8A:\r
-    Bytes = 1;\r
+      break;\r
+\r
+    //\r
+    // MMIO read (MOV regX, reg/memX)\r
+    //\r
+    case 0x8A:\r
+      Bytes = 1;\r
     //\r
     // fall through\r
     //\r
-  case 0x8B:\r
-    DecodeModRm (Regs, InstructionData);\r
-    Bytes = ((Bytes != 0) ? Bytes :\r
-             (InstructionData->DataSize == Size16Bits) ? 2 :\r
-             (InstructionData->DataSize == Size32Bits) ? 4 :\r
-             (InstructionData->DataSize == Size64Bits) ? 8 :\r
-             0);\r
-    if (InstructionData->Ext.ModRm.Mod == 3) {\r
-      //\r
-      // NPF on two register operands???\r
-      //\r
-      return UnsupportedExit (Ghcb, Regs, InstructionData);\r
-    }\r
+    case 0x8B:\r
+      DecodeModRm (Regs, InstructionData);\r
+      Bytes = ((Bytes != 0) ? Bytes :\r
+               (InstructionData->DataSize == Size16Bits) ? 2 :\r
+               (InstructionData->DataSize == Size32Bits) ? 4 :\r
+               (InstructionData->DataSize == Size64Bits) ? 8 :\r
+               0);\r
+      if (InstructionData->Ext.ModRm.Mod == 3) {\r
+        //\r
+        // NPF on two register operands???\r
+        //\r
+        return UnsupportedExit (Ghcb, Regs, InstructionData);\r
+      }\r
 \r
-    Status = ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Bytes);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
+      Status = ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Bytes);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-    ExitInfo1 = InstructionData->Ext.RmData;\r
-    ExitInfo2 = Bytes;\r
+      ExitInfo1 = InstructionData->Ext.RmData;\r
+      ExitInfo2 = Bytes;\r
 \r
-    Ghcb->SaveArea.SwScratch = (UINT64) Ghcb->SharedBuffer;\r
-    VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
-    Status = VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
+      Ghcb->SaveArea.SwScratch = (UINT64)Ghcb->SharedBuffer;\r
+      VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
+      Status = VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-    Register = GetRegisterPointer (Regs, InstructionData->Ext.ModRm.Reg);\r
-    if (Bytes == 4) {\r
-      //\r
-      // Zero-extend for 32-bit operation\r
-      //\r
-      *Register = 0;\r
-    }\r
-    CopyMem (Register, Ghcb->SharedBuffer, Bytes);\r
-    break;\r
+      Register = GetRegisterPointer (Regs, InstructionData->Ext.ModRm.Reg);\r
+      if (Bytes == 4) {\r
+        //\r
+        // Zero-extend for 32-bit operation\r
+        //\r
+        *Register = 0;\r
+      }\r
+\r
+      CopyMem (Register, Ghcb->SharedBuffer, Bytes);\r
+      break;\r
 \r
-  //\r
-  // MMIO read (MOV aX, moffsetX)\r
-  //\r
-  case 0xA0:\r
-    Bytes = 1;\r
     //\r
-    // fall through\r
+    // MMIO read (MOV aX, moffsetX)\r
     //\r
-  case 0xA1:\r
-    Bytes = ((Bytes != 0) ? Bytes :\r
-             (InstructionData->DataSize == Size16Bits) ? 2 :\r
-             (InstructionData->DataSize == Size32Bits) ? 4 :\r
-             (InstructionData->DataSize == Size64Bits) ? 8 :\r
-             0);\r
-\r
-    InstructionData->ImmediateSize = (UINTN) (1 << InstructionData->AddrSize);\r
-    InstructionData->End += InstructionData->ImmediateSize;\r
-\r
+    case 0xA0:\r
+      Bytes = 1;\r
     //\r
-    // This code is X64 only, so a possible 8-byte copy to a UINTN is ok.\r
-    // Use a STATIC_ASSERT to be certain the code is being built as X64.\r
+    // fall through\r
     //\r
-    STATIC_ASSERT (\r
-      sizeof (UINTN) == sizeof (UINT64),\r
-      "sizeof (UINTN) != sizeof (UINT64), this file must be built as X64"\r
-      );\r
-\r
-    Address = 0;\r
-    CopyMem (\r
-      &Address,\r
-      InstructionData->Immediate,\r
-      InstructionData->ImmediateSize\r
-      );\r
-\r
-    Status = ValidateMmioMemory (Ghcb, Address, Bytes);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
-\r
-    ExitInfo1 = Address;\r
-    ExitInfo2 = Bytes;\r
+    case 0xA1:\r
+      Bytes = ((Bytes != 0) ? Bytes :\r
+               (InstructionData->DataSize == Size16Bits) ? 2 :\r
+               (InstructionData->DataSize == Size32Bits) ? 4 :\r
+               (InstructionData->DataSize == Size64Bits) ? 8 :\r
+               0);\r
 \r
-    Ghcb->SaveArea.SwScratch = (UINT64) Ghcb->SharedBuffer;\r
-    VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
-    Status = VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
+      InstructionData->ImmediateSize = (UINTN)(1 << InstructionData->AddrSize);\r
+      InstructionData->End          += InstructionData->ImmediateSize;\r
 \r
-    if (Bytes == 4) {\r
       //\r
-      // Zero-extend for 32-bit operation\r
+      // This code is X64 only, so a possible 8-byte copy to a UINTN is ok.\r
+      // Use a STATIC_ASSERT to be certain the code is being built as X64.\r
       //\r
-      Regs->Rax = 0;\r
-    }\r
-    CopyMem (&Regs->Rax, Ghcb->SharedBuffer, Bytes);\r
-    break;\r
+      STATIC_ASSERT (\r
+        sizeof (UINTN) == sizeof (UINT64),\r
+        "sizeof (UINTN) != sizeof (UINT64), this file must be built as X64"\r
+        );\r
 \r
-  //\r
-  // MMIO read w/ zero-extension ((MOVZX regX, reg/memX)\r
-  //\r
-  case 0xB6:\r
-    Bytes = 1;\r
+      Address = 0;\r
+      CopyMem (\r
+        &Address,\r
+        InstructionData->Immediate,\r
+        InstructionData->ImmediateSize\r
+        );\r
+\r
+      Status = ValidateMmioMemory (Ghcb, Address, Bytes);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
+\r
+      ExitInfo1 = Address;\r
+      ExitInfo2 = Bytes;\r
+\r
+      Ghcb->SaveArea.SwScratch = (UINT64)Ghcb->SharedBuffer;\r
+      VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
+      Status = VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
+\r
+      if (Bytes == 4) {\r
+        //\r
+        // Zero-extend for 32-bit operation\r
+        //\r
+        Regs->Rax = 0;\r
+      }\r
+\r
+      CopyMem (&Regs->Rax, Ghcb->SharedBuffer, Bytes);\r
+      break;\r
+\r
+    //\r
+    // MMIO read w/ zero-extension ((MOVZX regX, reg/memX)\r
+    //\r
+    case 0xB6:\r
+      Bytes = 1;\r
     //\r
     // fall through\r
     //\r
-  case 0xB7:\r
-    DecodeModRm (Regs, InstructionData);\r
-    Bytes = (Bytes != 0) ? Bytes : 2;\r
+    case 0xB7:\r
+      DecodeModRm (Regs, InstructionData);\r
+      Bytes = (Bytes != 0) ? Bytes : 2;\r
 \r
-    Status = ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Bytes);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
+      Status = ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Bytes);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-    ExitInfo1 = InstructionData->Ext.RmData;\r
-    ExitInfo2 = Bytes;\r
+      ExitInfo1 = InstructionData->Ext.RmData;\r
+      ExitInfo2 = Bytes;\r
 \r
-    Ghcb->SaveArea.SwScratch = (UINT64) Ghcb->SharedBuffer;\r
-    VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
-    Status = VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
+      Ghcb->SaveArea.SwScratch = (UINT64)Ghcb->SharedBuffer;\r
+      VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
+      Status = VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-    Register = GetRegisterPointer (Regs, InstructionData->Ext.ModRm.Reg);\r
-    SetMem (Register, (UINTN) (1 << InstructionData->DataSize), 0);\r
-    CopyMem (Register, Ghcb->SharedBuffer, Bytes);\r
-    break;\r
+      Register = GetRegisterPointer (Regs, InstructionData->Ext.ModRm.Reg);\r
+      SetMem (Register, (UINTN)(1 << InstructionData->DataSize), 0);\r
+      CopyMem (Register, Ghcb->SharedBuffer, Bytes);\r
+      break;\r
 \r
-  //\r
-  // MMIO read w/ sign-extension (MOVSX regX, reg/memX)\r
-  //\r
-  case 0xBE:\r
-    Bytes = 1;\r
+    //\r
+    // MMIO read w/ sign-extension (MOVSX regX, reg/memX)\r
+    //\r
+    case 0xBE:\r
+      Bytes = 1;\r
     //\r
     // fall through\r
     //\r
-  case 0xBF:\r
-    DecodeModRm (Regs, InstructionData);\r
-    Bytes = (Bytes != 0) ? Bytes : 2;\r
+    case 0xBF:\r
+      DecodeModRm (Regs, InstructionData);\r
+      Bytes = (Bytes != 0) ? Bytes : 2;\r
 \r
-    Status = ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Bytes);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
+      Status = ValidateMmioMemory (Ghcb, InstructionData->Ext.RmData, Bytes);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-    ExitInfo1 = InstructionData->Ext.RmData;\r
-    ExitInfo2 = Bytes;\r
+      ExitInfo1 = InstructionData->Ext.RmData;\r
+      ExitInfo2 = Bytes;\r
 \r
-    Ghcb->SaveArea.SwScratch = (UINT64) Ghcb->SharedBuffer;\r
-    VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
-    Status = VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2);\r
-    if (Status != 0) {\r
-      return Status;\r
-    }\r
+      Ghcb->SaveArea.SwScratch = (UINT64)Ghcb->SharedBuffer;\r
+      VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
+      Status = VmgExit (Ghcb, SVM_EXIT_MMIO_READ, ExitInfo1, ExitInfo2);\r
+      if (Status != 0) {\r
+        return Status;\r
+      }\r
 \r
-    if (Bytes == 1) {\r
-      UINT8 *Data;\r
+      if (Bytes == 1) {\r
+        UINT8  *Data;\r
 \r
-      Data = (UINT8 *) Ghcb->SharedBuffer;\r
-      SignByte = ((*Data & BIT7) != 0) ? 0xFF : 0x00;\r
-    } else {\r
-      UINT16 *Data;\r
+        Data     = (UINT8 *)Ghcb->SharedBuffer;\r
+        SignByte = ((*Data & BIT7) != 0) ? 0xFF : 0x00;\r
+      } else {\r
+        UINT16  *Data;\r
 \r
-      Data = (UINT16 *) Ghcb->SharedBuffer;\r
-      SignByte = ((*Data & BIT15) != 0) ? 0xFF : 0x00;\r
-    }\r
+        Data     = (UINT16 *)Ghcb->SharedBuffer;\r
+        SignByte = ((*Data & BIT15) != 0) ? 0xFF : 0x00;\r
+      }\r
 \r
-    Register = GetRegisterPointer (Regs, InstructionData->Ext.ModRm.Reg);\r
-    SetMem (Register, (UINTN) (1 << InstructionData->DataSize), SignByte);\r
-    CopyMem (Register, Ghcb->SharedBuffer, Bytes);\r
-    break;\r
+      Register = GetRegisterPointer (Regs, InstructionData->Ext.ModRm.Reg);\r
+      SetMem (Register, (UINTN)(1 << InstructionData->DataSize), SignByte);\r
+      CopyMem (Register, Ghcb->SharedBuffer, Bytes);\r
+      break;\r
 \r
-  default:\r
-    DEBUG ((DEBUG_ERROR, "Invalid MMIO opcode (%x)\n", OpCode));\r
-    Status = GP_EXCEPTION;\r
-    ASSERT (FALSE);\r
+    default:\r
+      DEBUG ((DEBUG_ERROR, "Invalid MMIO opcode (%x)\n", OpCode));\r
+      Status = GP_EXCEPTION;\r
+      ASSERT (FALSE);\r
   }\r
 \r
   return Status;\r
@@ -1130,9 +1142,11 @@ RdtscpExit (
 \r
   if (!VmgIsOffsetValid (Ghcb, GhcbRax) ||\r
       !VmgIsOffsetValid (Ghcb, GhcbRcx) ||\r
-      !VmgIsOffsetValid (Ghcb, GhcbRdx)) {\r
+      !VmgIsOffsetValid (Ghcb, GhcbRdx))\r
+  {\r
     return UnsupportedExit (Ghcb, Regs, InstructionData);\r
   }\r
+\r
   Regs->Rax = Ghcb->SaveArea.Rax;\r
   Regs->Rcx = Ghcb->SaveArea.Rcx;\r
   Regs->Rdx = Ghcb->SaveArea.Rdx;\r
@@ -1168,7 +1182,7 @@ VmmCallExit (
 \r
   Ghcb->SaveArea.Rax = Regs->Rax;\r
   VmgSetOffsetValid (Ghcb, GhcbRax);\r
-  Ghcb->SaveArea.Cpl = (UINT8) (Regs->Cs & 0x3);\r
+  Ghcb->SaveArea.Cpl = (UINT8)(Regs->Cs & 0x3);\r
   VmgSetOffsetValid (Ghcb, GhcbCpl);\r
 \r
   Status = VmgExit (Ghcb, SVM_EXIT_VMMCALL, 0, 0);\r
@@ -1179,6 +1193,7 @@ VmmCallExit (
   if (!VmgIsOffsetValid (Ghcb, GhcbRax)) {\r
     return UnsupportedExit (Ghcb, Regs, InstructionData);\r
   }\r
+\r
   Regs->Rax = Ghcb->SaveArea.Rax;\r
 \r
   return 0;\r
@@ -1211,21 +1226,21 @@ MsrExit (
   ExitInfo1 = 0;\r
 \r
   switch (*(InstructionData->OpCodes + 1)) {\r
-  case 0x30: // WRMSR\r
-    ExitInfo1 = 1;\r
-    Ghcb->SaveArea.Rax = Regs->Rax;\r
-    VmgSetOffsetValid (Ghcb, GhcbRax);\r
-    Ghcb->SaveArea.Rdx = Regs->Rdx;\r
-    VmgSetOffsetValid (Ghcb, GhcbRdx);\r
+    case 0x30: // WRMSR\r
+      ExitInfo1          = 1;\r
+      Ghcb->SaveArea.Rax = Regs->Rax;\r
+      VmgSetOffsetValid (Ghcb, GhcbRax);\r
+      Ghcb->SaveArea.Rdx = Regs->Rdx;\r
+      VmgSetOffsetValid (Ghcb, GhcbRdx);\r
     //\r
     // fall through\r
     //\r
-  case 0x32: // RDMSR\r
-    Ghcb->SaveArea.Rcx = Regs->Rcx;\r
-    VmgSetOffsetValid (Ghcb, GhcbRcx);\r
-    break;\r
-  default:\r
-    return UnsupportedExit (Ghcb, Regs, InstructionData);\r
+    case 0x32: // RDMSR\r
+      Ghcb->SaveArea.Rcx = Regs->Rcx;\r
+      VmgSetOffsetValid (Ghcb, GhcbRcx);\r
+      break;\r
+    default:\r
+      return UnsupportedExit (Ghcb, Regs, InstructionData);\r
   }\r
 \r
   Status = VmgExit (Ghcb, SVM_EXIT_MSR, ExitInfo1, 0);\r
@@ -1235,9 +1250,11 @@ MsrExit (
 \r
   if (ExitInfo1 == 0) {\r
     if (!VmgIsOffsetValid (Ghcb, GhcbRax) ||\r
-        !VmgIsOffsetValid (Ghcb, GhcbRdx)) {\r
+        !VmgIsOffsetValid (Ghcb, GhcbRdx))\r
+    {\r
       return UnsupportedExit (Ghcb, Regs, InstructionData);\r
     }\r
+\r
     Regs->Rax = Ghcb->SaveArea.Rax;\r
     Regs->Rdx = Ghcb->SaveArea.Rdx;\r
   }\r
@@ -1269,106 +1286,106 @@ IoioExitInfo (
   ExitInfo = 0;\r
 \r
   switch (*(InstructionData->OpCodes)) {\r
-  //\r
-  // INS opcodes\r
-  //\r
-  case 0x6C:\r
-  case 0x6D:\r
-    ExitInfo |= IOIO_TYPE_INS;\r
-    ExitInfo |= IOIO_SEG_ES;\r
-    ExitInfo |= ((Regs->Rdx & 0xffff) << 16);\r
-    break;\r
+    //\r
+    // INS opcodes\r
+    //\r
+    case 0x6C:\r
+    case 0x6D:\r
+      ExitInfo |= IOIO_TYPE_INS;\r
+      ExitInfo |= IOIO_SEG_ES;\r
+      ExitInfo |= ((Regs->Rdx & 0xffff) << 16);\r
+      break;\r
 \r
-  //\r
-  // OUTS opcodes\r
-  //\r
-  case 0x6E:\r
-  case 0x6F:\r
-    ExitInfo |= IOIO_TYPE_OUTS;\r
-    ExitInfo |= IOIO_SEG_DS;\r
-    ExitInfo |= ((Regs->Rdx & 0xffff) << 16);\r
-    break;\r
+    //\r
+    // OUTS opcodes\r
+    //\r
+    case 0x6E:\r
+    case 0x6F:\r
+      ExitInfo |= IOIO_TYPE_OUTS;\r
+      ExitInfo |= IOIO_SEG_DS;\r
+      ExitInfo |= ((Regs->Rdx & 0xffff) << 16);\r
+      break;\r
 \r
-  //\r
-  // IN immediate opcodes\r
-  //\r
-  case 0xE4:\r
-  case 0xE5:\r
-    InstructionData->ImmediateSize = 1;\r
-    InstructionData->End++;\r
-    ExitInfo |= IOIO_TYPE_IN;\r
-    ExitInfo |= ((*(InstructionData->OpCodes + 1)) << 16);\r
-    break;\r
+    //\r
+    // IN immediate opcodes\r
+    //\r
+    case 0xE4:\r
+    case 0xE5:\r
+      InstructionData->ImmediateSize = 1;\r
+      InstructionData->End++;\r
+      ExitInfo |= IOIO_TYPE_IN;\r
+      ExitInfo |= ((*(InstructionData->OpCodes + 1)) << 16);\r
+      break;\r
 \r
-  //\r
-  // OUT immediate opcodes\r
-  //\r
-  case 0xE6:\r
-  case 0xE7:\r
-    InstructionData->ImmediateSize = 1;\r
-    InstructionData->End++;\r
-    ExitInfo |= IOIO_TYPE_OUT;\r
-    ExitInfo |= ((*(InstructionData->OpCodes + 1)) << 16) | IOIO_TYPE_OUT;\r
-    break;\r
+    //\r
+    // OUT immediate opcodes\r
+    //\r
+    case 0xE6:\r
+    case 0xE7:\r
+      InstructionData->ImmediateSize = 1;\r
+      InstructionData->End++;\r
+      ExitInfo |= IOIO_TYPE_OUT;\r
+      ExitInfo |= ((*(InstructionData->OpCodes + 1)) << 16) | IOIO_TYPE_OUT;\r
+      break;\r
 \r
-  //\r
-  // IN register opcodes\r
-  //\r
-  case 0xEC:\r
-  case 0xED:\r
-    ExitInfo |= IOIO_TYPE_IN;\r
-    ExitInfo |= ((Regs->Rdx & 0xffff) << 16);\r
-    break;\r
+    //\r
+    // IN register opcodes\r
+    //\r
+    case 0xEC:\r
+    case 0xED:\r
+      ExitInfo |= IOIO_TYPE_IN;\r
+      ExitInfo |= ((Regs->Rdx & 0xffff) << 16);\r
+      break;\r
 \r
-  //\r
-  // OUT register opcodes\r
-  //\r
-  case 0xEE:\r
-  case 0xEF:\r
-    ExitInfo |= IOIO_TYPE_OUT;\r
-    ExitInfo |= ((Regs->Rdx & 0xffff) << 16);\r
-    break;\r
+    //\r
+    // OUT register opcodes\r
+    //\r
+    case 0xEE:\r
+    case 0xEF:\r
+      ExitInfo |= IOIO_TYPE_OUT;\r
+      ExitInfo |= ((Regs->Rdx & 0xffff) << 16);\r
+      break;\r
 \r
-  default:\r
-    return 0;\r
+    default:\r
+      return 0;\r
   }\r
 \r
   switch (*(InstructionData->OpCodes)) {\r
-  //\r
-  // Single-byte opcodes\r
-  //\r
-  case 0x6C:\r
-  case 0x6E:\r
-  case 0xE4:\r
-  case 0xE6:\r
-  case 0xEC:\r
-  case 0xEE:\r
-    ExitInfo |= IOIO_DATA_8;\r
-    break;\r
+    //\r
+    // Single-byte opcodes\r
+    //\r
+    case 0x6C:\r
+    case 0x6E:\r
+    case 0xE4:\r
+    case 0xE6:\r
+    case 0xEC:\r
+    case 0xEE:\r
+      ExitInfo |= IOIO_DATA_8;\r
+      break;\r
 \r
-  //\r
-  // Length determined by instruction parsing\r
-  //\r
-  default:\r
-    ExitInfo |= (InstructionData->DataSize == Size16Bits) ? IOIO_DATA_16\r
+    //\r
+    // Length determined by instruction parsing\r
+    //\r
+    default:\r
+      ExitInfo |= (InstructionData->DataSize == Size16Bits) ? IOIO_DATA_16\r
                                                           : IOIO_DATA_32;\r
   }\r
 \r
   switch (InstructionData->AddrSize) {\r
-  case Size16Bits:\r
-    ExitInfo |= IOIO_ADDR_16;\r
-    break;\r
+    case Size16Bits:\r
+      ExitInfo |= IOIO_ADDR_16;\r
+      break;\r
 \r
-  case Size32Bits:\r
-    ExitInfo |= IOIO_ADDR_32;\r
-    break;\r
+    case Size32Bits:\r
+      ExitInfo |= IOIO_ADDR_32;\r
+      break;\r
 \r
-  case Size64Bits:\r
-    ExitInfo |= IOIO_ADDR_64;\r
-    break;\r
+    case Size64Bits:\r
+      ExitInfo |= IOIO_ADDR_64;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
   if (InstructionData->RepMode != 0) {\r
@@ -1415,20 +1432,20 @@ IoioExit (
 \r
     Status = 0;\r
 \r
-    IoBytes = IOIO_DATA_BYTES (ExitInfo1);\r
+    IoBytes   = IOIO_DATA_BYTES (ExitInfo1);\r
     GhcbCount = sizeof (Ghcb->SharedBuffer) / IoBytes;\r
 \r
     OpCount = ((ExitInfo1 & IOIO_REP) != 0) ? Regs->Rcx : 1;\r
     while (OpCount != 0) {\r
-      ExitInfo2 = MIN (OpCount, GhcbCount);\r
+      ExitInfo2    = MIN (OpCount, GhcbCount);\r
       VmgExitBytes = ExitInfo2 * IoBytes;\r
 \r
       if ((ExitInfo1 & IOIO_TYPE_IN) == 0) {\r
-        CopyMem (Ghcb->SharedBuffer, (VOID *) Regs->Rsi, VmgExitBytes);\r
+        CopyMem (Ghcb->SharedBuffer, (VOID *)Regs->Rsi, VmgExitBytes);\r
         Regs->Rsi += VmgExitBytes;\r
       }\r
 \r
-      Ghcb->SaveArea.SwScratch = (UINT64) Ghcb->SharedBuffer;\r
+      Ghcb->SaveArea.SwScratch = (UINT64)Ghcb->SharedBuffer;\r
       VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
       Status = VmgExit (Ghcb, SVM_EXIT_IOIO_PROT, ExitInfo1, ExitInfo2);\r
       if (Status != 0) {\r
@@ -1436,7 +1453,7 @@ IoioExit (
       }\r
 \r
       if ((ExitInfo1 & IOIO_TYPE_IN) != 0) {\r
-        CopyMem ((VOID *) Regs->Rdi, Ghcb->SharedBuffer, VmgExitBytes);\r
+        CopyMem ((VOID *)Regs->Rdi, Ghcb->SharedBuffer, VmgExitBytes);\r
         Regs->Rdi += VmgExitBytes;\r
       }\r
 \r
@@ -1452,6 +1469,7 @@ IoioExit (
     } else {\r
       CopyMem (&Ghcb->SaveArea.Rax, &Regs->Rax, IOIO_DATA_BYTES (ExitInfo1));\r
     }\r
+\r
     VmgSetOffsetValid (Ghcb, GhcbRax);\r
 \r
     Status = VmgExit (Ghcb, SVM_EXIT_IOIO_PROT, ExitInfo1, 0);\r
@@ -1463,6 +1481,7 @@ IoioExit (
       if (!VmgIsOffsetValid (Ghcb, GhcbRax)) {\r
         return UnsupportedExit (Ghcb, Regs, InstructionData);\r
       }\r
+\r
       CopyMem (&Regs->Rax, &Ghcb->SaveArea.Rax, IOIO_DATA_BYTES (ExitInfo1));\r
     }\r
   }\r
@@ -1526,7 +1545,7 @@ CpuidExit (
   if (Regs->Rax == CPUID_EXTENDED_STATE) {\r
     IA32_CR4  Cr4;\r
 \r
-    Cr4.UintN = AsmReadCr4 ();\r
+    Cr4.UintN           = AsmReadCr4 ();\r
     Ghcb->SaveArea.XCr0 = (Cr4.Bits.OSXSAVE == 1) ? AsmXGetBv (0) : 1;\r
     VmgSetOffsetValid (Ghcb, GhcbXCr0);\r
   }\r
@@ -1539,9 +1558,11 @@ CpuidExit (
   if (!VmgIsOffsetValid (Ghcb, GhcbRax) ||\r
       !VmgIsOffsetValid (Ghcb, GhcbRbx) ||\r
       !VmgIsOffsetValid (Ghcb, GhcbRcx) ||\r
-      !VmgIsOffsetValid (Ghcb, GhcbRdx)) {\r
+      !VmgIsOffsetValid (Ghcb, GhcbRdx))\r
+  {\r
     return UnsupportedExit (Ghcb, Regs, InstructionData);\r
   }\r
+\r
   Regs->Rax = Ghcb->SaveArea.Rax;\r
   Regs->Rbx = Ghcb->SaveArea.Rbx;\r
   Regs->Rcx = Ghcb->SaveArea.Rcx;\r
@@ -1583,9 +1604,11 @@ RdpmcExit (
   }\r
 \r
   if (!VmgIsOffsetValid (Ghcb, GhcbRax) ||\r
-      !VmgIsOffsetValid (Ghcb, GhcbRdx)) {\r
+      !VmgIsOffsetValid (Ghcb, GhcbRdx))\r
+  {\r
     return UnsupportedExit (Ghcb, Regs, InstructionData);\r
   }\r
+\r
   Regs->Rax = Ghcb->SaveArea.Rax;\r
   Regs->Rdx = Ghcb->SaveArea.Rdx;\r
 \r
@@ -1622,9 +1645,11 @@ RdtscExit (
   }\r
 \r
   if (!VmgIsOffsetValid (Ghcb, GhcbRax) ||\r
-      !VmgIsOffsetValid (Ghcb, GhcbRdx)) {\r
+      !VmgIsOffsetValid (Ghcb, GhcbRdx))\r
+  {\r
     return UnsupportedExit (Ghcb, Regs, InstructionData);\r
   }\r
+\r
   Regs->Rax = Ghcb->SaveArea.Rax;\r
   Regs->Rdx = Ghcb->SaveArea.Rdx;\r
 \r
@@ -1658,8 +1683,8 @@ Dr7WriteExit (
   UINT64                         *Register;\r
   UINT64                         Status;\r
 \r
-  Ext = &InstructionData->Ext;\r
-  SevEsData = (SEV_ES_PER_CPU_DATA *) (Ghcb + 1);\r
+  Ext       = &InstructionData->Ext;\r
+  SevEsData = (SEV_ES_PER_CPU_DATA *)(Ghcb + 1);\r
 \r
   DecodeModRm (Regs, InstructionData);\r
 \r
@@ -1679,7 +1704,7 @@ Dr7WriteExit (
     return Status;\r
   }\r
 \r
-  SevEsData->Dr7 = *Register;\r
+  SevEsData->Dr7       = *Register;\r
   SevEsData->Dr7Cached = 1;\r
 \r
   return 0;\r
@@ -1710,8 +1735,8 @@ Dr7ReadExit (
   SEV_ES_PER_CPU_DATA            *SevEsData;\r
   UINT64                         *Register;\r
 \r
-  Ext = &InstructionData->Ext;\r
-  SevEsData = (SEV_ES_PER_CPU_DATA *) (Ghcb + 1);\r
+  Ext       = &InstructionData->Ext;\r
+  SevEsData = (SEV_ES_PER_CPU_DATA *)(Ghcb + 1);\r
 \r
   DecodeModRm (Regs, InstructionData);\r
 \r
@@ -1754,12 +1779,12 @@ InternalVmgExitHandleVc (
   IN OUT EFI_SYSTEM_CONTEXT  SystemContext\r
   )\r
 {\r
-  EFI_SYSTEM_CONTEXT_X64    *Regs;\r
-  NAE_EXIT                  NaeExit;\r
-  SEV_ES_INSTRUCTION_DATA   InstructionData;\r
-  UINT64                    ExitCode, Status;\r
-  EFI_STATUS                VcRet;\r
-  BOOLEAN                   InterruptState;\r
+  EFI_SYSTEM_CONTEXT_X64   *Regs;\r
+  NAE_EXIT                 NaeExit;\r
+  SEV_ES_INSTRUCTION_DATA  InstructionData;\r
+  UINT64                   ExitCode, Status;\r
+  EFI_STATUS               VcRet;\r
+  BOOLEAN                  InterruptState;\r
 \r
   VcRet = EFI_SUCCESS;\r
 \r
@@ -1769,64 +1794,64 @@ InternalVmgExitHandleVc (
 \r
   ExitCode = Regs->ExceptionData;\r
   switch (ExitCode) {\r
-  case SVM_EXIT_DR7_READ:\r
-    NaeExit = Dr7ReadExit;\r
-    break;\r
+    case SVM_EXIT_DR7_READ:\r
+      NaeExit = Dr7ReadExit;\r
+      break;\r
 \r
-  case SVM_EXIT_DR7_WRITE:\r
-    NaeExit = Dr7WriteExit;\r
-    break;\r
+    case SVM_EXIT_DR7_WRITE:\r
+      NaeExit = Dr7WriteExit;\r
+      break;\r
 \r
-  case SVM_EXIT_RDTSC:\r
-    NaeExit = RdtscExit;\r
-    break;\r
+    case SVM_EXIT_RDTSC:\r
+      NaeExit = RdtscExit;\r
+      break;\r
 \r
-  case SVM_EXIT_RDPMC:\r
-    NaeExit = RdpmcExit;\r
-    break;\r
+    case SVM_EXIT_RDPMC:\r
+      NaeExit = RdpmcExit;\r
+      break;\r
 \r
-  case SVM_EXIT_CPUID:\r
-    NaeExit = CpuidExit;\r
-    break;\r
+    case SVM_EXIT_CPUID:\r
+      NaeExit = CpuidExit;\r
+      break;\r
 \r
-  case SVM_EXIT_INVD:\r
-    NaeExit = InvdExit;\r
-    break;\r
+    case SVM_EXIT_INVD:\r
+      NaeExit = InvdExit;\r
+      break;\r
 \r
-  case SVM_EXIT_IOIO_PROT:\r
-    NaeExit = IoioExit;\r
-    break;\r
+    case SVM_EXIT_IOIO_PROT:\r
+      NaeExit = IoioExit;\r
+      break;\r
 \r
-  case SVM_EXIT_MSR:\r
-    NaeExit = MsrExit;\r
-    break;\r
+    case SVM_EXIT_MSR:\r
+      NaeExit = MsrExit;\r
+      break;\r
 \r
-  case SVM_EXIT_VMMCALL:\r
-    NaeExit = VmmCallExit;\r
-    break;\r
+    case SVM_EXIT_VMMCALL:\r
+      NaeExit = VmmCallExit;\r
+      break;\r
 \r
-  case SVM_EXIT_RDTSCP:\r
-    NaeExit = RdtscpExit;\r
-    break;\r
+    case SVM_EXIT_RDTSCP:\r
+      NaeExit = RdtscpExit;\r
+      break;\r
 \r
-  case SVM_EXIT_WBINVD:\r
-    NaeExit = WbinvdExit;\r
-    break;\r
+    case SVM_EXIT_WBINVD:\r
+      NaeExit = WbinvdExit;\r
+      break;\r
 \r
-  case SVM_EXIT_MONITOR:\r
-    NaeExit = MonitorExit;\r
-    break;\r
+    case SVM_EXIT_MONITOR:\r
+      NaeExit = MonitorExit;\r
+      break;\r
 \r
-  case SVM_EXIT_MWAIT:\r
-    NaeExit = MwaitExit;\r
-    break;\r
+    case SVM_EXIT_MWAIT:\r
+      NaeExit = MwaitExit;\r
+      break;\r
 \r
-  case SVM_EXIT_NPF:\r
-    NaeExit = MmioExit;\r
-    break;\r
+    case SVM_EXIT_NPF:\r
+      NaeExit = MmioExit;\r
+      break;\r
 \r
-  default:\r
-    NaeExit = UnsupportedExit;\r
+    default:\r
+      NaeExit = UnsupportedExit;\r
   }\r
 \r
   InitInstructionData (&InstructionData, Ghcb, Regs);\r
index 9f30df29736d53d7810b829ad42306e0ac8019fa..248a03e8db0b5c3a2029357635d1a6d9cb3b0dee 100644 (file)
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  EFI_DEVICE_PATH_PROTOCOL  FilePathHeader;\r
-  CHAR16                    FilePath[ARRAY_SIZE (L"kernel")];\r
+  EFI_DEVICE_PATH_PROTOCOL    FilePathHeader;\r
+  CHAR16                      FilePath[ARRAY_SIZE (L"kernel")];\r
 } KERNEL_FILE_DEVPATH;\r
 \r
 typedef struct {\r
-  VENDOR_DEVICE_PATH        VenMediaNode;\r
-  KERNEL_FILE_DEVPATH       FileNode;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndNode;\r
+  VENDOR_DEVICE_PATH          VenMediaNode;\r
+  KERNEL_FILE_DEVPATH         FileNode;\r
+  EFI_DEVICE_PATH_PROTOCOL    EndNode;\r
 } KERNEL_VENMEDIA_FILE_DEVPATH;\r
 #pragma pack ()\r
 \r
-STATIC CONST KERNEL_VENMEDIA_FILE_DEVPATH mKernelDevicePath = {\r
+STATIC CONST KERNEL_VENMEDIA_FILE_DEVPATH  mKernelDevicePath = {\r
   {\r
     {\r
       MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP,\r
-      { sizeof (VENDOR_DEVICE_PATH) }\r
+      { sizeof (VENDOR_DEVICE_PATH)       }\r
     },\r
     QEMU_KERNEL_LOADER_FS_MEDIA_GUID\r
-  }, {\r
+  },  {\r
     {\r
       MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP,\r
-      { sizeof (KERNEL_FILE_DEVPATH) }\r
+      { sizeof (KERNEL_FILE_DEVPATH)      }\r
     },\r
     L"kernel",\r
-  }, {\r
+  },  {\r
     END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     { sizeof (EFI_DEVICE_PATH_PROTOCOL) }\r
   }\r
@@ -60,37 +60,48 @@ STATIC CONST KERNEL_VENMEDIA_FILE_DEVPATH mKernelDevicePath = {
 STATIC\r
 VOID\r
 FreeLegacyImage (\r
-  IN  OVMF_LOADED_X86_LINUX_KERNEL *LoadedImage\r
+  IN  OVMF_LOADED_X86_LINUX_KERNEL  *LoadedImage\r
   )\r
 {\r
   if (LoadedImage->SetupBuf != NULL) {\r
-    FreePages (LoadedImage->SetupBuf,\r
-      EFI_SIZE_TO_PAGES (LoadedImage->SetupSize));\r
+    FreePages (\r
+      LoadedImage->SetupBuf,\r
+      EFI_SIZE_TO_PAGES (LoadedImage->SetupSize)\r
+      );\r
   }\r
+\r
   if (LoadedImage->KernelBuf != NULL) {\r
-    FreePages (LoadedImage->KernelBuf,\r
-      EFI_SIZE_TO_PAGES (LoadedImage->KernelInitialSize));\r
+    FreePages (\r
+      LoadedImage->KernelBuf,\r
+      EFI_SIZE_TO_PAGES (LoadedImage->KernelInitialSize)\r
+      );\r
   }\r
+\r
   if (LoadedImage->CommandLine != NULL) {\r
-    FreePages (LoadedImage->CommandLine,\r
-      EFI_SIZE_TO_PAGES (LoadedImage->CommandLineSize));\r
+    FreePages (\r
+      LoadedImage->CommandLine,\r
+      EFI_SIZE_TO_PAGES (LoadedImage->CommandLineSize)\r
+      );\r
   }\r
+\r
   if (LoadedImage->InitrdData != NULL) {\r
-    FreePages (LoadedImage->InitrdData,\r
-      EFI_SIZE_TO_PAGES (LoadedImage->InitrdSize));\r
+    FreePages (\r
+      LoadedImage->InitrdData,\r
+      EFI_SIZE_TO_PAGES (LoadedImage->InitrdSize)\r
+      );\r
   }\r
 }\r
 \r
 STATIC\r
 EFI_STATUS\r
 QemuLoadLegacyImage (\r
-  OUT EFI_HANDLE                  *ImageHandle\r
+  OUT EFI_HANDLE  *ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  UINTN                           KernelSize;\r
-  UINTN                           SetupSize;\r
-  OVMF_LOADED_X86_LINUX_KERNEL    *LoadedImage;\r
+  EFI_STATUS                    Status;\r
+  UINTN                         KernelSize;\r
+  UINTN                         SetupSize;\r
+  OVMF_LOADED_X86_LINUX_KERNEL  *LoadedImage;\r
 \r
   QemuFwCfgSelectItem (QemuFwCfgItemKernelSize);\r
   KernelSize = (UINTN)QemuFwCfgRead32 ();\r
@@ -98,7 +109,7 @@ QemuLoadLegacyImage (
   QemuFwCfgSelectItem (QemuFwCfgItemKernelSetupSize);\r
   SetupSize = (UINTN)QemuFwCfgRead32 ();\r
 \r
-  if (KernelSize == 0 || SetupSize == 0) {\r
+  if ((KernelSize == 0) || (SetupSize == 0)) {\r
     DEBUG ((DEBUG_INFO, "qemu -kernel was not used.\n"));\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -109,8 +120,9 @@ QemuLoadLegacyImage (
   }\r
 \r
   LoadedImage->SetupSize = SetupSize;\r
-  LoadedImage->SetupBuf = LoadLinuxAllocateKernelSetupPages (\r
-                            EFI_SIZE_TO_PAGES (LoadedImage->SetupSize));\r
+  LoadedImage->SetupBuf  = LoadLinuxAllocateKernelSetupPages (\r
+                             EFI_SIZE_TO_PAGES (LoadedImage->SetupSize)\r
+                             );\r
   if (LoadedImage->SetupBuf == NULL) {\r
     DEBUG ((DEBUG_ERROR, "Unable to allocate memory for kernel setup!\n"));\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -123,8 +135,10 @@ QemuLoadLegacyImage (
   QemuFwCfgReadBytes (LoadedImage->SetupSize, LoadedImage->SetupBuf);\r
   DEBUG ((DEBUG_INFO, " [done]\n"));\r
 \r
-  Status = LoadLinuxCheckKernelSetup (LoadedImage->SetupBuf,\r
-             LoadedImage->SetupSize);\r
+  Status = LoadLinuxCheckKernelSetup (\r
+             LoadedImage->SetupBuf,\r
+             LoadedImage->SetupSize\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeImage;\r
   }\r
@@ -135,7 +149,9 @@ QemuLoadLegacyImage (
   }\r
 \r
   LoadedImage->KernelInitialSize = LoadLinuxGetKernelSize (\r
-                                     LoadedImage->SetupBuf, KernelSize);\r
+                                     LoadedImage->SetupBuf,\r
+                                     KernelSize\r
+                                     );\r
   if (LoadedImage->KernelInitialSize == 0) {\r
     Status = EFI_UNSUPPORTED;\r
     goto FreeImage;\r
@@ -163,18 +179,23 @@ QemuLoadLegacyImage (
   if (LoadedImage->CommandLineSize > 0) {\r
     LoadedImage->CommandLine = LoadLinuxAllocateCommandLinePages (\r
                                  EFI_SIZE_TO_PAGES (\r
-                                   LoadedImage->CommandLineSize));\r
+                                   LoadedImage->CommandLineSize\r
+                                   )\r
+                                 );\r
     if (LoadedImage->CommandLine == NULL) {\r
       DEBUG ((DEBUG_ERROR, "Unable to allocate memory for kernel command line!\n"));\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto FreeImage;\r
     }\r
+\r
     QemuFwCfgSelectItem (QemuFwCfgItemCommandLineData);\r
     QemuFwCfgReadBytes (LoadedImage->CommandLineSize, LoadedImage->CommandLine);\r
   }\r
 \r
-  Status = LoadLinuxSetCommandLine (LoadedImage->SetupBuf,\r
-             LoadedImage->CommandLine);\r
+  Status = LoadLinuxSetCommandLine (\r
+             LoadedImage->SetupBuf,\r
+             LoadedImage->CommandLine\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeImage;\r
   }\r
@@ -185,33 +206,45 @@ QemuLoadLegacyImage (
   if (LoadedImage->InitrdSize > 0) {\r
     LoadedImage->InitrdData = LoadLinuxAllocateInitrdPages (\r
                                 LoadedImage->SetupBuf,\r
-                                EFI_SIZE_TO_PAGES (LoadedImage->InitrdSize));\r
+                                EFI_SIZE_TO_PAGES (LoadedImage->InitrdSize)\r
+                                );\r
     if (LoadedImage->InitrdData == NULL) {\r
       DEBUG ((DEBUG_ERROR, "Unable to allocate memory for initrd!\n"));\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto FreeImage;\r
     }\r
-    DEBUG ((DEBUG_INFO, "Initrd size: 0x%x\n",\r
-      (UINT32)LoadedImage->InitrdSize));\r
+\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "Initrd size: 0x%x\n",\r
+      (UINT32)LoadedImage->InitrdSize\r
+      ));\r
     DEBUG ((DEBUG_INFO, "Reading initrd image ..."));\r
     QemuFwCfgSelectItem (QemuFwCfgItemInitrdData);\r
     QemuFwCfgReadBytes (LoadedImage->InitrdSize, LoadedImage->InitrdData);\r
     DEBUG ((DEBUG_INFO, " [done]\n"));\r
   }\r
 \r
-  Status = LoadLinuxSetInitrd (LoadedImage->SetupBuf, LoadedImage->InitrdData,\r
-             LoadedImage->InitrdSize);\r
+  Status = LoadLinuxSetInitrd (\r
+             LoadedImage->SetupBuf,\r
+             LoadedImage->InitrdData,\r
+             LoadedImage->InitrdSize\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeImage;\r
   }\r
 \r
   *ImageHandle = NULL;\r
-  Status = gBS->InstallProtocolInterface (ImageHandle,\r
-                  &gOvmfLoadedX86LinuxKernelProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  LoadedImage);\r
+  Status       = gBS->InstallProtocolInterface (\r
+                        ImageHandle,\r
+                        &gOvmfLoadedX86LinuxKernelProtocolGuid,\r
+                        EFI_NATIVE_INTERFACE,\r
+                        LoadedImage\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeImage;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 \r
 FreeImage:\r
@@ -224,7 +257,7 @@ FreeImageDesc:
 STATIC\r
 EFI_STATUS\r
 QemuStartLegacyImage (\r
-  IN  EFI_HANDLE                ImageHandle\r
+  IN  EFI_HANDLE  ImageHandle\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -248,7 +281,7 @@ QemuStartLegacyImage (
 STATIC\r
 EFI_STATUS\r
 QemuUnloadLegacyImage (\r
-  IN  EFI_HANDLE          ImageHandle\r
+  IN  EFI_HANDLE  ImageHandle\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -266,8 +299,11 @@ QemuUnloadLegacyImage (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Status = gBS->UninstallProtocolInterface (ImageHandle,\r
-                  &gOvmfLoadedX86LinuxKernelProtocolGuid, LoadedImage);\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  ImageHandle,\r
+                  &gOvmfLoadedX86LinuxKernelProtocolGuid,\r
+                  LoadedImage\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   FreeLegacyImage (LoadedImage);\r
@@ -294,15 +330,15 @@ QemuUnloadLegacyImage (
 EFI_STATUS\r
 EFIAPI\r
 QemuLoadKernelImage (\r
-  OUT EFI_HANDLE            *ImageHandle\r
+  OUT EFI_HANDLE  *ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  EFI_HANDLE                KernelImageHandle;\r
-  EFI_LOADED_IMAGE_PROTOCOL *KernelLoadedImage;\r
-  UINTN                     CommandLineSize;\r
-  CHAR8                     *CommandLine;\r
-  UINTN                     InitrdSize;\r
+  EFI_STATUS                 Status;\r
+  EFI_HANDLE                 KernelImageHandle;\r
+  EFI_LOADED_IMAGE_PROTOCOL  *KernelLoadedImage;\r
+  UINTN                      CommandLineSize;\r
+  CHAR8                      *CommandLine;\r
+  UINTN                      InitrdSize;\r
 \r
   //\r
   // Redundant assignment to work around GCC48/GCC49 limitations.\r
@@ -321,26 +357,26 @@ QemuLoadKernelImage (
                   &KernelImageHandle\r
                   );\r
   switch (Status) {\r
-  case EFI_SUCCESS:\r
-    break;\r
+    case EFI_SUCCESS:\r
+      break;\r
 \r
-  case EFI_NOT_FOUND:\r
-    //\r
-    // The image does not exist - no -kernel image was supplied via the\r
-    // command line so no point in invoking the legacy fallback\r
-    //\r
-    return EFI_NOT_FOUND;\r
+    case EFI_NOT_FOUND:\r
+      //\r
+      // The image does not exist - no -kernel image was supplied via the\r
+      // command line so no point in invoking the legacy fallback\r
+      //\r
+      return EFI_NOT_FOUND;\r
 \r
-  case EFI_SECURITY_VIOLATION:\r
-    //\r
-    // Since the image has been loaded, we need to unload it before proceeding\r
-    // to the EFI_ACCESS_DENIED case below.\r
-    //\r
-    gBS->UnloadImage (KernelImageHandle);\r
+    case EFI_SECURITY_VIOLATION:\r
+      //\r
+      // Since the image has been loaded, we need to unload it before proceeding\r
+      // to the EFI_ACCESS_DENIED case below.\r
+      //\r
+      gBS->UnloadImage (KernelImageHandle);\r
     //\r
     // Fall through\r
     //\r
-  case EFI_ACCESS_DENIED:\r
+    case EFI_ACCESS_DENIED:\r
     //\r
     // We are running with UEFI secure boot enabled, and the image failed to\r
     // authenticate. For compatibility reasons, we fall back to the legacy\r
@@ -348,23 +384,28 @@ QemuLoadKernelImage (
     //\r
     // Fall through\r
     //\r
-  case EFI_UNSUPPORTED:\r
-    //\r
-    // The image is not natively supported or cross-type supported. Let's try\r
-    // loading it using the loader that parses the bzImage metadata directly.\r
-    //\r
-    Status = QemuLoadLegacyImage (&KernelImageHandle);\r
-    if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: QemuLoadLegacyImage(): %r\n", __FUNCTION__,\r
-        Status));\r
+    case EFI_UNSUPPORTED:\r
+      //\r
+      // The image is not natively supported or cross-type supported. Let's try\r
+      // loading it using the loader that parses the bzImage metadata directly.\r
+      //\r
+      Status = QemuLoadLegacyImage (&KernelImageHandle);\r
+      if (EFI_ERROR (Status)) {\r
+        DEBUG ((\r
+          DEBUG_ERROR,\r
+          "%a: QemuLoadLegacyImage(): %r\n",\r
+          __FUNCTION__,\r
+          Status\r
+          ));\r
+        return Status;\r
+      }\r
+\r
+      *ImageHandle = KernelImageHandle;\r
+      return EFI_SUCCESS;\r
+\r
+    default:\r
+      DEBUG ((DEBUG_ERROR, "%a: LoadImage(): %r\n", __FUNCTION__, Status));\r
       return Status;\r
-    }\r
-    *ImageHandle = KernelImageHandle;\r
-    return EFI_SUCCESS;\r
-\r
-  default:\r
-    DEBUG ((DEBUG_ERROR, "%a: LoadImage(): %r\n", __FUNCTION__, Status));\r
-    return Status;\r
   }\r
 \r
   //\r
@@ -399,8 +440,11 @@ QemuLoadKernelImage (
     // Verify NUL-termination of the command line.\r
     //\r
     if (CommandLine[CommandLineSize - 1] != '\0') {\r
-      DEBUG ((DEBUG_ERROR, "%a: kernel command line is not NUL-terminated\n",\r
-        __FUNCTION__));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: kernel command line is not NUL-terminated\n",\r
+        __FUNCTION__\r
+        ));\r
       Status = EFI_PROTOCOL_ERROR;\r
       goto FreeCommandLine;\r
     }\r
@@ -408,7 +452,7 @@ QemuLoadKernelImage (
     //\r
     // Drop the terminating NUL, convert to UTF-16.\r
     //\r
-    KernelLoadedImage->LoadOptionsSize = (UINT32) ((CommandLineSize - 1) * 2);\r
+    KernelLoadedImage->LoadOptionsSize = (UINT32)((CommandLineSize - 1) * 2);\r
   }\r
 \r
   QemuFwCfgSelectItem (QemuFwCfgItemInitrdSize);\r
@@ -430,10 +474,11 @@ QemuLoadKernelImage (
     KernelLoadedImage->LoadOptionsSize += 2;\r
 \r
     KernelLoadedImage->LoadOptions = AllocatePool (\r
-                                       KernelLoadedImage->LoadOptionsSize);\r
+                                       KernelLoadedImage->LoadOptionsSize\r
+                                       );\r
     if (KernelLoadedImage->LoadOptions == NULL) {\r
       KernelLoadedImage->LoadOptionsSize = 0;\r
-      Status = EFI_OUT_OF_RESOURCES;\r
+      Status                             = EFI_OUT_OF_RESOURCES;\r
       goto FreeCommandLine;\r
     }\r
 \r
@@ -444,17 +489,22 @@ QemuLoadKernelImage (
       (CommandLineSize == 0) ?  "" : CommandLine,\r
       (InitrdSize == 0)      ?  "" : " initrd=initrd"\r
       );\r
-    DEBUG ((DEBUG_INFO, "%a: command line: \"%s\"\n", __FUNCTION__,\r
-      (CHAR16 *)KernelLoadedImage->LoadOptions));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: command line: \"%s\"\n",\r
+      __FUNCTION__,\r
+      (CHAR16 *)KernelLoadedImage->LoadOptions\r
+      ));\r
   }\r
 \r
   *ImageHandle = KernelImageHandle;\r
-  Status = EFI_SUCCESS;\r
+  Status       = EFI_SUCCESS;\r
 \r
 FreeCommandLine:\r
   if (CommandLineSize > 0) {\r
     FreePool (CommandLine);\r
   }\r
+\r
 UnloadImage:\r
   if (EFI_ERROR (Status)) {\r
     gBS->UnloadImage (KernelImageHandle);\r
@@ -481,7 +531,7 @@ UnloadImage:
 EFI_STATUS\r
 EFIAPI\r
 QemuStartKernelImage (\r
-  IN  OUT EFI_HANDLE            *ImageHandle\r
+  IN  OUT EFI_HANDLE  *ImageHandle\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -504,9 +554,9 @@ QemuStartKernelImage (
                   NULL,              // ExitDataSize\r
                   NULL               // ExitData\r
                   );\r
-#ifdef MDE_CPU_IA32\r
+ #ifdef MDE_CPU_IA32\r
   if (Status == EFI_UNSUPPORTED) {\r
-    EFI_HANDLE KernelImageHandle;\r
+    EFI_HANDLE  KernelImageHandle;\r
 \r
     //\r
     // On IA32, EFI_UNSUPPORTED means that the image's machine type is X64 while\r
@@ -524,6 +574,7 @@ QemuStartKernelImage (
       //\r
       return Status;\r
     }\r
+\r
     //\r
     // Swap in the legacy-loaded image.\r
     //\r
@@ -531,7 +582,8 @@ QemuStartKernelImage (
     *ImageHandle = KernelImageHandle;\r
     return QemuStartLegacyImage (KernelImageHandle);\r
   }\r
-#endif\r
+\r
+ #endif\r
   return Status;\r
 }\r
 \r
@@ -551,11 +603,11 @@ QemuStartKernelImage (
 EFI_STATUS\r
 EFIAPI\r
 QemuUnloadKernelImage (\r
-  IN  EFI_HANDLE          ImageHandle\r
+  IN  EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_LOADED_IMAGE_PROTOCOL   *KernelLoadedImage;\r
-  EFI_STATUS                  Status;\r
+  EFI_LOADED_IMAGE_PROTOCOL  *KernelLoadedImage;\r
+  EFI_STATUS                 Status;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ImageHandle,\r
@@ -588,6 +640,7 @@ QemuUnloadKernelImage (
     FreePool (KernelLoadedImage->LoadOptions);\r
     KernelLoadedImage->LoadOptions = NULL;\r
   }\r
+\r
   KernelLoadedImage->LoadOptionsSize = 0;\r
 \r
   return gBS->UnloadImage (ImageHandle);\r
index 895dfc02f90a4b64802b29e72be5fe7405518525..b29ed3e58e7ae54ee3ad37ba273760360694a83f 100644 (file)
@@ -36,8 +36,8 @@
 // in general, it is actually fine for the Xen domU (guest) environment that\r
 // this module is intended for, as UEFI always executes from DRAM in that case.\r
 //\r
-STATIC evtchn_send_t              mXenConsoleEventChain;\r
-STATIC struct xencons_interface   *mXenConsoleInterface;\r
+STATIC evtchn_send_t             mXenConsoleEventChain;\r
+STATIC struct xencons_interface  *mXenConsoleInterface;\r
 \r
 /**\r
   Initialize the serial device hardware.\r
@@ -56,19 +56,20 @@ SerialPortInitialize (
   VOID\r
   )\r
 {\r
-  if (! XenHypercallIsAvailable ()) {\r
+  if (!XenHypercallIsAvailable ()) {\r
     return RETURN_DEVICE_ERROR;\r
   }\r
 \r
   if (!mXenConsoleInterface) {\r
     mXenConsoleEventChain.port = (UINT32)XenHypercallHvmGetParam (HVM_PARAM_CONSOLE_EVTCHN);\r
-    mXenConsoleInterface = (struct xencons_interface *)(UINTN)\r
-      (XenHypercallHvmGetParam (HVM_PARAM_CONSOLE_PFN) << EFI_PAGE_SHIFT);\r
+    mXenConsoleInterface       = (struct xencons_interface *)(UINTN)\r
+                                 (XenHypercallHvmGetParam (HVM_PARAM_CONSOLE_PFN) << EFI_PAGE_SHIFT);\r
 \r
     //\r
     // No point in ASSERT'ing here as we won't be seeing the output\r
     //\r
   }\r
+\r
   return RETURN_SUCCESS;\r
 }\r
 \r
@@ -92,8 +93,8 @@ SerialPortInitialize (
 UINTN\r
 EFIAPI\r
 SerialPortWrite (\r
-  IN UINT8     *Buffer,\r
-  IN UINTN     NumberOfBytes\r
+  IN UINT8  *Buffer,\r
+  IN UINTN  NumberOfBytes\r
   )\r
 {\r
   XENCONS_RING_IDX  Consumer, Producer;\r
@@ -116,15 +117,15 @@ SerialPortWrite (
 \r
     MemoryFence ();\r
 \r
-    while (Sent < NumberOfBytes && ((Producer - Consumer) < sizeof (mXenConsoleInterface->out)))\r
-      mXenConsoleInterface->out[MASK_XENCONS_IDX(Producer++, mXenConsoleInterface->out)] = Buffer[Sent++];\r
+    while (Sent < NumberOfBytes && ((Producer - Consumer) < sizeof (mXenConsoleInterface->out))) {\r
+      mXenConsoleInterface->out[MASK_XENCONS_IDX (Producer++, mXenConsoleInterface->out)] = Buffer[Sent++];\r
+    }\r
 \r
     MemoryFence ();\r
 \r
     mXenConsoleInterface->out_prod = Producer;\r
 \r
     XenHypercallEventChannelOp (EVTCHNOP_send, &mXenConsoleEventChain);\r
-\r
   } while (Sent < NumberOfBytes);\r
 \r
   return Sent;\r
@@ -148,9 +149,9 @@ SerialPortWrite (
 UINTN\r
 EFIAPI\r
 SerialPortRead (\r
-  OUT UINT8     *Buffer,\r
-  IN  UINTN     NumberOfBytes\r
-)\r
+  OUT UINT8  *Buffer,\r
+  IN  UINTN  NumberOfBytes\r
+  )\r
 {\r
   XENCONS_RING_IDX  Consumer, Producer;\r
   UINTN             Received;\r
@@ -171,8 +172,9 @@ SerialPortRead (
   MemoryFence ();\r
 \r
   Received = 0;\r
-  while (Received < NumberOfBytes && Consumer < Producer)\r
-     Buffer[Received++] = mXenConsoleInterface->in[MASK_XENCONS_IDX(Consumer++, mXenConsoleInterface->in)];\r
+  while (Received < NumberOfBytes && Consumer < Producer) {\r
+    Buffer[Received++] = mXenConsoleInterface->in[MASK_XENCONS_IDX (Consumer++, mXenConsoleInterface->in)];\r
+  }\r
 \r
   MemoryFence ();\r
 \r
@@ -197,7 +199,7 @@ SerialPortPoll (
   )\r
 {\r
   return mXenConsoleInterface &&\r
-    mXenConsoleInterface->in_cons != mXenConsoleInterface->in_prod;\r
+         mXenConsoleInterface->in_cons != mXenConsoleInterface->in_prod;\r
 }\r
 \r
 /**\r
@@ -213,7 +215,7 @@ SerialPortPoll (
 RETURN_STATUS\r
 EFIAPI\r
 SerialPortSetControl (\r
-  IN UINT32 Control\r
+  IN UINT32  Control\r
   )\r
 {\r
   return RETURN_UNSUPPORTED;\r
@@ -232,7 +234,7 @@ SerialPortSetControl (
 RETURN_STATUS\r
 EFIAPI\r
 SerialPortGetControl (\r
-  OUT UINT32 *Control\r
+  OUT UINT32  *Control\r
   )\r
 {\r
   if (!mXenConsoleInterface) {\r
@@ -243,6 +245,7 @@ SerialPortGetControl (
   if (!SerialPortPoll ()) {\r
     *Control = EFI_SERIAL_INPUT_BUFFER_EMPTY;\r
   }\r
+\r
   return RETURN_SUCCESS;\r
 }\r
 \r
@@ -282,14 +285,13 @@ SerialPortGetControl (
 RETURN_STATUS\r
 EFIAPI\r
 SerialPortSetAttributes (\r
-  IN OUT UINT64             *BaudRate,\r
-  IN OUT UINT32             *ReceiveFifoDepth,\r
-  IN OUT UINT32             *Timeout,\r
-  IN OUT EFI_PARITY_TYPE    *Parity,\r
-  IN OUT UINT8              *DataBits,\r
-  IN OUT EFI_STOP_BITS_TYPE *StopBits\r
+  IN OUT UINT64              *BaudRate,\r
+  IN OUT UINT32              *ReceiveFifoDepth,\r
+  IN OUT UINT32              *Timeout,\r
+  IN OUT EFI_PARITY_TYPE     *Parity,\r
+  IN OUT UINT8               *DataBits,\r
+  IN OUT EFI_STOP_BITS_TYPE  *StopBits\r
   )\r
 {\r
   return RETURN_UNSUPPORTED;\r
 }\r
-\r
index f779e46470b86ea3d7c929e4d484963950254eb3..dcc657525028a313961797986374abf74f2cd3c4 100644 (file)
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/DebugLib.h>\r
 #include <Guid/XenInfo.h>\r
 \r
-STATIC VOID    *HyperPage;\r
+STATIC VOID  *HyperPage;\r
 \r
 /**\r
   Check if the Xen Hypercall library is able to make calls to the Xen\r
@@ -38,30 +38,30 @@ XenHypercallIsAvailable (
 INTN\r
 EFIAPI\r
 __XenHypercall2 (\r
-  IN     VOID *HypercallAddr,\r
-  IN OUT INTN Arg1,\r
-  IN OUT INTN Arg2\r
+  IN     VOID  *HypercallAddr,\r
+  IN OUT INTN  Arg1,\r
+  IN OUT INTN  Arg2\r
   );\r
 \r
 /**\r
   Library constructor: retrieves the Hyperpage address\r
   from the gEfiXenInfoGuid HOB\r
 **/\r
-\r
 RETURN_STATUS\r
 EFIAPI\r
 XenHypercallLibInit (\r
   VOID\r
   )\r
 {\r
-  EFI_HOB_GUID_TYPE   *GuidHob;\r
-  EFI_XEN_INFO        *XenInfo;\r
+  EFI_HOB_GUID_TYPE  *GuidHob;\r
+  EFI_XEN_INFO       *XenInfo;\r
 \r
   GuidHob = GetFirstGuidHob (&gEfiXenInfoGuid);\r
   if (GuidHob == NULL) {\r
     return RETURN_NOT_FOUND;\r
   }\r
-  XenInfo = (EFI_XEN_INFO *) GET_GUID_HOB_DATA (GuidHob);\r
+\r
+  XenInfo   = (EFI_XEN_INFO *)GET_GUID_HOB_DATA (GuidHob);\r
   HyperPage = XenInfo->HyperPages;\r
   return RETURN_SUCCESS;\r
 }\r
@@ -86,5 +86,5 @@ XenHypercall2 (
 {\r
   ASSERT (HyperPage != NULL);\r
 \r
-  return __XenHypercall2 ((UINT8*)HyperPage + HypercallID * 32, Arg1, Arg2);\r
+  return __XenHypercall2 ((UINT8 *)HyperPage + HypercallID * 32, Arg1, Arg2);\r
 }\r
index 265aa766d0e823486e666a01605b1d50b0baaa3c..65b14a11f40259443e0a39c93698839a69be2932 100644 (file)
@@ -34,43 +34,56 @@ XenHypercallLibConstruct (
 UINT64\r
 EFIAPI\r
 XenHypercallHvmGetParam (\r
-  IN UINT32        Index\r
+  IN UINT32  Index\r
   )\r
 {\r
-  xen_hvm_param_t     Parameter;\r
-  INTN                Error;\r
+  xen_hvm_param_t  Parameter;\r
+  INTN             Error;\r
 \r
   Parameter.domid = DOMID_SELF;\r
   Parameter.index = Index;\r
-  Error = XenHypercall2 (__HYPERVISOR_hvm_op,\r
-                         HVMOP_get_param, (INTN) &Parameter);\r
+  Error           = XenHypercall2 (\r
+                      __HYPERVISOR_hvm_op,\r
+                      HVMOP_get_param,\r
+                      (INTN)&Parameter\r
+                      );\r
   if (Error != 0) {\r
-    DEBUG ((DEBUG_ERROR,\r
-            "XenHypercall: Error %Ld trying to get HVM parameter %d\n",\r
-            (INT64)Error, Index));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenHypercall: Error %Ld trying to get HVM parameter %d\n",\r
+      (INT64)Error,\r
+      Index\r
+      ));\r
     return 0;\r
   }\r
+\r
   return Parameter.value;\r
 }\r
 \r
 INTN\r
 EFIAPI\r
 XenHypercallMemoryOp (\r
-  IN     UINTN Operation,\r
-  IN OUT VOID *Arguments\r
+  IN     UINTN  Operation,\r
+  IN OUT VOID   *Arguments\r
   )\r
 {\r
-  return XenHypercall2 (__HYPERVISOR_memory_op,\r
-                        Operation, (INTN) Arguments);\r
+  return XenHypercall2 (\r
+           __HYPERVISOR_memory_op,\r
+           Operation,\r
+           (INTN)Arguments\r
+           );\r
 }\r
 \r
 INTN\r
 EFIAPI\r
 XenHypercallEventChannelOp (\r
-  IN     INTN Operation,\r
-  IN OUT VOID *Arguments\r
+  IN     INTN  Operation,\r
+  IN OUT VOID  *Arguments\r
   )\r
 {\r
-  return XenHypercall2 (__HYPERVISOR_event_channel_op,\r
-                        Operation, (INTN) Arguments);\r
+  return XenHypercall2 (\r
+           __HYPERVISOR_event_channel_op,\r
+           Operation,\r
+           (INTN)Arguments\r
+           );\r
 }\r
index ae4ea0309ac3857b695e5195a35bc46ea2cc6ec0..caf4a28e1f29886b8f29ae833868f795ffa8d4c4 100644 (file)
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH                  Vendor;\r
-  EFI_PHYSICAL_ADDRESS                GrantTableAddress;\r
-  EFI_DEVICE_PATH_PROTOCOL            End;\r
+  VENDOR_DEVICE_PATH          Vendor;\r
+  EFI_PHYSICAL_ADDRESS        GrantTableAddress;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } XENBUS_ROOT_DEVICE_PATH;\r
 #pragma pack ()\r
 \r
-STATIC CONST XENBUS_ROOT_DEVICE_PATH mXenBusRootDevicePathTemplate = {\r
+STATIC CONST XENBUS_ROOT_DEVICE_PATH  mXenBusRootDevicePathTemplate = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
@@ -40,7 +40,7 @@ STATIC CONST XENBUS_ROOT_DEVICE_PATH mXenBusRootDevicePathTemplate = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-    { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }\r
+    { sizeof (EFI_DEVICE_PATH_PROTOCOL),                           0 }\r
   }\r
 };\r
 \r
@@ -66,14 +66,14 @@ STATIC CONST XENBUS_ROOT_DEVICE_PATH mXenBusRootDevicePathTemplate = {
 **/\r
 EFI_STATUS\r
 XenIoMmioInstall (\r
-  IN OUT   EFI_HANDLE              *Handle,\r
-  IN       EFI_PHYSICAL_ADDRESS    GrantTableAddress\r
+  IN OUT   EFI_HANDLE            *Handle,\r
+  IN       EFI_PHYSICAL_ADDRESS  GrantTableAddress\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  XENIO_PROTOCOL                 *XenIo;\r
-  XENBUS_ROOT_DEVICE_PATH        *XenBusDevicePath;\r
-  EFI_HANDLE                     OutHandle;\r
+  EFI_STATUS               Status;\r
+  XENIO_PROTOCOL           *XenIo;\r
+  XENBUS_ROOT_DEVICE_PATH  *XenBusDevicePath;\r
+  EFI_HANDLE               OutHandle;\r
 \r
   ASSERT (Handle != NULL);\r
 \r
@@ -83,29 +83,42 @@ XenIoMmioInstall (
   if (!XenIo) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   XenIo->GrantTableAddress = GrantTableAddress;\r
 \r
-  XenBusDevicePath = AllocateCopyPool (sizeof *XenBusDevicePath,\r
-                       &mXenBusRootDevicePathTemplate);\r
+  XenBusDevicePath = AllocateCopyPool (\r
+                       sizeof *XenBusDevicePath,\r
+                       &mXenBusRootDevicePathTemplate\r
+                       );\r
   if (!XenBusDevicePath) {\r
     DEBUG ((DEBUG_ERROR, "%a: Out of memory\n", __FUNCTION__));\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeXenIo;\r
   }\r
+\r
   XenBusDevicePath->GrantTableAddress = GrantTableAddress;\r
 \r
-  Status = gBS->InstallMultipleProtocolInterfaces (&OutHandle,\r
-                  &gEfiDevicePathProtocolGuid, XenBusDevicePath,\r
-                  &gXenIoProtocolGuid, XenIo,\r
-                  NULL);\r
+  Status = gBS->InstallMultipleProtocolInterfaces (\r
+                  &OutHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  XenBusDevicePath,\r
+                  &gXenIoProtocolGuid,\r
+                  XenIo,\r
+                  NULL\r
+                  );\r
   if (!EFI_ERROR (Status)) {\r
     *Handle = OutHandle;\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  DEBUG ((DEBUG_ERROR, "%a: Failed to install the EFI_DEVICE_PATH and "\r
+  DEBUG ((\r
+    DEBUG_ERROR,\r
+    "%a: Failed to install the EFI_DEVICE_PATH and "\r
     "XENIO_PROTOCOL protocols on handle %p (Status == %r)\n",\r
-    __FUNCTION__, OutHandle, Status));\r
+    __FUNCTION__,\r
+    OutHandle,\r
+    Status\r
+    ));\r
 \r
   FreePool (XenBusDevicePath);\r
 \r
@@ -129,25 +142,41 @@ FreeXenIo:
 **/\r
 EFI_STATUS\r
 XenIoMmioUninstall (\r
-  IN       EFI_HANDLE              Handle\r
+  IN       EFI_HANDLE  Handle\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  VOID          *XenIo;\r
-  VOID          *XenBusDevicePath;\r
+  EFI_STATUS  Status;\r
+  VOID        *XenIo;\r
+  VOID        *XenBusDevicePath;\r
 \r
   XenBusDevicePath = NULL;\r
-  gBS->OpenProtocol (Handle, &gEfiDevicePathProtocolGuid, &XenBusDevicePath,\r
-         NULL, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+  gBS->OpenProtocol (\r
+         Handle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         &XenBusDevicePath,\r
+         NULL,\r
+         NULL,\r
+         EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+         );\r
 \r
   XenIo = NULL;\r
-  gBS->OpenProtocol (Handle, &gXenIoProtocolGuid, &XenIo,\r
-         NULL, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
-\r
-  Status = gBS->UninstallMultipleProtocolInterfaces (Handle,\r
-                  &gEfiDevicePathProtocolGuid, XenBusDevicePath,\r
-                  &gXenIoProtocolGuid, XenIo,\r
-                  NULL);\r
+  gBS->OpenProtocol (\r
+         Handle,\r
+         &gXenIoProtocolGuid,\r
+         &XenIo,\r
+         NULL,\r
+         NULL,\r
+         EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+         );\r
+\r
+  Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                  Handle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  XenBusDevicePath,\r
+                  &gXenIoProtocolGuid,\r
+                  XenIo,\r
+                  NULL\r
+                  );\r
 \r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
index 8f20ae2d456ee329233d2253cc32661859ca78d3..f6b3e5ca7001af9ec99f5cea099491051378b1f7 100644 (file)
@@ -25,9 +25,9 @@ XenGetInfoHOB (
   VOID\r
   )\r
 {\r
-  EFI_HOB_GUID_TYPE   *GuidHob;\r
-  STATIC BOOLEAN      Cached = FALSE;\r
-  STATIC EFI_XEN_INFO *XenInfo;\r
+  EFI_HOB_GUID_TYPE    *GuidHob;\r
+  STATIC BOOLEAN       Cached = FALSE;\r
+  STATIC EFI_XEN_INFO  *XenInfo;\r
 \r
   //\r
   // Return the cached result for the benefit of XenDetected that can be\r
@@ -41,8 +41,9 @@ XenGetInfoHOB (
   if (GuidHob == NULL) {\r
     XenInfo = NULL;\r
   } else {\r
-    XenInfo = (EFI_XEN_INFO *) GET_GUID_HOB_DATA (GuidHob);\r
+    XenInfo = (EFI_XEN_INFO *)GET_GUID_HOB_DATA (GuidHob);\r
   }\r
+\r
   Cached = TRUE;\r
   return XenInfo;\r
 }\r
@@ -74,7 +75,7 @@ XenPvhDetected (
   VOID\r
   )\r
 {\r
-  EFI_XEN_INFO        *XenInfo;\r
+  EFI_XEN_INFO  *XenInfo;\r
 \r
   XenInfo = XenGetInfoHOB ();\r
   return (XenInfo != NULL && XenInfo->RsdpPvh != NULL);\r
index 72e0aaa8798c5da79ce7ce7a41ce28cc6c47ce48..7f37710b964f3b5bd85ca97e95d54747fd088f7f 100644 (file)
@@ -22,22 +22,22 @@ EpochToEfiTime (
   OUT EFI_TIME  *Time\r
   )\r
 {\r
-  UINTN         a;\r
-  UINTN         b;\r
-  UINTN         c;\r
-  UINTN         d;\r
-  UINTN         g;\r
-  UINTN         j;\r
-  UINTN         m;\r
-  UINTN         y;\r
-  UINTN         da;\r
-  UINTN         db;\r
-  UINTN         dc;\r
-  UINTN         dg;\r
-  UINTN         hh;\r
-  UINTN         mm;\r
-  UINTN         ss;\r
-  UINTN         J;\r
+  UINTN  a;\r
+  UINTN  b;\r
+  UINTN  c;\r
+  UINTN  d;\r
+  UINTN  g;\r
+  UINTN  j;\r
+  UINTN  m;\r
+  UINTN  y;\r
+  UINTN  da;\r
+  UINTN  db;\r
+  UINTN  dc;\r
+  UINTN  dg;\r
+  UINTN  hh;\r
+  UINTN  mm;\r
+  UINTN  ss;\r
+  UINTN  J;\r
 \r
   J  = (EpochSeconds / 86400) + 2440588;\r
   j  = J + 32044;\r
@@ -60,14 +60,13 @@ EpochToEfiTime (
   ss = EpochSeconds % 60;\r
   a  = (EpochSeconds - ss) / 60;\r
   mm = a % 60;\r
-  b = (a - mm) / 60;\r
+  b  = (a - mm) / 60;\r
   hh = b % 24;\r
 \r
-  Time->Hour        = (UINT8)hh;\r
-  Time->Minute      = (UINT8)mm;\r
-  Time->Second      = (UINT8)ss;\r
-  Time->Nanosecond  = 0;\r
-\r
+  Time->Hour       = (UINT8)hh;\r
+  Time->Minute     = (UINT8)mm;\r
+  Time->Second     = (UINT8)ss;\r
+  Time->Nanosecond = 0;\r
 }\r
 \r
 /**\r
@@ -97,7 +96,7 @@ LibGetTime (
   // as Xen's timekeeping uses a shared info page which cannot be shared\r
   // between UEFI and the OS\r
   //\r
-  EpochToEfiTime(1421770011, Time);\r
+  EpochToEfiTime (1421770011, Time);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -115,13 +114,12 @@ LibGetTime (
 EFI_STATUS\r
 EFIAPI\r
 LibSetTime (\r
-  IN EFI_TIME                *Time\r
+  IN EFI_TIME  *Time\r
   )\r
 {\r
   return EFI_DEVICE_ERROR;\r
 }\r
 \r
-\r
 /**\r
   Returns the current wakeup alarm clock setting.\r
 \r
@@ -138,9 +136,9 @@ LibSetTime (
 EFI_STATUS\r
 EFIAPI\r
 LibGetWakeupTime (\r
-  OUT BOOLEAN     *Enabled,\r
-  OUT BOOLEAN     *Pending,\r
-  OUT EFI_TIME    *Time\r
+  OUT BOOLEAN   *Enabled,\r
+  OUT BOOLEAN   *Pending,\r
+  OUT EFI_TIME  *Time\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -162,8 +160,8 @@ LibGetWakeupTime (
 EFI_STATUS\r
 EFIAPI\r
 LibSetWakeupTime (\r
-  IN BOOLEAN      Enabled,\r
-  OUT EFI_TIME    *Time\r
+  IN BOOLEAN    Enabled,\r
+  OUT EFI_TIME  *Time\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -182,8 +180,8 @@ LibSetWakeupTime (
 EFI_STATUS\r
 EFIAPI\r
 LibRtcInitialize (\r
-  IN EFI_HANDLE                            ImageHandle,\r
-  IN EFI_SYSTEM_TABLE                      *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EFI_SUCCESS;\r
index 07baa0e8d10001eb2ec6fd003d6f8f4389a622fe..40c464ce16b691dada256dcd8fbe8b5574351085 100644 (file)
@@ -31,25 +31,25 @@ typedef struct {
 } SINGLE_NODE_VENDOR_MEDIA_DEVPATH;\r
 #pragma pack ()\r
 \r
-STATIC EFI_HII_HANDLE         mLinuxInitrdShellCommandHiiHandle;\r
-STATIC EFI_PHYSICAL_ADDRESS   mInitrdFileAddress;\r
-STATIC UINTN                  mInitrdFileSize;\r
-STATIC EFI_HANDLE             mInitrdLoadFile2Handle;\r
-\r
-STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
-  {L"-u", TypeFlag},\r
-  {NULL, TypeMax}\r
-  };\r
+STATIC EFI_HII_HANDLE        mLinuxInitrdShellCommandHiiHandle;\r
+STATIC EFI_PHYSICAL_ADDRESS  mInitrdFileAddress;\r
+STATIC UINTN                 mInitrdFileSize;\r
+STATIC EFI_HANDLE            mInitrdLoadFile2Handle;\r
+\r
+STATIC CONST SHELL_PARAM_ITEM  ParamList[] = {\r
+  { L"-u", TypeFlag },\r
+  { NULL,  TypeMax  }\r
+};\r
 \r
-STATIC CONST SINGLE_NODE_VENDOR_MEDIA_DEVPATH mInitrdDevicePath = {\r
+STATIC CONST SINGLE_NODE_VENDOR_MEDIA_DEVPATH  mInitrdDevicePath = {\r
   {\r
     {\r
-      MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH) }\r
+      MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP,{ sizeof (VENDOR_DEVICE_PATH)                                       }\r
     },\r
     LINUX_EFI_INITRD_MEDIA_GUID\r
-  }, {\r
+  },{\r
     END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-    { sizeof (EFI_DEVICE_PATH_PROTOCOL) }\r
+    { sizeof (EFI_DEVICE_PATH_PROTOCOL)                                 }\r
   }\r
 };\r
 \r
@@ -59,13 +59,16 @@ IsOtherInitrdDevicePathAlreadyInstalled (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;\r
-  EFI_HANDLE                  Handle;\r
+  EFI_STATUS                Status;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+  EFI_HANDLE                Handle;\r
 \r
   DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)&mInitrdDevicePath;\r
-  Status = gBS->LocateDevicePath (&gEfiLoadFile2ProtocolGuid, &DevicePath,\r
-                  &Handle);\r
+  Status     = gBS->LocateDevicePath (\r
+                      &gEfiLoadFile2ProtocolGuid,\r
+                      &DevicePath,\r
+                      &Handle\r
+                      );\r
   if (EFI_ERROR (Status)) {\r
     return FALSE;\r
   }\r
@@ -77,6 +80,7 @@ IsOtherInitrdDevicePathAlreadyInstalled (
   if (Handle == mInitrdLoadFile2Handle) {\r
     return FALSE;\r
   }\r
+\r
   return TRUE;\r
 }\r
 \r
@@ -84,28 +88,29 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 InitrdLoadFile2 (\r
-  IN      EFI_LOAD_FILE2_PROTOCOL       *This,\r
-  IN      EFI_DEVICE_PATH_PROTOCOL      *FilePath,\r
-  IN      BOOLEAN                       BootPolicy,\r
-  IN  OUT UINTN                         *BufferSize,\r
-  OUT     VOID                          *Buffer     OPTIONAL\r
+  IN      EFI_LOAD_FILE2_PROTOCOL   *This,\r
+  IN      EFI_DEVICE_PATH_PROTOCOL  *FilePath,\r
+  IN      BOOLEAN                   BootPolicy,\r
+  IN  OUT UINTN                     *BufferSize,\r
+  OUT     VOID                      *Buffer     OPTIONAL\r
   )\r
 {\r
   if (BootPolicy) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  if (BufferSize == NULL || !IsDevicePathValid (FilePath, 0)) {\r
+  if ((BufferSize == NULL) || !IsDevicePathValid (FilePath, 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (FilePath->Type != END_DEVICE_PATH_TYPE ||\r
-      FilePath->SubType != END_ENTIRE_DEVICE_PATH_SUBTYPE ||\r
-      mInitrdFileSize == 0) {\r
+  if ((FilePath->Type != END_DEVICE_PATH_TYPE) ||\r
+      (FilePath->SubType != END_ENTIRE_DEVICE_PATH_SUBTYPE) ||\r
+      (mInitrdFileSize == 0))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  if (Buffer == NULL || *BufferSize < mInitrdFileSize) {\r
+  if ((Buffer == NULL) || (*BufferSize < mInitrdFileSize)) {\r
     *BufferSize = mInitrdFileSize;\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
@@ -117,7 +122,7 @@ InitrdLoadFile2 (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC CONST EFI_LOAD_FILE2_PROTOCOL     mInitrdLoadFile2 = {\r
+STATIC CONST EFI_LOAD_FILE2_PROTOCOL  mInitrdLoadFile2 = {\r
   InitrdLoadFile2,\r
 };\r
 \r
@@ -127,18 +132,24 @@ UninstallLoadFile2Protocol (
   VOID\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (mInitrdLoadFile2Handle != NULL) {\r
-    Status = gBS->UninstallMultipleProtocolInterfaces (mInitrdLoadFile2Handle,\r
-                    &gEfiDevicePathProtocolGuid,    &mInitrdDevicePath,\r
-                    &gEfiLoadFile2ProtocolGuid,     &mInitrdLoadFile2,\r
-                    NULL);\r
+    Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                    mInitrdLoadFile2Handle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    &mInitrdDevicePath,\r
+                    &gEfiLoadFile2ProtocolGuid,\r
+                    &mInitrdLoadFile2,\r
+                    NULL\r
+                    );\r
     if (!EFI_ERROR (Status)) {\r
       mInitrdLoadFile2Handle = NULL;\r
     }\r
+\r
     return Status;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -157,42 +168,59 @@ FreeInitrdFile (
 STATIC\r
 EFI_STATUS\r
 CacheInitrdFile (\r
-  IN  SHELL_FILE_HANDLE   FileHandle\r
+  IN  SHELL_FILE_HANDLE  FileHandle\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  UINT64                  FileSize;\r
-  UINTN                   ReadSize;\r
+  EFI_STATUS  Status;\r
+  UINT64      FileSize;\r
+  UINTN       ReadSize;\r
 \r
   Status = gEfiShellProtocol->GetFileSize (FileHandle, &FileSize);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  if (FileSize == 0 || FileSize > MAX_UINTN) {\r
+  if ((FileSize == 0) || (FileSize > MAX_UINTN)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Status = gBS->AllocatePages (AllocateAnyPages, EfiLoaderData,\r
-                  EFI_SIZE_TO_PAGES ((UINTN)FileSize), &mInitrdFileAddress);\r
+  Status = gBS->AllocatePages (\r
+                  AllocateAnyPages,\r
+                  EfiLoaderData,\r
+                  EFI_SIZE_TO_PAGES ((UINTN)FileSize),\r
+                  &mInitrdFileAddress\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   ReadSize = (UINTN)FileSize;\r
-  Status = gEfiShellProtocol->ReadFile (FileHandle, &ReadSize,\r
-                                (VOID *)(UINTN)mInitrdFileAddress);\r
-  if (EFI_ERROR (Status) || ReadSize < FileSize) {\r
-    DEBUG ((DEBUG_WARN, "%a: failed to read initrd file - %r 0x%lx 0x%lx\n",\r
-      __FUNCTION__, Status, (UINT64)ReadSize, FileSize));\r
+  Status   = gEfiShellProtocol->ReadFile (\r
+                                  FileHandle,\r
+                                  &ReadSize,\r
+                                  (VOID *)(UINTN)mInitrdFileAddress\r
+                                  );\r
+  if (EFI_ERROR (Status) || (ReadSize < FileSize)) {\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
+      "%a: failed to read initrd file - %r 0x%lx 0x%lx\n",\r
+      __FUNCTION__,\r
+      Status,\r
+      (UINT64)ReadSize,\r
+      FileSize\r
+      ));\r
     goto FreeMemory;\r
   }\r
 \r
   if (mInitrdLoadFile2Handle == NULL) {\r
-    Status = gBS->InstallMultipleProtocolInterfaces (&mInitrdLoadFile2Handle,\r
-                    &gEfiDevicePathProtocolGuid,  &mInitrdDevicePath,\r
-                    &gEfiLoadFile2ProtocolGuid,   &mInitrdLoadFile2,\r
-                    NULL);\r
+    Status = gBS->InstallMultipleProtocolInterfaces (\r
+                    &mInitrdLoadFile2Handle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    &mInitrdDevicePath,\r
+                    &gEfiLoadFile2ProtocolGuid,\r
+                    &mInitrdLoadFile2,\r
+                    NULL\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
@@ -218,16 +246,16 @@ RunInitrd (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  LIST_ENTRY            *Package;\r
-  CHAR16                *ProblemParam;\r
-  CONST CHAR16          *Param;\r
-  CHAR16                *Filename;\r
-  SHELL_STATUS          ShellStatus;\r
-  SHELL_FILE_HANDLE     FileHandle;\r
+  EFI_STATUS         Status;\r
+  LIST_ENTRY         *Package;\r
+  CHAR16             *ProblemParam;\r
+  CONST CHAR16       *Param;\r
+  CHAR16             *Filename;\r
+  SHELL_STATUS       ShellStatus;\r
+  SHELL_FILE_HANDLE  FileHandle;\r
 \r
-  ProblemParam        = NULL;\r
-  ShellStatus         = SHELL_SUCCESS;\r
+  ProblemParam = NULL;\r
+  ShellStatus  = SHELL_SUCCESS;\r
 \r
   Status = ShellInitialize ();\r
   ASSERT_EFI_ERROR (Status);\r
@@ -237,30 +265,55 @@ RunInitrd (
   //\r
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
   if (EFI_ERROR (Status)) {\r
-    if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
-      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM),\r
-        mLinuxInitrdShellCommandHiiHandle, L"initrd", ProblemParam);\r
+    if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {\r
+      ShellPrintHiiEx (\r
+        -1,\r
+        -1,\r
+        NULL,\r
+        STRING_TOKEN (STR_GEN_PROBLEM),\r
+        mLinuxInitrdShellCommandHiiHandle,\r
+        L"initrd",\r
+        ProblemParam\r
+        );\r
       FreePool (ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
-      ASSERT(FALSE);\r
+      ASSERT (FALSE);\r
     }\r
   } else if (IsOtherInitrdDevicePathAlreadyInstalled ()) {\r
-    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ALREADY_INSTALLED),\r
-      mLinuxInitrdShellCommandHiiHandle, L"initrd");\r
+    ShellPrintHiiEx (\r
+      -1,\r
+      -1,\r
+      NULL,\r
+      STRING_TOKEN (STR_GEN_ALREADY_INSTALLED),\r
+      mLinuxInitrdShellCommandHiiHandle,\r
+      L"initrd"\r
+      );\r
     ShellStatus = SHELL_UNSUPPORTED;\r
   } else {\r
     if (ShellCommandLineGetCount (Package) > 2) {\r
-      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY),\r
-        mLinuxInitrdShellCommandHiiHandle, L"initrd");\r
+      ShellPrintHiiEx (\r
+        -1,\r
+        -1,\r
+        NULL,\r
+        STRING_TOKEN (STR_GEN_TOO_MANY),\r
+        mLinuxInitrdShellCommandHiiHandle,\r
+        L"initrd"\r
+        );\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else if (ShellCommandLineGetCount (Package) < 2) {\r
       if (ShellCommandLineGetFlag (Package, L"-u")) {\r
         FreeInitrdFile ();\r
         UninstallLoadFile2Protocol ();\r
       } else {\r
-        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW),\r
-          mLinuxInitrdShellCommandHiiHandle, L"initrd");\r
+        ShellPrintHiiEx (\r
+          -1,\r
+          -1,\r
+          NULL,\r
+          STRING_TOKEN (STR_GEN_TOO_FEW),\r
+          mLinuxInitrdShellCommandHiiHandle,\r
+          L"initrd"\r
+          );\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
       }\r
     } else {\r
@@ -269,30 +322,50 @@ RunInitrd (
 \r
       Filename = ShellFindFilePath (Param);\r
       if (Filename == NULL) {\r
-        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL),\r
-          mLinuxInitrdShellCommandHiiHandle, L"initrd", Param);\r
+        ShellPrintHiiEx (\r
+          -1,\r
+          -1,\r
+          NULL,\r
+          STRING_TOKEN (STR_GEN_FIND_FAIL),\r
+          mLinuxInitrdShellCommandHiiHandle,\r
+          L"initrd",\r
+          Param\r
+          );\r
         ShellStatus = SHELL_NOT_FOUND;\r
       } else {\r
-        Status = ShellOpenFileByName (Filename, &FileHandle,\r
-                   EFI_FILE_MODE_READ, 0);\r
+        Status = ShellOpenFileByName (\r
+                   Filename,\r
+                   &FileHandle,\r
+                   EFI_FILE_MODE_READ,\r
+                   0\r
+                   );\r
         if (!EFI_ERROR (Status)) {\r
           FreeInitrdFile ();\r
           Status = CacheInitrdFile (FileHandle);\r
           ShellCloseFile (&FileHandle);\r
         }\r
+\r
         if (EFI_ERROR (Status)) {\r
-          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL),\r
-            mLinuxInitrdShellCommandHiiHandle, L"initrd", Param);\r
+          ShellPrintHiiEx (\r
+            -1,\r
+            -1,\r
+            NULL,\r
+            STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL),\r
+            mLinuxInitrdShellCommandHiiHandle,\r
+            L"initrd",\r
+            Param\r
+            );\r
           ShellStatus = SHELL_NOT_FOUND;\r
         }\r
+\r
         FreePool (Filename);\r
       }\r
     }\r
   }\r
+\r
   return ShellStatus;\r
 }\r
 \r
-\r
 /**\r
   This is the shell command handler function pointer callback type.  This\r
   function handles the command when it is invoked in the shell.\r
@@ -310,10 +383,10 @@ RunInitrd (
 SHELL_STATUS\r
 EFIAPI\r
 LinuxInitrdCommandHandler (\r
-  IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL    *This,\r
-  IN EFI_SYSTEM_TABLE                      *SystemTable,\r
-  IN EFI_SHELL_PARAMETERS_PROTOCOL         *ShellParameters,\r
-  IN EFI_SHELL_PROTOCOL                    *Shell\r
+  IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL  *This,\r
+  IN EFI_SYSTEM_TABLE                    *SystemTable,\r
+  IN EFI_SHELL_PARAMETERS_PROTOCOL       *ShellParameters,\r
+  IN EFI_SHELL_PROTOCOL                  *Shell\r
   )\r
 {\r
   gEfiShellParametersProtocol = ShellParameters;\r
@@ -338,15 +411,18 @@ STATIC
 CHAR16 *\r
 EFIAPI\r
 LinuxInitrdGetHelp (\r
-  IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL    *This,\r
-  IN CONST CHAR8                           *Language\r
+  IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL  *This,\r
+  IN CONST CHAR8                         *Language\r
   )\r
 {\r
-  return HiiGetString (mLinuxInitrdShellCommandHiiHandle,\r
-           STRING_TOKEN (STR_GET_HELP_INITRD), Language);\r
+  return HiiGetString (\r
+           mLinuxInitrdShellCommandHiiHandle,\r
+           STRING_TOKEN (STR_GET_HELP_INITRD),\r
+           Language\r
+           );\r
 }\r
 \r
-STATIC EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL mLinuxInitrdDynamicCommand = {\r
+STATIC EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL  mLinuxInitrdDynamicCommand = {\r
   L"initrd",\r
   LinuxInitrdCommandHandler,\r
   LinuxInitrdGetHelp\r
@@ -362,19 +438,24 @@ STATIC EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL mLinuxInitrdDynamicCommand = {
 STATIC\r
 EFI_HII_HANDLE\r
 InitializeHiiPackage (\r
-  EFI_HANDLE                  ImageHandle\r
+  EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
-  EFI_HII_HANDLE              HiiHandle;\r
+  EFI_STATUS                   Status;\r
+  EFI_HII_PACKAGE_LIST_HEADER  *PackageList;\r
+  EFI_HII_HANDLE               HiiHandle;\r
 \r
   //\r
   // Retrieve HII package list from ImageHandle\r
   //\r
-  Status = gBS->OpenProtocol (ImageHandle, &gEfiHiiPackageListProtocolGuid,\r
-                  (VOID **)&PackageList, ImageHandle, NULL,\r
-                  EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+  Status = gBS->OpenProtocol (\r
+                  ImageHandle,\r
+                  &gEfiHiiPackageListProtocolGuid,\r
+                  (VOID **)&PackageList,\r
+                  ImageHandle,\r
+                  NULL,\r
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
@@ -383,12 +464,17 @@ InitializeHiiPackage (
   //\r
   // Publish HII package list to HII Database.\r
   //\r
-  Status = gHiiDatabase->NewPackageList (gHiiDatabase, PackageList, NULL,\r
-                           &HiiHandle);\r
+  Status = gHiiDatabase->NewPackageList (\r
+                           gHiiDatabase,\r
+                           PackageList,\r
+                           NULL,\r
+                           &HiiHandle\r
+                           );\r
   ASSERT_EFI_ERROR (Status);\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
   }\r
+\r
   return HiiHandle;\r
 }\r
 \r
@@ -407,21 +493,23 @@ InitializeHiiPackage (
 EFI_STATUS\r
 EFIAPI\r
 LinuxInitrdDynamicShellCommandEntryPoint (\r
-  IN EFI_HANDLE               ImageHandle,\r
-  IN EFI_SYSTEM_TABLE         *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
+  EFI_STATUS  Status;\r
 \r
   mLinuxInitrdShellCommandHiiHandle = InitializeHiiPackage (ImageHandle);\r
   if (mLinuxInitrdShellCommandHiiHandle == NULL) {\r
     return EFI_ABORTED;\r
   }\r
 \r
-  Status = gBS->InstallProtocolInterface (&ImageHandle,\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &ImageHandle,\r
                   &gEfiShellDynamicCommandProtocolGuid,\r
                   EFI_NATIVE_INTERFACE,\r
-                  &mLinuxInitrdDynamicCommand);\r
+                  &mLinuxInitrdDynamicCommand\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
   return Status;\r
 }\r
@@ -437,10 +525,10 @@ LinuxInitrdDynamicShellCommandEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 LinuxInitrdDynamicShellCommandUnload (\r
-  IN EFI_HANDLE               ImageHandle\r
-)\r
+  IN EFI_HANDLE  ImageHandle\r
+  )\r
 {\r
-  EFI_STATUS                  Status;\r
+  EFI_STATUS  Status;\r
 \r
   FreeInitrdFile ();\r
 \r
@@ -449,9 +537,11 @@ LinuxInitrdDynamicShellCommandUnload (
     return Status;\r
   }\r
 \r
-  Status = gBS->UninstallProtocolInterface (ImageHandle,\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  ImageHandle,\r
                   &gEfiShellDynamicCommandProtocolGuid,\r
-                  &mLinuxInitrdDynamicCommand);\r
+                  &mLinuxInitrdDynamicCommand\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
index ed5fc3bfdd9d1ec98105fca11d665d54dac9529c..1f52b85ed24e27a0af16567756c579c844560fa4 100644 (file)
@@ -28,9 +28,9 @@
 STATIC\r
 EFI_STATUS\r
 Out8 (\r
-  IN LSI_SCSI_DEV *Dev,\r
-  IN UINT32       Addr,\r
-  IN UINT8        Data\r
+  IN LSI_SCSI_DEV  *Dev,\r
+  IN UINT32        Addr,\r
+  IN UINT8         Data\r
   )\r
 {\r
   return Dev->PciIo->Io.Write (\r
@@ -46,9 +46,9 @@ Out8 (
 STATIC\r
 EFI_STATUS\r
 Out32 (\r
-  IN LSI_SCSI_DEV       *Dev,\r
-  IN UINT32             Addr,\r
-  IN UINT32             Data\r
+  IN LSI_SCSI_DEV  *Dev,\r
+  IN UINT32        Addr,\r
+  IN UINT32        Data\r
   )\r
 {\r
   return Dev->PciIo->Io.Write (\r
@@ -64,9 +64,9 @@ Out32 (
 STATIC\r
 EFI_STATUS\r
 In8 (\r
-  IN  LSI_SCSI_DEV *Dev,\r
-  IN  UINT32       Addr,\r
-  OUT UINT8        *Data\r
+  IN  LSI_SCSI_DEV  *Dev,\r
+  IN  UINT32        Addr,\r
+  OUT UINT8         *Data\r
   )\r
 {\r
   return Dev->PciIo->Io.Read (\r
@@ -82,9 +82,9 @@ In8 (
 STATIC\r
 EFI_STATUS\r
 In32 (\r
-  IN  LSI_SCSI_DEV *Dev,\r
-  IN  UINT32       Addr,\r
-  OUT UINT32       *Data\r
+  IN  LSI_SCSI_DEV  *Dev,\r
+  IN  UINT32        Addr,\r
+  OUT UINT32        *Data\r
   )\r
 {\r
   return Dev->PciIo->Io.Read (\r
@@ -100,7 +100,7 @@ In32 (
 STATIC\r
 EFI_STATUS\r
 LsiScsiReset (\r
-  IN LSI_SCSI_DEV *Dev\r
+  IN LSI_SCSI_DEV  *Dev\r
   )\r
 {\r
   return Out8 (Dev, LSI_REG_ISTAT0, LSI_ISTAT0_SRST);\r
@@ -109,12 +109,12 @@ LsiScsiReset (
 STATIC\r
 EFI_STATUS\r
 ReportHostAdapterOverrunError (\r
-  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  Packet->SenseDataLength = 0;\r
+  Packet->SenseDataLength   = 0;\r
   Packet->HostAdapterStatus =\r
-            EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+    EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
   Packet->TargetStatus = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
   return EFI_BAD_BUFFER_SIZE;\r
 }\r
@@ -146,40 +146,42 @@ ReportHostAdapterOverrunError (
 STATIC\r
 EFI_STATUS\r
 LsiScsiCheckRequest (\r
-  IN LSI_SCSI_DEV                                   *Dev,\r
-  IN UINT8                                          Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  IN LSI_SCSI_DEV                                    *Dev,\r
+  IN UINT8                                           Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  if (Target > Dev->MaxTarget || Lun > Dev->MaxLun ||\r
-      Packet->DataDirection > EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL ||\r
+  if ((Target > Dev->MaxTarget) || (Lun > Dev->MaxLun) ||\r
+      (Packet->DataDirection > EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL) ||\r
       //\r
       // Trying to receive, but destination pointer is NULL, or contradicting\r
       // transfer direction\r
       //\r
-      (Packet->InTransferLength > 0 &&\r
-       (Packet->InDataBuffer == NULL ||\r
-        Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_WRITE\r
-         )\r
-        ) ||\r
+      ((Packet->InTransferLength > 0) &&\r
+       ((Packet->InDataBuffer == NULL) ||\r
+        (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_WRITE)\r
+       )\r
+      ) ||\r
 \r
       //\r
       // Trying to send, but source pointer is NULL, or contradicting transfer\r
       // direction\r
       //\r
-      (Packet->OutTransferLength > 0 &&\r
-       (Packet->OutDataBuffer == NULL ||\r
-        Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ\r
-         )\r
-        )\r
-    ) {\r
+      ((Packet->OutTransferLength > 0) &&\r
+       ((Packet->OutDataBuffer == NULL) ||\r
+        (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ)\r
+       )\r
+      )\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL ||\r
-      (Packet->InTransferLength > 0 && Packet->OutTransferLength > 0) ||\r
-      Packet->CdbLength > sizeof Dev->Dma->Cdb) {\r
+  if ((Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL) ||\r
+      ((Packet->InTransferLength > 0) && (Packet->OutTransferLength > 0)) ||\r
+      (Packet->CdbLength > sizeof Dev->Dma->Cdb))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -187,6 +189,7 @@ LsiScsiCheckRequest (
     Packet->InTransferLength = sizeof Dev->Dma->Data;\r
     return ReportHostAdapterOverrunError (Packet);\r
   }\r
+\r
   if (Packet->OutTransferLength > sizeof Dev->Dma->Data) {\r
     Packet->OutTransferLength = sizeof Dev->Dma->Data;\r
     return ReportHostAdapterOverrunError (Packet);\r
@@ -221,32 +224,32 @@ LsiScsiCheckRequest (
 STATIC\r
 EFI_STATUS\r
 LsiScsiProcessRequest (\r
-  IN LSI_SCSI_DEV                                   *Dev,\r
-  IN UINT8                                          Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  IN LSI_SCSI_DEV                                    *Dev,\r
+  IN UINT8                                           Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT32     *Script;\r
-  UINT8      *Cdb;\r
-  UINT8      *MsgOut;\r
-  UINT8      *MsgIn;\r
-  UINT8      *ScsiStatus;\r
-  UINT8      *Data;\r
-  UINT8      DStat;\r
-  UINT8      SIst0;\r
-  UINT8      SIst1;\r
-  UINT32     Csbc;\r
-  UINT32     CsbcBase;\r
-  UINT32     Transferred;\r
-\r
-  Script      = Dev->Dma->Script;\r
-  Cdb         = Dev->Dma->Cdb;\r
-  Data        = Dev->Dma->Data;\r
-  MsgIn       = Dev->Dma->MsgIn;\r
-  MsgOut      = &Dev->Dma->MsgOut;\r
-  ScsiStatus  = &Dev->Dma->Status;\r
+  EFI_STATUS  Status;\r
+  UINT32      *Script;\r
+  UINT8       *Cdb;\r
+  UINT8       *MsgOut;\r
+  UINT8       *MsgIn;\r
+  UINT8       *ScsiStatus;\r
+  UINT8       *Data;\r
+  UINT8       DStat;\r
+  UINT8       SIst0;\r
+  UINT8       SIst1;\r
+  UINT32      Csbc;\r
+  UINT32      CsbcBase;\r
+  UINT32      Transferred;\r
+\r
+  Script     = Dev->Dma->Script;\r
+  Cdb        = Dev->Dma->Cdb;\r
+  Data       = Dev->Dma->Data;\r
+  MsgIn      = Dev->Dma->MsgIn;\r
+  MsgOut     = &Dev->Dma->MsgOut;\r
+  ScsiStatus = &Dev->Dma->Status;\r
 \r
   *ScsiStatus = 0xFF;\r
 \r
@@ -308,7 +311,7 @@ LsiScsiProcessRequest (
   //\r
   // 2. Select LUN.\r
   //\r
-  *MsgOut   = 0x80 | (UINT8) Lun; // 0x80: Identify bit\r
+  *MsgOut   = 0x80 | (UINT8)Lun;  // 0x80: Identify bit\r
   *Script++ = LSI_INS_TYPE_BLK | LSI_INS_BLK_SCSIP_MSG_OUT |\r
               (UINT32)sizeof Dev->Dma->MsgOut;\r
   *Script++ = LSI_SCSI_DMA_ADDR (Dev, MsgOut);\r
@@ -416,21 +419,23 @@ LsiScsiProcessRequest (
   // Poll the device registers (DSTAT, SIST0, and SIST1) until the SIR\r
   // bit sets.\r
   //\r
-  for(;;) {\r
+  for ( ; ;) {\r
     Status = In8 (Dev, LSI_REG_DSTAT, &DStat);\r
     if (EFI_ERROR (Status)) {\r
       goto Error;\r
     }\r
+\r
     Status = In8 (Dev, LSI_REG_SIST0, &SIst0);\r
     if (EFI_ERROR (Status)) {\r
       goto Error;\r
     }\r
+\r
     Status = In8 (Dev, LSI_REG_SIST1, &SIst1);\r
     if (EFI_ERROR (Status)) {\r
       goto Error;\r
     }\r
 \r
-    if (SIst0 != 0 || SIst1 != 0) {\r
+    if ((SIst0 != 0) || (SIst1 != 0)) {\r
       goto Error;\r
     }\r
 \r
@@ -449,7 +454,7 @@ LsiScsiProcessRequest (
   //   SCSI Message Code 0x00: COMMAND COMPLETE\r
   //   SCSI Status  Code 0x00: Good\r
   //\r
-  if (MsgIn[0] != 0 || *ScsiStatus != 0) {\r
+  if ((MsgIn[0] != 0) || (*ScsiStatus != 0)) {\r
     goto Error;\r
   }\r
 \r
@@ -504,15 +509,21 @@ LsiScsiProcessRequest (
   return EFI_SUCCESS;\r
 \r
 Error:\r
-  DEBUG ((DEBUG_VERBOSE, "%a: dstat: %02X, sist0: %02X, sist1: %02X\n",\r
-    __FUNCTION__, DStat, SIst0, SIst1));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: dstat: %02X, sist0: %02X, sist1: %02X\n",\r
+    __FUNCTION__,\r
+    DStat,\r
+    SIst0,\r
+    SIst1\r
+    ));\r
   //\r
   // Update the request packet to reflect the status.\r
   //\r
   if (*ScsiStatus != 0xFF) {\r
-    Packet->TargetStatus    = *ScsiStatus;\r
+    Packet->TargetStatus = *ScsiStatus;\r
   } else {\r
-    Packet->TargetStatus    = EFI_EXT_SCSI_STATUS_TARGET_TASK_ABORTED;\r
+    Packet->TargetStatus = EFI_EXT_SCSI_STATUS_TARGET_TASK_ABORTED;\r
   }\r
 \r
   if (SIst0 & LSI_SIST0_PAR) {\r
@@ -557,17 +568,17 @@ Error:
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiPassThru (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN EFI_EVENT                                      Event     OPTIONAL\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                 *This,\r
+  IN UINT8                                           *Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN EFI_EVENT                                       Event     OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS   Status;\r
-  LSI_SCSI_DEV *Dev;\r
+  EFI_STATUS    Status;\r
+  LSI_SCSI_DEV  *Dev;\r
 \r
-  Dev = LSI_SCSI_FROM_PASS_THRU (This);\r
+  Dev    = LSI_SCSI_FROM_PASS_THRU (This);\r
   Status = LsiScsiCheckRequest (Dev, *Target, Lun, Packet);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -579,15 +590,15 @@ LsiScsiPassThru (
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiGetNextTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN OUT UINT8                       **TargetPointer,\r
-  IN OUT UINT64                      *Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **TargetPointer,\r
+  IN OUT UINT64                       *Lun\r
   )\r
 {\r
-  LSI_SCSI_DEV *Dev;\r
-  UINTN        Idx;\r
-  UINT8        *Target;\r
-  UINT16       LastTarget;\r
+  LSI_SCSI_DEV  *Dev;\r
+  UINTN         Idx;\r
+  UINT8         *Target;\r
+  UINT16        LastTarget;\r
 \r
   //\r
   // the TargetPointer input parameter is unnecessarily a pointer-to-pointer\r
@@ -597,8 +608,9 @@ LsiScsiGetNextTargetLun (
   //\r
   // Search for first non-0xFF byte. If not found, return first target & LUN.\r
   //\r
-  for (Idx = 0; Idx < TARGET_MAX_BYTES && Target[Idx] == 0xFF; ++Idx)\r
-    ;\r
+  for (Idx = 0; Idx < TARGET_MAX_BYTES && Target[Idx] == 0xFF; ++Idx) {\r
+  }\r
+\r
   if (Idx == TARGET_MAX_BYTES) {\r
     SetMem (Target, TARGET_MAX_BYTES, 0x00);\r
     *Lun = 0;\r
@@ -611,7 +623,7 @@ LsiScsiGetNextTargetLun (
   // increment (target, LUN) pair if valid on input\r
   //\r
   Dev = LSI_SCSI_FROM_PASS_THRU (This);\r
-  if (LastTarget > Dev->MaxTarget || *Lun > Dev->MaxLun) {\r
+  if ((LastTarget > Dev->MaxTarget) || (*Lun > Dev->MaxLun)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -633,15 +645,15 @@ LsiScsiGetNextTargetLun (
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiBuildDevicePath (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN UINT8                           *Target,\r
-  IN UINT64                          Lun,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL    **DevicePath\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL     **DevicePath\r
   )\r
 {\r
-  UINT16           TargetValue;\r
-  LSI_SCSI_DEV     *Dev;\r
-  SCSI_DEVICE_PATH *ScsiDevicePath;\r
+  UINT16            TargetValue;\r
+  LSI_SCSI_DEV      *Dev;\r
+  SCSI_DEVICE_PATH  *ScsiDevicePath;\r
 \r
   if (DevicePath == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -649,7 +661,7 @@ LsiScsiBuildDevicePath (
 \r
   CopyMem (&TargetValue, Target, sizeof TargetValue);\r
   Dev = LSI_SCSI_FROM_PASS_THRU (This);\r
-  if (TargetValue > Dev->MaxTarget || Lun > Dev->MaxLun || Lun > 0xFFFF) {\r
+  if ((TargetValue > Dev->MaxTarget) || (Lun > Dev->MaxLun) || (Lun > 0xFFFF)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -660,10 +672,10 @@ LsiScsiBuildDevicePath (
 \r
   ScsiDevicePath->Header.Type      = MESSAGING_DEVICE_PATH;\r
   ScsiDevicePath->Header.SubType   = MSG_SCSI_DP;\r
-  ScsiDevicePath->Header.Length[0] = (UINT8)  sizeof *ScsiDevicePath;\r
-  ScsiDevicePath->Header.Length[1] = (UINT8) (sizeof *ScsiDevicePath >> 8);\r
+  ScsiDevicePath->Header.Length[0] = (UINT8)sizeof *ScsiDevicePath;\r
+  ScsiDevicePath->Header.Length[1] = (UINT8)(sizeof *ScsiDevicePath >> 8);\r
   ScsiDevicePath->Pun              = TargetValue;\r
-  ScsiDevicePath->Lun              = (UINT16) Lun;\r
+  ScsiDevicePath->Lun              = (UINT16)Lun;\r
 \r
   *DevicePath = &ScsiDevicePath->Header;\r
   return EFI_SUCCESS;\r
@@ -672,30 +684,33 @@ LsiScsiBuildDevicePath (
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiGetTargetLun (\r
-  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL        *DevicePath,\r
-  OUT UINT8                           **TargetPointer,\r
-  OUT UINT64                          *Lun\r
+  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL         *DevicePath,\r
+  OUT UINT8                            **TargetPointer,\r
+  OUT UINT64                           *Lun\r
   )\r
 {\r
-  SCSI_DEVICE_PATH *ScsiDevicePath;\r
-  LSI_SCSI_DEV     *Dev;\r
-  UINT8            *Target;\r
+  SCSI_DEVICE_PATH  *ScsiDevicePath;\r
+  LSI_SCSI_DEV      *Dev;\r
+  UINT8             *Target;\r
 \r
-  if (DevicePath == NULL || TargetPointer == NULL || *TargetPointer == NULL ||\r
-      Lun == NULL) {\r
+  if ((DevicePath == NULL) || (TargetPointer == NULL) || (*TargetPointer == NULL) ||\r
+      (Lun == NULL))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (DevicePath->Type    != MESSAGING_DEVICE_PATH ||\r
-      DevicePath->SubType != MSG_SCSI_DP) {\r
+  if ((DevicePath->Type    != MESSAGING_DEVICE_PATH) ||\r
+      (DevicePath->SubType != MSG_SCSI_DP))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  ScsiDevicePath = (SCSI_DEVICE_PATH *) DevicePath;\r
-  Dev = LSI_SCSI_FROM_PASS_THRU (This);\r
-  if (ScsiDevicePath->Pun > Dev->MaxTarget ||\r
-      ScsiDevicePath->Lun > Dev->MaxLun) {\r
+  ScsiDevicePath = (SCSI_DEVICE_PATH *)DevicePath;\r
+  Dev            = LSI_SCSI_FROM_PASS_THRU (This);\r
+  if ((ScsiDevicePath->Pun > Dev->MaxTarget) ||\r
+      (ScsiDevicePath->Lun > Dev->MaxLun))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -710,7 +725,7 @@ LsiScsiGetTargetLun (
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiResetChannel (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -719,9 +734,9 @@ LsiScsiResetChannel (
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiResetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN UINT8                           *Target,\r
-  IN UINT64                          Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -730,14 +745,14 @@ LsiScsiResetTargetLun (
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiGetNextTarget (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN OUT UINT8                       **TargetPointer\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **TargetPointer\r
   )\r
 {\r
-  LSI_SCSI_DEV *Dev;\r
-  UINTN        Idx;\r
-  UINT8        *Target;\r
-  UINT16       LastTarget;\r
+  LSI_SCSI_DEV  *Dev;\r
+  UINTN         Idx;\r
+  UINT8         *Target;\r
+  UINT16        LastTarget;\r
 \r
   //\r
   // the TargetPointer input parameter is unnecessarily a pointer-to-pointer\r
@@ -747,8 +762,9 @@ LsiScsiGetNextTarget (
   //\r
   // Search for first non-0xFF byte. If not found, return first target.\r
   //\r
-  for (Idx = 0; Idx < TARGET_MAX_BYTES && Target[Idx] == 0xFF; ++Idx)\r
-    ;\r
+  for (Idx = 0; Idx < TARGET_MAX_BYTES && Target[Idx] == 0xFF; ++Idx) {\r
+  }\r
+\r
   if (Idx == TARGET_MAX_BYTES) {\r
     SetMem (Target, TARGET_MAX_BYTES, 0x00);\r
     return EFI_SUCCESS;\r
@@ -777,11 +793,11 @@ STATIC
 VOID\r
 EFIAPI\r
 LsiScsiExitBoot (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  LSI_SCSI_DEV *Dev;\r
+  LSI_SCSI_DEV  *Dev;\r
 \r
   Dev = Context;\r
   DEBUG ((DEBUG_VERBOSE, "%a: Context=0x%p\n", __FUNCTION__, Context));\r
@@ -800,14 +816,14 @@ LsiScsiExitBoot (
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiControllerSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE00          Pci;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
@@ -832,8 +848,9 @@ LsiScsiControllerSupported (
     goto Done;\r
   }\r
 \r
-  if (Pci.Hdr.VendorId == LSI_LOGIC_PCI_VENDOR_ID &&\r
-      Pci.Hdr.DeviceId == LSI_53C895A_PCI_DEVICE_ID) {\r
+  if ((Pci.Hdr.VendorId == LSI_LOGIC_PCI_VENDOR_ID) &&\r
+      (Pci.Hdr.DeviceId == LSI_53C895A_PCI_DEVICE_ID))\r
+  {\r
     Status = EFI_SUCCESS;\r
   } else {\r
     Status = EFI_UNSUPPORTED;\r
@@ -852,15 +869,15 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiControllerStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  LSI_SCSI_DEV         *Dev;\r
-  UINTN                Pages;\r
-  UINTN                BytesMapped;\r
+  EFI_STATUS    Status;\r
+  LSI_SCSI_DEV  *Dev;\r
+  UINTN         Pages;\r
+  UINTN         BytesMapped;\r
 \r
   Dev = AllocateZeroPool (sizeof (*Dev));\r
   if (Dev == NULL) {\r
@@ -877,8 +894,8 @@ LsiScsiControllerStart (
     FixedPcdGet8 (PcdLsiScsiMaxLunLimit) < 128,\r
     "LSI 53C895A supports LUNs [0..127]"\r
     );\r
-  Dev->MaxTarget = PcdGet8 (PcdLsiScsiMaxTargetLimit);\r
-  Dev->MaxLun = PcdGet8 (PcdLsiScsiMaxLunLimit);\r
+  Dev->MaxTarget        = PcdGet8 (PcdLsiScsiMaxTargetLimit);\r
+  Dev->MaxLun           = PcdGet8 (PcdLsiScsiMaxLunLimit);\r
   Dev->StallPerPollUsec = PcdGet32 (PcdLsiScsiStallPerPollUsec);\r
 \r
   Status = gBS->OpenProtocol (\r
@@ -920,7 +937,7 @@ LsiScsiControllerStart (
   //\r
   // Create buffers for data transfer\r
   //\r
-  Pages = EFI_SIZE_TO_PAGES (sizeof (*Dev->Dma));\r
+  Pages  = EFI_SIZE_TO_PAGES (sizeof (*Dev->Dma));\r
   Status = Dev->PciIo->AllocateBuffer (\r
                          Dev->PciIo,\r
                          AllocateAnyPages,\r
@@ -934,14 +951,14 @@ LsiScsiControllerStart (
   }\r
 \r
   BytesMapped = EFI_PAGES_TO_SIZE (Pages);\r
-  Status = Dev->PciIo->Map (\r
-                         Dev->PciIo,\r
-                         EfiPciIoOperationBusMasterCommonBuffer,\r
-                         Dev->Dma,\r
-                         &BytesMapped,\r
-                         &Dev->DmaPhysical,\r
-                         &Dev->DmaMapping\r
-                         );\r
+  Status      = Dev->PciIo->Map (\r
+                              Dev->PciIo,\r
+                              EfiPciIoOperationBusMasterCommonBuffer,\r
+                              Dev->Dma,\r
+                              &BytesMapped,\r
+                              &Dev->DmaPhysical,\r
+                              &Dev->DmaMapping\r
+                              );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeBuffer;\r
   }\r
@@ -970,19 +987,19 @@ LsiScsiControllerStart (
   //\r
   // Host adapter channel, doesn't exist\r
   //\r
-  Dev->PassThruMode.AdapterId = MAX_UINT32;\r
+  Dev->PassThruMode.AdapterId  = MAX_UINT32;\r
   Dev->PassThruMode.Attributes =\r
     EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_PHYSICAL |\r
     EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_LOGICAL;\r
 \r
-  Dev->PassThru.Mode = &Dev->PassThruMode;\r
-  Dev->PassThru.PassThru = &LsiScsiPassThru;\r
+  Dev->PassThru.Mode             = &Dev->PassThruMode;\r
+  Dev->PassThru.PassThru         = &LsiScsiPassThru;\r
   Dev->PassThru.GetNextTargetLun = &LsiScsiGetNextTargetLun;\r
-  Dev->PassThru.BuildDevicePath = &LsiScsiBuildDevicePath;\r
-  Dev->PassThru.GetTargetLun = &LsiScsiGetTargetLun;\r
-  Dev->PassThru.ResetChannel = &LsiScsiResetChannel;\r
-  Dev->PassThru.ResetTargetLun = &LsiScsiResetTargetLun;\r
-  Dev->PassThru.GetNextTarget = &LsiScsiGetNextTarget;\r
+  Dev->PassThru.BuildDevicePath  = &LsiScsiBuildDevicePath;\r
+  Dev->PassThru.GetTargetLun     = &LsiScsiGetTargetLun;\r
+  Dev->PassThru.ResetChannel     = &LsiScsiResetChannel;\r
+  Dev->PassThru.ResetTargetLun   = &LsiScsiResetTargetLun;\r
+  Dev->PassThru.GetNextTarget    = &LsiScsiGetNextTarget;\r
 \r
   Status = gBS->InstallProtocolInterface (\r
                   &ControllerHandle,\r
@@ -1040,15 +1057,15 @@ FreePool:
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiControllerStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *PassThru;\r
-  LSI_SCSI_DEV                    *Dev;\r
+  EFI_STATUS                       Status;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *PassThru;\r
+  LSI_SCSI_DEV                     *Dev;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
@@ -1113,7 +1130,7 @@ LsiScsiControllerStop (
 // C, 10.1 EFI Driver Binding Protocol.\r
 //\r
 STATIC\r
-EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gDriverBinding = {\r
   &LsiScsiControllerSupported,\r
   &LsiScsiControllerStart,\r
   &LsiScsiControllerStop,\r
@@ -1123,7 +1140,6 @@ EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
   NULL  // DriverBindingHandle, ditto\r
 };\r
 \r
-\r
 //\r
 // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL and\r
 // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's name\r
@@ -1137,20 +1153,20 @@ EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
 //\r
 \r
 STATIC\r
-EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "eng;en", L"LSI 53C895A SCSI Controller Driver" },\r
   { NULL,     NULL                                  }\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName;\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -1165,27 +1181,27 @@ LsiScsiGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName = {\r
   &LsiScsiGetDriverName,\r
   &LsiScsiGetDeviceName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME2_PROTOCOL gComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &LsiScsiGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &LsiScsiGetDeviceName,\r
+EFI_COMPONENT_NAME2_PROTOCOL  gComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&LsiScsiGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&LsiScsiGetDeviceName,\r
   "en" // SupportedLanguages, RFC 4646 language codes\r
 };\r
 \r
@@ -1195,8 +1211,8 @@ EFI_COMPONENT_NAME2_PROTOCOL gComponentName2 = {
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r
index 6ecf523f5a9ea68cd14244f62ea6163572e9794d..bdee9bb70e13ddf574a39248b79c9b4d0de755ab 100644 (file)
@@ -17,11 +17,11 @@ typedef struct {
   // Allocate 32 UINT32 entries for the script and it's sufficient for\r
   // 16 instructions.\r
   //\r
-  UINT32                          Script[32];\r
+  UINT32    Script[32];\r
   //\r
   // The max size of CDB is 32.\r
   //\r
-  UINT8                           Cdb[32];\r
+  UINT8     Cdb[32];\r
   //\r
   // Allocate 64KB for read/write buffer. It seems sufficient for the common\r
   // boot scenarios.\r
@@ -29,37 +29,37 @@ typedef struct {
   // NOTE: The number of bytes for data transmission is bounded by DMA Byte\r
   //       Count (DBC), a 24-bit register, so the maximum is 0xFFFFFF (16MB-1).\r
   //\r
-  UINT8                           Data[SIZE_64KB];\r
+  UINT8     Data[SIZE_64KB];\r
   //\r
   // For SCSI Message In phase\r
   //\r
-  UINT8                           MsgIn[2];\r
+  UINT8     MsgIn[2];\r
   //\r
   // For SCSI Message Out phase\r
   //\r
-  UINT8                           MsgOut;\r
+  UINT8     MsgOut;\r
   //\r
   // For SCSI Status phase\r
   //\r
-  UINT8                           Status;\r
+  UINT8     Status;\r
 } LSI_SCSI_DMA_BUFFER;\r
 \r
 typedef struct {\r
-  UINT32                          Signature;\r
-  UINT64                          OrigPciAttrs;\r
-  EFI_EVENT                       ExitBoot;\r
-  EFI_PCI_IO_PROTOCOL             *PciIo;\r
-  UINT8                           MaxTarget;\r
-  UINT8                           MaxLun;\r
-  UINT32                          StallPerPollUsec;\r
-  LSI_SCSI_DMA_BUFFER             *Dma;\r
-  EFI_PHYSICAL_ADDRESS            DmaPhysical;\r
-  VOID                            *DmaMapping;\r
-  EFI_EXT_SCSI_PASS_THRU_MODE     PassThruMode;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL PassThru;\r
+  UINT32                             Signature;\r
+  UINT64                             OrigPciAttrs;\r
+  EFI_EVENT                          ExitBoot;\r
+  EFI_PCI_IO_PROTOCOL                *PciIo;\r
+  UINT8                              MaxTarget;\r
+  UINT8                              MaxLun;\r
+  UINT32                             StallPerPollUsec;\r
+  LSI_SCSI_DMA_BUFFER                *Dma;\r
+  EFI_PHYSICAL_ADDRESS               DmaPhysical;\r
+  VOID                               *DmaMapping;\r
+  EFI_EXT_SCSI_PASS_THRU_MODE        PassThruMode;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL    PassThru;\r
 } LSI_SCSI_DEV;\r
 \r
-#define LSI_SCSI_DEV_SIGNATURE SIGNATURE_32 ('L','S','I','S')\r
+#define LSI_SCSI_DEV_SIGNATURE  SIGNATURE_32 ('L','S','I','S')\r
 \r
 #define LSI_SCSI_FROM_PASS_THRU(PassThruPtr) \\r
   CR (PassThruPtr, LSI_SCSI_DEV, PassThru, LSI_SCSI_DEV_SIGNATURE)\r
@@ -67,7 +67,6 @@ typedef struct {
 #define LSI_SCSI_DMA_ADDR(Dev, MemberName) \\r
   ((UINT32)(Dev->DmaPhysical + OFFSET_OF (LSI_SCSI_DMA_BUFFER, MemberName)))\r
 \r
-\r
 //\r
 // Probe, start and stop functions of this driver, called by the DXE core for\r
 // specific devices.\r
@@ -80,29 +79,28 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiControllerSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiControllerStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiControllerStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   );\r
 \r
-\r
 //\r
 // The next seven functions implement EFI_EXT_SCSI_PASS_THRU_PROTOCOL\r
 // for the LSI 53C895A SCSI Controller. Refer to UEFI Spec 2.3.1 + Errata C,\r
@@ -114,61 +112,60 @@ LsiScsiControllerStop (
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiPassThru (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN EFI_EVENT                                      Event     OPTIONAL\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                 *This,\r
+  IN UINT8                                           *Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN EFI_EVENT                                       Event     OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiGetNextTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN OUT UINT8                       **TargetPointer,\r
-  IN OUT UINT64                      *Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **TargetPointer,\r
+  IN OUT UINT64                       *Lun\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiBuildDevicePath (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN UINT8                           *Target,\r
-  IN UINT64                          Lun,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL    **DevicePath\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL     **DevicePath\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiGetTargetLun (\r
-  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL        *DevicePath,\r
-  OUT UINT8                           **TargetPointer,\r
-  OUT UINT64                          *Lun\r
+  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL         *DevicePath,\r
+  OUT UINT8                            **TargetPointer,\r
+  OUT UINT64                           *Lun\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiResetChannel (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiResetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN UINT8                           *Target,\r
-  IN UINT64                          Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiGetNextTarget (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN OUT UINT8                       **TargetPointer\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **TargetPointer\r
   );\r
 \r
-\r
 //\r
 // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL and\r
 // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's name\r
@@ -184,19 +181,19 @@ LsiScsiGetNextTarget (
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 LsiScsiGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
 #endif // _LSI_SCSI_DXE_H_\r
index 9ed1831bac6dcf051b0a9e7bcb4ff07e6a93bb3a..f64ccec24da8deeb7cac8de6cdc55d03d45cc79a 100644 (file)
 // Higher versions will be used before lower, 0x10-0xffffffef is the version\r
 // range for IVH (Indie Hardware Vendors)\r
 //\r
-#define MPT_SCSI_BINDING_VERSION 0x10\r
+#define MPT_SCSI_BINDING_VERSION  0x10\r
 \r
 //\r
 // Runtime Structures\r
 //\r
 \r
 typedef struct {\r
-  MPT_SCSI_REQUEST_ALIGNED        IoRequest;\r
-  MPT_SCSI_IO_REPLY_ALIGNED       IoReply;\r
+  MPT_SCSI_REQUEST_ALIGNED     IoRequest;\r
+  MPT_SCSI_IO_REPLY_ALIGNED    IoReply;\r
   //\r
   // As EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET.SenseDataLength is defined\r
   // as UINT8, defining here SenseData size to MAX_UINT8 will guarantee it\r
   // cannot overflow when passed to device.\r
   //\r
-  UINT8                           Sense[MAX_UINT8];\r
+  UINT8                        Sense[MAX_UINT8];\r
   //\r
   // This size of the data is arbitrarily chosen.\r
   // It seems to be sufficient for all I/O requests sent through\r
   // EFI_SCSI_PASS_THRU_PROTOCOL.PassThru() for common boot scenarios.\r
   //\r
-  UINT8                           Data[0x2000];\r
+  UINT8                        Data[0x2000];\r
 } MPT_SCSI_DMA_BUFFER;\r
 \r
-#define MPT_SCSI_DEV_SIGNATURE SIGNATURE_32 ('M','P','T','S')\r
+#define MPT_SCSI_DEV_SIGNATURE  SIGNATURE_32 ('M','P','T','S')\r
 typedef struct {\r
-  UINT32                          Signature;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL PassThru;\r
-  EFI_EXT_SCSI_PASS_THRU_MODE     PassThruMode;\r
-  UINT8                           MaxTarget;\r
-  UINT32                          StallPerPollUsec;\r
-  EFI_PCI_IO_PROTOCOL             *PciIo;\r
-  UINT64                          OriginalPciAttributes;\r
-  EFI_EVENT                       ExitBoot;\r
-  MPT_SCSI_DMA_BUFFER             *Dma;\r
-  EFI_PHYSICAL_ADDRESS            DmaPhysical;\r
-  VOID                            *DmaMapping;\r
-  BOOLEAN                         IoReplyEnqueued;\r
+  UINT32                             Signature;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL    PassThru;\r
+  EFI_EXT_SCSI_PASS_THRU_MODE        PassThruMode;\r
+  UINT8                              MaxTarget;\r
+  UINT32                             StallPerPollUsec;\r
+  EFI_PCI_IO_PROTOCOL                *PciIo;\r
+  UINT64                             OriginalPciAttributes;\r
+  EFI_EVENT                          ExitBoot;\r
+  MPT_SCSI_DMA_BUFFER                *Dma;\r
+  EFI_PHYSICAL_ADDRESS               DmaPhysical;\r
+  VOID                               *DmaMapping;\r
+  BOOLEAN                            IoReplyEnqueued;\r
 } MPT_SCSI_DEV;\r
 \r
 #define MPT_SCSI_FROM_PASS_THRU(PassThruPtr) \\r
@@ -85,9 +85,9 @@ typedef struct {
 STATIC\r
 EFI_STATUS\r
 Out32 (\r
-  IN MPT_SCSI_DEV       *Dev,\r
-  IN UINT32             Addr,\r
-  IN UINT32             Data\r
+  IN MPT_SCSI_DEV  *Dev,\r
+  IN UINT32        Addr,\r
+  IN UINT32        Data\r
   )\r
 {\r
   return Dev->PciIo->Io.Write (\r
@@ -103,9 +103,9 @@ Out32 (
 STATIC\r
 EFI_STATUS\r
 In32 (\r
-  IN  MPT_SCSI_DEV       *Dev,\r
-  IN  UINT32             Addr,\r
-  OUT UINT32             *Data\r
+  IN  MPT_SCSI_DEV  *Dev,\r
+  IN  UINT32        Addr,\r
+  OUT UINT32        *Data\r
   )\r
 {\r
   return Dev->PciIo->Io.Read (\r
@@ -121,9 +121,9 @@ In32 (
 STATIC\r
 EFI_STATUS\r
 MptDoorbell (\r
-  IN MPT_SCSI_DEV       *Dev,\r
-  IN UINT8              DoorbellFunc,\r
-  IN UINT8              DoorbellArg\r
+  IN MPT_SCSI_DEV  *Dev,\r
+  IN UINT8         DoorbellFunc,\r
+  IN UINT8         DoorbellArg\r
   )\r
 {\r
   return Out32 (\r
@@ -136,10 +136,10 @@ MptDoorbell (
 STATIC\r
 EFI_STATUS\r
 MptScsiReset (\r
-  IN MPT_SCSI_DEV       *Dev\r
+  IN MPT_SCSI_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Reset hardware\r
@@ -148,6 +148,7 @@ MptScsiReset (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Mask interrupts\r
   //\r
@@ -155,6 +156,7 @@ MptScsiReset (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Clear interrupt status\r
   //\r
@@ -169,18 +171,19 @@ MptScsiReset (
 STATIC\r
 EFI_STATUS\r
 MptScsiInit (\r
-  IN MPT_SCSI_DEV       *Dev\r
+  IN MPT_SCSI_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
+  EFI_STATUS  Status;\r
+\r
   union {\r
-    MPT_IO_CONTROLLER_INIT_REQUEST Data;\r
-    UINT32                         Uint32;\r
+    MPT_IO_CONTROLLER_INIT_REQUEST    Data;\r
+    UINT32                            Uint32;\r
   } AlignedReq;\r
-  MPT_IO_CONTROLLER_INIT_REQUEST   *Req;\r
-  MPT_IO_CONTROLLER_INIT_REPLY     Reply;\r
-  UINT8                            *ReplyBytes;\r
-  UINT32                           ReplyWord;\r
+  MPT_IO_CONTROLLER_INIT_REQUEST  *Req;\r
+  MPT_IO_CONTROLLER_INIT_REPLY    Reply;\r
+  UINT8                           *ReplyBytes;\r
+  UINT32                          ReplyWord;\r
 \r
   Req = &AlignedReq.Data;\r
 \r
@@ -191,16 +194,16 @@ MptScsiInit (
 \r
   ZeroMem (Req, sizeof (*Req));\r
   ZeroMem (&Reply, sizeof (Reply));\r
-  Req->WhoInit = MPT_IOC_WHOINIT_ROM_BIOS;\r
+  Req->WhoInit  = MPT_IOC_WHOINIT_ROM_BIOS;\r
   Req->Function = MPT_MESSAGE_HDR_FUNCTION_IOC_INIT;\r
   STATIC_ASSERT (\r
     FixedPcdGet8 (PcdMptScsiMaxTargetLimit) < 255,\r
     "Req supports 255 targets only (max target is 254)"\r
     );\r
-  Req->MaxDevices = Dev->MaxTarget + 1;\r
-  Req->MaxBuses = 1;\r
-  Req->ReplyFrameSize = sizeof Dev->Dma->IoReply.Data;\r
-  Req->HostMfaHighAddr = MPT_SCSI_DMA_ADDR_HIGH (Dev, IoRequest);\r
+  Req->MaxDevices          = Dev->MaxTarget + 1;\r
+  Req->MaxBuses            = 1;\r
+  Req->ReplyFrameSize      = sizeof Dev->Dma->IoReply.Data;\r
+  Req->HostMfaHighAddr     = MPT_SCSI_DMA_ADDR_HIGH (Dev, IoRequest);\r
   Req->SenseBufferHighAddr = MPT_SCSI_DMA_ADDR_HIGH (Dev, Sense);\r
 \r
   //\r
@@ -222,6 +225,7 @@ MptScsiInit (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   Status = Dev->PciIo->Io.Write (\r
                             Dev->PciIo,\r
                             EfiPciIoWidthFifoUint32,\r
@@ -252,6 +256,7 @@ MptScsiInit (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     CopyMem (ReplyBytes, &ReplyWord, sizeof (UINT16));\r
     ReplyBytes += sizeof (UINT16);\r
   }\r
@@ -270,7 +275,7 @@ MptScsiInit (
 STATIC\r
 EFI_STATUS\r
 ReportHostAdapterError (\r
-  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
   DEBUG ((DEBUG_ERROR, "%a: fatal error in scsi request\n", __FUNCTION__));\r
@@ -285,12 +290,12 @@ ReportHostAdapterError (
 STATIC\r
 EFI_STATUS\r
 ReportHostAdapterOverrunError (\r
-  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  Packet->SenseDataLength = 0;\r
+  Packet->SenseDataLength   = 0;\r
   Packet->HostAdapterStatus =\r
-            EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+    EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
   Packet->TargetStatus = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
   return EFI_BAD_BUFFER_SIZE;\r
 }\r
@@ -298,44 +303,46 @@ ReportHostAdapterOverrunError (
 STATIC\r
 EFI_STATUS\r
 MptScsiPopulateRequest (\r
-  IN MPT_SCSI_DEV                                   *Dev,\r
-  IN UINT8                                          Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  IN MPT_SCSI_DEV                                    *Dev,\r
+  IN UINT8                                           Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  MPT_SCSI_REQUEST_WITH_SG *Request;\r
+  MPT_SCSI_REQUEST_WITH_SG  *Request;\r
 \r
   Request = &Dev->Dma->IoRequest.Data;\r
 \r
-  if (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL ||\r
-      (Packet->InTransferLength > 0 && Packet->OutTransferLength > 0) ||\r
-      Packet->CdbLength > sizeof (Request->Header.Cdb)) {\r
+  if ((Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL) ||\r
+      ((Packet->InTransferLength > 0) && (Packet->OutTransferLength > 0)) ||\r
+      (Packet->CdbLength > sizeof (Request->Header.Cdb)))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  if (Target > Dev->MaxTarget || Lun > 0 ||\r
-      Packet->DataDirection > EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL ||\r
+  if ((Target > Dev->MaxTarget) || (Lun > 0) ||\r
+      (Packet->DataDirection > EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL) ||\r
       //\r
       // Trying to receive, but destination pointer is NULL, or contradicting\r
       // transfer direction\r
       //\r
-      (Packet->InTransferLength > 0 &&\r
-       (Packet->InDataBuffer == NULL ||\r
-        Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_WRITE\r
-         )\r
-        ) ||\r
+      ((Packet->InTransferLength > 0) &&\r
+       ((Packet->InDataBuffer == NULL) ||\r
+        (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_WRITE)\r
+       )\r
+      ) ||\r
 \r
       //\r
       // Trying to send, but source pointer is NULL, or contradicting transfer\r
       // direction\r
       //\r
-      (Packet->OutTransferLength > 0 &&\r
-       (Packet->OutDataBuffer == NULL ||\r
-        Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ\r
-         )\r
-        )\r
-    ) {\r
+      ((Packet->OutTransferLength > 0) &&\r
+       ((Packet->OutDataBuffer == NULL) ||\r
+        (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ)\r
+       )\r
+      )\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -343,6 +350,7 @@ MptScsiPopulateRequest (
     Packet->InTransferLength = sizeof (Dev->Dma->Data);\r
     return ReportHostAdapterOverrunError (Packet);\r
   }\r
+\r
   if (Packet->OutTransferLength > sizeof (Dev->Dma->Data)) {\r
     Packet->OutTransferLength = sizeof (Dev->Dma->Data);\r
     return ReportHostAdapterOverrunError (Packet);\r
@@ -353,8 +361,8 @@ MptScsiPopulateRequest (
   //\r
   // Only LUN 0 is currently supported, hence the cast is safe\r
   //\r
-  Request->Header.Lun[1] = (UINT8)Lun;\r
-  Request->Header.Function = MPT_MESSAGE_HDR_FUNCTION_SCSI_IO_REQUEST;\r
+  Request->Header.Lun[1]         = (UINT8)Lun;\r
+  Request->Header.Function       = MPT_MESSAGE_HDR_FUNCTION_SCSI_IO_REQUEST;\r
   Request->Header.MessageContext = 1; // We handle one request at a time\r
 \r
   Request->Header.CdbLength = Packet->CdbLength;\r
@@ -364,14 +372,14 @@ MptScsiPopulateRequest (
   // SenseDataLength is UINT8, Sense[] is MAX_UINT8, so we can't overflow\r
   //\r
   ZeroMem (Dev->Dma->Sense, Packet->SenseDataLength);\r
-  Request->Header.SenseBufferLength = Packet->SenseDataLength;\r
+  Request->Header.SenseBufferLength     = Packet->SenseDataLength;\r
   Request->Header.SenseBufferLowAddress = MPT_SCSI_DMA_ADDR_LOW (Dev, Sense);\r
 \r
-  Request->Sg.EndOfList = 1;\r
-  Request->Sg.EndOfBuffer = 1;\r
-  Request->Sg.LastElement = 1;\r
-  Request->Sg.ElementType = MPT_SG_ENTRY_TYPE_SIMPLE;\r
-  Request->Sg.Is64BitAddress = 1;\r
+  Request->Sg.EndOfList         = 1;\r
+  Request->Sg.EndOfBuffer       = 1;\r
+  Request->Sg.LastElement       = 1;\r
+  Request->Sg.ElementType       = MPT_SG_ENTRY_TYPE_SIMPLE;\r
+  Request->Sg.Is64BitAddress    = 1;\r
   Request->Sg.DataBufferAddress = MPT_SCSI_DMA_ADDR (Dev, Data);\r
 \r
   //\r
@@ -384,12 +392,12 @@ MptScsiPopulateRequest (
 \r
   if (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ) {\r
     Request->Header.DataLength = Packet->InTransferLength;\r
-    Request->Sg.Length = Packet->InTransferLength;\r
-    Request->Header.Control = MPT_SCSIIO_REQUEST_CONTROL_TXDIR_READ;\r
+    Request->Sg.Length         = Packet->InTransferLength;\r
+    Request->Header.Control    = MPT_SCSIIO_REQUEST_CONTROL_TXDIR_READ;\r
   } else {\r
     Request->Header.DataLength = Packet->OutTransferLength;\r
-    Request->Sg.Length = Packet->OutTransferLength;\r
-    Request->Header.Control = MPT_SCSIIO_REQUEST_CONTROL_TXDIR_WRITE;\r
+    Request->Sg.Length         = Packet->OutTransferLength;\r
+    Request->Header.Control    = MPT_SCSIIO_REQUEST_CONTROL_TXDIR_WRITE;\r
 \r
     CopyMem (Dev->Dma->Data, Packet->OutDataBuffer, Packet->OutTransferLength);\r
     Request->Sg.BufferContainsData = 1;\r
@@ -405,11 +413,11 @@ MptScsiPopulateRequest (
 STATIC\r
 EFI_STATUS\r
 MptScsiSendRequest (\r
-  IN MPT_SCSI_DEV                                   *Dev,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  IN MPT_SCSI_DEV                                    *Dev,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (!Dev->IoReplyEnqueued) {\r
     //\r
@@ -420,6 +428,7 @@ MptScsiSendRequest (
     if (EFI_ERROR (Status)) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
+\r
     Dev->IoReplyEnqueued = TRUE;\r
   }\r
 \r
@@ -434,19 +443,19 @@ MptScsiSendRequest (
 STATIC\r
 EFI_STATUS\r
 MptScsiGetReply (\r
-  IN MPT_SCSI_DEV                                   *Dev,\r
-  OUT UINT32                                        *Reply\r
+  IN MPT_SCSI_DEV  *Dev,\r
+  OUT UINT32       *Reply\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT32     Istatus;\r
-  UINT32     EmptyReply;\r
+  EFI_STATUS  Status;\r
+  UINT32      Istatus;\r
+  UINT32      EmptyReply;\r
 \r
   //\r
   // Timeouts are not supported for\r
   // EFI_EXT_SCSI_PASS_THRU_PROTOCOL.PassThru() in this implementation.\r
   //\r
-  for (;;) {\r
+  for ( ; ;) {\r
     Status = In32 (Dev, MPT_REG_ISTATUS, &Istatus);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -473,7 +482,7 @@ MptScsiGetReply (
   // next read reply to be the last.\r
   //\r
   Status = In32 (Dev, MPT_REG_REP_Q, &EmptyReply);\r
-  if (EFI_ERROR (Status) || EmptyReply != MAX_UINT32) {\r
+  if (EFI_ERROR (Status) || (EmptyReply != MAX_UINT32)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -483,9 +492,9 @@ MptScsiGetReply (
 STATIC\r
 EFI_STATUS\r
 MptScsiHandleReply (\r
-  IN MPT_SCSI_DEV                                   *Dev,\r
-  IN UINT32                                         Reply,\r
-  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET    *Packet\r
+  IN MPT_SCSI_DEV                                 *Dev,\r
+  IN UINT32                                       Reply,\r
+  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
   if (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ) {\r
@@ -496,10 +505,9 @@ MptScsiHandleReply (
     //\r
     // This is a turbo reply, everything is good\r
     //\r
-    Packet->SenseDataLength = 0;\r
+    Packet->SenseDataLength   = 0;\r
     Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK;\r
-    Packet->TargetStatus = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
-\r
+    Packet->TargetStatus      = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
   } else if ((Reply & BIT31) != 0) {\r
     DEBUG ((DEBUG_INFO, "%a: Full reply returned\n", __FUNCTION__));\r
     //\r
@@ -524,23 +532,22 @@ MptScsiHandleReply (
     }\r
 \r
     switch (Dev->Dma->IoReply.Data.IocStatus) {\r
-    case MPT_SCSI_IOCSTATUS_SUCCESS:\r
-      Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK;\r
-      break;\r
-    case MPT_SCSI_IOCSTATUS_DEVICE_NOT_THERE:\r
-      Packet->HostAdapterStatus =\r
-        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_SELECTION_TIMEOUT;\r
-      return EFI_TIMEOUT;\r
-    case MPT_SCSI_IOCSTATUS_DATA_UNDERRUN:\r
-    case MPT_SCSI_IOCSTATUS_DATA_OVERRUN:\r
-      Packet->HostAdapterStatus =\r
-        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
-      break;\r
-    default:\r
-      Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OTHER;\r
-      return EFI_DEVICE_ERROR;\r
+      case MPT_SCSI_IOCSTATUS_SUCCESS:\r
+        Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK;\r
+        break;\r
+      case MPT_SCSI_IOCSTATUS_DEVICE_NOT_THERE:\r
+        Packet->HostAdapterStatus =\r
+          EFI_EXT_SCSI_STATUS_HOST_ADAPTER_SELECTION_TIMEOUT;\r
+        return EFI_TIMEOUT;\r
+      case MPT_SCSI_IOCSTATUS_DATA_UNDERRUN:\r
+      case MPT_SCSI_IOCSTATUS_DATA_OVERRUN:\r
+        Packet->HostAdapterStatus =\r
+          EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+        break;\r
+      default:\r
+        Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OTHER;\r
+        return EFI_DEVICE_ERROR;\r
     }\r
-\r
   } else {\r
     DEBUG ((DEBUG_ERROR, "%a: unexpected reply (%x)\n", __FUNCTION__, Reply));\r
     return ReportHostAdapterError (Packet);\r
@@ -557,16 +564,16 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 MptScsiPassThru (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN EFI_EVENT                                      Event     OPTIONAL\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                 *This,\r
+  IN UINT8                                           *Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN EFI_EVENT                                       Event     OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS   Status;\r
-  MPT_SCSI_DEV *Dev;\r
-  UINT32       Reply;\r
+  EFI_STATUS    Status;\r
+  MPT_SCSI_DEV  *Dev;\r
+  UINT32        Reply;\r
 \r
   Dev = MPT_SCSI_FROM_PASS_THRU (This);\r
   //\r
@@ -596,16 +603,17 @@ MptScsiPassThru (
 STATIC\r
 BOOLEAN\r
 IsTargetInitialized (\r
-  IN UINT8                                          *Target\r
+  IN UINT8  *Target\r
   )\r
 {\r
-  UINTN Idx;\r
+  UINTN  Idx;\r
 \r
   for (Idx = 0; Idx < TARGET_MAX_BYTES; ++Idx) {\r
     if (Target[Idx] != 0xFF) {\r
       return TRUE;\r
     }\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
@@ -613,12 +621,12 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 MptScsiGetNextTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN OUT UINT8                                      **Target,\r
-  IN OUT UINT64                                     *Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **Target,\r
+  IN OUT UINT64                       *Lun\r
   )\r
 {\r
-  MPT_SCSI_DEV *Dev;\r
+  MPT_SCSI_DEV  *Dev;\r
 \r
   Dev = MPT_SCSI_FROM_PASS_THRU (This);\r
   //\r
@@ -627,7 +635,7 @@ MptScsiGetNextTargetLun (
   if (!IsTargetInitialized (*Target)) {\r
     ZeroMem (*Target, TARGET_MAX_BYTES);\r
     *Lun = 0;\r
-  } else if (**Target > Dev->MaxTarget || *Lun > 0) {\r
+  } else if ((**Target > Dev->MaxTarget) || (*Lun > 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   } else if (**Target < Dev->MaxTarget) {\r
     //\r
@@ -646,11 +654,11 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 MptScsiGetNextTarget (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
-  IN OUT UINT8                                     **Target\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **Target\r
   )\r
 {\r
-  MPT_SCSI_DEV *Dev;\r
+  MPT_SCSI_DEV  *Dev;\r
 \r
   Dev = MPT_SCSI_FROM_PASS_THRU (This);\r
   if (!IsTargetInitialized (*Target)) {\r
@@ -674,14 +682,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 MptScsiBuildDevicePath (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
-  IN UINT8                                         *Target,\r
-  IN UINT64                                        Lun,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL                  **DevicePath\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL     **DevicePath\r
   )\r
 {\r
-  MPT_SCSI_DEV     *Dev;\r
-  SCSI_DEVICE_PATH *ScsiDevicePath;\r
+  MPT_SCSI_DEV      *Dev;\r
+  SCSI_DEVICE_PATH  *ScsiDevicePath;\r
 \r
   if (DevicePath == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -692,7 +700,7 @@ MptScsiBuildDevicePath (
   // the LSB of Target.\r
   //\r
   Dev = MPT_SCSI_FROM_PASS_THRU (This);\r
-  if (*Target > Dev->MaxTarget || Lun > 0) {\r
+  if ((*Target > Dev->MaxTarget) || (Lun > 0)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -716,29 +724,32 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 MptScsiGetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
-  IN EFI_DEVICE_PATH_PROTOCOL                      *DevicePath,\r
-  OUT UINT8                                        **Target,\r
-  OUT UINT64                                       *Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN EFI_DEVICE_PATH_PROTOCOL         *DevicePath,\r
+  OUT UINT8                           **Target,\r
+  OUT UINT64                          *Lun\r
   )\r
 {\r
-  MPT_SCSI_DEV     *Dev;\r
-  SCSI_DEVICE_PATH *ScsiDevicePath;\r
+  MPT_SCSI_DEV      *Dev;\r
+  SCSI_DEVICE_PATH  *ScsiDevicePath;\r
 \r
-  if (DevicePath == NULL ||\r
-      Target == NULL || *Target == NULL || Lun == NULL) {\r
+  if ((DevicePath == NULL) ||\r
+      (Target == NULL) || (*Target == NULL) || (Lun == NULL))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (DevicePath->Type    != MESSAGING_DEVICE_PATH ||\r
-      DevicePath->SubType != MSG_SCSI_DP) {\r
+  if ((DevicePath->Type    != MESSAGING_DEVICE_PATH) ||\r
+      (DevicePath->SubType != MSG_SCSI_DP))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Dev = MPT_SCSI_FROM_PASS_THRU (This);\r
+  Dev            = MPT_SCSI_FROM_PASS_THRU (This);\r
   ScsiDevicePath = (SCSI_DEVICE_PATH *)DevicePath;\r
-  if (ScsiDevicePath->Pun > Dev->MaxTarget ||\r
-      ScsiDevicePath->Lun > 0) {\r
+  if ((ScsiDevicePath->Pun > Dev->MaxTarget) ||\r
+      (ScsiDevicePath->Lun > 0))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -748,7 +759,7 @@ MptScsiGetTargetLun (
   // of Target.\r
   //\r
   **Target = (UINT8)ScsiDevicePath->Pun;\r
-  *Lun = ScsiDevicePath->Lun;\r
+  *Lun     = ScsiDevicePath->Lun;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -757,7 +768,7 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 MptScsiResetChannel (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -767,23 +778,24 @@ STATIC
 VOID\r
 EFIAPI\r
 MptScsiExitBoot (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  MPT_SCSI_DEV *Dev;\r
+  MPT_SCSI_DEV  *Dev;\r
 \r
   Dev = Context;\r
   DEBUG ((DEBUG_VERBOSE, "%a: Context=0x%p\n", __FUNCTION__, Context));\r
   MptScsiReset (Dev);\r
 }\r
+\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MptScsiResetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
-  IN UINT8                                         *Target,\r
-  IN UINT64                                        Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -797,14 +809,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 MptScsiControllerSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL            *This,\r
-  IN EFI_HANDLE                             ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL               *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE00          Pci;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
@@ -829,10 +841,11 @@ MptScsiControllerSupported (
     goto Done;\r
   }\r
 \r
-  if (Pci.Hdr.VendorId == LSI_LOGIC_PCI_VENDOR_ID &&\r
-      (Pci.Hdr.DeviceId == LSI_53C1030_PCI_DEVICE_ID ||\r
-       Pci.Hdr.DeviceId == LSI_SAS1068_PCI_DEVICE_ID ||\r
-       Pci.Hdr.DeviceId == LSI_SAS1068E_PCI_DEVICE_ID)) {\r
+  if ((Pci.Hdr.VendorId == LSI_LOGIC_PCI_VENDOR_ID) &&\r
+      ((Pci.Hdr.DeviceId == LSI_53C1030_PCI_DEVICE_ID) ||\r
+       (Pci.Hdr.DeviceId == LSI_SAS1068_PCI_DEVICE_ID) ||\r
+       (Pci.Hdr.DeviceId == LSI_SAS1068E_PCI_DEVICE_ID)))\r
+  {\r
     Status = EFI_SUCCESS;\r
   } else {\r
     Status = EFI_UNSUPPORTED;\r
@@ -852,15 +865,15 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 MptScsiControllerStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL            *This,\r
-  IN EFI_HANDLE                             ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL               *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  MPT_SCSI_DEV         *Dev;\r
-  UINTN                Pages;\r
-  UINTN                BytesMapped;\r
+  EFI_STATUS    Status;\r
+  MPT_SCSI_DEV  *Dev;\r
+  UINTN         Pages;\r
+  UINTN         BytesMapped;\r
 \r
   Dev = AllocateZeroPool (sizeof (*Dev));\r
   if (Dev == NULL) {\r
@@ -869,7 +882,7 @@ MptScsiControllerStart (
 \r
   Dev->Signature = MPT_SCSI_DEV_SIGNATURE;\r
 \r
-  Dev->MaxTarget = PcdGet8 (PcdMptScsiMaxTargetLimit);\r
+  Dev->MaxTarget        = PcdGet8 (PcdMptScsiMaxTargetLimit);\r
   Dev->StallPerPollUsec = PcdGet32 (PcdMptScsiStallPerPollUsec);\r
 \r
   Status = gBS->OpenProtocol (\r
@@ -934,7 +947,7 @@ MptScsiControllerStart (
   //\r
   // Create buffers for data transfer\r
   //\r
-  Pages = EFI_SIZE_TO_PAGES (sizeof (*Dev->Dma));\r
+  Pages  = EFI_SIZE_TO_PAGES (sizeof (*Dev->Dma));\r
   Status = Dev->PciIo->AllocateBuffer (\r
                          Dev->PciIo,\r
                          AllocateAnyPages,\r
@@ -948,14 +961,14 @@ MptScsiControllerStart (
   }\r
 \r
   BytesMapped = EFI_PAGES_TO_SIZE (Pages);\r
-  Status = Dev->PciIo->Map (\r
-                         Dev->PciIo,\r
-                         EfiPciIoOperationBusMasterCommonBuffer,\r
-                         Dev->Dma,\r
-                         &BytesMapped,\r
-                         &Dev->DmaPhysical,\r
-                         &Dev->DmaMapping\r
-                         );\r
+  Status      = Dev->PciIo->Map (\r
+                              Dev->PciIo,\r
+                              EfiPciIoOperationBusMasterCommonBuffer,\r
+                              Dev->Dma,\r
+                              &BytesMapped,\r
+                              &Dev->DmaPhysical,\r
+                              &Dev->DmaMapping\r
+                              );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeBuffer;\r
   }\r
@@ -984,19 +997,19 @@ MptScsiControllerStart (
   //\r
   // Host adapter channel, doesn't exist\r
   //\r
-  Dev->PassThruMode.AdapterId = MAX_UINT32;\r
+  Dev->PassThruMode.AdapterId  = MAX_UINT32;\r
   Dev->PassThruMode.Attributes =\r
     EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_PHYSICAL |\r
     EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_LOGICAL;\r
 \r
-  Dev->PassThru.Mode = &Dev->PassThruMode;\r
-  Dev->PassThru.PassThru = &MptScsiPassThru;\r
+  Dev->PassThru.Mode             = &Dev->PassThruMode;\r
+  Dev->PassThru.PassThru         = &MptScsiPassThru;\r
   Dev->PassThru.GetNextTargetLun = &MptScsiGetNextTargetLun;\r
-  Dev->PassThru.BuildDevicePath = &MptScsiBuildDevicePath;\r
-  Dev->PassThru.GetTargetLun = &MptScsiGetTargetLun;\r
-  Dev->PassThru.ResetChannel = &MptScsiResetChannel;\r
-  Dev->PassThru.ResetTargetLun = &MptScsiResetTargetLun;\r
-  Dev->PassThru.GetNextTarget = &MptScsiGetNextTarget;\r
+  Dev->PassThru.BuildDevicePath  = &MptScsiBuildDevicePath;\r
+  Dev->PassThru.GetTargetLun     = &MptScsiGetTargetLun;\r
+  Dev->PassThru.ResetChannel     = &MptScsiResetChannel;\r
+  Dev->PassThru.ResetTargetLun   = &MptScsiResetTargetLun;\r
+  Dev->PassThru.GetNextTarget    = &MptScsiGetNextTarget;\r
 \r
   Status = gBS->InstallProtocolInterface (\r
                   &ControllerHandle,\r
@@ -1055,15 +1068,15 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 MptScsiControllerStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL            *This,\r
-  IN  EFI_HANDLE                            ControllerHandle,\r
-  IN  UINTN                                 NumberOfChildren,\r
-  IN  EFI_HANDLE                            *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                  ControllerHandle,\r
+  IN  UINTN                       NumberOfChildren,\r
+  IN  EFI_HANDLE                  *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *PassThru;\r
-  MPT_SCSI_DEV                    *Dev;\r
+  EFI_STATUS                       Status;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *PassThru;\r
+  MPT_SCSI_DEV                     *Dev;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
@@ -1123,7 +1136,7 @@ MptScsiControllerStop (
 }\r
 \r
 STATIC\r
-EFI_DRIVER_BINDING_PROTOCOL mMptScsiDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  mMptScsiDriverBinding = {\r
   &MptScsiControllerSupported,\r
   &MptScsiControllerStart,\r
   &MptScsiControllerStop,\r
@@ -1137,20 +1150,20 @@ EFI_DRIVER_BINDING_PROTOCOL mMptScsiDriverBinding = {
 //\r
 \r
 STATIC\r
-EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "eng;en", L"LSI Fusion MPT SCSI Driver" },\r
-  { NULL,     NULL                   }\r
+  { NULL,     NULL                          }\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL mComponentName;\r
+EFI_COMPONENT_NAME_PROTOCOL  mComponentName;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 MptScsiGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -1165,27 +1178,27 @@ MptScsiGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 MptScsiGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL mComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL  mComponentName = {\r
   &MptScsiGetDriverName,\r
   &MptScsiGetDeviceName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &MptScsiGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &MptScsiGetDeviceName,\r
+EFI_COMPONENT_NAME2_PROTOCOL  mComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&MptScsiGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&MptScsiGetDeviceName,\r
   "en" // SupportedLanguages, RFC 4646 language codes\r
 };\r
 \r
@@ -1196,8 +1209,8 @@ EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {
 EFI_STATUS\r
 EFIAPI\r
 MptScsiEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r
index 90f0574fc614453c7bda62bdafe8dabbc85c850e..489060cdaddbbea0fc871114c9a73d9bc6d45bbb 100644 (file)
 #include "stdio.h"\r
 #include "stddef.h"\r
 \r
-void print_hdr(void *s, size_t size)\r
+void\r
+print_hdr (\r
+  void    *s,\r
+  size_t  size\r
+  )\r
 {\r
-  char *c = s;\r
+  char  *c = s;\r
 \r
   while (size--) {\r
-    printf("0x%02hhx, ", *(c++));\r
+    printf ("0x%02hhx, ", *(c++));\r
   }\r
 }\r
 \r
 /* Format for the XEN_ELFNOTE_PHYS32_ENTRY program segment */\r
-#define XEN_ELFNOTE_PHYS32_ENTRY 18\r
+#define XEN_ELFNOTE_PHYS32_ENTRY  18\r
 typedef struct {\r
-  uint32_t name_size;\r
-  uint32_t desc_size;\r
-  uint32_t type;\r
-  char name[4];\r
-  uint32_t desc;\r
+  uint32_t    name_size;\r
+  uint32_t    desc_size;\r
+  uint32_t    type;\r
+  char        name[4];\r
+  uint32_t    desc;\r
 } xen_elfnote_phys32_entry;\r
 \r
-int main(void)\r
+int\r
+main (\r
+  void\r
+  )\r
 {\r
   /* FW_SIZE */\r
-  size_t ovmf_blob_size = 0x00200000;\r
+  size_t  ovmf_blob_size = 0x00200000;\r
   /* Load OVMF at 1MB when running as PVH guest */\r
-  uint32_t ovmf_base_address = 0x00100000;\r
+  uint32_t  ovmf_base_address = 0x00100000;\r
   /* Xen PVH entry point */\r
-  uint32_t ovmfxen_pvh_entry_point = ovmf_base_address + ovmf_blob_size - 0x30;\r
-  size_t offset_into_file = 0;\r
+  uint32_t  ovmfxen_pvh_entry_point = ovmf_base_address + ovmf_blob_size - 0x30;\r
+  size_t    offset_into_file        = 0;\r
 \r
   /* ELF file header */\r
-  Elf32_Ehdr hdr = {\r
-    .e_ident = ELFMAG,\r
-    .e_type = ET_EXEC,\r
-    .e_machine = EM_386,\r
-    .e_version = EV_CURRENT,\r
-    .e_entry = ovmfxen_pvh_entry_point,\r
-    .e_flags = R_386_NONE,\r
-    .e_ehsize = sizeof (hdr),\r
+  Elf32_Ehdr  hdr = {\r
+    .e_ident     = ELFMAG,\r
+    .e_type      = ET_EXEC,\r
+    .e_machine   = EM_386,\r
+    .e_version   = EV_CURRENT,\r
+    .e_entry     = ovmfxen_pvh_entry_point,\r
+    .e_flags     = R_386_NONE,\r
+    .e_ehsize    = sizeof (hdr),\r
     .e_phentsize = sizeof (Elf32_Phdr),\r
   };\r
+\r
   offset_into_file += sizeof (hdr);\r
 \r
-  hdr.e_ident[EI_CLASS] = ELFCLASS32;\r
-  hdr.e_ident[EI_DATA] = ELFDATA2LSB;\r
+  hdr.e_ident[EI_CLASS]   = ELFCLASS32;\r
+  hdr.e_ident[EI_DATA]    = ELFDATA2LSB;\r
   hdr.e_ident[EI_VERSION] = EV_CURRENT;\r
-  hdr.e_ident[EI_OSABI] = ELFOSABI_LINUX;\r
+  hdr.e_ident[EI_OSABI]   = ELFOSABI_LINUX;\r
   /* Placing program headers just after hdr */\r
   hdr.e_phoff = sizeof (hdr);\r
 \r
   /* program header */\r
-  Elf32_Phdr phdr_load = {\r
-    .p_type = PT_LOAD,\r
+  Elf32_Phdr  phdr_load = {\r
+    .p_type   = PT_LOAD,\r
     .p_offset = 0, /* load everything */\r
-    .p_paddr = ovmf_base_address,\r
+    .p_paddr  = ovmf_base_address,\r
     .p_filesz = ovmf_blob_size,\r
-    .p_memsz = ovmf_blob_size,\r
-    .p_flags = PF_X | PF_W | PF_R,\r
-    .p_align = 0,\r
+    .p_memsz  = ovmf_blob_size,\r
+    .p_flags  = PF_X | PF_W | PF_R,\r
+    .p_align  = 0,\r
   };\r
+\r
   phdr_load.p_vaddr = phdr_load.p_paddr;\r
-  hdr.e_phnum += 1;\r
+  hdr.e_phnum      += 1;\r
   offset_into_file += sizeof (phdr_load);\r
 \r
   /* Xen ELF Note. */\r
 \r
-  xen_elfnote_phys32_entry xen_elf_note = {\r
-    .type = XEN_ELFNOTE_PHYS32_ENTRY,\r
-    .name = "Xen",\r
-    .desc = ovmfxen_pvh_entry_point,\r
+  xen_elfnote_phys32_entry  xen_elf_note = {\r
+    .type      = XEN_ELFNOTE_PHYS32_ENTRY,\r
+    .name      = "Xen",\r
+    .desc      = ovmfxen_pvh_entry_point,\r
     .name_size =\r
       offsetof (xen_elfnote_phys32_entry, desc) -\r
       offsetof (xen_elfnote_phys32_entry, name),\r
@@ -89,51 +98,52 @@ int main(void)
       sizeof (xen_elfnote_phys32_entry) -\r
       offsetof (xen_elfnote_phys32_entry, desc),\r
   };\r
-  Elf32_Phdr phdr_note = {\r
-    .p_type = PT_NOTE,\r
+  Elf32_Phdr                phdr_note = {\r
+    .p_type   = PT_NOTE,\r
     .p_filesz = sizeof (xen_elf_note),\r
-    .p_memsz = sizeof (xen_elf_note),\r
-    .p_flags = PF_R,\r
-    .p_align = 0,\r
+    .p_memsz  = sizeof (xen_elf_note),\r
+    .p_flags  = PF_R,\r
+    .p_align  = 0,\r
   };\r
-  hdr.e_phnum += 1;\r
-  offset_into_file += sizeof (phdr_note);\r
-  phdr_note.p_offset = offset_into_file;\r
-  phdr_note.p_paddr = ovmf_base_address + phdr_note.p_offset;\r
-  phdr_note.p_vaddr = phdr_note.p_paddr;\r
 \r
+  hdr.e_phnum       += 1;\r
+  offset_into_file  += sizeof (phdr_note);\r
+  phdr_note.p_offset = offset_into_file;\r
+  phdr_note.p_paddr  = ovmf_base_address + phdr_note.p_offset;\r
+  phdr_note.p_vaddr  = phdr_note.p_paddr;\r
 \r
   /*\r
    * print elf header\r
    */\r
 \r
-  size_t i;\r
-  size_t hdr_size = sizeof (hdr);\r
-  size_t entry_off = offsetof(typeof(hdr), e_entry);\r
+  size_t  i;\r
+  size_t  hdr_size  = sizeof (hdr);\r
+  size_t  entry_off = offsetof (typeof(hdr), e_entry);\r
 \r
-  printf("# ELF file header\n");\r
-  print_hdr(&hdr, entry_off);\r
-  printf("\n");\r
-  print_hdr(&hdr.e_entry, sizeof (hdr.e_entry));\r
-  printf(" # hdr.e_entry\n");\r
-  print_hdr(&hdr.e_entry + 1, hdr_size - entry_off - sizeof (hdr.e_entry));\r
+  printf ("# ELF file header\n");\r
+  print_hdr (&hdr, entry_off);\r
+  printf ("\n");\r
+  print_hdr (&hdr.e_entry, sizeof (hdr.e_entry));\r
+  printf (" # hdr.e_entry\n");\r
+  print_hdr (&hdr.e_entry + 1, hdr_size - entry_off - sizeof (hdr.e_entry));\r
 \r
-  printf("\n\n# ELF Program segment headers\n");\r
-  printf("# - Load segment\n");\r
+  printf ("\n\n# ELF Program segment headers\n");\r
+  printf ("# - Load segment\n");\r
   for (i = 0; i < sizeof (phdr_load); i += 4) {\r
-    print_hdr(((char*)&phdr_load) + i, 4);\r
-    printf("\n");\r
+    print_hdr (((char *)&phdr_load) + i, 4);\r
+    printf ("\n");\r
   }\r
-  printf("# - ELFNOTE segment\n");\r
+\r
+  printf ("# - ELFNOTE segment\n");\r
   for (i = 0; i < sizeof (phdr_note); i += 4) {\r
-    print_hdr(((char*)&phdr_note) + i, 4);\r
-    printf("\n");\r
+    print_hdr (((char *)&phdr_note) + i, 4);\r
+    printf ("\n");\r
   }\r
 \r
-  printf("\n# XEN_ELFNOTE_PHYS32_ENTRY\n");\r
+  printf ("\n# XEN_ELFNOTE_PHYS32_ENTRY\n");\r
   for (i = 0; i < sizeof (xen_elf_note); i += 4) {\r
-    print_hdr(((char*)&xen_elf_note) + i, 4);\r
-    printf("\n");\r
+    print_hdr (((char *)&xen_elf_note) + i, 4);\r
+    printf ("\n");\r
   }\r
 \r
   return 0;\r
index 387b1e80eb01ecb959f9482a396eae3a6a76e27f..c122855b735d6f9bde730b2f252fed00328ed446 100644 (file)
@@ -27,8 +27,7 @@
 //\r
 // TRUE if the PCI platform supports extended config space, FALSE otherwise.\r
 //\r
-STATIC BOOLEAN mPciExtConfSpaceSupported;\r
-\r
+STATIC BOOLEAN  mPciExtConfSpaceSupported;\r
 \r
 //\r
 // The protocol interface this driver produces.\r
@@ -36,8 +35,7 @@ STATIC BOOLEAN mPciExtConfSpaceSupported;
 // Refer to 12.6 "PCI Hot Plug PCI Initialization Protocol" in the Platform\r
 // Init 1.4a Spec, Volume 5.\r
 //\r
-STATIC EFI_PCI_HOT_PLUG_INIT_PROTOCOL mPciHotPlugInit;\r
-\r
+STATIC EFI_PCI_HOT_PLUG_INIT_PROTOCOL  mPciHotPlugInit;\r
 \r
 //\r
 // Resource padding template for the GetResourcePadding() protocol member\r
@@ -58,12 +56,11 @@ STATIC EFI_PCI_HOT_PLUG_INIT_PROTOCOL mPciHotPlugInit;
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR Padding[4];\r
-  EFI_ACPI_END_TAG_DESCRIPTOR       EndDesc;\r
+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR    Padding[4];\r
+  EFI_ACPI_END_TAG_DESCRIPTOR          EndDesc;\r
 } RESOURCE_PADDING;\r
 #pragma pack ()\r
 \r
-\r
 /**\r
   Initialize a RESOURCE_PADDING object.\r
 \r
@@ -73,10 +70,10 @@ typedef struct {
 STATIC\r
 VOID\r
 InitializeResourcePadding (\r
-  OUT RESOURCE_PADDING *ResourcePadding\r
+  OUT RESOURCE_PADDING  *ResourcePadding\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
 \r
   ZeroMem (ResourcePadding, sizeof *ResourcePadding);\r
 \r
@@ -84,17 +81,17 @@ InitializeResourcePadding (
   // Fill in the Padding fields that don't vary across resource types.\r
   //\r
   for (Index = 0; Index < ARRAY_SIZE (ResourcePadding->Padding); ++Index) {\r
-    EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor;\r
+    EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *Descriptor;\r
 \r
     Descriptor       = ResourcePadding->Padding + Index;\r
     Descriptor->Desc = ACPI_ADDRESS_SPACE_DESCRIPTOR;\r
     Descriptor->Len  = (UINT16)(\r
-                         sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -\r
-                         OFFSET_OF (\r
-                           EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,\r
-                           ResType\r
-                           )\r
-                         );\r
+                                sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -\r
+                                OFFSET_OF (\r
+                                  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,\r
+                                  ResType\r
+                                  )\r
+                                );\r
   }\r
 \r
   //\r
@@ -103,7 +100,6 @@ InitializeResourcePadding (
   ResourcePadding->EndDesc.Desc = ACPI_END_TAG_DESCRIPTOR;\r
 }\r
 \r
-\r
 /**\r
   Set up a descriptor entry for reserving IO space.\r
 \r
@@ -117,16 +113,15 @@ InitializeResourcePadding (
 STATIC\r
 VOID\r
 SetIoPadding (\r
-  IN OUT EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor,\r
-  IN     UINTN                             SizeExponent\r
+  IN OUT EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *Descriptor,\r
+  IN     UINTN                              SizeExponent\r
   )\r
 {\r
-  Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_IO;\r
-  Descriptor->AddrLen = LShiftU64 (1, SizeExponent);\r
+  Descriptor->ResType      = ACPI_ADDRESS_SPACE_TYPE_IO;\r
+  Descriptor->AddrLen      = LShiftU64 (1, SizeExponent);\r
   Descriptor->AddrRangeMax = Descriptor->AddrLen - 1;\r
 }\r
 \r
-\r
 /**\r
   Set up a descriptor entry for reserving MMIO space.\r
 \r
@@ -152,10 +147,10 @@ SetIoPadding (
 STATIC\r
 VOID\r
 SetMmioPadding (\r
-  IN OUT EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor,\r
-  IN     BOOLEAN                           Prefetchable,\r
-  IN     BOOLEAN                           ThirtyTwoBitOnly,\r
-  IN     UINTN                             SizeExponent\r
+  IN OUT EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *Descriptor,\r
+  IN     BOOLEAN                            Prefetchable,\r
+  IN     BOOLEAN                            ThirtyTwoBitOnly,\r
+  IN     UINTN                              SizeExponent\r
   )\r
 {\r
   Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;\r
@@ -168,11 +163,11 @@ SetMmioPadding (
       EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_NON_CACHEABLE;\r
     Descriptor->AddrSpaceGranularity = 32;\r
   }\r
-  Descriptor->AddrLen = LShiftU64 (1, SizeExponent);\r
+\r
+  Descriptor->AddrLen      = LShiftU64 (1, SizeExponent);\r
   Descriptor->AddrRangeMax = Descriptor->AddrLen - 1;\r
 }\r
 \r
-\r
 /**\r
   Round up a positive 32-bit value to the next whole power of two, and return\r
   the bit position of the highest bit set in the result. Equivalent to\r
@@ -190,10 +185,10 @@ SetMmioPadding (
 STATIC\r
 INTN\r
 HighBitSetRoundUp32 (\r
-  IN UINT32 Operand\r
+  IN UINT32  Operand\r
   )\r
 {\r
-  INTN HighBit;\r
+  INTN  HighBit;\r
 \r
   HighBit = HighBitSet32 (Operand);\r
   if (HighBit == -1) {\r
@@ -202,16 +197,17 @@ HighBitSetRoundUp32 (
     //\r
     return HighBit;\r
   }\r
+\r
   if ((Operand & (Operand - 1)) != 0) {\r
     //\r
     // Operand is not a whole power of two.\r
     //\r
     ++HighBit;\r
   }\r
+\r
   return (HighBit < 32) ? HighBit : -1;\r
 }\r
 \r
-\r
 /**\r
   Round up a positive 64-bit value to the next whole power of two, and return\r
   the bit position of the highest bit set in the result. Equivalent to\r
@@ -229,10 +225,10 @@ HighBitSetRoundUp32 (
 STATIC\r
 INTN\r
 HighBitSetRoundUp64 (\r
-  IN UINT64 Operand\r
+  IN UINT64  Operand\r
   )\r
 {\r
-  INTN HighBit;\r
+  INTN  HighBit;\r
 \r
   HighBit = HighBitSet64 (Operand);\r
   if (HighBit == -1) {\r
@@ -241,16 +237,17 @@ HighBitSetRoundUp64 (
     //\r
     return HighBit;\r
   }\r
+\r
   if ((Operand & (Operand - 1)) != 0) {\r
     //\r
     // Operand is not a whole power of two.\r
     //\r
     ++HighBit;\r
   }\r
+\r
   return (HighBit < 64) ? HighBit : -1;\r
 }\r
 \r
-\r
 /**\r
   Look up the QEMU-specific Resource Reservation capability in the conventional\r
   config space of a Hotplug Controller (that is, PCI Bridge).\r
@@ -273,16 +270,16 @@ HighBitSetRoundUp64 (
 STATIC\r
 EFI_STATUS\r
 QueryReservationHint (\r
-  IN  CONST EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS *HpcPciAddress,\r
-  OUT QEMU_PCI_BRIDGE_CAPABILITY_RESOURCE_RESERVATION   *ReservationHint\r
-)\r
+  IN  CONST EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS  *HpcPciAddress,\r
+  OUT QEMU_PCI_BRIDGE_CAPABILITY_RESOURCE_RESERVATION    *ReservationHint\r
+  )\r
 {\r
-  UINT16       PciVendorId;\r
-  EFI_STATUS   Status;\r
-  PCI_CAP_DEV  *PciDevice;\r
-  PCI_CAP_LIST *CapList;\r
-  UINT16       VendorInstance;\r
-  PCI_CAP      *VendorCap;\r
+  UINT16        PciVendorId;\r
+  EFI_STATUS    Status;\r
+  PCI_CAP_DEV   *PciDevice;\r
+  PCI_CAP_LIST  *CapList;\r
+  UINT16        VendorInstance;\r
+  PCI_CAP       *VendorCap;\r
 \r
   //\r
   // Check the vendor identifier.\r
@@ -313,6 +310,7 @@ QueryReservationHint (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   Status = PciCapListInit (PciDevice, &CapList);\r
   if (EFI_ERROR (Status)) {\r
     goto UninitPciDevice;\r
@@ -323,9 +321,9 @@ QueryReservationHint (
   // capability.\r
   //\r
   VendorInstance = 0;\r
-  for (;;) {\r
-    UINT8 VendorLength;\r
-    UINT8 BridgeCapType;\r
+  for ( ; ;) {\r
+    UINT8  VendorLength;\r
+    UINT8  BridgeCapType;\r
 \r
     Status = PciCapListFindCap (\r
                CapList,\r
@@ -351,6 +349,7 @@ QueryReservationHint (
     if (EFI_ERROR (Status)) {\r
       goto UninitCapList;\r
     }\r
+\r
     if (VendorLength != sizeof *ReservationHint) {\r
       continue;\r
     }\r
@@ -368,8 +367,10 @@ QueryReservationHint (
     if (EFI_ERROR (Status)) {\r
       goto UninitCapList;\r
     }\r
+\r
     if (BridgeCapType ==\r
-        QEMU_PCI_BRIDGE_CAPABILITY_TYPE_RESOURCE_RESERVATION) {\r
+        QEMU_PCI_BRIDGE_CAPABILITY_TYPE_RESOURCE_RESERVATION)\r
+    {\r
       //\r
       // We have a match.\r
       //\r
@@ -397,7 +398,6 @@ UninitPciDevice:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Returns a list of root Hot Plug Controllers (HPCs) that require\r
   initialization during the boot process.\r
@@ -428,12 +428,12 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 GetRootHpcList (\r
-  IN  EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This,\r
-  OUT UINTN                          *HpcCount,\r
-  OUT EFI_HPC_LOCATION               **HpcList\r
+  IN  EFI_PCI_HOT_PLUG_INIT_PROTOCOL  *This,\r
+  OUT UINTN                           *HpcCount,\r
+  OUT EFI_HPC_LOCATION                **HpcList\r
   )\r
 {\r
-  if (HpcCount == NULL || HpcList == NULL) {\r
+  if ((HpcCount == NULL) || (HpcList == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -442,11 +442,10 @@ GetRootHpcList (
   // that would require special initialization.\r
   //\r
   *HpcCount = 0;\r
-  *HpcList = NULL;\r
+  *HpcList  = NULL;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Initializes one root Hot Plug Controller (HPC). This process may causes\r
   initialization of its subordinate buses.\r
@@ -486,11 +485,11 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 InitializeRootHpc (\r
-  IN  EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL       *HpcDevicePath,\r
-  IN  UINT64                         HpcPciAddress,\r
-  IN  EFI_EVENT                      Event  OPTIONAL,\r
-  OUT EFI_HPC_STATE                  *HpcState\r
+  IN  EFI_PCI_HOT_PLUG_INIT_PROTOCOL  *This,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL        *HpcDevicePath,\r
+  IN  UINT64                          HpcPciAddress,\r
+  IN  EFI_EVENT                       Event  OPTIONAL,\r
+  OUT EFI_HPC_STATE                   *HpcState\r
   )\r
 {\r
   //\r
@@ -502,10 +501,10 @@ InitializeRootHpc (
   if (HpcState == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Returns the resource padding that is required by the PCI bus that is\r
   controlled by the specified Hot Plug Controller (HPC).\r
@@ -546,43 +545,50 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 GetResourcePadding (\r
-  IN  EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL       *HpcDevicePath,\r
-  IN  UINT64                         HpcPciAddress,\r
-  OUT EFI_HPC_STATE                  *HpcState,\r
-  OUT VOID                           **Padding,\r
-  OUT EFI_HPC_PADDING_ATTRIBUTES     *Attributes\r
+  IN  EFI_PCI_HOT_PLUG_INIT_PROTOCOL  *This,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL        *HpcDevicePath,\r
+  IN  UINT64                          HpcPciAddress,\r
+  OUT EFI_HPC_STATE                   *HpcState,\r
+  OUT VOID                            **Padding,\r
+  OUT EFI_HPC_PADDING_ATTRIBUTES      *Attributes\r
   )\r
 {\r
-  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS     *Address;\r
-  BOOLEAN                                         DefaultIo;\r
-  BOOLEAN                                         DefaultMmio;\r
-  RESOURCE_PADDING                                ReservationRequest;\r
-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR               *FirstResource;\r
-  EFI_STATUS                                      ReservationHintStatus;\r
-  QEMU_PCI_BRIDGE_CAPABILITY_RESOURCE_RESERVATION ReservationHint;\r
+  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS      *Address;\r
+  BOOLEAN                                          DefaultIo;\r
+  BOOLEAN                                          DefaultMmio;\r
+  RESOURCE_PADDING                                 ReservationRequest;\r
+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR                *FirstResource;\r
+  EFI_STATUS                                       ReservationHintStatus;\r
+  QEMU_PCI_BRIDGE_CAPABILITY_RESOURCE_RESERVATION  ReservationHint;\r
 \r
   Address = (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS *)&HpcPciAddress;\r
 \r
   DEBUG_CODE_BEGIN ();\r
-    CHAR16                                      *DevicePathString;\r
-\r
-    DevicePathString = ConvertDevicePathToText (HpcDevicePath, FALSE, FALSE);\r
-\r
-    DEBUG ((DEBUG_VERBOSE, "%a: Address=%02x:%02x.%x DevicePath=%s\n",\r
-      __FUNCTION__, Address->Bus, Address->Device, Address->Function,\r
-      (DevicePathString == NULL) ? L"<unavailable>" : DevicePathString));\r
+  CHAR16  *DevicePathString;\r
+\r
+  DevicePathString = ConvertDevicePathToText (HpcDevicePath, FALSE, FALSE);\r
+\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: Address=%02x:%02x.%x DevicePath=%s\n",\r
+    __FUNCTION__,\r
+    Address->Bus,\r
+    Address->Device,\r
+    Address->Function,\r
+    (DevicePathString == NULL) ? L"<unavailable>" : DevicePathString\r
+    ));\r
+\r
+  if (DevicePathString != NULL) {\r
+    FreePool (DevicePathString);\r
+  }\r
 \r
-    if (DevicePathString != NULL) {\r
-      FreePool (DevicePathString);\r
-    }\r
   DEBUG_CODE_END ();\r
 \r
-  if (HpcState == NULL || Padding == NULL || Attributes == NULL) {\r
+  if ((HpcState == NULL) || (Padding == NULL) || (Attributes == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  DefaultIo = TRUE;\r
+  DefaultIo   = TRUE;\r
   DefaultMmio = TRUE;\r
 \r
   //\r
@@ -599,7 +605,7 @@ GetResourcePadding (
   //\r
   ReservationHintStatus = QueryReservationHint (Address, &ReservationHint);\r
   if (!EFI_ERROR (ReservationHintStatus)) {\r
-    INTN HighBit;\r
+    INTN  HighBit;\r
 \r
     DEBUG ((\r
       DEBUG_VERBOSE,\r
@@ -618,82 +624,84 @@ GetResourcePadding (
     // (a) Reserve bus numbers.\r
     //\r
     switch (ReservationHint.BusNumbers) {\r
-    case 0:\r
-      //\r
-      // No reservation needed.\r
-      //\r
-      break;\r
-    case MAX_UINT32:\r
-      //\r
-      // Firmware default (unspecified). Treat it as "no reservation needed".\r
-      //\r
-      break;\r
-    default:\r
-      //\r
-      // Request the specified amount.\r
-      //\r
-      --FirstResource;\r
-      FirstResource->ResType = ACPI_ADDRESS_SPACE_TYPE_BUS;\r
-      FirstResource->AddrLen = ReservationHint.BusNumbers;\r
-      break;\r
+      case 0:\r
+        //\r
+        // No reservation needed.\r
+        //\r
+        break;\r
+      case MAX_UINT32:\r
+        //\r
+        // Firmware default (unspecified). Treat it as "no reservation needed".\r
+        //\r
+        break;\r
+      default:\r
+        //\r
+        // Request the specified amount.\r
+        //\r
+        --FirstResource;\r
+        FirstResource->ResType = ACPI_ADDRESS_SPACE_TYPE_BUS;\r
+        FirstResource->AddrLen = ReservationHint.BusNumbers;\r
+        break;\r
     }\r
 \r
     //\r
     // (b) Reserve IO space.\r
     //\r
     switch (ReservationHint.Io) {\r
-    case 0:\r
-      //\r
-      // No reservation needed, disable our built-in.\r
-      //\r
-      DefaultIo = FALSE;\r
-      break;\r
-    case MAX_UINT64:\r
-      //\r
-      // Firmware default (unspecified). Stick with our built-in.\r
-      //\r
-      break;\r
-    default:\r
-      //\r
-      // Round the specified amount up to the next power of two. If rounding is\r
-      // successful, reserve the rounded value. Fall back to the default\r
-      // otherwise.\r
-      //\r
-      HighBit = HighBitSetRoundUp64 (ReservationHint.Io);\r
-      if (HighBit != -1) {\r
-        SetIoPadding (--FirstResource, (UINTN)HighBit);\r
+      case 0:\r
+        //\r
+        // No reservation needed, disable our built-in.\r
+        //\r
         DefaultIo = FALSE;\r
-      }\r
-      break;\r
+        break;\r
+      case MAX_UINT64:\r
+        //\r
+        // Firmware default (unspecified). Stick with our built-in.\r
+        //\r
+        break;\r
+      default:\r
+        //\r
+        // Round the specified amount up to the next power of two. If rounding is\r
+        // successful, reserve the rounded value. Fall back to the default\r
+        // otherwise.\r
+        //\r
+        HighBit = HighBitSetRoundUp64 (ReservationHint.Io);\r
+        if (HighBit != -1) {\r
+          SetIoPadding (--FirstResource, (UINTN)HighBit);\r
+          DefaultIo = FALSE;\r
+        }\r
+\r
+        break;\r
     }\r
 \r
     //\r
     // (c) Reserve non-prefetchable MMIO space (32-bit only).\r
     //\r
     switch (ReservationHint.NonPrefetchable32BitMmio) {\r
-    case 0:\r
-      //\r
-      // No reservation needed, disable our built-in.\r
-      //\r
-      DefaultMmio = FALSE;\r
-      break;\r
-    case MAX_UINT32:\r
-      //\r
-      // Firmware default (unspecified). Stick with our built-in.\r
-      //\r
-      break;\r
-    default:\r
-      //\r
-      // Round the specified amount up to the next power of two. If rounding is\r
-      // successful, reserve the rounded value. Fall back to the default\r
-      // otherwise.\r
-      //\r
-      HighBit = HighBitSetRoundUp32 (ReservationHint.NonPrefetchable32BitMmio);\r
-      if (HighBit != -1) {\r
-        SetMmioPadding (--FirstResource, FALSE, TRUE, (UINTN)HighBit);\r
+      case 0:\r
+        //\r
+        // No reservation needed, disable our built-in.\r
+        //\r
         DefaultMmio = FALSE;\r
-      }\r
-      break;\r
+        break;\r
+      case MAX_UINT32:\r
+        //\r
+        // Firmware default (unspecified). Stick with our built-in.\r
+        //\r
+        break;\r
+      default:\r
+        //\r
+        // Round the specified amount up to the next power of two. If rounding is\r
+        // successful, reserve the rounded value. Fall back to the default\r
+        // otherwise.\r
+        //\r
+        HighBit = HighBitSetRoundUp32 (ReservationHint.NonPrefetchable32BitMmio);\r
+        if (HighBit != -1) {\r
+          SetMmioPadding (--FirstResource, FALSE, TRUE, (UINTN)HighBit);\r
+          DefaultMmio = FALSE;\r
+        }\r
+\r
+        break;\r
     }\r
 \r
     //\r
@@ -708,14 +716,16 @@ GetResourcePadding (
     // rounding is successful, reserve the rounded value. Do not reserve\r
     // prefetchable MMIO space otherwise.\r
     //\r
-    if (ReservationHint.Prefetchable32BitMmio > 0 &&\r
-        ReservationHint.Prefetchable32BitMmio < MAX_UINT32) {\r
+    if ((ReservationHint.Prefetchable32BitMmio > 0) &&\r
+        (ReservationHint.Prefetchable32BitMmio < MAX_UINT32))\r
+    {\r
       HighBit = HighBitSetRoundUp32 (ReservationHint.Prefetchable32BitMmio);\r
       if (HighBit != -1) {\r
         SetMmioPadding (--FirstResource, TRUE, TRUE, (UINTN)HighBit);\r
       }\r
-    } else if (ReservationHint.Prefetchable64BitMmio > 0 &&\r
-               ReservationHint.Prefetchable64BitMmio < MAX_UINT64) {\r
+    } else if ((ReservationHint.Prefetchable64BitMmio > 0) &&\r
+               (ReservationHint.Prefetchable64BitMmio < MAX_UINT64))\r
+    {\r
       HighBit = HighBitSetRoundUp64 (ReservationHint.Prefetchable64BitMmio);\r
       if (HighBit != -1) {\r
         SetMmioPadding (--FirstResource, TRUE, FALSE, (UINTN)HighBit);\r
@@ -769,7 +779,6 @@ GetResourcePadding (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Entry point for this driver.\r
 \r
@@ -783,18 +792,22 @@ GetResourcePadding (
 EFI_STATUS\r
 EFIAPI\r
 DriverInitialize (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   mPciExtConfSpaceSupported = (PcdGet16 (PcdOvmfHostBridgePciDevId) ==\r
                                INTEL_Q35_MCH_DEVICE_ID);\r
-  mPciHotPlugInit.GetRootHpcList = GetRootHpcList;\r
-  mPciHotPlugInit.InitializeRootHpc = InitializeRootHpc;\r
+  mPciHotPlugInit.GetRootHpcList     = GetRootHpcList;\r
+  mPciHotPlugInit.InitializeRootHpc  = InitializeRootHpc;\r
   mPciHotPlugInit.GetResourcePadding = GetResourcePadding;\r
-  Status = gBS->InstallMultipleProtocolInterfaces (&ImageHandle,\r
-                  &gEfiPciHotPlugInitProtocolGuid, &mPciHotPlugInit, NULL);\r
+  Status                             = gBS->InstallMultipleProtocolInterfaces (\r
+                                              &ImageHandle,\r
+                                              &gEfiPciHotPlugInitProtocolGuid,\r
+                                              &mPciHotPlugInit,\r
+                                              NULL\r
+                                              );\r
   return Status;\r
 }\r
index f2e51960ce8b7c1d00fe76764598e1f55fd5cea8..69a7ecb83d03fc474175210ed2e7b224b7749283 100644 (file)
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH       VendorDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL End;\r
+  VENDOR_DEVICE_PATH          VendorDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } PKG_DEVICE_PATH;\r
 #pragma pack()\r
 \r
-STATIC PKG_DEVICE_PATH mPkgDevicePath = {\r
+STATIC PKG_DEVICE_PATH  mPkgDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)     ),\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH) >> 8)\r
       }\r
     },\r
     EFI_CALLER_ID_GUID\r
@@ -65,8 +65,8 @@ STATIC PKG_DEVICE_PATH mPkgDevicePath = {
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     {\r
-      (UINT8) (END_DEVICE_PATH_LENGTH     ),\r
-      (UINT8) (END_DEVICE_PATH_LENGTH >> 8)\r
+      (UINT8)(END_DEVICE_PATH_LENGTH),\r
+      (UINT8)(END_DEVICE_PATH_LENGTH >> 8)\r
     }\r
   }\r
 };\r
@@ -75,12 +75,12 @@ STATIC PKG_DEVICE_PATH mPkgDevicePath = {
 // The configuration interface between the HII engine (form display etc) and\r
 // this driver.\r
 //\r
-STATIC EFI_HII_CONFIG_ACCESS_PROTOCOL mConfigAccess;\r
+STATIC EFI_HII_CONFIG_ACCESS_PROTOCOL  mConfigAccess;\r
 \r
 //\r
 // The handle representing our list of packages after installation.\r
 //\r
-STATIC EFI_HII_HANDLE mInstalledPackages;\r
+STATIC EFI_HII_HANDLE  mInstalledPackages;\r
 \r
 //\r
 // The arrays below constitute our HII package list. They are auto-generated by\r
@@ -93,32 +93,31 @@ STATIC EFI_HII_HANDLE mInstalledPackages;
 //   plus "Bin".\r
 //\r
 //\r
-extern UINT8 PlatformDxeStrings[];\r
-extern UINT8 PlatformFormsBin[];\r
+extern UINT8  PlatformDxeStrings[];\r
+extern UINT8  PlatformFormsBin[];\r
 \r
 //\r
 // We want to be notified about GOP installations until we find one GOP\r
 // interface that lets us populate the form.\r
 //\r
-STATIC EFI_EVENT mGopEvent;\r
+STATIC EFI_EVENT  mGopEvent;\r
 \r
 //\r
 // The registration record underneath this pointer allows us to iterate through\r
 // the GOP instances one by one.\r
 //\r
-STATIC VOID *mGopTracker;\r
+STATIC VOID  *mGopTracker;\r
 \r
 //\r
 // Cache the resolutions we get from the GOP.\r
 //\r
 typedef struct {\r
-  UINT32 X;\r
-  UINT32 Y;\r
+  UINT32    X;\r
+  UINT32    Y;\r
 } GOP_MODE;\r
 \r
-STATIC UINTN    mNumGopModes;\r
-STATIC GOP_MODE *mGopModes;\r
-\r
+STATIC UINTN     mNumGopModes;\r
+STATIC GOP_MODE  *mGopModes;\r
 \r
 /**\r
   Load the persistent platform configuration and translate it to binary form\r
@@ -136,63 +135,66 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PlatformConfigToFormState (\r
-  OUT MAIN_FORM_STATE *MainFormState\r
+  OUT MAIN_FORM_STATE  *MainFormState\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  PLATFORM_CONFIG PlatformConfig;\r
-  UINT64          OptionalElements;\r
-  UINTN           ModeNumber;\r
+  EFI_STATUS       Status;\r
+  PLATFORM_CONFIG  PlatformConfig;\r
+  UINT64           OptionalElements;\r
+  UINTN            ModeNumber;\r
 \r
   ZeroMem (MainFormState, sizeof *MainFormState);\r
 \r
   Status = PlatformConfigLoad (&PlatformConfig, &OptionalElements);\r
   switch (Status) {\r
-  case EFI_SUCCESS:\r
-    if (OptionalElements & PLATFORM_CONFIG_F_GRAPHICS_RESOLUTION) {\r
-      //\r
-      // Format the preferred resolution as text.\r
-      //\r
-      UnicodeSPrintAsciiFormat (\r
-        (CHAR16 *) MainFormState->CurrentPreferredResolution,\r
-        sizeof MainFormState->CurrentPreferredResolution,\r
-        "%Ldx%Ld",\r
-        (INT64) PlatformConfig.HorizontalResolution,\r
-        (INT64) PlatformConfig.VerticalResolution);\r
-\r
-      //\r
-      // Try to locate it in the drop-down list too. This may not succeed, but\r
-      // that's fine.\r
-      //\r
-      for (ModeNumber = 0; ModeNumber < mNumGopModes; ++ModeNumber) {\r
-        if (mGopModes[ModeNumber].X == PlatformConfig.HorizontalResolution &&\r
-            mGopModes[ModeNumber].Y == PlatformConfig.VerticalResolution) {\r
-          MainFormState->NextPreferredResolution = (UINT32) ModeNumber;\r
-          break;\r
+    case EFI_SUCCESS:\r
+      if (OptionalElements & PLATFORM_CONFIG_F_GRAPHICS_RESOLUTION) {\r
+        //\r
+        // Format the preferred resolution as text.\r
+        //\r
+        UnicodeSPrintAsciiFormat (\r
+          (CHAR16 *)MainFormState->CurrentPreferredResolution,\r
+          sizeof MainFormState->CurrentPreferredResolution,\r
+          "%Ldx%Ld",\r
+          (INT64)PlatformConfig.HorizontalResolution,\r
+          (INT64)PlatformConfig.VerticalResolution\r
+          );\r
+\r
+        //\r
+        // Try to locate it in the drop-down list too. This may not succeed, but\r
+        // that's fine.\r
+        //\r
+        for (ModeNumber = 0; ModeNumber < mNumGopModes; ++ModeNumber) {\r
+          if ((mGopModes[ModeNumber].X == PlatformConfig.HorizontalResolution) &&\r
+              (mGopModes[ModeNumber].Y == PlatformConfig.VerticalResolution))\r
+          {\r
+            MainFormState->NextPreferredResolution = (UINT32)ModeNumber;\r
+            break;\r
+          }\r
         }\r
+\r
+        break;\r
       }\r
 \r
-      break;\r
-    }\r
     //\r
     // fall through otherwise\r
     //\r
 \r
-  case EFI_NOT_FOUND:\r
-    UnicodeSPrintAsciiFormat (\r
-      (CHAR16 *) MainFormState->CurrentPreferredResolution,\r
-      sizeof MainFormState->CurrentPreferredResolution,\r
-      "Unset");\r
-    break;\r
+    case EFI_NOT_FOUND:\r
+      UnicodeSPrintAsciiFormat (\r
+        (CHAR16 *)MainFormState->CurrentPreferredResolution,\r
+        sizeof MainFormState->CurrentPreferredResolution,\r
+        "Unset"\r
+        );\r
+      break;\r
 \r
-  default:\r
-    return Status;\r
+    default:\r
+      return Status;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function is called by the HII machinery when it fetches the form state.\r
 \r
@@ -223,10 +225,10 @@ ExtractConfig (
   IN CONST  EFI_STRING                      Request,\r
   OUT       EFI_STRING                      *Progress,\r
   OUT       EFI_STRING                      *Results\r
-)\r
+  )\r
 {\r
-  MAIN_FORM_STATE MainFormState;\r
-  EFI_STATUS      Status;\r
+  MAIN_FORM_STATE  MainFormState;\r
+  EFI_STATUS       Status;\r
 \r
   DEBUG ((DEBUG_VERBOSE, "%a: Request=\"%s\"\n", __FUNCTION__, Request));\r
 \r
@@ -239,19 +241,29 @@ ExtractConfig (
   //\r
   // Answer the textual request keying off the binary form state.\r
   //\r
-  Status = gHiiConfigRouting->BlockToConfig (gHiiConfigRouting, Request,\r
-                                (VOID *) &MainFormState, sizeof MainFormState,\r
-                                Results, Progress);\r
+  Status = gHiiConfigRouting->BlockToConfig (\r
+                                gHiiConfigRouting,\r
+                                Request,\r
+                                (VOID *)&MainFormState,\r
+                                sizeof MainFormState,\r
+                                Results,\r
+                                Progress\r
+                                );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: BlockToConfig(): %r, Progress=\"%s\"\n",\r
-      __FUNCTION__, Status, (Status == EFI_DEVICE_ERROR) ? NULL : *Progress));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: BlockToConfig(): %r, Progress=\"%s\"\n",\r
+      __FUNCTION__,\r
+      Status,\r
+      (Status == EFI_DEVICE_ERROR) ? NULL : *Progress\r
+      ));\r
   } else {\r
     DEBUG ((DEBUG_VERBOSE, "%a: Results=\"%s\"\n", __FUNCTION__, *Results));\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Interpret the binary form state and save it as persistent platform\r
   configuration.\r
@@ -265,12 +277,12 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 FormStateToPlatformConfig (\r
-  IN CONST MAIN_FORM_STATE *MainFormState\r
+  IN CONST MAIN_FORM_STATE  *MainFormState\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  PLATFORM_CONFIG PlatformConfig;\r
-  CONST GOP_MODE  *GopMode;\r
+  EFI_STATUS       Status;\r
+  PLATFORM_CONFIG  PlatformConfig;\r
+  CONST GOP_MODE   *GopMode;\r
 \r
   //\r
   // There's nothing to do with the textual CurrentPreferredResolution field.\r
@@ -279,6 +291,7 @@ FormStateToPlatformConfig (
   if (MainFormState->NextPreferredResolution >= mNumGopModes) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   GopMode = mGopModes + MainFormState->NextPreferredResolution;\r
 \r
   ZeroMem (&PlatformConfig, sizeof PlatformConfig);\r
@@ -289,7 +302,6 @@ FormStateToPlatformConfig (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is called by the HII machinery when it wants the driver to\r
   interpret and persist the form state.\r
@@ -315,14 +327,18 @@ RouteConfig (
   IN CONST  EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
   IN CONST  EFI_STRING                      Configuration,\r
   OUT       EFI_STRING                      *Progress\r
-)\r
+  )\r
 {\r
-  MAIN_FORM_STATE MainFormState;\r
-  UINTN           BlockSize;\r
-  EFI_STATUS      Status;\r
+  MAIN_FORM_STATE  MainFormState;\r
+  UINTN            BlockSize;\r
+  EFI_STATUS       Status;\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: Configuration=\"%s\"\n", __FUNCTION__,\r
-    Configuration));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: Configuration=\"%s\"\n",\r
+    __FUNCTION__,\r
+    Configuration\r
+    ));\r
 \r
   //\r
   // the "read" step in RMW\r
@@ -340,12 +356,21 @@ RouteConfig (
   // general we must pre-load the form state from the platform config.)\r
   //\r
   BlockSize = sizeof MainFormState;\r
-  Status = gHiiConfigRouting->ConfigToBlock (gHiiConfigRouting, Configuration,\r
-                                (VOID *) &MainFormState, &BlockSize, Progress);\r
+  Status    = gHiiConfigRouting->ConfigToBlock (\r
+                                   gHiiConfigRouting,\r
+                                   Configuration,\r
+                                   (VOID *)&MainFormState,\r
+                                   &BlockSize,\r
+                                   Progress\r
+                                   );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: ConfigToBlock(): %r, Progress=\"%s\"\n",\r
-      __FUNCTION__, Status,\r
-      (Status == EFI_BUFFER_TOO_SMALL) ? NULL : *Progress));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: ConfigToBlock(): %r, Progress=\"%s\"\n",\r
+      __FUNCTION__,\r
+      Status,\r
+      (Status == EFI_BUFFER_TOO_SMALL) ? NULL : *Progress\r
+      ));\r
     return Status;\r
   }\r
 \r
@@ -356,46 +381,51 @@ RouteConfig (
   if (EFI_ERROR (Status)) {\r
     *Progress = Configuration;\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Callback (\r
-  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN     EFI_BROWSER_ACTION                     Action,\r
-  IN     EFI_QUESTION_ID                        QuestionId,\r
-  IN     UINT8                                  Type,\r
-  IN OUT EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT    EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN     EFI_BROWSER_ACTION                    Action,\r
+  IN     EFI_QUESTION_ID                       QuestionId,\r
+  IN     UINT8                                 Type,\r
+  IN OUT EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT    EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   )\r
 {\r
-  DEBUG ((DEBUG_VERBOSE, "%a: Action=0x%Lx QuestionId=%d Type=%d\n",\r
-    __FUNCTION__, (UINT64) Action, QuestionId, Type));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: Action=0x%Lx QuestionId=%d Type=%d\n",\r
+    __FUNCTION__,\r
+    (UINT64)Action,\r
+    QuestionId,\r
+    Type\r
+    ));\r
 \r
   if (Action != EFI_BROWSER_ACTION_CHANGED) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   switch (QuestionId) {\r
-  case QUESTION_SAVE_EXIT:\r
-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
-    break;\r
+    case QUESTION_SAVE_EXIT:\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+      break;\r
 \r
-  case QUESTION_DISCARD_EXIT:\r
-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
-    break;\r
+    case QUESTION_DISCARD_EXIT:\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Query and save all resolutions supported by the GOP.\r
 \r
@@ -417,17 +447,18 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 QueryGopModes (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL *Gop,\r
-  OUT UINTN                        *NumGopModes,\r
-  OUT GOP_MODE                     **GopModes\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL  *Gop,\r
+  OUT UINTN                         *NumGopModes,\r
+  OUT GOP_MODE                      **GopModes\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT32     ModeNumber;\r
+  EFI_STATUS  Status;\r
+  UINT32      ModeNumber;\r
 \r
   if (Gop->Mode->MaxMode == 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   *NumGopModes = Gop->Mode->MaxMode;\r
 \r
   *GopModes = AllocatePool (Gop->Mode->MaxMode * sizeof **GopModes);\r
@@ -436,8 +467,8 @@ QueryGopModes (
   }\r
 \r
   for (ModeNumber = 0; ModeNumber < Gop->Mode->MaxMode; ++ModeNumber) {\r
-    EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;\r
-    UINTN                                SizeOfInfo;\r
+    EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info;\r
+    UINTN                                 SizeOfInfo;\r
 \r
     Status = Gop->QueryMode (Gop, ModeNumber, &SizeOfInfo, &Info);\r
     if (EFI_ERROR (Status)) {\r
@@ -457,7 +488,6 @@ FreeGopModes:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Create a set of "one-of-many" (ie. "drop down list") option IFR opcodes,\r
   based on available GOP resolutions, to be placed under a "one-of-many" (ie.\r
@@ -492,9 +522,9 @@ CreateResolutionOptions (
   IN  GOP_MODE        *GopModes\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  VOID       *OutputBuffer;\r
-  UINTN      ModeNumber;\r
+  EFI_STATUS  Status;\r
+  VOID        *OutputBuffer;\r
+  UINTN       ModeNumber;\r
 \r
   OutputBuffer = HiiAllocateOpCodeHandle ();\r
   if (OutputBuffer == NULL) {\r
@@ -502,20 +532,35 @@ CreateResolutionOptions (
   }\r
 \r
   for (ModeNumber = 0; ModeNumber < NumGopModes; ++ModeNumber) {\r
-    CHAR16        Desc[MAXSIZE_RES_CUR];\r
-    EFI_STRING_ID NewString;\r
-    VOID          *OpCode;\r
-\r
-    UnicodeSPrintAsciiFormat (Desc, sizeof Desc, "%Ldx%Ld",\r
-      (INT64) GopModes[ModeNumber].X, (INT64) GopModes[ModeNumber].Y);\r
-    NewString = HiiSetString (PackageList, 0 /* new string */, Desc,\r
-                  NULL /* for all languages */);\r
+    CHAR16         Desc[MAXSIZE_RES_CUR];\r
+    EFI_STRING_ID  NewString;\r
+    VOID           *OpCode;\r
+\r
+    UnicodeSPrintAsciiFormat (\r
+      Desc,\r
+      sizeof Desc,\r
+      "%Ldx%Ld",\r
+      (INT64)GopModes[ModeNumber].X,\r
+      (INT64)GopModes[ModeNumber].Y\r
+      );\r
+    NewString = HiiSetString (\r
+                  PackageList,\r
+                  0 /* new string */,\r
+                  Desc,\r
+                  NULL /* for all languages */\r
+                  );\r
     if (NewString == 0) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto FreeOutputBuffer;\r
     }\r
-    OpCode = HiiCreateOneOfOptionOpCode (OutputBuffer, NewString,\r
-               0 /* Flags */, EFI_IFR_NUMERIC_SIZE_4, ModeNumber);\r
+\r
+    OpCode = HiiCreateOneOfOptionOpCode (\r
+               OutputBuffer,\r
+               NewString,\r
+               0 /* Flags */,\r
+               EFI_IFR_NUMERIC_SIZE_4,\r
+               ModeNumber\r
+               );\r
     if (OpCode == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto FreeOutputBuffer;\r
@@ -531,7 +576,6 @@ FreeOutputBuffer:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Populate the form identified by the (PackageList, FormSetGuid, FormId)\r
   triplet.\r
@@ -554,11 +598,11 @@ PopulateForm (
   IN  GOP_MODE        *GopModes\r
   )\r
 {\r
-  EFI_STATUS         Status;\r
-  VOID               *OpCodeBuffer;\r
-  VOID               *OpCode;\r
-  EFI_IFR_GUID_LABEL *Anchor;\r
-  VOID               *OpCodeBuffer2;\r
+  EFI_STATUS          Status;\r
+  VOID                *OpCodeBuffer;\r
+  VOID                *OpCode;\r
+  EFI_IFR_GUID_LABEL  *Anchor;\r
+  VOID                *OpCodeBuffer2;\r
 \r
   OpCodeBuffer2 = NULL;\r
 \r
@@ -574,12 +618,17 @@ PopulateForm (
   // 2. Create a label opcode (which is a Tiano extension) inside the buffer.\r
   // The label's number must match the "anchor" label in the form.\r
   //\r
-  OpCode = HiiCreateGuidOpCode (OpCodeBuffer, &gEfiIfrTianoGuid,\r
-             NULL /* optional copy origin */, sizeof *Anchor);\r
+  OpCode = HiiCreateGuidOpCode (\r
+             OpCodeBuffer,\r
+             &gEfiIfrTianoGuid,\r
+             NULL /* optional copy origin */,\r
+             sizeof *Anchor\r
+             );\r
   if (OpCode == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeOpCodeBuffer;\r
   }\r
+\r
   Anchor               = OpCode;\r
   Anchor->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   Anchor->Number       = LABEL_RES_NEXT;\r
@@ -590,8 +639,12 @@ PopulateForm (
   //\r
   // 3.1. Get a list of resolutions.\r
   //\r
-  Status = CreateResolutionOptions (PackageList, &OpCodeBuffer2,\r
-             NumGopModes, GopModes);\r
+  Status = CreateResolutionOptions (\r
+             PackageList,\r
+             &OpCodeBuffer2,\r
+             NumGopModes,\r
+             GopModes\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeOpCodeBuffer;\r
   }\r
@@ -605,8 +658,10 @@ PopulateForm (
              QUESTION_RES_NEXT,                   // ID of question,\r
              FORMSTATEID_MAIN_FORM,               // identifies form state\r
                                                   //   storage,\r
-             (UINT16) OFFSET_OF (MAIN_FORM_STATE, // value of question stored\r
-                        NextPreferredResolution), //   at this offset,\r
+             (UINT16)OFFSET_OF (\r
+                       MAIN_FORM_STATE,           // value of question stored\r
+                       NextPreferredResolution\r
+                       ),                         //   at this offset,\r
              STRING_TOKEN (STR_RES_NEXT),         // Prompt,\r
              STRING_TOKEN (STR_RES_NEXT_HELP),    // Help,\r
              0,                                   // QuestionFlags,\r
@@ -624,7 +679,10 @@ PopulateForm (
   //\r
   // 4. Update the form with the opcode buffer.\r
   //\r
-  Status = HiiUpdateForm (PackageList, FormSetGuid, FormId,\r
+  Status = HiiUpdateForm (\r
+             PackageList,\r
+             FormSetGuid,\r
+             FormId,\r
              OpCodeBuffer, // buffer with head anchor, and new contents to be\r
                            // inserted at it\r
              NULL          // buffer with tail anchor, for deleting old\r
@@ -640,7 +698,6 @@ FreeOpCodeBuffer:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Load and execute the platform configuration.\r
 \r
@@ -654,15 +711,19 @@ ExecutePlatformConfig (
   VOID\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  PLATFORM_CONFIG PlatformConfig;\r
-  UINT64          OptionalElements;\r
-  RETURN_STATUS   PcdStatus;\r
+  EFI_STATUS       Status;\r
+  PLATFORM_CONFIG  PlatformConfig;\r
+  UINT64           OptionalElements;\r
+  RETURN_STATUS    PcdStatus;\r
 \r
   Status = PlatformConfigLoad (&PlatformConfig, &OptionalElements);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG (((Status == EFI_NOT_FOUND) ? DEBUG_VERBOSE : DEBUG_ERROR,\r
-      "%a: failed to load platform config: %r\n", __FUNCTION__, Status));\r
+    DEBUG ((\r
+      (Status == EFI_NOT_FOUND) ? DEBUG_VERBOSE : DEBUG_ERROR,\r
+      "%a: failed to load platform config: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return Status;\r
   }\r
 \r
@@ -670,19 +731,22 @@ ExecutePlatformConfig (
     //\r
     // Pass the preferred resolution to GraphicsConsoleDxe via dynamic PCDs.\r
     //\r
-    PcdStatus = PcdSet32S (PcdVideoHorizontalResolution,\r
-      PlatformConfig.HorizontalResolution);\r
+    PcdStatus = PcdSet32S (\r
+                  PcdVideoHorizontalResolution,\r
+                  PlatformConfig.HorizontalResolution\r
+                  );\r
     ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
-    PcdStatus = PcdSet32S (PcdVideoVerticalResolution,\r
-      PlatformConfig.VerticalResolution);\r
+    PcdStatus = PcdSet32S (\r
+                  PcdVideoVerticalResolution,\r
+                  PlatformConfig.VerticalResolution\r
+                  );\r
     ASSERT_RETURN_ERROR (PcdStatus);\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Notification callback for GOP interface installation.\r
 \r
@@ -695,24 +759,27 @@ STATIC
 VOID\r
 EFIAPI\r
 GopInstalled (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL *Gop;\r
+  EFI_STATUS                    Status;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *Gop;\r
 \r
   ASSERT (Event == mGopEvent);\r
 \r
   //\r
   // Check further GOPs.\r
   //\r
-  for (;;) {\r
+  for ( ; ;) {\r
     mNumGopModes = 0;\r
-    mGopModes = NULL;\r
+    mGopModes    = NULL;\r
 \r
-    Status = gBS->LocateProtocol (&gEfiGraphicsOutputProtocolGuid, mGopTracker,\r
-                    (VOID **) &Gop);\r
+    Status = gBS->LocateProtocol (\r
+                    &gEfiGraphicsOutputProtocolGuid,\r
+                    mGopTracker,\r
+                    (VOID **)&Gop\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       return;\r
     }\r
@@ -722,8 +789,13 @@ GopInstalled (
       continue;\r
     }\r
 \r
-    Status = PopulateForm (mInstalledPackages, &gOvmfPlatformConfigGuid,\r
-               FORMID_MAIN_FORM, mNumGopModes, mGopModes);\r
+    Status = PopulateForm (\r
+               mInstalledPackages,\r
+               &gOvmfPlatformConfigGuid,\r
+               FORMID_MAIN_FORM,\r
+               mNumGopModes,\r
+               mGopModes\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       FreePool (mGopModes);\r
       continue;\r
@@ -738,11 +810,10 @@ GopInstalled (
   //\r
   Status = gBS->CloseEvent (mGopEvent);\r
   ASSERT_EFI_ERROR (Status);\r
-  mGopEvent = NULL;\r
+  mGopEvent   = NULL;\r
   mGopTracker = NULL;\r
 }\r
 \r
-\r
 /**\r
   Entry point for this driver.\r
 \r
@@ -761,7 +832,7 @@ PlatformInit (
   IN  EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   ExecutePlatformConfig ();\r
 \r
@@ -772,10 +843,14 @@ PlatformInit (
   //\r
   // Declare ourselves suitable for HII communication.\r
   //\r
-  Status = gBS->InstallMultipleProtocolInterfaces (&ImageHandle,\r
-                  &gEfiDevicePathProtocolGuid,      &mPkgDevicePath,\r
-                  &gEfiHiiConfigAccessProtocolGuid, &mConfigAccess,\r
-                  NULL);\r
+  Status = gBS->InstallMultipleProtocolInterfaces (\r
+                  &ImageHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  &mPkgDevicePath,\r
+                  &gEfiHiiConfigAccessProtocolGuid,\r
+                  &mConfigAccess,\r
+                  NULL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -795,14 +870,22 @@ PlatformInit (
     goto UninstallProtocols;\r
   }\r
 \r
-  Status = gBS->CreateEvent (EVT_NOTIFY_SIGNAL, TPL_CALLBACK, &GopInstalled,\r
-                  NULL /* Context */, &mGopEvent);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  &GopInstalled,\r
+                  NULL /* Context */,\r
+                  &mGopEvent\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto RemovePackages;\r
   }\r
 \r
-  Status = gBS->RegisterProtocolNotify (&gEfiGraphicsOutputProtocolGuid,\r
-                  mGopEvent, &mGopTracker);\r
+  Status = gBS->RegisterProtocolNotify (\r
+                  &gEfiGraphicsOutputProtocolGuid,\r
+                  mGopEvent,\r
+                  &mGopTracker\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseGopEvent;\r
   }\r
@@ -822,10 +905,14 @@ RemovePackages:
   HiiRemovePackages (mInstalledPackages);\r
 \r
 UninstallProtocols:\r
-  gBS->UninstallMultipleProtocolInterfaces (ImageHandle,\r
-         &gEfiDevicePathProtocolGuid,      &mPkgDevicePath,\r
-         &gEfiHiiConfigAccessProtocolGuid, &mConfigAccess,\r
-         NULL);\r
+  gBS->UninstallMultipleProtocolInterfaces (\r
+         ImageHandle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         &mPkgDevicePath,\r
+         &gEfiHiiConfigAccessProtocolGuid,\r
+         &mConfigAccess,\r
+         NULL\r
+         );\r
   return Status;\r
 }\r
 \r
@@ -861,9 +948,13 @@ PlatformUnload (
   // Release resources allocated by the entry point.\r
   //\r
   HiiRemovePackages (mInstalledPackages);\r
-  gBS->UninstallMultipleProtocolInterfaces (ImageHandle,\r
-         &gEfiDevicePathProtocolGuid,      &mPkgDevicePath,\r
-         &gEfiHiiConfigAccessProtocolGuid, &mConfigAccess,\r
-         NULL);\r
+  gBS->UninstallMultipleProtocolInterfaces (\r
+         ImageHandle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         &mPkgDevicePath,\r
+         &gEfiHiiConfigAccessProtocolGuid,\r
+         &mConfigAccess,\r
+         NULL\r
+         );\r
   return EFI_SUCCESS;\r
 }\r
index 63b5e525755769ac69463dc1391805fd25fdf34d..7cdbd867cafb2ce968a130df59905b6103f4d4db 100644 (file)
 #define FORMSTATEID_MAIN_FORM  1\r
 #define FORMID_MAIN_FORM       1\r
 \r
-#define QUESTION_RES_CUR       1\r
-#define MAXSIZE_RES_CUR       16\r
+#define QUESTION_RES_CUR  1\r
+#define MAXSIZE_RES_CUR   16\r
 \r
-#define LABEL_RES_NEXT         1\r
-#define QUESTION_RES_NEXT      2\r
+#define LABEL_RES_NEXT     1\r
+#define QUESTION_RES_NEXT  2\r
 \r
 #define QUESTION_SAVE_EXIT     3\r
 #define QUESTION_DISCARD_EXIT  4\r
@@ -30,8 +30,8 @@
 // visual widgets on the form.\r
 //\r
 typedef struct {\r
-  UINT16 CurrentPreferredResolution[MAXSIZE_RES_CUR];\r
-  UINT32 NextPreferredResolution;\r
+  UINT16    CurrentPreferredResolution[MAXSIZE_RES_CUR];\r
+  UINT32    NextPreferredResolution;\r
 } MAIN_FORM_STATE;\r
 \r
 #endif // _PLATFORM_H_\r
index f3f0b54d6c1eb936d0036b175c69014381cea514..e202ac5b4798deb5f916c3a811adcdba9f0e986b 100644 (file)
@@ -21,8 +21,7 @@
 //\r
 // Name of the UEFI variable that we use for persistent storage.\r
 //\r
-STATIC CHAR16 mVariableName[] = L"PlatformConfig";\r
-\r
+STATIC CHAR16  mVariableName[] = L"PlatformConfig";\r
 \r
 /**\r
   Serialize and persistently save platform configuration.\r
@@ -34,10 +33,10 @@ STATIC CHAR16 mVariableName[] = L"PlatformConfig";
 EFI_STATUS\r
 EFIAPI\r
 PlatformConfigSave (\r
-  IN PLATFORM_CONFIG *PlatformConfig\r
+  IN PLATFORM_CONFIG  *PlatformConfig\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // We could implement any kind of translation here, as part of serialization.\r
@@ -45,14 +44,17 @@ PlatformConfigSave (
   // variables with human-readable contents, allowing other tools to access\r
   // them more easily. For now, just save a binary dump.\r
   //\r
-  Status = gRT->SetVariable (mVariableName, &gOvmfPlatformConfigGuid,\r
+  Status = gRT->SetVariable (\r
+                  mVariableName,\r
+                  &gOvmfPlatformConfigGuid,\r
                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS |\r
-                    EFI_VARIABLE_RUNTIME_ACCESS,\r
-                  sizeof *PlatformConfig, PlatformConfig);\r
+                  EFI_VARIABLE_RUNTIME_ACCESS,\r
+                  sizeof *PlatformConfig,\r
+                  PlatformConfig\r
+                  );\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Load and deserialize platform configuration.\r
 \r
@@ -73,13 +75,13 @@ PlatformConfigSave (
 EFI_STATUS\r
 EFIAPI\r
 PlatformConfigLoad (\r
-  OUT PLATFORM_CONFIG *PlatformConfig,\r
-  OUT UINT64          *OptionalElements\r
+  OUT PLATFORM_CONFIG  *PlatformConfig,\r
+  OUT UINT64           *OptionalElements\r
   )\r
 {\r
-  VOID       *Data;\r
-  UINTN      DataSize;\r
-  EFI_STATUS Status;\r
+  VOID        *Data;\r
+  UINTN       DataSize;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Any translation done in PlatformConfigSave() would have to be mirrored\r
@@ -89,8 +91,12 @@ PlatformConfigLoad (
   // (only incremental changes, ie. new fields), and on GUID.\r
   // (Incompatible changes require a GUID change.)\r
   //\r
-  Status = GetVariable2 (mVariableName, &gOvmfPlatformConfigGuid, &Data,\r
-             &DataSize);\r
+  Status = GetVariable2 (\r
+             mVariableName,\r
+             &gOvmfPlatformConfigGuid,\r
+             &Data,\r
+             &DataSize\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -108,15 +114,18 @@ PlatformConfigLoad (
     //\r
     // Handle firmware upgrade -- zero out missing fields.\r
     //\r
-    ZeroMem ((UINT8 *)PlatformConfig + DataSize,\r
-      sizeof *PlatformConfig - DataSize);\r
+    ZeroMem (\r
+      (UINT8 *)PlatformConfig + DataSize,\r
+      sizeof *PlatformConfig - DataSize\r
+      );\r
   }\r
 \r
   //\r
   // Based on DataSize, report the optional features that we recognize.\r
   //\r
   if (DataSize >= (OFFSET_OF (PLATFORM_CONFIG, VerticalResolution) +\r
-                   sizeof PlatformConfig->VerticalResolution)) {\r
+                   sizeof PlatformConfig->VerticalResolution))\r
+  {\r
     *OptionalElements |= PLATFORM_CONFIG_F_GRAPHICS_RESOLUTION;\r
   }\r
 \r
index 716514da214f3a917dec3b91468e09b8afbe7457..902c9b2ce043b1f0bcf7c34eb739aac950c3a935 100644 (file)
@@ -23,8 +23,8 @@ typedef struct {
   //\r
   // preferred graphics console resolution when booting\r
   //\r
-  UINT32 HorizontalResolution;\r
-  UINT32 VerticalResolution;\r
+  UINT32    HorizontalResolution;\r
+  UINT32    VerticalResolution;\r
 } PLATFORM_CONFIG;\r
 #pragma pack()\r
 \r
@@ -34,20 +34,20 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 PlatformConfigSave (\r
-  IN PLATFORM_CONFIG *PlatformConfig\r
+  IN PLATFORM_CONFIG  *PlatformConfig\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 PlatformConfigLoad (\r
-  OUT PLATFORM_CONFIG *PlatformConfig,\r
-  OUT UINT64          *OptionalElements\r
+  OUT PLATFORM_CONFIG  *PlatformConfig,\r
+  OUT UINT64           *OptionalElements\r
   );\r
 \r
 //\r
 // Feature flags for OptionalElements.\r
 //\r
-#define PLATFORM_CONFIG_F_GRAPHICS_RESOLUTION BIT0\r
-#define PLATFORM_CONFIG_F_DOWNGRADE           BIT63\r
+#define PLATFORM_CONFIG_F_GRAPHICS_RESOLUTION  BIT0\r
+#define PLATFORM_CONFIG_F_DOWNGRADE            BIT63\r
 \r
 #endif // _PLATFORM_CONFIG_H_\r
index a8bf610022ba7f15f6bc00ead16196836e229cde..3991edfd1e82b1edfe4f6e1a59f6eeeaec778227 100644 (file)
@@ -58,10 +58,10 @@ AmdSevEsInitialize (
   //   make them reserved.\r
   //\r
   GhcbPageCount = mMaxCpuCount * 2;\r
-  GhcbBase = AllocateReservedPages (GhcbPageCount);\r
+  GhcbBase      = AllocateReservedPages (GhcbPageCount);\r
   ASSERT (GhcbBase != NULL);\r
 \r
-  GhcbBasePa = (PHYSICAL_ADDRESS)(UINTN) GhcbBase;\r
+  GhcbBasePa = (PHYSICAL_ADDRESS)(UINTN)GhcbBase;\r
 \r
   //\r
   // Each vCPU gets two consecutive pages, the first is the GHCB and the\r
@@ -70,10 +70,10 @@ AmdSevEsInitialize (
   //\r
   for (PageCount = 0; PageCount < GhcbPageCount; PageCount += 2) {\r
     DecryptStatus = MemEncryptSevClearPageEncMask (\r
-      0,\r
-      GhcbBasePa + EFI_PAGES_TO_SIZE (PageCount),\r
-      1\r
-      );\r
+                      0,\r
+                      GhcbBasePa + EFI_PAGES_TO_SIZE (PageCount),\r
+                      1\r
+                      );\r
     ASSERT_RETURN_ERROR (DecryptStatus);\r
   }\r
 \r
@@ -84,16 +84,19 @@ AmdSevEsInitialize (
   PcdStatus = PcdSet64S (PcdGhcbSize, EFI_PAGES_TO_SIZE (GhcbPageCount));\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
-  DEBUG ((DEBUG_INFO,\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
     "SEV-ES is enabled, %lu GHCB pages allocated starting at 0x%p\n",\r
-    (UINT64)GhcbPageCount, GhcbBase));\r
+    (UINT64)GhcbPageCount,\r
+    GhcbBase\r
+    ));\r
 \r
   //\r
   // Allocate #VC recursion backup pages. The number of backup pages needed is\r
   // one less than the maximum VC count.\r
   //\r
   GhcbBackupPageCount = mMaxCpuCount * (VMGEXIT_MAXIMUM_VC_COUNT - 1);\r
-  GhcbBackupBase = AllocatePages (GhcbBackupPageCount);\r
+  GhcbBackupBase      = AllocatePages (GhcbBackupPageCount);\r
   ASSERT (GhcbBackupBase != NULL);\r
 \r
   GhcbBackupPages = GhcbBackupBase;\r
@@ -105,9 +108,12 @@ AmdSevEsInitialize (
     GhcbBackupPages += EFI_PAGE_SIZE * (VMGEXIT_MAXIMUM_VC_COUNT - 1);\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO,\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
     "SEV-ES is enabled, %lu GHCB backup pages allocated starting at 0x%p\n",\r
-    (UINT64)GhcbBackupPageCount, GhcbBackupBase));\r
+    (UINT64)GhcbBackupPageCount,\r
+    GhcbBackupBase\r
+    ));\r
 \r
   AsmWriteMsr64 (MSR_SEV_ES_GHCB, GhcbBasePa);\r
 \r
@@ -120,11 +126,11 @@ AmdSevEsInitialize (
   //\r
   AsmReadGdtr (&Gdtr);\r
 \r
-  Gdt = AllocatePages (EFI_SIZE_TO_PAGES ((UINTN) Gdtr.Limit + 1));\r
+  Gdt = AllocatePages (EFI_SIZE_TO_PAGES ((UINTN)Gdtr.Limit + 1));\r
   ASSERT (Gdt != NULL);\r
 \r
-  CopyMem (Gdt, (VOID *) Gdtr.Base, Gdtr.Limit + 1);\r
-  Gdtr.Base = (UINTN) Gdt;\r
+  CopyMem (Gdt, (VOID *)Gdtr.Base, Gdtr.Limit + 1);\r
+  Gdtr.Base = (UINTN)Gdt;\r
   AsmWriteGdtr (&Gdtr);\r
 }\r
 \r
@@ -139,8 +145,8 @@ AmdSevInitialize (
   VOID\r
   )\r
 {\r
-  UINT64                            EncryptionMask;\r
-  RETURN_STATUS                     PcdStatus;\r
+  UINT64         EncryptionMask;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   //\r
   // Check if SEV is enabled\r
@@ -153,7 +159,7 @@ AmdSevInitialize (
   // Set Memory Encryption Mask PCD\r
   //\r
   EncryptionMask = MemEncryptSevGetEncryptionMask ();\r
-  PcdStatus = PcdSet64S (PcdPteMemoryEncryptionAddressOrMask, EncryptionMask);\r
+  PcdStatus      = PcdSet64S (PcdPteMemoryEncryptionAddressOrMask, EncryptionMask);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   DEBUG ((DEBUG_INFO, "SEV is enabled (mask 0x%lx)\n", EncryptionMask));\r
@@ -176,9 +182,9 @@ AmdSevInitialize (
   // hypervisor.\r
   //\r
   if (FeaturePcdGet (PcdSmmSmramRequire) && (mBootMode != BOOT_ON_S3_RESUME)) {\r
-    RETURN_STATUS LocateMapStatus;\r
-    UINTN         MapPagesBase;\r
-    UINTN         MapPagesCount;\r
+    RETURN_STATUS  LocateMapStatus;\r
+    UINTN          MapPagesBase;\r
+    UINTN          MapPagesCount;\r
 \r
     LocateMapStatus = MemEncryptSevLocateInitialSmramSaveStateMapPages (\r
                         &MapPagesBase,\r
index 5c538c59e07416f81ace82e9603a31e39d229d0c..9f23f9a4284745bc733d47a57be99a39bd629ab2 100644 (file)
@@ -29,7 +29,7 @@ STATIC
 VOID\r
 EFIAPI\r
 ClearCache (\r
-  IN OUT VOID *WorkSpace\r
+  IN OUT VOID  *WorkSpace\r
   )\r
 {\r
   WriteBackInvalidateDataCache ();\r
@@ -56,8 +56,8 @@ ClearCacheOnMpServicesAvailable (
   IN VOID                       *Ppi\r
   )\r
 {\r
-  EFI_PEI_MP_SERVICES_PPI *MpServices;\r
-  EFI_STATUS              Status;\r
+  EFI_PEI_MP_SERVICES_PPI  *MpServices;\r
+  EFI_STATUS               Status;\r
 \r
   DEBUG ((DEBUG_INFO, "%a: %a\n", gEfiCallerBaseName, __FUNCTION__));\r
 \r
@@ -65,15 +65,15 @@ ClearCacheOnMpServicesAvailable (
   // Clear cache on all the APs in parallel.\r
   //\r
   MpServices = Ppi;\r
-  Status = MpServices->StartupAllAPs (\r
-                         (CONST EFI_PEI_SERVICES **)PeiServices,\r
-                         MpServices,\r
-                         ClearCache,          // Procedure\r
-                         FALSE,               // SingleThread\r
-                         0,                   // TimeoutInMicroSeconds: inf.\r
-                         NULL                 // ProcedureArgument\r
-                         );\r
-  if (EFI_ERROR (Status) && Status != EFI_NOT_STARTED) {\r
+  Status     = MpServices->StartupAllAPs (\r
+                             (CONST EFI_PEI_SERVICES **)PeiServices,\r
+                             MpServices,\r
+                             ClearCache,      // Procedure\r
+                             FALSE,           // SingleThread\r
+                             0,               // TimeoutInMicroSeconds: inf.\r
+                             NULL             // ProcedureArgument\r
+                             );\r
+  if (EFI_ERROR (Status) && (Status != EFI_NOT_STARTED)) {\r
     DEBUG ((DEBUG_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status));\r
     return Status;\r
   }\r
@@ -89,7 +89,7 @@ ClearCacheOnMpServicesAvailable (
 // Notification object for registering the callback, for when\r
 // EFI_PEI_MP_SERVICES_PPI becomes available.\r
 //\r
-STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mMpServicesNotify = {\r
+STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR  mMpServicesNotify = {\r
   EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | // Flags\r
   EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
   &gEfiPeiMpServicesPpiGuid,               // Guid\r
@@ -101,11 +101,15 @@ InstallClearCacheCallback (
   VOID\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = PeiServicesNotifyPpi (&mMpServicesNotify);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: failed to set up MP Services callback: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: failed to set up MP Services callback: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
   }\r
 }\r
index 9b34e10b17962384f053b2b884f74da227f1a4fe..a01b3866bee478f18070741fc9331a4394c55dbb 100644 (file)
@@ -6,7 +6,6 @@
 \r
 **/\r
 \r
-\r
 #include "Cmos.h"\r
 #include "Library/IoLib.h"\r
 \r
 UINT8\r
 EFIAPI\r
 CmosRead8 (\r
-  IN      UINTN                     Index\r
+  IN      UINTN  Index\r
   )\r
 {\r
-  IoWrite8 (0x70, (UINT8) Index);\r
+  IoWrite8 (0x70, (UINT8)Index);\r
   return IoRead8 (0x71);\r
 }\r
 \r
-\r
 /**\r
   Writes 8-bits of CMOS data.\r
 \r
@@ -47,12 +45,11 @@ CmosRead8 (
 UINT8\r
 EFIAPI\r
 CmosWrite8 (\r
-  IN      UINTN                     Index,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Index,\r
+  IN      UINT8  Value\r
   )\r
 {\r
-  IoWrite8 (0x70, (UINT8) Index);\r
+  IoWrite8 (0x70, (UINT8)Index);\r
   IoWrite8 (0x71, Value);\r
   return Value;\r
 }\r
-\r
index 3cd98799a3af6993617d6d75a049e7ed02295b1a..2b3124d7ba36d55b76fda3c40f2fbdac10c36381 100644 (file)
@@ -23,7 +23,7 @@
 UINT8\r
 EFIAPI\r
 CmosRead8 (\r
-  IN      UINTN                     Index\r
+  IN      UINTN  Index\r
   );\r
 \r
 /**\r
@@ -41,10 +41,8 @@ CmosRead8 (
 UINT8\r
 EFIAPI\r
 CmosWrite8 (\r
-  IN      UINTN                     Index,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Index,\r
+  IN      UINT8  Value\r
   );\r
 \r
-\r
 #endif\r
-\r
index dccf9505dd7b6a52b0b17a81a44e081c4dcef24a..9af58c2655f88abcf0dfb222f49d7b830c16e03d 100644 (file)
@@ -18,7 +18,7 @@
 //\r
 // The value to be written to the Feature Control MSR, retrieved from fw_cfg.\r
 //\r
-STATIC UINT64 mFeatureControlValue;\r
+STATIC UINT64  mFeatureControlValue;\r
 \r
 /**\r
   Write the Feature Control MSR on an Application Processor or the Boot\r
@@ -34,7 +34,7 @@ STATIC
 VOID\r
 EFIAPI\r
 WriteFeatureControl (\r
-  IN OUT VOID *WorkSpace\r
+  IN OUT VOID  *WorkSpace\r
   )\r
 {\r
   AsmWriteMsr64 (MSR_IA32_FEATURE_CONTROL, mFeatureControlValue);\r
@@ -60,8 +60,8 @@ OnMpServicesAvailable (
   IN VOID                       *Ppi\r
   )\r
 {\r
-  EFI_PEI_MP_SERVICES_PPI *MpServices;\r
-  EFI_STATUS              Status;\r
+  EFI_PEI_MP_SERVICES_PPI  *MpServices;\r
+  EFI_STATUS               Status;\r
 \r
   DEBUG ((DEBUG_VERBOSE, "%a: %a\n", gEfiCallerBaseName, __FUNCTION__));\r
 \r
@@ -69,15 +69,15 @@ OnMpServicesAvailable (
   // Write the MSR on all the APs in parallel.\r
   //\r
   MpServices = Ppi;\r
-  Status = MpServices->StartupAllAPs (\r
-                         (CONST EFI_PEI_SERVICES **)PeiServices,\r
-                         MpServices,\r
-                         WriteFeatureControl, // Procedure\r
-                         FALSE,               // SingleThread\r
-                         0,                   // TimeoutInMicroSeconds: inf.\r
-                         NULL                 // ProcedureArgument\r
-                         );\r
-  if (EFI_ERROR (Status) && Status != EFI_NOT_STARTED) {\r
+  Status     = MpServices->StartupAllAPs (\r
+                             (CONST EFI_PEI_SERVICES **)PeiServices,\r
+                             MpServices,\r
+                             WriteFeatureControl, // Procedure\r
+                             FALSE,               // SingleThread\r
+                             0,                   // TimeoutInMicroSeconds: inf.\r
+                             NULL                 // ProcedureArgument\r
+                             );\r
+  if (EFI_ERROR (Status) && (Status != EFI_NOT_STARTED)) {\r
     DEBUG ((DEBUG_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status));\r
     return Status;\r
   }\r
@@ -93,7 +93,7 @@ OnMpServicesAvailable (
 // Notification object for registering the callback, for when\r
 // EFI_PEI_MP_SERVICES_PPI becomes available.\r
 //\r
-STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mMpServicesNotify = {\r
+STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR  mMpServicesNotify = {\r
   EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | // Flags\r
   EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
   &gEfiPeiMpServicesPpiGuid,               // Guid\r
@@ -105,24 +105,32 @@ InstallFeatureControlCallback (
   VOID\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  FIRMWARE_CONFIG_ITEM FwCfgItem;\r
-  UINTN                FwCfgSize;\r
-\r
-  Status = QemuFwCfgFindFile ("etc/msr_feature_control", &FwCfgItem,\r
-             &FwCfgSize);\r
-  if (EFI_ERROR (Status) || FwCfgSize != sizeof mFeatureControlValue) {\r
+  EFI_STATUS            Status;\r
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;\r
+  UINTN                 FwCfgSize;\r
+\r
+  Status = QemuFwCfgFindFile (\r
+             "etc/msr_feature_control",\r
+             &FwCfgItem,\r
+             &FwCfgSize\r
+             );\r
+  if (EFI_ERROR (Status) || (FwCfgSize != sizeof mFeatureControlValue)) {\r
     //\r
     // Nothing to do.\r
     //\r
     return;\r
   }\r
+\r
   QemuFwCfgSelectItem (FwCfgItem);\r
   QemuFwCfgReadBytes (sizeof mFeatureControlValue, &mFeatureControlValue);\r
 \r
   Status = PeiServicesNotifyPpi (&mMpServicesNotify);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: failed to set up MP Services callback: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: failed to set up MP Services callback: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
   }\r
 }\r
index ee4ecab615f9a4506fc4a50ad992c726027edfb6..8cd8cacc591335d75e084616d29a70237da3c77b 100644 (file)
@@ -13,7 +13,6 @@
 #include <Library/PeiServicesLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
-\r
 /**\r
   Publish PEI & DXE (Decompressed) Memory based FVs to let PEI\r
   and DXE know about them.\r
@@ -26,7 +25,7 @@ PeiFvInitialization (
   VOID\r
   )\r
 {\r
-  BOOLEAN SecureS3Needed;\r
+  BOOLEAN  SecureS3Needed;\r
 \r
   DEBUG ((DEBUG_INFO, "Platform PEI Firmware Volume Initialization\n"));\r
 \r
@@ -67,7 +66,7 @@ PeiFvInitialization (
   // of DXEFV, so let's keep away the OS from there too.\r
   //\r
   if (SecureS3Needed) {\r
-    UINT32 DxeMemFvEnd;\r
+    UINT32  DxeMemFvEnd;\r
 \r
     DxeMemFvEnd = PcdGet32 (PcdOvmfDxeMemFvBase) +\r
                   PcdGet32 (PcdOvmfDxeMemFvSize);\r
@@ -83,7 +82,7 @@ PeiFvInitialization (
   //\r
   PeiServicesInstallFvInfoPpi (\r
     NULL,\r
-    (VOID *)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase),\r
+    (VOID *)(UINTN)PcdGet32 (PcdOvmfDxeMemFvBase),\r
     PcdGet32 (PcdOvmfDxeMemFvSize),\r
     NULL,\r
     NULL\r
@@ -91,4 +90,3 @@ PeiFvInitialization (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index d736b85e0d90940fdb868816a9d6c6687a465944..3f59a1ac79f6ff77c18a5582a87fd7c5087c3f86 100644 (file)
@@ -39,24 +39,24 @@ Module Name:
 #include "Platform.h"\r
 #include "Cmos.h"\r
 \r
-UINT8 mPhysMemAddressWidth;\r
+UINT8  mPhysMemAddressWidth;\r
 \r
-STATIC UINT32 mS3AcpiReservedMemoryBase;\r
-STATIC UINT32 mS3AcpiReservedMemorySize;\r
+STATIC UINT32  mS3AcpiReservedMemoryBase;\r
+STATIC UINT32  mS3AcpiReservedMemorySize;\r
 \r
-STATIC UINT16 mQ35TsegMbytes;\r
+STATIC UINT16  mQ35TsegMbytes;\r
 \r
-BOOLEAN mQ35SmramAtDefaultSmbase;\r
+BOOLEAN  mQ35SmramAtDefaultSmbase;\r
 \r
-UINT32 mQemuUc32Base;\r
+UINT32  mQemuUc32Base;\r
 \r
 VOID\r
 Q35TsegMbytesInitialization (\r
   VOID\r
   )\r
 {\r
-  UINT16        ExtendedTsegMbytes;\r
-  RETURN_STATUS PcdStatus;\r
+  UINT16         ExtendedTsegMbytes;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   ASSERT (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID);\r
 \r
@@ -94,46 +94,53 @@ Q35TsegMbytesInitialization (
   mQ35TsegMbytes = ExtendedTsegMbytes;\r
 }\r
 \r
-\r
 VOID\r
 Q35SmramAtDefaultSmbaseInitialization (\r
   VOID\r
   )\r
 {\r
-  RETURN_STATUS PcdStatus;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   ASSERT (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID);\r
 \r
   mQ35SmramAtDefaultSmbase = FALSE;\r
   if (FeaturePcdGet (PcdCsmEnable)) {\r
-    DEBUG ((DEBUG_INFO, "%a: SMRAM at default SMBASE not checked due to CSM\n",\r
-      __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: SMRAM at default SMBASE not checked due to CSM\n",\r
+      __FUNCTION__\r
+      ));\r
   } else {\r
-    UINTN CtlReg;\r
-    UINT8 CtlRegVal;\r
+    UINTN  CtlReg;\r
+    UINT8  CtlRegVal;\r
 \r
     CtlReg = DRAMC_REGISTER_Q35 (MCH_DEFAULT_SMBASE_CTL);\r
     PciWrite8 (CtlReg, MCH_DEFAULT_SMBASE_QUERY);\r
-    CtlRegVal = PciRead8 (CtlReg);\r
+    CtlRegVal                = PciRead8 (CtlReg);\r
     mQ35SmramAtDefaultSmbase = (BOOLEAN)(CtlRegVal ==\r
                                          MCH_DEFAULT_SMBASE_IN_RAM);\r
-    DEBUG ((DEBUG_INFO, "%a: SMRAM at default SMBASE %a\n", __FUNCTION__,\r
-      mQ35SmramAtDefaultSmbase ? "found" : "not found"));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: SMRAM at default SMBASE %a\n",\r
+      __FUNCTION__,\r
+      mQ35SmramAtDefaultSmbase ? "found" : "not found"\r
+      ));\r
   }\r
 \r
-  PcdStatus = PcdSetBoolS (PcdQ35SmramAtDefaultSmbase,\r
-                mQ35SmramAtDefaultSmbase);\r
+  PcdStatus = PcdSetBoolS (\r
+                PcdQ35SmramAtDefaultSmbase,\r
+                mQ35SmramAtDefaultSmbase\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 }\r
 \r
-\r
 VOID\r
 QemuUc32BaseInitialization (\r
   VOID\r
   )\r
 {\r
-  UINT32 LowerMemorySize;\r
-  UINT32 Uc32Size;\r
+  UINT32  LowerMemorySize;\r
+  UINT32  Uc32Size;\r
 \r
   if (mHostBridgeDevId == 0xffff /* microvm */) {\r
     return;\r
@@ -159,8 +166,8 @@ QemuUc32BaseInitialization (
   // while keeping the end affixed to 4GB. This will round the base up.\r
   //\r
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
-  Uc32Size = GetPowerOfTwo32 ((UINT32)(SIZE_4GB - LowerMemorySize));\r
-  mQemuUc32Base = (UINT32)(SIZE_4GB - Uc32Size);\r
+  Uc32Size        = GetPowerOfTwo32 ((UINT32)(SIZE_4GB - LowerMemorySize));\r
+  mQemuUc32Base   = (UINT32)(SIZE_4GB - Uc32Size);\r
   //\r
   // Assuming that LowerMemorySize is at least 1 byte, Uc32Size is at most 2GB.\r
   // Therefore mQemuUc32Base is at least 2GB.\r
@@ -168,13 +175,18 @@ QemuUc32BaseInitialization (
   ASSERT (mQemuUc32Base >= BASE_2GB);\r
 \r
   if (mQemuUc32Base != LowerMemorySize) {\r
-    DEBUG ((DEBUG_VERBOSE, "%a: rounded UC32 base from 0x%x up to 0x%x, for "\r
-      "an UC32 size of 0x%x\n", __FUNCTION__, LowerMemorySize, mQemuUc32Base,\r
-      Uc32Size));\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "%a: rounded UC32 base from 0x%x up to 0x%x, for "\r
+      "an UC32 size of 0x%x\n",\r
+      __FUNCTION__,\r
+      LowerMemorySize,\r
+      mQemuUc32Base,\r
+      Uc32Size\r
+      ));\r
   }\r
 }\r
 \r
-\r
 /**\r
   Iterate over the RAM entries in QEMU's fw_cfg E820 RAM map that start outside\r
   of the 32-bit address range.\r
@@ -204,19 +216,20 @@ QemuUc32BaseInitialization (
 STATIC\r
 EFI_STATUS\r
 ScanOrAdd64BitE820Ram (\r
-  OUT UINT64 *MaxAddress OPTIONAL\r
+  OUT UINT64  *MaxAddress OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
-  FIRMWARE_CONFIG_ITEM FwCfgItem;\r
-  UINTN                FwCfgSize;\r
-  EFI_E820_ENTRY64     E820Entry;\r
-  UINTN                Processed;\r
+  EFI_STATUS            Status;\r
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;\r
+  UINTN                 FwCfgSize;\r
+  EFI_E820_ENTRY64      E820Entry;\r
+  UINTN                 Processed;\r
 \r
   Status = QemuFwCfgFindFile ("etc/e820", &FwCfgItem, &FwCfgSize);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   if (FwCfgSize % sizeof E820Entry != 0) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
@@ -236,18 +249,19 @@ ScanOrAdd64BitE820Ram (
       E820Entry.Length,\r
       E820Entry.Type\r
       ));\r
-    if (E820Entry.Type == EfiAcpiAddressRangeMemory &&\r
-        E820Entry.BaseAddr >= BASE_4GB) {\r
+    if ((E820Entry.Type == EfiAcpiAddressRangeMemory) &&\r
+        (E820Entry.BaseAddr >= BASE_4GB))\r
+    {\r
       if (MaxAddress == NULL) {\r
-        UINT64 Base;\r
-        UINT64 End;\r
+        UINT64  Base;\r
+        UINT64  End;\r
 \r
         //\r
         // Round up the start address, and round down the end address.\r
         //\r
         Base = ALIGN_VALUE (E820Entry.BaseAddr, (UINT64)EFI_PAGE_SIZE);\r
-        End = (E820Entry.BaseAddr + E820Entry.Length) &\r
-              ~(UINT64)EFI_PAGE_MASK;\r
+        End  = (E820Entry.BaseAddr + E820Entry.Length) &\r
+               ~(UINT64)EFI_PAGE_MASK;\r
         if (Base < End) {\r
           AddMemoryRangeHob (Base, End);\r
           DEBUG ((\r
@@ -259,7 +273,7 @@ ScanOrAdd64BitE820Ram (
             ));\r
         }\r
       } else {\r
-        UINT64 Candidate;\r
+        UINT64  Candidate;\r
 \r
         Candidate = E820Entry.BaseAddr + E820Entry.Length;\r
         if (Candidate > *MaxAddress) {\r
@@ -274,17 +288,17 @@ ScanOrAdd64BitE820Ram (
       }\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 UINT32\r
 GetSystemMemorySizeBelow4gb (\r
   VOID\r
   )\r
 {\r
-  UINT8 Cmos0x34;\r
-  UINT8 Cmos0x35;\r
+  UINT8  Cmos0x34;\r
+  UINT8  Cmos0x35;\r
 \r
   //\r
   // CMOS 0x34/0x35 specifies the system memory above 16 MB.\r
@@ -295,20 +309,19 @@ GetSystemMemorySizeBelow4gb (
   //   into the calculation to get the total memory size.\r
   //\r
 \r
-  Cmos0x34 = (UINT8) CmosRead8 (0x34);\r
-  Cmos0x35 = (UINT8) CmosRead8 (0x35);\r
+  Cmos0x34 = (UINT8)CmosRead8 (0x34);\r
+  Cmos0x35 = (UINT8)CmosRead8 (0x35);\r
 \r
-  return (UINT32) (((UINTN)((Cmos0x35 << 8) + Cmos0x34) << 16) + SIZE_16MB);\r
+  return (UINT32)(((UINTN)((Cmos0x35 << 8) + Cmos0x34) << 16) + SIZE_16MB);\r
 }\r
 \r
-\r
 STATIC\r
 UINT64\r
 GetSystemMemorySizeAbove4gb (\r
   )\r
 {\r
-  UINT32 Size;\r
-  UINTN  CmosIndex;\r
+  UINT32  Size;\r
+  UINTN   CmosIndex;\r
 \r
   //\r
   // CMOS 0x5b-0x5d specifies the system memory above 4GB MB.\r
@@ -320,13 +333,12 @@ GetSystemMemorySizeAbove4gb (
 \r
   Size = 0;\r
   for (CmosIndex = 0x5d; CmosIndex >= 0x5b; CmosIndex--) {\r
-    Size = (UINT32) (Size << 8) + (UINT32) CmosRead8 (CmosIndex);\r
+    Size = (UINT32)(Size << 8) + (UINT32)CmosRead8 (CmosIndex);\r
   }\r
 \r
   return LShiftU64 (Size, 16);\r
 }\r
 \r
-\r
 /**\r
   Return the highest address that DXE could possibly use, plus one.\r
 **/\r
@@ -336,14 +348,14 @@ GetFirstNonAddress (
   VOID\r
   )\r
 {\r
-  UINT64               FirstNonAddress;\r
-  UINT64               Pci64Base, Pci64Size;\r
-  UINT32               FwCfgPciMmio64Mb;\r
-  EFI_STATUS           Status;\r
-  FIRMWARE_CONFIG_ITEM FwCfgItem;\r
-  UINTN                FwCfgSize;\r
-  UINT64               HotPlugMemoryEnd;\r
-  RETURN_STATUS        PcdStatus;\r
+  UINT64                FirstNonAddress;\r
+  UINT64                Pci64Base, Pci64Size;\r
+  UINT32                FwCfgPciMmio64Mb;\r
+  EFI_STATUS            Status;\r
+  FIRMWARE_CONFIG_ITEM  FwCfgItem;\r
+  UINTN                 FwCfgSize;\r
+  UINT64                HotPlugMemoryEnd;\r
+  RETURN_STATUS         PcdStatus;\r
 \r
   //\r
   // set FirstNonAddress to suppress incorrect compiler/analyzer warnings\r
@@ -367,11 +379,12 @@ GetFirstNonAddress (
   // resources to 32-bit anyway. See DegradeResource() in\r
   // "PciResourceSupport.c".\r
   //\r
-#ifdef MDE_CPU_IA32\r
+ #ifdef MDE_CPU_IA32\r
   if (!FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {\r
     return FirstNonAddress;\r
   }\r
-#endif\r
+\r
+ #endif\r
 \r
   //\r
   // Otherwise, in order to calculate the highest address plus one, we must\r
@@ -386,31 +399,40 @@ GetFirstNonAddress (
   // As signaled by the "X-" prefix, this knob is experimental, and might go\r
   // away at any time.\r
   //\r
-  Status = QemuFwCfgParseUint32 ("opt/ovmf/X-PciMmio64Mb", FALSE,\r
-             &FwCfgPciMmio64Mb);\r
+  Status = QemuFwCfgParseUint32 (\r
+             "opt/ovmf/X-PciMmio64Mb",\r
+             FALSE,\r
+             &FwCfgPciMmio64Mb\r
+             );\r
   switch (Status) {\r
-  case EFI_UNSUPPORTED:\r
-  case EFI_NOT_FOUND:\r
-    break;\r
-  case EFI_SUCCESS:\r
-    if (FwCfgPciMmio64Mb <= 0x1000000) {\r
-      Pci64Size = LShiftU64 (FwCfgPciMmio64Mb, 20);\r
+    case EFI_UNSUPPORTED:\r
+    case EFI_NOT_FOUND:\r
       break;\r
-    }\r
+    case EFI_SUCCESS:\r
+      if (FwCfgPciMmio64Mb <= 0x1000000) {\r
+        Pci64Size = LShiftU64 (FwCfgPciMmio64Mb, 20);\r
+        break;\r
+      }\r
+\r
     //\r
     // fall through\r
     //\r
-  default:\r
-    DEBUG ((DEBUG_WARN,\r
-      "%a: ignoring malformed 64-bit PCI host aperture size from fw_cfg\n",\r
-      __FUNCTION__));\r
-    break;\r
+    default:\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a: ignoring malformed 64-bit PCI host aperture size from fw_cfg\n",\r
+        __FUNCTION__\r
+        ));\r
+      break;\r
   }\r
 \r
   if (Pci64Size == 0) {\r
     if (mBootMode != BOOT_ON_S3_RESUME) {\r
-      DEBUG ((DEBUG_INFO, "%a: disabling 64-bit PCI host aperture\n",\r
-        __FUNCTION__));\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "%a: disabling 64-bit PCI host aperture\n",\r
+        __FUNCTION__\r
+        ));\r
       PcdStatus = PcdSet64S (PcdPciMmio64Size, 0);\r
       ASSERT_RETURN_ERROR (PcdStatus);\r
     }\r
@@ -429,13 +451,20 @@ GetFirstNonAddress (
   // starts right at the end of the memory above 4GB. The 64-bit PCI host\r
   // aperture must be placed above it.\r
   //\r
-  Status = QemuFwCfgFindFile ("etc/reserved-memory-end", &FwCfgItem,\r
-             &FwCfgSize);\r
-  if (!EFI_ERROR (Status) && FwCfgSize == sizeof HotPlugMemoryEnd) {\r
+  Status = QemuFwCfgFindFile (\r
+             "etc/reserved-memory-end",\r
+             &FwCfgItem,\r
+             &FwCfgSize\r
+             );\r
+  if (!EFI_ERROR (Status) && (FwCfgSize == sizeof HotPlugMemoryEnd)) {\r
     QemuFwCfgSelectItem (FwCfgItem);\r
     QemuFwCfgReadBytes (FwCfgSize, &HotPlugMemoryEnd);\r
-    DEBUG ((DEBUG_VERBOSE, "%a: HotPlugMemoryEnd=0x%Lx\n", __FUNCTION__,\r
-      HotPlugMemoryEnd));\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "%a: HotPlugMemoryEnd=0x%Lx\n",\r
+      __FUNCTION__,\r
+      HotPlugMemoryEnd\r
+      ));\r
 \r
     ASSERT (HotPlugMemoryEnd >= FirstNonAddress);\r
     FirstNonAddress = HotPlugMemoryEnd;\r
@@ -467,8 +496,13 @@ GetFirstNonAddress (
     PcdStatus = PcdSet64S (PcdPciMmio64Size, Pci64Size);\r
     ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
-    DEBUG ((DEBUG_INFO, "%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n",\r
-      __FUNCTION__, Pci64Base, Pci64Size));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n",\r
+      __FUNCTION__,\r
+      Pci64Base,\r
+      Pci64Size\r
+      ));\r
   }\r
 \r
   //\r
@@ -478,7 +512,6 @@ GetFirstNonAddress (
   return FirstNonAddress;\r
 }\r
 \r
-\r
 /**\r
   Initialize the mPhysMemAddressWidth variable, based on guest RAM size.\r
 **/\r
@@ -487,7 +520,7 @@ AddressWidthInitialization (
   VOID\r
   )\r
 {\r
-  UINT64 FirstNonAddress;\r
+  UINT64  FirstNonAddress;\r
 \r
   //\r
   // As guest-physical memory size grows, the permanent PEI RAM requirements\r
@@ -515,10 +548,10 @@ AddressWidthInitialization (
   if (mPhysMemAddressWidth <= 36) {\r
     mPhysMemAddressWidth = 36;\r
   }\r
+\r
   ASSERT (mPhysMemAddressWidth <= 48);\r
 }\r
 \r
-\r
 /**\r
   Calculate the cap for the permanent PEI memory.\r
 **/\r
@@ -528,21 +561,22 @@ GetPeiMemoryCap (
   VOID\r
   )\r
 {\r
-  BOOLEAN Page1GSupport;\r
-  UINT32  RegEax;\r
-  UINT32  RegEdx;\r
-  UINT32  Pml4Entries;\r
-  UINT32  PdpEntries;\r
-  UINTN   TotalPages;\r
+  BOOLEAN  Page1GSupport;\r
+  UINT32   RegEax;\r
+  UINT32   RegEdx;\r
+  UINT32   Pml4Entries;\r
+  UINT32   PdpEntries;\r
+  UINTN    TotalPages;\r
 \r
   //\r
   // If DXE is 32-bit, then just return the traditional 64 MB cap.\r
   //\r
-#ifdef MDE_CPU_IA32\r
+ #ifdef MDE_CPU_IA32\r
   if (!FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {\r
     return SIZE_64MB;\r
   }\r
-#endif\r
+\r
+ #endif\r
 \r
   //\r
   // Dependent on physical address width, PEI memory allocations can be\r
@@ -563,7 +597,7 @@ GetPeiMemoryCap (
 \r
   if (mPhysMemAddressWidth <= 39) {\r
     Pml4Entries = 1;\r
-    PdpEntries = 1 << (mPhysMemAddressWidth - 30);\r
+    PdpEntries  = 1 << (mPhysMemAddressWidth - 30);\r
     ASSERT (PdpEntries <= 0x200);\r
   } else {\r
     Pml4Entries = 1 << (mPhysMemAddressWidth - 39);\r
@@ -572,7 +606,7 @@ GetPeiMemoryCap (
   }\r
 \r
   TotalPages = Page1GSupport ? Pml4Entries + 1 :\r
-                               (PdpEntries + 1) * Pml4Entries + 1;\r
+               (PdpEntries + 1) * Pml4Entries + 1;\r
   ASSERT (TotalPages <= 0x40201);\r
 \r
   //\r
@@ -583,7 +617,6 @@ GetPeiMemoryCap (
   return (UINT32)(EFI_PAGES_TO_SIZE (TotalPages) + SIZE_64MB);\r
 }\r
 \r
-\r
 /**\r
   Publish PEI core memory\r
 \r
@@ -595,11 +628,11 @@ PublishPeiMemory (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase;\r
-  UINT64                      MemorySize;\r
-  UINT32                      LowerMemorySize;\r
-  UINT32                      PeiMemoryCap;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase;\r
+  UINT64                MemorySize;\r
+  UINT32                LowerMemorySize;\r
+  UINT32                PeiMemoryCap;\r
 \r
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
   if (FeaturePcdGet (PcdSmmSmramRequire)) {\r
@@ -616,10 +649,10 @@ PublishPeiMemory (
   //\r
   if (mS3Supported) {\r
     mS3AcpiReservedMemorySize = SIZE_512KB +\r
-      mMaxCpuCount *\r
-      PcdGet32 (PcdCpuApStackSize);\r
+                                mMaxCpuCount *\r
+                                PcdGet32 (PcdCpuApStackSize);\r
     mS3AcpiReservedMemoryBase = LowerMemorySize - mS3AcpiReservedMemorySize;\r
-    LowerMemorySize = mS3AcpiReservedMemoryBase;\r
+    LowerMemorySize           = mS3AcpiReservedMemoryBase;\r
   }\r
 \r
   if (mBootMode == BOOT_ON_S3_RESUME) {\r
@@ -627,8 +660,13 @@ PublishPeiMemory (
     MemorySize = mS3AcpiReservedMemorySize;\r
   } else {\r
     PeiMemoryCap = GetPeiMemoryCap ();\r
-    DEBUG ((DEBUG_INFO, "%a: mPhysMemAddressWidth=%d PeiMemoryCap=%u KB\n",\r
-      __FUNCTION__, mPhysMemAddressWidth, PeiMemoryCap >> 10));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: mPhysMemAddressWidth=%d PeiMemoryCap=%u KB\n",\r
+      __FUNCTION__,\r
+      mPhysMemAddressWidth,\r
+      PeiMemoryCap >> 10\r
+      ));\r
 \r
     //\r
     // Determine the range of memory to use during PEI\r
@@ -641,8 +679,8 @@ PublishPeiMemory (
     // shouldn't overlap with that HOB.\r
     //\r
     MemoryBase = mS3Supported && FeaturePcdGet (PcdSmmSmramRequire) ?\r
-      PcdGet32 (PcdOvmfDecompressionScratchEnd) :\r
-      PcdGet32 (PcdOvmfDxeMemFvBase) + PcdGet32 (PcdOvmfDxeMemFvSize);\r
+                 PcdGet32 (PcdOvmfDecompressionScratchEnd) :\r
+                 PcdGet32 (PcdOvmfDxeMemFvBase) + PcdGet32 (PcdOvmfDxeMemFvSize);\r
     MemorySize = LowerMemorySize - MemoryBase;\r
     if (MemorySize > PeiMemoryCap) {\r
       MemoryBase = LowerMemorySize - PeiMemoryCap;\r
@@ -662,13 +700,12 @@ PublishPeiMemory (
   //\r
   // Publish this memory to the PEI Core\r
   //\r
-  Status = PublishSystemMemory(MemoryBase, MemorySize);\r
+  Status = PublishSystemMemory (MemoryBase, MemorySize);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 VOID\r
 QemuInitializeRamBelow1gb (\r
@@ -677,20 +714,24 @@ QemuInitializeRamBelow1gb (
 {\r
   if (FeaturePcdGet (PcdSmmSmramRequire) && mQ35SmramAtDefaultSmbase) {\r
     AddMemoryRangeHob (0, SMM_DEFAULT_SMBASE);\r
-    AddReservedMemoryBaseSizeHob (SMM_DEFAULT_SMBASE, MCH_DEFAULT_SMBASE_SIZE,\r
-      TRUE /* Cacheable */);\r
+    AddReservedMemoryBaseSizeHob (\r
+      SMM_DEFAULT_SMBASE,\r
+      MCH_DEFAULT_SMBASE_SIZE,\r
+      TRUE /* Cacheable */\r
+      );\r
     STATIC_ASSERT (\r
       SMM_DEFAULT_SMBASE + MCH_DEFAULT_SMBASE_SIZE < BASE_512KB + BASE_128KB,\r
       "end of SMRAM at default SMBASE ends at, or exceeds, 640KB"\r
       );\r
-    AddMemoryRangeHob (SMM_DEFAULT_SMBASE + MCH_DEFAULT_SMBASE_SIZE,\r
-      BASE_512KB + BASE_128KB);\r
+    AddMemoryRangeHob (\r
+      SMM_DEFAULT_SMBASE + MCH_DEFAULT_SMBASE_SIZE,\r
+      BASE_512KB + BASE_128KB\r
+      );\r
   } else {\r
     AddMemoryRangeHob (0, BASE_512KB + BASE_128KB);\r
   }\r
 }\r
 \r
-\r
 /**\r
   Peform Memory Detection for QEMU / KVM\r
 \r
@@ -701,10 +742,10 @@ QemuInitializeRam (
   VOID\r
   )\r
 {\r
-  UINT64                      LowerMemorySize;\r
-  UINT64                      UpperMemorySize;\r
-  MTRR_SETTINGS               MtrrSettings;\r
-  EFI_STATUS                  Status;\r
+  UINT64         LowerMemorySize;\r
+  UINT64         UpperMemorySize;\r
+  MTRR_SETTINGS  MtrrSettings;\r
+  EFI_STATUS     Status;\r
 \r
   DEBUG ((DEBUG_INFO, "%a called\n", __FUNCTION__));\r
 \r
@@ -743,12 +784,15 @@ QemuInitializeRam (
     QemuInitializeRamBelow1gb ();\r
 \r
     if (FeaturePcdGet (PcdSmmSmramRequire)) {\r
-      UINT32 TsegSize;\r
+      UINT32  TsegSize;\r
 \r
       TsegSize = mQ35TsegMbytes * SIZE_1MB;\r
       AddMemoryRangeHob (BASE_1MB, LowerMemorySize - TsegSize);\r
-      AddReservedMemoryBaseSizeHob (LowerMemorySize - TsegSize, TsegSize,\r
-        TRUE);\r
+      AddReservedMemoryBaseSizeHob (\r
+        LowerMemorySize - TsegSize,\r
+        TsegSize,\r
+        TRUE\r
+        );\r
     } else {\r
       AddMemoryRangeHob (BASE_1MB, LowerMemorySize);\r
     }\r
@@ -759,7 +803,7 @@ QemuInitializeRam (
     // memory size read from the CMOS.\r
     //\r
     Status = ScanOrAdd64BitE820Ram (NULL);\r
-    if (EFI_ERROR (Status) && UpperMemorySize != 0) {\r
+    if (EFI_ERROR (Status) && (UpperMemorySize != 0)) {\r
       AddMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);\r
     }\r
   }\r
@@ -796,16 +840,22 @@ QemuInitializeRam (
     //\r
     // Set memory range from 640KB to 1MB to uncacheable\r
     //\r
-    Status = MtrrSetMemoryAttribute (BASE_512KB + BASE_128KB,\r
-               BASE_1MB - (BASE_512KB + BASE_128KB), CacheUncacheable);\r
+    Status = MtrrSetMemoryAttribute (\r
+               BASE_512KB + BASE_128KB,\r
+               BASE_1MB - (BASE_512KB + BASE_128KB),\r
+               CacheUncacheable\r
+               );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     //\r
     // Set the memory range from the start of the 32-bit MMIO area (32-bit PCI\r
     // MMIO aperture on i440fx, PCIEXBAR on q35) to 4GB as uncacheable.\r
     //\r
-    Status = MtrrSetMemoryAttribute (mQemuUc32Base, SIZE_4GB - mQemuUc32Base,\r
-               CacheUncacheable);\r
+    Status = MtrrSetMemoryAttribute (\r
+               mQemuUc32Base,\r
+               SIZE_4GB - mQemuUc32Base,\r
+               CacheUncacheable\r
+               );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 }\r
@@ -821,7 +871,7 @@ InitializeRamRegions (
 {\r
   QemuInitializeRam ();\r
 \r
-  if (mS3Supported && mBootMode != BOOT_ON_S3_RESUME) {\r
+  if (mS3Supported && (mBootMode != BOOT_ON_S3_RESUME)) {\r
     //\r
     // This is the memory range that will be used for PEI on S3 resume\r
     //\r
@@ -851,7 +901,7 @@ InitializeRamRegions (
       EfiACPIMemoryNVS\r
       );\r
 \r
-#ifdef MDE_CPU_X64\r
+ #ifdef MDE_CPU_X64\r
     //\r
     // Reserve the initial page tables built by the reset vector code.\r
     //\r
@@ -859,8 +909,8 @@ InitializeRamRegions (
     // resume, it must be reserved as ACPI NVS.\r
     //\r
     BuildMemoryAllocationHob (\r
-      (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSecPageTablesBase),\r
-      (UINT64)(UINTN) PcdGet32 (PcdOvmfSecPageTablesSize),\r
+      (EFI_PHYSICAL_ADDRESS)(UINTN)PcdGet32 (PcdOvmfSecPageTablesBase),\r
+      (UINT64)(UINTN)PcdGet32 (PcdOvmfSecPageTablesSize),\r
       EfiACPIMemoryNVS\r
       );\r
 \r
@@ -875,22 +925,23 @@ InitializeRamRegions (
       // resume, it must be reserved as ACPI NVS.\r
       //\r
       BuildMemoryAllocationHob (\r
-        (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSecGhcbPageTableBase),\r
-        (UINT64)(UINTN) PcdGet32 (PcdOvmfSecGhcbPageTableSize),\r
+        (EFI_PHYSICAL_ADDRESS)(UINTN)PcdGet32 (PcdOvmfSecGhcbPageTableBase),\r
+        (UINT64)(UINTN)PcdGet32 (PcdOvmfSecGhcbPageTableSize),\r
         EfiACPIMemoryNVS\r
         );\r
       BuildMemoryAllocationHob (\r
-        (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSecGhcbBase),\r
-        (UINT64)(UINTN) PcdGet32 (PcdOvmfSecGhcbSize),\r
+        (EFI_PHYSICAL_ADDRESS)(UINTN)PcdGet32 (PcdOvmfSecGhcbBase),\r
+        (UINT64)(UINTN)PcdGet32 (PcdOvmfSecGhcbSize),\r
         EfiACPIMemoryNVS\r
         );\r
       BuildMemoryAllocationHob (\r
-        (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSecGhcbBackupBase),\r
-        (UINT64)(UINTN) PcdGet32 (PcdOvmfSecGhcbBackupSize),\r
+        (EFI_PHYSICAL_ADDRESS)(UINTN)PcdGet32 (PcdOvmfSecGhcbBackupBase),\r
+        (UINT64)(UINTN)PcdGet32 (PcdOvmfSecGhcbBackupSize),\r
         EfiACPIMemoryNVS\r
         );\r
     }\r
-#endif\r
+\r
+ #endif\r
   }\r
 \r
   if (mBootMode != BOOT_ON_S3_RESUME) {\r
@@ -906,18 +957,18 @@ InitializeRamRegions (
       // such that they would overlap the LockBox storage.\r
       //\r
       ZeroMem (\r
-        (VOID*)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageBase),\r
-        (UINTN) PcdGet32 (PcdOvmfLockBoxStorageSize)\r
+        (VOID *)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageBase),\r
+        (UINTN)PcdGet32 (PcdOvmfLockBoxStorageSize)\r
         );\r
       BuildMemoryAllocationHob (\r
-        (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageBase),\r
-        (UINT64)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageSize),\r
+        (EFI_PHYSICAL_ADDRESS)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageBase),\r
+        (UINT64)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageSize),\r
         mS3Supported ? EfiACPIMemoryNVS : EfiBootServicesData\r
         );\r
     }\r
 \r
     if (FeaturePcdGet (PcdSmmSmramRequire)) {\r
-      UINT32 TsegSize;\r
+      UINT32  TsegSize;\r
 \r
       //\r
       // Make sure the TSEG area that we reported as a reserved memory resource\r
@@ -925,7 +976,7 @@ InitializeRamRegions (
       //\r
       TsegSize = mQ35TsegMbytes * SIZE_1MB;\r
       BuildMemoryAllocationHob (\r
-        GetSystemMemorySizeBelow4gb() - TsegSize,\r
+        GetSystemMemorySizeBelow4gb () - TsegSize,\r
         TsegSize,\r
         EfiReservedMemoryType\r
         );\r
@@ -942,7 +993,7 @@ InitializeRamRegions (
       }\r
     }\r
 \r
-#ifdef MDE_CPU_X64\r
+ #ifdef MDE_CPU_X64\r
     if (FixedPcdGet32 (PcdOvmfWorkAreaSize) != 0) {\r
       //\r
       // Reserve the work area.\r
@@ -955,11 +1006,12 @@ InitializeRamRegions (
       // such that they would overlap the work area.\r
       //\r
       BuildMemoryAllocationHob (\r
-        (EFI_PHYSICAL_ADDRESS)(UINTN) FixedPcdGet32 (PcdOvmfWorkAreaBase),\r
-        (UINT64)(UINTN) FixedPcdGet32 (PcdOvmfWorkAreaSize),\r
+        (EFI_PHYSICAL_ADDRESS)(UINTN)FixedPcdGet32 (PcdOvmfWorkAreaBase),\r
+        (UINT64)(UINTN)FixedPcdGet32 (PcdOvmfWorkAreaSize),\r
         mS3Supported ? EfiACPIMemoryNVS : EfiBootServicesData\r
         );\r
     }\r
-#endif\r
+\r
+ #endif\r
   }\r
 }\r
index f3ce2b6865e1c3ebf075aac66b807e55c07d2308..fc5ccfaf113d25f09fc7b462de006cded6f27354 100644 (file)
 #define MEMORY_TYPE_INFO_DEFAULT(Type) \\r
   { Type, FixedPcdGet32 (PcdMemoryType ## Type) }\r
 \r
-STATIC EFI_MEMORY_TYPE_INFORMATION mMemoryTypeInformation[] = {\r
+STATIC EFI_MEMORY_TYPE_INFORMATION  mMemoryTypeInformation[] = {\r
   MEMORY_TYPE_INFO_DEFAULT (EfiACPIMemoryNVS),\r
   MEMORY_TYPE_INFO_DEFAULT (EfiACPIReclaimMemory),\r
   MEMORY_TYPE_INFO_DEFAULT (EfiReservedMemoryType),\r
   MEMORY_TYPE_INFO_DEFAULT (EfiRuntimeServicesCode),\r
   MEMORY_TYPE_INFO_DEFAULT (EfiRuntimeServicesData),\r
-  { EfiMaxMemoryType, }\r
+  { EfiMaxMemoryType,                               0}\r
 };\r
 \r
 STATIC\r
@@ -64,28 +64,28 @@ BuildMemTypeInfoHob (
 STATIC\r
 VOID\r
 RefreshMemTypeInfo (\r
-  IN EFI_PEI_READ_ONLY_VARIABLE2_PPI *ReadOnlyVariable2\r
+  IN EFI_PEI_READ_ONLY_VARIABLE2_PPI  *ReadOnlyVariable2\r
   )\r
 {\r
-  UINTN                       DataSize;\r
-  EFI_MEMORY_TYPE_INFORMATION Entries[EfiMaxMemoryType + 1];\r
-  EFI_STATUS                  Status;\r
-  UINTN                       NumEntries;\r
-  UINTN                       HobRecordIdx;\r
+  UINTN                        DataSize;\r
+  EFI_MEMORY_TYPE_INFORMATION  Entries[EfiMaxMemoryType + 1];\r
+  EFI_STATUS                   Status;\r
+  UINTN                        NumEntries;\r
+  UINTN                        HobRecordIdx;\r
 \r
   //\r
   // Read the MemoryTypeInformation UEFI variable from the\r
   // gEfiMemoryTypeInformationGuid namespace.\r
   //\r
   DataSize = sizeof Entries;\r
-  Status = ReadOnlyVariable2->GetVariable (\r
-                                ReadOnlyVariable2,\r
-                                EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME,\r
-                                &gEfiMemoryTypeInformationGuid,\r
-                                NULL,\r
-                                &DataSize,\r
-                                Entries\r
-                                );\r
+  Status   = ReadOnlyVariable2->GetVariable (\r
+                                  ReadOnlyVariable2,\r
+                                  EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME,\r
+                                  &gEfiMemoryTypeInformationGuid,\r
+                                  NULL,\r
+                                  &DataSize,\r
+                                  Entries\r
+                                  );\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // If the UEFI variable does not exist (EFI_NOT_FOUND), we can't use it for\r
@@ -108,10 +108,15 @@ RefreshMemTypeInfo (
   // Sanity-check the UEFI variable size against the record size.\r
   //\r
   if (DataSize % sizeof Entries[0] != 0) {\r
-    DEBUG ((DEBUG_ERROR, "%a: invalid UEFI variable size %Lu\n", __FUNCTION__,\r
-      (UINT64)DataSize));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: invalid UEFI variable size %Lu\n",\r
+      __FUNCTION__,\r
+      (UINT64)DataSize\r
+      ));\r
     return;\r
   }\r
+\r
   NumEntries = DataSize / sizeof Entries[0];\r
 \r
   //\r
@@ -121,10 +126,11 @@ RefreshMemTypeInfo (
   //\r
   for (HobRecordIdx = 0;\r
        HobRecordIdx < ARRAY_SIZE (mMemoryTypeInformation) - 1;\r
-       HobRecordIdx++) {\r
-    EFI_MEMORY_TYPE_INFORMATION *HobRecord;\r
-    UINTN                       Idx;\r
-    EFI_MEMORY_TYPE_INFORMATION *VariableRecord;\r
+       HobRecordIdx++)\r
+  {\r
+    EFI_MEMORY_TYPE_INFORMATION  *HobRecord;\r
+    UINTN                        Idx;\r
+    EFI_MEMORY_TYPE_INFORMATION  *VariableRecord;\r
 \r
     HobRecord = &mMemoryTypeInformation[HobRecordIdx];\r
 \r
@@ -139,11 +145,17 @@ RefreshMemTypeInfo (
     //\r
     // If there is a match, allow the UEFI variable to increase NumberOfPages.\r
     //\r
-    if (Idx < NumEntries &&\r
-        HobRecord->NumberOfPages < VariableRecord->NumberOfPages) {\r
-      DEBUG ((DEBUG_VERBOSE, "%a: Type 0x%x: NumberOfPages 0x%x -> 0x%x\n",\r
-        __FUNCTION__, HobRecord->Type, HobRecord->NumberOfPages,\r
-        VariableRecord->NumberOfPages));\r
+    if ((Idx < NumEntries) &&\r
+        (HobRecord->NumberOfPages < VariableRecord->NumberOfPages))\r
+    {\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: Type 0x%x: NumberOfPages 0x%x -> 0x%x\n",\r
+        __FUNCTION__,\r
+        HobRecord->Type,\r
+        HobRecord->NumberOfPages,\r
+        VariableRecord->NumberOfPages\r
+        ));\r
 \r
       HobRecord->NumberOfPages = VariableRecord->NumberOfPages;\r
     }\r
@@ -182,7 +194,7 @@ OnReadOnlyVariable2Available (
 // Notification object for registering the callback, for when\r
 // EFI_PEI_READ_ONLY_VARIABLE2_PPI becomes available.\r
 //\r
-STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mReadOnlyVariable2Notify = {\r
+STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR  mReadOnlyVariable2Notify = {\r
   (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH |\r
    EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),  // Flags\r
   &gEfiPeiReadOnlyVariable2PpiGuid,         // Guid\r
@@ -194,7 +206,7 @@ MemTypeInfoInitialization (
   VOID\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (!FeaturePcdGet (PcdSmmSmramRequire)) {\r
     //\r
@@ -207,8 +219,12 @@ MemTypeInfoInitialization (
 \r
   Status = PeiServicesNotifyPpi (&mReadOnlyVariable2Notify);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: failed to set up R/O Variable 2 callback: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: failed to set up R/O Variable 2 callback: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
index df2d9ad015aae7a01afdb55db816c29a889013c3..3000176efdbf96cebd31923cb55df9905dd6b154 100644 (file)
@@ -40,7 +40,7 @@
 #include "Platform.h"\r
 #include "Cmos.h"\r
 \r
-EFI_PEI_PPI_DESCRIPTOR   mPpiBootMode[] = {\r
+EFI_PEI_PPI_DESCRIPTOR  mPpiBootMode[] = {\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
     &gEfiPeiMasterBootModePpiGuid,\r
@@ -48,27 +48,26 @@ EFI_PEI_PPI_DESCRIPTOR   mPpiBootMode[] = {
   }\r
 };\r
 \r
+UINT16  mHostBridgeDevId;\r
 \r
-UINT16 mHostBridgeDevId;\r
+EFI_BOOT_MODE  mBootMode = BOOT_WITH_FULL_CONFIGURATION;\r
 \r
-EFI_BOOT_MODE mBootMode = BOOT_WITH_FULL_CONFIGURATION;\r
+BOOLEAN  mS3Supported = FALSE;\r
 \r
-BOOLEAN mS3Supported = FALSE;\r
-\r
-UINT32 mMaxCpuCount;\r
+UINT32  mMaxCpuCount;\r
 \r
 VOID\r
 AddIoMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   )\r
 {\r
   BuildResourceDescriptorHob (\r
     EFI_RESOURCE_MEMORY_MAPPED_IO,\r
-      EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
-      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
-      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_TESTED,\r
+    EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
+    EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+    EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_TESTED,\r
     MemoryBase,\r
     MemorySize\r
     );\r
@@ -76,23 +75,23 @@ AddIoMemoryBaseSizeHob (
 \r
 VOID\r
 AddReservedMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize,\r
-  BOOLEAN                     Cacheable\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize,\r
+  BOOLEAN               Cacheable\r
   )\r
 {\r
   BuildResourceDescriptorHob (\r
     EFI_RESOURCE_MEMORY_RESERVED,\r
-      EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
-      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
-      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
-      (Cacheable ?\r
-       EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
-       EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
-       EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE :\r
-       0\r
-       ) |\r
-      EFI_RESOURCE_ATTRIBUTE_TESTED,\r
+    EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
+    EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+    EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+    (Cacheable ?\r
+     EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
+     EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
+     EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE :\r
+     0\r
+    ) |\r
+    EFI_RESOURCE_ATTRIBUTE_TESTED,\r
     MemoryBase,\r
     MemorySize\r
     );\r
@@ -100,57 +99,54 @@ AddReservedMemoryBaseSizeHob (
 \r
 VOID\r
 AddIoMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   )\r
 {\r
   AddIoMemoryBaseSizeHob (MemoryBase, (UINT64)(MemoryLimit - MemoryBase));\r
 }\r
 \r
-\r
 VOID\r
 AddMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   )\r
 {\r
   BuildResourceDescriptorHob (\r
     EFI_RESOURCE_SYSTEM_MEMORY,\r
-      EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
-      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
-      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_TESTED,\r
+    EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
+    EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+    EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_TESTED,\r
     MemoryBase,\r
     MemorySize\r
     );\r
 }\r
 \r
-\r
 VOID\r
 AddMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   )\r
 {\r
   AddMemoryBaseSizeHob (MemoryBase, (UINT64)(MemoryLimit - MemoryBase));\r
 }\r
 \r
-\r
 VOID\r
 MemMapInitialization (\r
   VOID\r
   )\r
 {\r
-  UINT64        PciIoBase;\r
-  UINT64        PciIoSize;\r
-  RETURN_STATUS PcdStatus;\r
-  UINT32        TopOfLowRam;\r
-  UINT64        PciExBarBase;\r
-  UINT32        PciBase;\r
-  UINT32        PciSize;\r
+  UINT64         PciIoBase;\r
+  UINT64         PciIoSize;\r
+  RETURN_STATUS  PcdStatus;\r
+  UINT32         TopOfLowRam;\r
+  UINT64         PciExBarBase;\r
+  UINT32         PciBase;\r
+  UINT32         PciSize;\r
 \r
   PciIoBase = 0xC000;\r
   PciIoSize = 0x4000;\r
@@ -167,7 +163,7 @@ MemMapInitialization (
     return;\r
   }\r
 \r
-  TopOfLowRam = GetSystemMemorySizeBelow4gb ();\r
+  TopOfLowRam  = GetSystemMemorySizeBelow4gb ();\r
   PciExBarBase = 0;\r
   if (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) {\r
     //\r
@@ -229,10 +225,14 @@ MemMapInitialization (
     // uncacheable reserved memory right here.\r
     //\r
     AddReservedMemoryBaseSizeHob (PciExBarBase, SIZE_256MB, FALSE);\r
-    BuildMemoryAllocationHob (PciExBarBase, SIZE_256MB,\r
-      EfiReservedMemoryType);\r
+    BuildMemoryAllocationHob (\r
+      PciExBarBase,\r
+      SIZE_256MB,\r
+      EfiReservedMemoryType\r
+      );\r
   }\r
-  AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);\r
+\r
+  AddIoMemoryBaseSizeHob (PcdGet32 (PcdCpuLocalApicBaseAddress), SIZE_1MB);\r
 \r
   //\r
   // On Q35, the IO Port space is available for PCI resource allocations from\r
@@ -286,8 +286,8 @@ PciExBarInitialization (
   )\r
 {\r
   union {\r
-    UINT64 Uint64;\r
-    UINT32 Uint32[2];\r
+    UINT64    Uint64;\r
+    UINT32    Uint32[2];\r
   } PciExBarBase;\r
 \r
   //\r
@@ -326,13 +326,13 @@ MiscInitialization (
   VOID\r
   )\r
 {\r
-  UINTN         PmCmd;\r
-  UINTN         Pmba;\r
-  UINT32        PmbaAndVal;\r
-  UINT32        PmbaOrVal;\r
-  UINTN         AcpiCtlReg;\r
-  UINT8         AcpiEnBit;\r
-  RETURN_STATUS PcdStatus;\r
+  UINTN          PmCmd;\r
+  UINTN          Pmba;\r
+  UINT32         PmbaAndVal;\r
+  UINT32         PmbaOrVal;\r
+  UINTN          AcpiCtlReg;\r
+  UINT8          AcpiEnBit;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   //\r
   // Disable A20 Mask\r
@@ -368,16 +368,23 @@ MiscInitialization (
       break;\r
     case 0xffff: /* microvm */\r
       DEBUG ((DEBUG_INFO, "%a: microvm\n", __FUNCTION__));\r
-      PcdStatus = PcdSet16S (PcdOvmfHostBridgePciDevId,\r
-                             MICROVM_PSEUDO_DEVICE_ID);\r
+      PcdStatus = PcdSet16S (\r
+                    PcdOvmfHostBridgePciDevId,\r
+                    MICROVM_PSEUDO_DEVICE_ID\r
+                    );\r
       ASSERT_RETURN_ERROR (PcdStatus);\r
       return;\r
     default:\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, mHostBridgeDevId));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        mHostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return;\r
   }\r
+\r
   PcdStatus = PcdSet16S (PcdOvmfHostBridgePciDevId, mHostBridgeDevId);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
@@ -420,17 +427,17 @@ MiscInitialization (
   }\r
 }\r
 \r
-\r
 VOID\r
 BootModeInitialization (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (CmosRead8 (0xF) == 0xFE) {\r
     mBootMode = BOOT_ON_S3_RESUME;\r
   }\r
+\r
   CmosWrite8 (0xF, 0x00);\r
 \r
   Status = PeiServicesSetBootMode (mBootMode);\r
@@ -440,13 +447,12 @@ BootModeInitialization (
   ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
-\r
 VOID\r
 ReserveEmuVariableNvStore (\r
   )\r
 {\r
-  EFI_PHYSICAL_ADDRESS VariableStore;\r
-  RETURN_STATUS        PcdStatus;\r
+  EFI_PHYSICAL_ADDRESS  VariableStore;\r
+  RETURN_STATUS         PcdStatus;\r
 \r
   //\r
   // Allocate storage for NV variables early on so it will be\r
@@ -456,25 +462,25 @@ ReserveEmuVariableNvStore (
   //\r
   VariableStore =\r
     (EFI_PHYSICAL_ADDRESS)(UINTN)\r
-      AllocateRuntimePages (\r
-        EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize))\r
-        );\r
-  DEBUG ((DEBUG_INFO,\r
-          "Reserved variable store memory: 0x%lX; size: %dkb\n",\r
-          VariableStore,\r
-          (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024\r
-        ));\r
+    AllocateRuntimePages (\r
+      EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize))\r
+      );\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "Reserved variable store memory: 0x%lX; size: %dkb\n",\r
+    VariableStore,\r
+    (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024\r
+    ));\r
   PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 }\r
 \r
-\r
 VOID\r
 DebugDumpCmos (\r
   VOID\r
   )\r
 {\r
-  UINT32 Loop;\r
+  UINT32  Loop;\r
 \r
   DEBUG ((DEBUG_INFO, "CMOS:\n"));\r
 \r
@@ -482,6 +488,7 @@ DebugDumpCmos (
     if ((Loop % 0x10) == 0) {\r
       DEBUG ((DEBUG_INFO, "%02x:", Loop));\r
     }\r
+\r
     DEBUG ((DEBUG_INFO, " %02x", CmosRead8 (Loop)));\r
     if ((Loop % 0x10) == 0xf) {\r
       DEBUG ((DEBUG_INFO, "\n"));\r
@@ -489,27 +496,34 @@ DebugDumpCmos (
   }\r
 }\r
 \r
-\r
 VOID\r
 S3Verification (\r
   VOID\r
   )\r
 {\r
-#if defined (MDE_CPU_X64)\r
+ #if defined (MDE_CPU_X64)\r
   if (FeaturePcdGet (PcdSmmSmramRequire) && mS3Supported) {\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n", __FUNCTION__));\r
-    DEBUG ((DEBUG_ERROR,\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n",\r
+      __FUNCTION__\r
+      ));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "%a: Please disable S3 on the QEMU command line (see the README),\n",\r
-      __FUNCTION__));\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a: or build OVMF with \"OvmfPkgIa32X64.dsc\".\n", __FUNCTION__));\r
+      __FUNCTION__\r
+      ));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: or build OVMF with \"OvmfPkgIa32X64.dsc\".\n",\r
+      __FUNCTION__\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
-#endif\r
-}\r
 \r
+ #endif\r
+}\r
 \r
 VOID\r
 Q35BoardVerification (\r
@@ -532,7 +546,6 @@ Q35BoardVerification (
   CpuDeadLoop ();\r
 }\r
 \r
-\r
 /**\r
   Fetch the boot CPU count and the possible CPU count from QEMU, and expose\r
   them to UefiCpuPkg modules. Set the mMaxCpuCount variable.\r
@@ -542,8 +555,8 @@ MaxCpuCountInitialization (
   VOID\r
   )\r
 {\r
-  UINT16        BootCpuCount;\r
-  RETURN_STATUS PcdStatus;\r
+  UINT16         BootCpuCount;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   //\r
   // Try to fetch the boot CPU count.\r
@@ -566,8 +579,8 @@ MaxCpuCountInitialization (
     //\r
     // Now try to fetch the possible CPU count.\r
     //\r
-    UINTN CpuHpBase;\r
-    UINT32 CmdData2;\r
+    UINTN   CpuHpBase;\r
+    UINT32  CmdData2;\r
 \r
     CpuHpBase = ((mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) ?\r
                  ICH9_CPU_HOTPLUG_BASE : PIIX4_CPU_HOTPLUG_BASE);\r
@@ -616,16 +629,19 @@ MaxCpuCountInitialization (
       // QEMU doesn't support the modern CPU hotplug interface. Assume that the\r
       // possible CPU count equals the boot CPU count (precluding hotplug).\r
       //\r
-      DEBUG ((DEBUG_WARN, "%a: modern CPU hotplug interface unavailable\n",\r
-        __FUNCTION__));\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a: modern CPU hotplug interface unavailable\n",\r
+        __FUNCTION__\r
+        ));\r
       mMaxCpuCount = BootCpuCount;\r
     } else {\r
       //\r
       // Grab the possible CPU count from the modern CPU hotplug interface.\r
       //\r
-      UINT32 Present, Possible, Selected;\r
+      UINT32  Present, Possible, Selected;\r
 \r
-      Present = 0;\r
+      Present  = 0;\r
       Possible = 0;\r
 \r
       //\r
@@ -637,7 +653,7 @@ MaxCpuCountInitialization (
       IoWrite32 (CpuHpBase + QEMU_CPUHP_W_CPU_SEL, Possible);\r
 \r
       do {\r
-        UINT8 CpuStatus;\r
+        UINT8  CpuStatus;\r
 \r
         //\r
         // Read the status of the currently selected CPU. This will help with a\r
@@ -647,6 +663,7 @@ MaxCpuCountInitialization (
         if ((CpuStatus & QEMU_CPUHP_STAT_ENABLED) != 0) {\r
           ++Present;\r
         }\r
+\r
         //\r
         // Attempt to select the next CPU.\r
         //\r
@@ -666,8 +683,14 @@ MaxCpuCountInitialization (
       // return the same boot CPU count.\r
       //\r
       if (BootCpuCount != Present) {\r
-        DEBUG ((DEBUG_WARN, "%a: QEMU v2.7 reset bug: BootCpuCount=%d "\r
-          "Present=%u\n", __FUNCTION__, BootCpuCount, Present));\r
+        DEBUG ((\r
+          DEBUG_WARN,\r
+          "%a: QEMU v2.7 reset bug: BootCpuCount=%d "\r
+          "Present=%u\n",\r
+          __FUNCTION__,\r
+          BootCpuCount,\r
+          Present\r
+          ));\r
         //\r
         // The handling of QemuFwCfgItemSmpCpuCount, across CPU hotplug plus\r
         // platform reset (including S3), was corrected in QEMU commit\r
@@ -681,8 +704,13 @@ MaxCpuCountInitialization (
     }\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO, "%a: BootCpuCount=%d mMaxCpuCount=%u\n", __FUNCTION__,\r
-    BootCpuCount, mMaxCpuCount));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: BootCpuCount=%d mMaxCpuCount=%u\n",\r
+    __FUNCTION__,\r
+    BootCpuCount,\r
+    mMaxCpuCount\r
+    ));\r
   ASSERT (BootCpuCount <= mMaxCpuCount);\r
 \r
   PcdStatus = PcdSet32S (PcdCpuBootLogicalProcessorNumber, BootCpuCount);\r
@@ -691,7 +719,6 @@ MaxCpuCountInitialization (
   ASSERT_RETURN_ERROR (PcdStatus);\r
 }\r
 \r
-\r
 /**\r
   Perform Platform PEI initialization.\r
 \r
@@ -708,7 +735,7 @@ InitializePlatform (
   IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   DEBUG ((DEBUG_INFO, "Platform PEIM Loaded\n"));\r
 \r
@@ -717,7 +744,7 @@ InitializePlatform (
   if (QemuFwCfgS3Enabled ()) {\r
     DEBUG ((DEBUG_INFO, "S3 support was detected on QEMU\n"));\r
     mS3Supported = TRUE;\r
-    Status = PcdSetBoolS (PcdAcpiS3Enable, TRUE);\r
+    Status       = PcdSetBoolS (PcdAcpiS3Enable, TRUE);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
@@ -748,6 +775,7 @@ InitializePlatform (
     if (!FeaturePcdGet (PcdSmmSmramRequire)) {\r
       ReserveEmuVariableNvStore ();\r
     }\r
+\r
     PeiFvInitialization ();\r
     MemTypeInfoInitialization ();\r
     MemMapInitialization ();\r
index 8b1d270c2b0b8e28e49f07f8b9482561f4b6e038..357b3d4095c39c9e6aa771aef337f709a15268c9 100644 (file)
 \r
 VOID\r
 AddIoMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   );\r
 \r
 VOID\r
 AddIoMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   );\r
 \r
 VOID\r
 AddMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   );\r
 \r
 VOID\r
 AddMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   );\r
 \r
 VOID\r
 AddReservedMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize,\r
-  BOOLEAN                     Cacheable\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize,\r
+  BOOLEAN               Cacheable\r
   );\r
 \r
 VOID\r
@@ -102,18 +102,18 @@ AmdSevInitialize (
   VOID\r
   );\r
 \r
-extern EFI_BOOT_MODE mBootMode;\r
+extern EFI_BOOT_MODE  mBootMode;\r
 \r
-extern BOOLEAN mS3Supported;\r
+extern BOOLEAN  mS3Supported;\r
 \r
-extern UINT8 mPhysMemAddressWidth;\r
+extern UINT8  mPhysMemAddressWidth;\r
 \r
-extern UINT32 mMaxCpuCount;\r
+extern UINT32  mMaxCpuCount;\r
 \r
-extern UINT16 mHostBridgeDevId;\r
+extern UINT16  mHostBridgeDevId;\r
 \r
-extern BOOLEAN mQ35SmramAtDefaultSmbase;\r
+extern BOOLEAN  mQ35SmramAtDefaultSmbase;\r
 \r
-extern UINT32 mQemuUc32Base;\r
+extern UINT32  mQemuUc32Base;\r
 \r
 #endif // _PLATFORM_PEI_H_INCLUDED_\r
index 843534ebf71103fee18381a96be17cca48f746e9..47cc0ae59bf8ee137244b4b17346182ae04698ac 100644 (file)
@@ -26,7 +26,7 @@
 // Higher versions will be used before lower, 0x10-0xffffffef is the version\r
 // range for IHV (Indie Hardware Vendors)\r
 //\r
-#define PVSCSI_BINDING_VERSION      0x10\r
+#define PVSCSI_BINDING_VERSION  0x10\r
 \r
 //\r
 // Ext SCSI Pass Thru utilities\r
@@ -38,9 +38,9 @@
 STATIC\r
 EFI_STATUS\r
 PvScsiMmioRead32 (\r
-  IN CONST PVSCSI_DEV   *Dev,\r
-  IN UINT64             Offset,\r
-  OUT UINT32            *Value\r
+  IN CONST PVSCSI_DEV  *Dev,\r
+  IN UINT64            Offset,\r
+  OUT UINT32           *Value\r
   )\r
 {\r
   return Dev->PciIo->Mem.Read (\r
@@ -59,9 +59,9 @@ PvScsiMmioRead32 (
 STATIC\r
 EFI_STATUS\r
 PvScsiMmioWrite32 (\r
-  IN CONST PVSCSI_DEV   *Dev,\r
-  IN UINT64             Offset,\r
-  IN UINT32             Value\r
+  IN CONST PVSCSI_DEV  *Dev,\r
+  IN UINT64            Offset,\r
+  IN UINT32            Value\r
   )\r
 {\r
   return Dev->PciIo->Mem.Write (\r
@@ -80,10 +80,10 @@ PvScsiMmioWrite32 (
 STATIC\r
 EFI_STATUS\r
 PvScsiMmioWrite32Multiple (\r
-  IN CONST PVSCSI_DEV   *Dev,\r
-  IN UINT64             Offset,\r
-  IN UINTN              Count,\r
-  IN UINT32             *Words\r
+  IN CONST PVSCSI_DEV  *Dev,\r
+  IN UINT64            Offset,\r
+  IN UINTN             Count,\r
+  IN UINT32            *Words\r
   )\r
 {\r
   return Dev->PciIo->Mem.Write (\r
@@ -116,13 +116,13 @@ PvScsiMmioWrite32Multiple (
 STATIC\r
 EFI_STATUS\r
 PvScsiWriteCmdDesc (\r
-  IN CONST PVSCSI_DEV   *Dev,\r
-  IN UINT32             Cmd,\r
-  IN UINT32             *DescWords      OPTIONAL,\r
-  IN UINTN              DescWordsCount\r
+  IN CONST PVSCSI_DEV  *Dev,\r
+  IN UINT32            Cmd,\r
+  IN UINT32            *DescWords      OPTIONAL,\r
+  IN UINTN             DescWordsCount\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (DescWordsCount > PVSCSI_MAX_CMD_DATA_WORDS) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -148,7 +148,7 @@ PvScsiWriteCmdDesc (
 STATIC\r
 EFI_STATUS\r
 PvScsiResetAdapter (\r
-  IN CONST PVSCSI_DEV   *Dev\r
+  IN CONST PVSCSI_DEV  *Dev\r
   )\r
 {\r
   return PvScsiWriteCmdDesc (Dev, PvScsiCmdAdapterReset, NULL, 0);\r
@@ -160,13 +160,13 @@ PvScsiResetAdapter (
 STATIC\r
 BOOLEAN\r
 PvScsiIsReqRingFull (\r
-  IN CONST PVSCSI_DEV   *Dev\r
+  IN CONST PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  PVSCSI_RINGS_STATE *RingsState;\r
-  UINT32             ReqNumEntries;\r
+  PVSCSI_RINGS_STATE  *RingsState;\r
+  UINT32              ReqNumEntries;\r
 \r
-  RingsState = Dev->RingDesc.RingState;\r
+  RingsState    = Dev->RingDesc.RingState;\r
   ReqNumEntries = 1U << RingsState->ReqNumEntriesLog2;\r
   return (RingsState->ReqProdIdx - RingsState->CmpConsIdx) >= ReqNumEntries;\r
 }\r
@@ -177,13 +177,13 @@ PvScsiIsReqRingFull (
 STATIC\r
 PVSCSI_RING_REQ_DESC *\r
 PvScsiGetCurrentRequest (\r
-  IN CONST PVSCSI_DEV   *Dev\r
+  IN CONST PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  PVSCSI_RINGS_STATE *RingState;\r
-  UINT32             ReqNumEntries;\r
+  PVSCSI_RINGS_STATE  *RingState;\r
+  UINT32              ReqNumEntries;\r
 \r
-  RingState = Dev->RingDesc.RingState;\r
+  RingState     = Dev->RingDesc.RingState;\r
   ReqNumEntries = 1U << RingState->ReqNumEntriesLog2;\r
   return Dev->RingDesc.RingReqs +\r
          (RingState->ReqProdIdx & (ReqNumEntries - 1));\r
@@ -195,13 +195,13 @@ PvScsiGetCurrentRequest (
 STATIC\r
 PVSCSI_RING_CMP_DESC *\r
 PvScsiGetCurrentResponse (\r
-  IN CONST PVSCSI_DEV   *Dev\r
+  IN CONST PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  PVSCSI_RINGS_STATE *RingState;\r
-  UINT32             CmpNumEntries;\r
+  PVSCSI_RINGS_STATE  *RingState;\r
+  UINT32              CmpNumEntries;\r
 \r
-  RingState = Dev->RingDesc.RingState;\r
+  RingState     = Dev->RingDesc.RingState;\r
   CmpNumEntries = 1U << RingState->CmpNumEntriesLog2;\r
   return Dev->RingDesc.RingCmps +\r
          (RingState->CmpConsIdx & (CmpNumEntries - 1));\r
@@ -213,11 +213,11 @@ PvScsiGetCurrentResponse (
 STATIC\r
 EFI_STATUS\r
 PvScsiWaitForRequestCompletion (\r
-  IN CONST PVSCSI_DEV   *Dev\r
+  IN CONST PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT32     IntrStatus;\r
+  EFI_STATUS  Status;\r
+  UINT32      IntrStatus;\r
 \r
   //\r
   // Note: We don't yet support Timeout according to\r
@@ -226,7 +226,7 @@ PvScsiWaitForRequestCompletion (
   // This is consistent with some other Scsi PassThru drivers\r
   // such as VirtioScsi.\r
   //\r
-  for (;;) {\r
+  for ( ; ;) {\r
     Status = PvScsiMmioRead32 (Dev, PvScsiRegOffsetIntrStatus, &IntrStatus);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -258,14 +258,14 @@ PvScsiWaitForRequestCompletion (
 STATIC\r
 EFI_STATUS\r
 ReportHostAdapterError (\r
-  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  Packet->InTransferLength = 0;\r
+  Packet->InTransferLength  = 0;\r
   Packet->OutTransferLength = 0;\r
-  Packet->SenseDataLength = 0;\r
+  Packet->SenseDataLength   = 0;\r
   Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OTHER;\r
-  Packet->TargetStatus = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
+  Packet->TargetStatus      = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
   return EFI_DEVICE_ERROR;\r
 }\r
 \r
@@ -275,12 +275,12 @@ ReportHostAdapterError (
 STATIC\r
 EFI_STATUS\r
 ReportHostAdapterOverrunError (\r
-  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  Packet->SenseDataLength = 0;\r
+  Packet->SenseDataLength   = 0;\r
   Packet->HostAdapterStatus =\r
-            EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+    EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
   Packet->TargetStatus = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
   return EFI_BAD_BUFFER_SIZE;\r
 }\r
@@ -292,14 +292,14 @@ ReportHostAdapterOverrunError (
 STATIC\r
 EFI_STATUS\r
 PopulateRequest (\r
-  IN CONST PVSCSI_DEV                               *Dev,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  OUT PVSCSI_RING_REQ_DESC                          *Request\r
+  IN CONST PVSCSI_DEV                                *Dev,\r
+  IN UINT8                                           *Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  OUT PVSCSI_RING_REQ_DESC                           *Request\r
   )\r
 {\r
-  UINT8 TargetValue;\r
+  UINT8  TargetValue;\r
 \r
   //\r
   // We only use first byte of target identifer\r
@@ -313,15 +313,15 @@ PopulateRequest (
       //\r
       // Bidirectional transfer was requested\r
       //\r
-      (Packet->InTransferLength > 0 && Packet->OutTransferLength > 0) ||\r
+      ((Packet->InTransferLength > 0) && (Packet->OutTransferLength > 0)) ||\r
       (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL) ||\r
       //\r
       // Command Descriptor Block bigger than this constant should be considered\r
       // out-of-band. We currently don't support these CDBs.\r
       //\r
       (Packet->CdbLength > PVSCSI_CDB_MAX_SIZE)\r
-      ) {\r
-\r
+      )\r
+  {\r
     //\r
     // This error code doesn't require updates to the Packet output fields\r
     //\r
@@ -348,8 +348,8 @@ PopulateRequest (
       ((Packet->InTransferLength > 0) &&\r
        ((Packet->InDataBuffer == NULL) ||\r
         (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_WRITE)\r
-        )\r
-       ) ||\r
+       )\r
+      ) ||\r
       //\r
       // Trying to send, but source pointer is NULL, or contradicting\r
       // transfer direction\r
@@ -357,10 +357,10 @@ PopulateRequest (
       ((Packet->OutTransferLength > 0) &&\r
        ((Packet->OutDataBuffer == NULL) ||\r
         (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ)\r
-        )\r
        )\r
-      ) {\r
-\r
+      )\r
+      )\r
+  {\r
     //\r
     // This error code doesn't require updates to the Packet output fields\r
     //\r
@@ -374,6 +374,7 @@ PopulateRequest (
     Packet->InTransferLength = sizeof (Dev->DmaBuf->Data);\r
     return ReportHostAdapterOverrunError (Packet);\r
   }\r
+\r
   if (Packet->OutTransferLength > sizeof (Dev->DmaBuf->Data)) {\r
     Packet->OutTransferLength = sizeof (Dev->DmaBuf->Data);\r
     return ReportHostAdapterOverrunError (Packet);\r
@@ -384,27 +385,27 @@ PopulateRequest (
   //\r
   ZeroMem (Request, sizeof (*Request));\r
 \r
-  Request->Bus = 0;\r
+  Request->Bus    = 0;\r
   Request->Target = TargetValue;\r
   //\r
   // This cast is safe as PVSCSI_DEV.MaxLun is defined as UINT8\r
   //\r
-  Request->Lun[1] = (UINT8)Lun;\r
+  Request->Lun[1]   = (UINT8)Lun;\r
   Request->SenseLen = Packet->SenseDataLength;\r
   //\r
   // DMA communication buffer SenseData overflow is not possible\r
   // due to Packet->SenseDataLength defined as UINT8\r
   //\r
   Request->SenseAddr = PVSCSI_DMA_BUF_DEV_ADDR (Dev, SenseData);\r
-  Request->CdbLen = Packet->CdbLength;\r
+  Request->CdbLen    = Packet->CdbLength;\r
   CopyMem (Request->Cdb, Packet->Cdb, Packet->CdbLength);\r
   Request->VcpuHint = 0;\r
-  Request->Tag = PVSCSI_SIMPLE_QUEUE_TAG;\r
+  Request->Tag      = PVSCSI_SIMPLE_QUEUE_TAG;\r
   if (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ) {\r
-    Request->Flags = PVSCSI_FLAG_CMD_DIR_TOHOST;\r
+    Request->Flags   = PVSCSI_FLAG_CMD_DIR_TOHOST;\r
     Request->DataLen = Packet->InTransferLength;\r
   } else {\r
-    Request->Flags = PVSCSI_FLAG_CMD_DIR_TODEVICE;\r
+    Request->Flags   = PVSCSI_FLAG_CMD_DIR_TODEVICE;\r
     Request->DataLen = Packet->OutTransferLength;\r
     CopyMem (\r
       Dev->DmaBuf->Data,\r
@@ -412,6 +413,7 @@ PopulateRequest (
       Packet->OutTransferLength\r
       );\r
   }\r
+\r
   Request->DataAddr = PVSCSI_DMA_BUF_DEV_ADDR (Dev, Data);\r
 \r
   return EFI_SUCCESS;\r
@@ -426,9 +428,9 @@ PopulateRequest (
 STATIC\r
 EFI_STATUS\r
 HandleResponse (\r
-  IN PVSCSI_DEV                                     *Dev,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN CONST PVSCSI_RING_CMP_DESC                     *Response\r
+  IN PVSCSI_DEV                                      *Dev,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN CONST PVSCSI_RING_CMP_DESC                      *Response\r
   )\r
 {\r
   //\r
@@ -437,6 +439,7 @@ HandleResponse (
   if (Packet->SenseDataLength > Response->SenseLen) {\r
     Packet->SenseDataLength = (UINT8)Response->SenseLen;\r
   }\r
+\r
   //\r
   // Copy sense data from DMA communication buffer\r
   //\r
@@ -482,18 +485,19 @@ HandleResponse (
       } else {\r
         Packet->OutTransferLength = (UINT32)Response->DataLen;\r
       }\r
+\r
       Packet->HostAdapterStatus =\r
-                EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
       return EFI_SUCCESS;\r
 \r
     case PvScsiBtStatDatarun:\r
       Packet->HostAdapterStatus =\r
-                EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
       return EFI_SUCCESS;\r
 \r
     case PvScsiBtStatSelTimeout:\r
       Packet->HostAdapterStatus =\r
-                EFI_EXT_SCSI_STATUS_HOST_ADAPTER_SELECTION_TIMEOUT;\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_SELECTION_TIMEOUT;\r
       return EFI_TIMEOUT;\r
 \r
     case PvScsiBtStatBusFree:\r
@@ -506,13 +510,13 @@ HandleResponse (
 \r
     case PvScsiBtStatSensFailed:\r
       Packet->HostAdapterStatus =\r
-                EFI_EXT_SCSI_STATUS_HOST_ADAPTER_REQUEST_SENSE_FAILED;\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_REQUEST_SENSE_FAILED;\r
       break;\r
 \r
     case PvScsiBtStatTagReject:\r
     case PvScsiBtStatBadMsg:\r
       Packet->HostAdapterStatus =\r
-          EFI_EXT_SCSI_STATUS_HOST_ADAPTER_MESSAGE_REJECT;\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_MESSAGE_REJECT;\r
       break;\r
 \r
     case PvScsiBtStatBusReset:\r
@@ -542,16 +546,17 @@ HandleResponse (
 STATIC\r
 BOOLEAN\r
 IsTargetInitialized (\r
-  IN UINT8                                          *Target\r
+  IN UINT8  *Target\r
   )\r
 {\r
-  UINTN Idx;\r
+  UINTN  Idx;\r
 \r
   for (Idx = 0; Idx < TARGET_MAX_BYTES; ++Idx) {\r
     if (Target[Idx] != 0xFF) {\r
       return TRUE;\r
     }\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
@@ -563,17 +568,17 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiPassThru (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN EFI_EVENT                                      Event    OPTIONAL\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                 *This,\r
+  IN UINT8                                           *Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN EFI_EVENT                                       Event    OPTIONAL\r
   )\r
 {\r
   PVSCSI_DEV            *Dev;\r
   EFI_STATUS            Status;\r
-  PVSCSI_RING_REQ_DESC *Request;\r
-  PVSCSI_RING_CMP_DESC *Response;\r
+  PVSCSI_RING_REQ_DESC  *Request;\r
+  PVSCSI_RING_CMP_DESC  *Response;\r
 \r
   Dev = PVSCSI_FROM_PASS_THRU (This);\r
 \r
@@ -616,7 +621,7 @@ PvScsiPassThru (
   }\r
 \r
   Response = PvScsiGetCurrentResponse (Dev);\r
-  Status = HandleResponse (Dev, Packet, Response);\r
+  Status   = HandleResponse (Dev, Packet, Response);\r
 \r
   //\r
   // Reads from response must complete before releasing completion entry\r
@@ -632,14 +637,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiGetNextTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN OUT UINT8                                      **Target,\r
-  IN OUT UINT64                                     *Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **Target,\r
+  IN OUT UINT64                       *Lun\r
   )\r
 {\r
-  UINT8      *TargetPtr;\r
-  UINT8      LastTarget;\r
-  PVSCSI_DEV *Dev;\r
+  UINT8       *TargetPtr;\r
+  UINT8       LastTarget;\r
+  PVSCSI_DEV  *Dev;\r
 \r
   if (Target == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -668,7 +673,7 @@ PvScsiGetNextTargetLun (
   // Increment (target, LUN) pair if valid on input\r
   //\r
   Dev = PVSCSI_FROM_PASS_THRU (This);\r
-  if (LastTarget > Dev->MaxTarget || *Lun > Dev->MaxLun) {\r
+  if ((LastTarget > Dev->MaxTarget) || (*Lun > Dev->MaxLun)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -691,10 +696,10 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiBuildDevicePath (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL                   **DevicePath\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL     **DevicePath\r
   )\r
 {\r
   UINT8             TargetValue;\r
@@ -711,7 +716,7 @@ PvScsiBuildDevicePath (
   TargetValue = *Target;\r
 \r
   Dev = PVSCSI_FROM_PASS_THRU (This);\r
-  if (TargetValue > Dev->MaxTarget || Lun > Dev->MaxLun) {\r
+  if ((TargetValue > Dev->MaxTarget) || (Lun > Dev->MaxLun)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -735,28 +740,30 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiGetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN EFI_DEVICE_PATH_PROTOCOL                       *DevicePath,\r
-  OUT UINT8                                         **Target,\r
-  OUT UINT64                                        *Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN EFI_DEVICE_PATH_PROTOCOL         *DevicePath,\r
+  OUT UINT8                           **Target,\r
+  OUT UINT64                          *Lun\r
   )\r
 {\r
-  SCSI_DEVICE_PATH *ScsiDevicePath;\r
-  PVSCSI_DEV       *Dev;\r
+  SCSI_DEVICE_PATH  *ScsiDevicePath;\r
+  PVSCSI_DEV        *Dev;\r
 \r
-  if (DevicePath == NULL || Target == NULL || *Target == NULL || Lun == NULL) {\r
+  if ((DevicePath == NULL) || (Target == NULL) || (*Target == NULL) || (Lun == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (DevicePath->Type    != MESSAGING_DEVICE_PATH ||\r
-      DevicePath->SubType != MSG_SCSI_DP) {\r
+  if ((DevicePath->Type    != MESSAGING_DEVICE_PATH) ||\r
+      (DevicePath->SubType != MSG_SCSI_DP))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   ScsiDevicePath = (SCSI_DEVICE_PATH *)DevicePath;\r
-  Dev = PVSCSI_FROM_PASS_THRU (This);\r
-  if (ScsiDevicePath->Pun > Dev->MaxTarget ||\r
-      ScsiDevicePath->Lun > Dev->MaxLun) {\r
+  Dev            = PVSCSI_FROM_PASS_THRU (This);\r
+  if ((ScsiDevicePath->Pun > Dev->MaxTarget) ||\r
+      (ScsiDevicePath->Lun > Dev->MaxLun))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -774,7 +781,7 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiResetChannel (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -784,9 +791,9 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiResetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -796,13 +803,13 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiGetNextTarget (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN OUT UINT8                                      **Target\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **Target\r
   )\r
 {\r
-  UINT8      *TargetPtr;\r
-  UINT8      LastTarget;\r
-  PVSCSI_DEV *Dev;\r
+  UINT8       *TargetPtr;\r
+  UINT8       LastTarget;\r
+  PVSCSI_DEV  *Dev;\r
 \r
   if (Target == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -846,10 +853,10 @@ PvScsiGetNextTarget (
 STATIC\r
 EFI_STATUS\r
 PvScsiSetPciAttributes (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Backup original PCI Attributes\r
@@ -907,7 +914,7 @@ PvScsiSetPciAttributes (
 STATIC\r
 VOID\r
 PvScsiRestorePciAttributes (\r
-  IN PVSCSI_DEV *Dev\r
+  IN PVSCSI_DEV  *Dev\r
   )\r
 {\r
   Dev->PciIo->Attributes (\r
@@ -921,14 +928,14 @@ PvScsiRestorePciAttributes (
 STATIC\r
 EFI_STATUS\r
 PvScsiAllocateSharedPages (\r
-  IN PVSCSI_DEV                     *Dev,\r
-  IN UINTN                          Pages,\r
-  OUT VOID                          **HostAddress,\r
-  OUT PVSCSI_DMA_DESC               *DmaDesc\r
+  IN PVSCSI_DEV        *Dev,\r
+  IN UINTN             Pages,\r
+  OUT VOID             **HostAddress,\r
+  OUT PVSCSI_DMA_DESC  *DmaDesc\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINTN      NumberOfBytes;\r
+  EFI_STATUS  Status;\r
+  UINTN       NumberOfBytes;\r
 \r
   Status = Dev->PciIo->AllocateBuffer (\r
                          Dev->PciIo,\r
@@ -943,14 +950,14 @@ PvScsiAllocateSharedPages (
   }\r
 \r
   NumberOfBytes = EFI_PAGES_TO_SIZE (Pages);\r
-  Status = Dev->PciIo->Map (\r
-                         Dev->PciIo,\r
-                         EfiPciIoOperationBusMasterCommonBuffer,\r
-                         *HostAddress,\r
-                         &NumberOfBytes,\r
-                         &DmaDesc->DeviceAddress,\r
-                         &DmaDesc->Mapping\r
-                         );\r
+  Status        = Dev->PciIo->Map (\r
+                                Dev->PciIo,\r
+                                EfiPciIoOperationBusMasterCommonBuffer,\r
+                                *HostAddress,\r
+                                &NumberOfBytes,\r
+                                &DmaDesc->DeviceAddress,\r
+                                &DmaDesc->Mapping\r
+                                );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeBuffer;\r
   }\r
@@ -974,10 +981,10 @@ FreeBuffer:
 STATIC\r
 VOID\r
 PvScsiFreeSharedPages (\r
-  IN PVSCSI_DEV                     *Dev,\r
-  IN UINTN                          Pages,\r
-  IN VOID                           *HostAddress,\r
-  IN PVSCSI_DMA_DESC                *DmaDesc\r
+  IN PVSCSI_DEV       *Dev,\r
+  IN UINTN            Pages,\r
+  IN VOID             *HostAddress,\r
+  IN PVSCSI_DMA_DESC  *DmaDesc\r
   )\r
 {\r
   Dev->PciIo->Unmap (Dev->PciIo, DmaDesc->Mapping);\r
@@ -987,10 +994,10 @@ PvScsiFreeSharedPages (
 STATIC\r
 EFI_STATUS\r
 PvScsiInitRings (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = PvScsiAllocateSharedPages (\r
              Dev,\r
@@ -1001,6 +1008,7 @@ PvScsiInitRings (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ZeroMem (Dev->RingDesc.RingState, EFI_PAGE_SIZE);\r
 \r
   Status = PvScsiAllocateSharedPages (\r
@@ -1012,6 +1020,7 @@ PvScsiInitRings (
   if (EFI_ERROR (Status)) {\r
     goto FreeRingState;\r
   }\r
+\r
   ZeroMem (Dev->RingDesc.RingReqs, EFI_PAGE_SIZE);\r
 \r
   Status = PvScsiAllocateSharedPages (\r
@@ -1023,6 +1032,7 @@ PvScsiInitRings (
   if (EFI_ERROR (Status)) {\r
     goto FreeRingReqs;\r
   }\r
+\r
   ZeroMem (Dev->RingDesc.RingCmps, EFI_PAGE_SIZE);\r
 \r
   return EFI_SUCCESS;\r
@@ -1049,7 +1059,7 @@ FreeRingState:
 STATIC\r
 VOID\r
 PvScsiFreeRings (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
   PvScsiFreeSharedPages (\r
@@ -1077,24 +1087,24 @@ PvScsiFreeRings (
 STATIC\r
 EFI_STATUS\r
 PvScsiSetupRings (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
   union {\r
-    PVSCSI_CMD_DESC_SETUP_RINGS Cmd;\r
-    UINT32                      Uint32;\r
+    PVSCSI_CMD_DESC_SETUP_RINGS    Cmd;\r
+    UINT32                         Uint32;\r
   } AlignedCmd;\r
-  PVSCSI_CMD_DESC_SETUP_RINGS *Cmd;\r
+  PVSCSI_CMD_DESC_SETUP_RINGS  *Cmd;\r
 \r
   Cmd = &AlignedCmd.Cmd;\r
 \r
   ZeroMem (Cmd, sizeof (*Cmd));\r
   Cmd->ReqRingNumPages = 1;\r
   Cmd->CmpRingNumPages = 1;\r
-  Cmd->RingsStatePPN = RShiftU64 (\r
-                         Dev->RingDesc.RingStateDmaDesc.DeviceAddress,\r
-                         EFI_PAGE_SHIFT\r
-                         );\r
+  Cmd->RingsStatePPN   = RShiftU64 (\r
+                           Dev->RingDesc.RingStateDmaDesc.DeviceAddress,\r
+                           EFI_PAGE_SHIFT\r
+                           );\r
   Cmd->ReqRingPPNs[0] = RShiftU64 (\r
                           Dev->RingDesc.RingReqsDmaDesc.DeviceAddress,\r
                           EFI_PAGE_SHIFT\r
@@ -1119,16 +1129,16 @@ PvScsiSetupRings (
 STATIC\r
 EFI_STATUS\r
 PvScsiInit (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Init configuration\r
   //\r
-  Dev->MaxTarget = PcdGet8 (PcdPvScsiMaxTargetLimit);\r
-  Dev->MaxLun = PcdGet8 (PcdPvScsiMaxLunLimit);\r
+  Dev->MaxTarget              = PcdGet8 (PcdPvScsiMaxTargetLimit);\r
+  Dev->MaxLun                 = PcdGet8 (PcdPvScsiMaxLunLimit);\r
   Dev->WaitForCmpStallInUsecs = PcdGet32 (PcdPvScsiWaitForCmpStallInUsecs);\r
 \r
   //\r
@@ -1227,7 +1237,7 @@ RestorePciAttributes:
 STATIC\r
 VOID\r
 PvScsiUninit (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
   //\r
@@ -1262,11 +1272,11 @@ STATIC
 VOID\r
 EFIAPI\r
 PvScsiExitBoot (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  PVSCSI_DEV *Dev;\r
+  PVSCSI_DEV  *Dev;\r
 \r
   Dev = Context;\r
   DEBUG ((DEBUG_VERBOSE, "%a: Context=0x%p\n", __FUNCTION__, Context));\r
@@ -1288,14 +1298,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE00          Pci;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
@@ -1321,7 +1331,8 @@ PvScsiDriverBindingSupported (
   }\r
 \r
   if ((Pci.Hdr.VendorId != PCI_VENDOR_ID_VMWARE) ||\r
-      (Pci.Hdr.DeviceId != PCI_DEVICE_ID_VMWARE_PVSCSI)) {\r
+      (Pci.Hdr.DeviceId != PCI_DEVICE_ID_VMWARE_PVSCSI))\r
+  {\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
@@ -1343,15 +1354,15 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  PVSCSI_DEV *Dev;\r
-  EFI_STATUS Status;\r
+  PVSCSI_DEV  *Dev;\r
+  EFI_STATUS  Status;\r
 \r
-  Dev = (PVSCSI_DEV *) AllocateZeroPool (sizeof (*Dev));\r
+  Dev = (PVSCSI_DEV *)AllocateZeroPool (sizeof (*Dev));\r
   if (Dev == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1388,12 +1399,12 @@ PvScsiDriverBindingStart (
   // Setup complete, attempt to export the driver instance's PassThru interface\r
   //\r
   Dev->Signature = PVSCSI_SIG;\r
-  Status = gBS->InstallProtocolInterface (\r
-                  &ControllerHandle,\r
-                  &gEfiExtScsiPassThruProtocolGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &Dev->PassThru\r
-                  );\r
+  Status         = gBS->InstallProtocolInterface (\r
+                          &ControllerHandle,\r
+                          &gEfiExtScsiPassThruProtocolGuid,\r
+                          EFI_NATIVE_INTERFACE,\r
+                          &Dev->PassThru\r
+                          );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseExitBoot;\r
   }\r
@@ -1424,15 +1435,15 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *PassThru;\r
-  PVSCSI_DEV                      *Dev;\r
+  EFI_STATUS                       Status;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *PassThru;\r
+  PVSCSI_DEV                       *Dev;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
@@ -1473,7 +1484,7 @@ PvScsiDriverBindingStop (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC EFI_DRIVER_BINDING_PROTOCOL mPvScsiDriverBinding = {\r
+STATIC EFI_DRIVER_BINDING_PROTOCOL  mPvScsiDriverBinding = {\r
   &PvScsiDriverBindingSupported,\r
   &PvScsiDriverBindingStart,\r
   &PvScsiDriverBindingStop,\r
@@ -1486,20 +1497,20 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL mPvScsiDriverBinding = {
 // Component Name\r
 //\r
 \r
-STATIC EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+STATIC EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "eng;en", L"PVSCSI Host Driver" },\r
   { NULL,     NULL                  }\r
 };\r
 \r
-STATIC EFI_COMPONENT_NAME_PROTOCOL mComponentName;\r
+STATIC EFI_COMPONENT_NAME_PROTOCOL  mComponentName;\r
 \r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 PvScsiGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -1515,25 +1526,25 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-STATIC EFI_COMPONENT_NAME_PROTOCOL mComponentName = {\r
+STATIC EFI_COMPONENT_NAME_PROTOCOL  mComponentName = {\r
   &PvScsiGetDriverName,\r
   &PvScsiGetDeviceName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
-STATIC EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &PvScsiGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &PvScsiGetDeviceName,\r
+STATIC EFI_COMPONENT_NAME2_PROTOCOL  mComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&PvScsiGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&PvScsiGetDeviceName,\r
   "en" // SupportedLanguages, RFC 4646 language codes\r
 };\r
 \r
@@ -1544,8 +1555,8 @@ STATIC EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {
 EFI_STATUS\r
 EFIAPI\r
 PvScsiEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r
index 544359ebc05cefd0cac0def7a85da7bc36320918..245705ed07b3609a219a27f84edcd8ec6a201d93 100644 (file)
 #include <Protocol/ScsiPassThruExt.h>\r
 \r
 typedef struct {\r
-  EFI_PHYSICAL_ADDRESS DeviceAddress;\r
-  VOID                 *Mapping;\r
+  EFI_PHYSICAL_ADDRESS    DeviceAddress;\r
+  VOID                    *Mapping;\r
 } PVSCSI_DMA_DESC;\r
 \r
 typedef struct {\r
-  PVSCSI_RINGS_STATE   *RingState;\r
-  PVSCSI_DMA_DESC      RingStateDmaDesc;\r
+  PVSCSI_RINGS_STATE      *RingState;\r
+  PVSCSI_DMA_DESC         RingStateDmaDesc;\r
 \r
-  PVSCSI_RING_REQ_DESC *RingReqs;\r
-  PVSCSI_DMA_DESC      RingReqsDmaDesc;\r
+  PVSCSI_RING_REQ_DESC    *RingReqs;\r
+  PVSCSI_DMA_DESC         RingReqsDmaDesc;\r
 \r
-  PVSCSI_RING_CMP_DESC *RingCmps;\r
-  PVSCSI_DMA_DESC      RingCmpsDmaDesc;\r
+  PVSCSI_RING_CMP_DESC    *RingCmps;\r
+  PVSCSI_DMA_DESC         RingCmpsDmaDesc;\r
 } PVSCSI_RING_DESC;\r
 \r
 typedef struct {\r
@@ -37,30 +37,30 @@ typedef struct {
   // as UINT8, defining here SenseData size to MAX_UINT8 will guarantee it\r
   // cannot overflow when passed to device.\r
   //\r
-  UINT8     SenseData[MAX_UINT8];\r
+  UINT8    SenseData[MAX_UINT8];\r
   //\r
   // This size of the data is arbitrarily chosen.\r
   // It seems to be sufficient for all I/O requests sent through\r
   // EFI_SCSI_PASS_THRU_PROTOCOL.PassThru() for common boot scenarios.\r
   //\r
-  UINT8     Data[0x2000];\r
+  UINT8    Data[0x2000];\r
 } PVSCSI_DMA_BUFFER;\r
 \r
-#define PVSCSI_SIG SIGNATURE_32 ('P', 'S', 'C', 'S')\r
+#define PVSCSI_SIG  SIGNATURE_32 ('P', 'S', 'C', 'S')\r
 \r
 typedef struct {\r
-  UINT32                          Signature;\r
-  EFI_PCI_IO_PROTOCOL             *PciIo;\r
-  EFI_EVENT                       ExitBoot;\r
-  UINT64                          OriginalPciAttributes;\r
-  PVSCSI_RING_DESC                RingDesc;\r
-  PVSCSI_DMA_BUFFER               *DmaBuf;\r
-  PVSCSI_DMA_DESC                 DmaBufDmaDesc;\r
-  UINT8                           MaxTarget;\r
-  UINT8                           MaxLun;\r
-  UINTN                           WaitForCmpStallInUsecs;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL PassThru;\r
-  EFI_EXT_SCSI_PASS_THRU_MODE     PassThruMode;\r
+  UINT32                             Signature;\r
+  EFI_PCI_IO_PROTOCOL                *PciIo;\r
+  EFI_EVENT                          ExitBoot;\r
+  UINT64                             OriginalPciAttributes;\r
+  PVSCSI_RING_DESC                   RingDesc;\r
+  PVSCSI_DMA_BUFFER                  *DmaBuf;\r
+  PVSCSI_DMA_DESC                    DmaBufDmaDesc;\r
+  UINT8                              MaxTarget;\r
+  UINT8                              MaxLun;\r
+  UINTN                              WaitForCmpStallInUsecs;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL    PassThru;\r
+  EFI_EXT_SCSI_PASS_THRU_MODE        PassThruMode;\r
 } PVSCSI_DEV;\r
 \r
 #define PVSCSI_FROM_PASS_THRU(PassThruPointer) \\r
index 7a6dfb9c21d6d69ce850bb90b7909727e0a70c2e..ea5ce837119a664390dedd2d6ebddb895d224bf7 100644 (file)
 #include <Library/PcdLib.h>\r
 \r
 typedef struct {\r
-  UINT64                      FvLength;\r
-  EFI_FIRMWARE_VOLUME_HEADER  FvbInfo;\r
+  UINT64                        FvLength;\r
+  EFI_FIRMWARE_VOLUME_HEADER    FvbInfo;\r
   //\r
   // EFI_FV_BLOCK_MAP_ENTRY    ExtraBlockMap[n];//n=0\r
   //\r
-  EFI_FV_BLOCK_MAP_ENTRY      End[1];\r
+  EFI_FV_BLOCK_MAP_ENTRY        End[1];\r
 } EFI_FVB_MEDIA_INFO;\r
 \r
 EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {\r
@@ -59,12 +59,12 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       FixedPcdGet32 (PcdOvmfFlashNvStorageEventLogSize),\r
       EFI_FVH_SIGNATURE,\r
       EFI_FVB2_MEMORY_MAPPED |\r
-        EFI_FVB2_READ_ENABLED_CAP |\r
-        EFI_FVB2_READ_STATUS |\r
-        EFI_FVB2_WRITE_ENABLED_CAP |\r
-        EFI_FVB2_WRITE_STATUS |\r
-        EFI_FVB2_ERASE_POLARITY |\r
-        EFI_FVB2_ALIGNMENT_16,\r
+      EFI_FVB2_READ_ENABLED_CAP |\r
+      EFI_FVB2_READ_STATUS |\r
+      EFI_FVB2_WRITE_ENABLED_CAP |\r
+      EFI_FVB2_WRITE_STATUS |\r
+      EFI_FVB2_ERASE_POLARITY |\r
+      EFI_FVB2_ALIGNMENT_16,\r
       sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),\r
       0,  // CheckSum\r
       0,  // ExtHeaderOffset\r
@@ -94,31 +94,34 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
 \r
 EFI_STATUS\r
 GetFvbInfo (\r
-  IN  UINT64                        FvLength,\r
-  OUT EFI_FIRMWARE_VOLUME_HEADER    **FvbInfo\r
+  IN  UINT64                      FvLength,\r
+  OUT EFI_FIRMWARE_VOLUME_HEADER  **FvbInfo\r
   )\r
 {\r
-  STATIC BOOLEAN Checksummed = FALSE;\r
-  UINTN Index;\r
+  STATIC BOOLEAN  Checksummed = FALSE;\r
+  UINTN           Index;\r
 \r
   if (!Checksummed) {\r
     for (Index = 0;\r
          Index < sizeof (mPlatformFvbMediaInfo) / sizeof (EFI_FVB_MEDIA_INFO);\r
-         Index += 1) {\r
-      UINT16 Checksum;\r
+         Index += 1)\r
+    {\r
+      UINT16  Checksum;\r
       mPlatformFvbMediaInfo[Index].FvbInfo.Checksum = 0;\r
-      Checksum = CalculateCheckSum16 (\r
-                   (UINT16*) &mPlatformFvbMediaInfo[Index].FvbInfo,\r
-                   mPlatformFvbMediaInfo[Index].FvbInfo.HeaderLength\r
-                   );\r
+      Checksum                                      = CalculateCheckSum16 (\r
+                                                        (UINT16 *)&mPlatformFvbMediaInfo[Index].FvbInfo,\r
+                                                        mPlatformFvbMediaInfo[Index].FvbInfo.HeaderLength\r
+                                                        );\r
       mPlatformFvbMediaInfo[Index].FvbInfo.Checksum = Checksum;\r
     }\r
+\r
     Checksummed = TRUE;\r
   }\r
 \r
   for (Index = 0;\r
        Index < sizeof (mPlatformFvbMediaInfo) / sizeof (EFI_FVB_MEDIA_INFO);\r
-       Index += 1) {\r
+       Index += 1)\r
+  {\r
     if (mPlatformFvbMediaInfo[Index].FvLength == FvLength) {\r
       *FvbInfo = &mPlatformFvbMediaInfo[Index].FvbInfo;\r
       return EFI_SUCCESS;\r
index bc3f1bb5fdeffe4fff53fbaba33564af1da77e4d..b34298faf82b72ae5470930b17f6e137a5627eed 100644 (file)
@@ -37,9 +37,9 @@
 #define EFI_FVB2_STATUS \\r
           (EFI_FVB2_READ_STATUS | EFI_FVB2_WRITE_STATUS | EFI_FVB2_LOCK_STATUS)\r
 \r
-ESAL_FWB_GLOBAL         *mFvbModuleGlobal;\r
+ESAL_FWB_GLOBAL  *mFvbModuleGlobal;\r
 \r
-FV_MEMMAP_DEVICE_PATH mFvMemmapDevicePathTemplate = {\r
+FV_MEMMAP_DEVICE_PATH  mFvMemmapDevicePathTemplate = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
@@ -50,8 +50,8 @@ FV_MEMMAP_DEVICE_PATH mFvMemmapDevicePathTemplate = {
       }\r
     },\r
     EfiMemoryMappedIO,\r
-    (EFI_PHYSICAL_ADDRESS) 0,\r
-    (EFI_PHYSICAL_ADDRESS) 0,\r
+    (EFI_PHYSICAL_ADDRESS)0,\r
+    (EFI_PHYSICAL_ADDRESS)0,\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -63,7 +63,7 @@ FV_MEMMAP_DEVICE_PATH mFvMemmapDevicePathTemplate = {
   }\r
 };\r
 \r
-FV_PIWG_DEVICE_PATH mFvPIWGDevicePathTemplate = {\r
+FV_PIWG_DEVICE_PATH  mFvPIWGDevicePathTemplate = {\r
   {\r
     {\r
       MEDIA_DEVICE_PATH,\r
@@ -85,7 +85,7 @@ FV_PIWG_DEVICE_PATH mFvPIWGDevicePathTemplate = {
   }\r
 };\r
 \r
-EFI_FW_VOL_BLOCK_DEVICE mFvbDeviceTemplate = {\r
+EFI_FW_VOL_BLOCK_DEVICE  mFvbDeviceTemplate = {\r
   FVB_DEVICE_SIGNATURE,\r
   NULL,\r
   0,\r
@@ -101,13 +101,13 @@ EFI_FW_VOL_BLOCK_DEVICE mFvbDeviceTemplate = {
   }\r
 };\r
 \r
-\r
 EFI_STATUS\r
 GetFvbInstance (\r
-  IN  UINTN                               Instance,\r
-  IN  ESAL_FWB_GLOBAL                     *Global,\r
-  OUT EFI_FW_VOL_INSTANCE                 **FwhInstance\r
+  IN  UINTN                Instance,\r
+  IN  ESAL_FWB_GLOBAL      *Global,\r
+  OUT EFI_FW_VOL_INSTANCE  **FwhInstance\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -126,22 +126,23 @@ GetFvbInstance (
 \r
 --*/\r
 {\r
-  EFI_FW_VOL_INSTANCE *FwhRecord;\r
+  EFI_FW_VOL_INSTANCE  *FwhRecord;\r
 \r
   *FwhInstance = NULL;\r
   if (Instance >= Global->NumFv) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // Find the right instance of the FVB private data\r
   //\r
   FwhRecord = Global->FvInstance;\r
   while (Instance > 0) {\r
     FwhRecord = (EFI_FW_VOL_INSTANCE *)\r
-      (\r
-        (UINTN) ((UINT8 *) FwhRecord) + FwhRecord->VolumeHeader.HeaderLength +\r
-          (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
-      );\r
+                (\r
+                 (UINTN)((UINT8 *)FwhRecord) + FwhRecord->VolumeHeader.HeaderLength +\r
+                 (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
+                );\r
     Instance--;\r
   }\r
 \r
@@ -152,10 +153,11 @@ GetFvbInstance (
 \r
 EFI_STATUS\r
 FvbGetPhysicalAddress (\r
-  IN UINTN                                Instance,\r
-  OUT EFI_PHYSICAL_ADDRESS                *Address,\r
-  IN ESAL_FWB_GLOBAL                      *Global\r
+  IN UINTN                  Instance,\r
+  OUT EFI_PHYSICAL_ADDRESS  *Address,\r
+  IN ESAL_FWB_GLOBAL        *Global\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -176,8 +178,8 @@ FvbGetPhysicalAddress (
 \r
 --*/\r
 {\r
-  EFI_FW_VOL_INSTANCE *FwhInstance;\r
-  EFI_STATUS          Status;\r
+  EFI_FW_VOL_INSTANCE  *FwhInstance;\r
+  EFI_STATUS           Status;\r
 \r
   //\r
   // Find the right instance of the FVB private data\r
@@ -191,10 +193,11 @@ FvbGetPhysicalAddress (
 \r
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
-  IN UINTN                                Instance,\r
-  OUT EFI_FVB_ATTRIBUTES_2                *Attributes,\r
-  IN ESAL_FWB_GLOBAL                      *Global\r
+  IN UINTN                  Instance,\r
+  OUT EFI_FVB_ATTRIBUTES_2  *Attributes,\r
+  IN ESAL_FWB_GLOBAL        *Global\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -214,8 +217,8 @@ FvbGetVolumeAttributes (
 \r
 --*/\r
 {\r
-  EFI_FW_VOL_INSTANCE *FwhInstance;\r
-  EFI_STATUS          Status;\r
+  EFI_FW_VOL_INSTANCE  *FwhInstance;\r
+  EFI_STATUS           Status;\r
 \r
   //\r
   // Find the right instance of the FVB private data\r
@@ -229,13 +232,14 @@ FvbGetVolumeAttributes (
 \r
 EFI_STATUS\r
 FvbGetLbaAddress (\r
-  IN  UINTN                               Instance,\r
-  IN  EFI_LBA                             Lba,\r
-  OUT UINTN                               *LbaAddress,\r
-  OUT UINTN                               *LbaLength,\r
-  OUT UINTN                               *NumOfBlocks,\r
-  IN  ESAL_FWB_GLOBAL                     *Global\r
+  IN  UINTN            Instance,\r
+  IN  EFI_LBA          Lba,\r
+  OUT UINTN            *LbaAddress,\r
+  OUT UINTN            *LbaLength,\r
+  OUT UINTN            *NumOfBlocks,\r
+  IN  ESAL_FWB_GLOBAL  *Global\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -275,9 +279,9 @@ FvbGetLbaAddress (
   Status = GetFvbInstance (Instance, Global, &FwhInstance);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  StartLba  = 0;\r
-  Offset    = 0;\r
-  BlockMap  = &(FwhInstance->VolumeHeader.BlockMap[0]);\r
+  StartLba = 0;\r
+  Offset   = 0;\r
+  BlockMap = &(FwhInstance->VolumeHeader.BlockMap[0]);\r
 \r
   //\r
   // Parse the blockmap of the FV to find which map entry the Lba belongs to\r
@@ -286,7 +290,7 @@ FvbGetLbaAddress (
     NumBlocks   = BlockMap->NumBlocks;\r
     BlockLength = BlockMap->Length;\r
 \r
-    if (NumBlocks == 0 || BlockLength == 0) {\r
+    if ((NumBlocks == 0) || (BlockLength == 0)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -295,8 +299,8 @@ FvbGetLbaAddress (
     //\r
     // The map entry found\r
     //\r
-    if (Lba >= StartLba && Lba < NextLba) {\r
-      Offset = Offset + (UINTN) MultU64x32 ((Lba - StartLba), BlockLength);\r
+    if ((Lba >= StartLba) && (Lba < NextLba)) {\r
+      Offset = Offset + (UINTN)MultU64x32 ((Lba - StartLba), BlockLength);\r
       if (LbaAddress != NULL) {\r
         *LbaAddress = FwhInstance->FvBase + Offset;\r
       }\r
@@ -306,24 +310,25 @@ FvbGetLbaAddress (
       }\r
 \r
       if (NumOfBlocks != NULL) {\r
-        *NumOfBlocks = (UINTN) (NextLba - Lba);\r
+        *NumOfBlocks = (UINTN)(NextLba - Lba);\r
       }\r
 \r
       return EFI_SUCCESS;\r
     }\r
 \r
-    StartLba  = NextLba;\r
-    Offset    = Offset + NumBlocks * BlockLength;\r
+    StartLba = NextLba;\r
+    Offset   = Offset + NumBlocks * BlockLength;\r
     BlockMap++;\r
   }\r
 }\r
 \r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r
-  IN UINTN                                  Instance,\r
-  IN OUT EFI_FVB_ATTRIBUTES_2               *Attributes,\r
-  IN ESAL_FWB_GLOBAL                        *Global\r
+  IN UINTN                     Instance,\r
+  IN OUT EFI_FVB_ATTRIBUTES_2  *Attributes,\r
+  IN ESAL_FWB_GLOBAL           *Global\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -364,8 +369,8 @@ FvbSetVolumeAttributes (
   Status = GetFvbInstance (Instance, Global, &FwhInstance);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  AttribPtr     =\r
-    (EFI_FVB_ATTRIBUTES_2 *) &(FwhInstance->VolumeHeader.Attributes);\r
+  AttribPtr =\r
+    (EFI_FVB_ATTRIBUTES_2 *)&(FwhInstance->VolumeHeader.Attributes);\r
   OldAttributes = *AttribPtr;\r
   Capabilities  = OldAttributes & (EFI_FVB2_READ_DISABLED_CAP | \\r
                                    EFI_FVB2_READ_ENABLED_CAP | \\r
@@ -373,8 +378,8 @@ FvbSetVolumeAttributes (
                                    EFI_FVB2_WRITE_ENABLED_CAP | \\r
                                    EFI_FVB2_LOCK_CAP \\r
                                    );\r
-  OldStatus     = OldAttributes & EFI_FVB2_STATUS;\r
-  NewStatus     = *Attributes & EFI_FVB2_STATUS;\r
+  OldStatus = OldAttributes & EFI_FVB2_STATUS;\r
+  NewStatus = *Attributes & EFI_FVB2_STATUS;\r
 \r
   UnchangedAttributes = EFI_FVB2_READ_DISABLED_CAP  | \\r
                         EFI_FVB2_READ_ENABLED_CAP   | \\r
@@ -392,9 +397,11 @@ FvbSetVolumeAttributes (
   // Some attributes of FV is read only can *not* be set\r
   //\r
   if ((OldAttributes & UnchangedAttributes) ^\r
-      (*Attributes & UnchangedAttributes)) {\r
+      (*Attributes & UnchangedAttributes))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // If firmware volume is locked, no status bit can be updated\r
   //\r
@@ -403,6 +410,7 @@ FvbSetVolumeAttributes (
       return EFI_ACCESS_DENIED;\r
     }\r
   }\r
+\r
   //\r
   // Test read disable\r
   //\r
@@ -411,6 +419,7 @@ FvbSetVolumeAttributes (
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
+\r
   //\r
   // Test read enable\r
   //\r
@@ -419,6 +428,7 @@ FvbSetVolumeAttributes (
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
+\r
   //\r
   // Test write disable\r
   //\r
@@ -427,6 +437,7 @@ FvbSetVolumeAttributes (
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
+\r
   //\r
   // Test write enable\r
   //\r
@@ -435,6 +446,7 @@ FvbSetVolumeAttributes (
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
+\r
   //\r
   // Test lock\r
   //\r
@@ -457,9 +469,10 @@ FvbSetVolumeAttributes (
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetPhysicalAddress (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  OUT EFI_PHYSICAL_ADDRESS                        *Address\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  OUT EFI_PHYSICAL_ADDRESS                     *Address\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -476,22 +489,26 @@ FvbProtocolGetPhysicalAddress (
 \r
 --*/\r
 {\r
-  EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+  EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice;\r
 \r
   FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
 \r
-  return FvbGetPhysicalAddress (FvbDevice->Instance, Address,\r
-           mFvbModuleGlobal);\r
+  return FvbGetPhysicalAddress (\r
+           FvbDevice->Instance,\r
+           Address,\r
+           mFvbModuleGlobal\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetBlockSize (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  IN CONST EFI_LBA                                     Lba,\r
-  OUT UINTN                                       *BlockSize,\r
-  OUT UINTN                                       *NumOfBlocks\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  IN CONST EFI_LBA                             Lba,\r
+  OUT UINTN                                    *BlockSize,\r
+  OUT UINTN                                    *NumOfBlocks\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -513,26 +530,27 @@ FvbProtocolGetBlockSize (
 \r
 --*/\r
 {\r
-  EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+  EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice;\r
 \r
   FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
 \r
   return FvbGetLbaAddress (\r
-          FvbDevice->Instance,\r
-          Lba,\r
-          NULL,\r
-          BlockSize,\r
-          NumOfBlocks,\r
-          mFvbModuleGlobal\r
-          );\r
+           FvbDevice->Instance,\r
+           Lba,\r
+           NULL,\r
+           BlockSize,\r
+           NumOfBlocks,\r
+           mFvbModuleGlobal\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetAttributes (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  OUT EFI_FVB_ATTRIBUTES_2                              *Attributes\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  OUT EFI_FVB_ATTRIBUTES_2                     *Attributes\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -547,20 +565,24 @@ FvbProtocolGetAttributes (
 \r
 --*/\r
 {\r
-  EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+  EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice;\r
 \r
   FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
 \r
-  return FvbGetVolumeAttributes (FvbDevice->Instance, Attributes,\r
-           mFvbModuleGlobal);\r
+  return FvbGetVolumeAttributes (\r
+           FvbDevice->Instance,\r
+           Attributes,\r
+           mFvbModuleGlobal\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  IN OUT EFI_FVB_ATTRIBUTES_2                           *Attributes\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  IN OUT EFI_FVB_ATTRIBUTES_2                  *Attributes\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -575,20 +597,24 @@ FvbProtocolSetAttributes (
 \r
 --*/\r
 {\r
-  EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
+  EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice;\r
 \r
   FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
 \r
-  return FvbSetVolumeAttributes (FvbDevice->Instance, Attributes,\r
-           mFvbModuleGlobal);\r
+  return FvbSetVolumeAttributes (\r
+           FvbDevice->Instance,\r
+           Attributes,\r
+           mFvbModuleGlobal\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolEraseBlocks (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *This,\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
   ...\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -615,18 +641,21 @@ FvbProtocolEraseBlocks (
 \r
 --*/\r
 {\r
-  EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;\r
-  EFI_FW_VOL_INSTANCE     *FwhInstance;\r
-  UINTN                   NumOfBlocks;\r
-  VA_LIST                 args;\r
-  EFI_LBA                 StartingLba;\r
-  UINTN                   NumOfLba;\r
-  EFI_STATUS              Status;\r
+  EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice;\r
+  EFI_FW_VOL_INSTANCE      *FwhInstance;\r
+  UINTN                    NumOfBlocks;\r
+  VA_LIST                  args;\r
+  EFI_LBA                  StartingLba;\r
+  UINTN                    NumOfLba;\r
+  EFI_STATUS               Status;\r
 \r
   FvbDevice = FVB_DEVICE_FROM_THIS (This);\r
 \r
-  Status    = GetFvbInstance (FvbDevice->Instance, mFvbModuleGlobal,\r
-                &FwhInstance);\r
+  Status = GetFvbInstance (\r
+             FvbDevice->Instance,\r
+             mFvbModuleGlobal,\r
+             &FwhInstance\r
+             );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   NumOfBlocks = FwhInstance->NumOfBlocks;\r
@@ -671,7 +700,6 @@ FvbProtocolEraseBlocks (
       StartingLba++;\r
       NumOfLba--;\r
     }\r
-\r
   } while (1);\r
 \r
   VA_END (args);\r
@@ -682,12 +710,13 @@ FvbProtocolEraseBlocks (
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolWrite (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  IN       EFI_LBA                                      Lba,\r
-  IN       UINTN                                        Offset,\r
-  IN OUT   UINTN                                    *NumBytes,\r
-  IN       UINT8                                        *Buffer\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  IN       EFI_LBA                             Lba,\r
+  IN       UINTN                               Offset,\r
+  IN OUT   UINTN                               *NumBytes,\r
+  IN       UINT8                               *Buffer\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -720,19 +749,24 @@ FvbProtocolWrite (
 \r
 --*/\r
 {\r
-  return QemuFlashWrite ((EFI_LBA)Lba, (UINTN)Offset, NumBytes,\r
-           (UINT8 *)Buffer);\r
+  return QemuFlashWrite (\r
+           (EFI_LBA)Lba,\r
+           (UINTN)Offset,\r
+           NumBytes,\r
+           (UINT8 *)Buffer\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolRead (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  IN CONST EFI_LBA                                      Lba,\r
-  IN CONST UINTN                                        Offset,\r
-  IN OUT UINTN                                    *NumBytes,\r
-  IN UINT8                                        *Buffer\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  IN CONST EFI_LBA                             Lba,\r
+  IN CONST UINTN                               Offset,\r
+  IN OUT UINTN                                 *NumBytes,\r
+  IN UINT8                                     *Buffer\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -765,14 +799,19 @@ FvbProtocolRead (
 \r
 --*/\r
 {\r
-  return QemuFlashRead ((EFI_LBA)Lba, (UINTN)Offset, NumBytes,\r
-           (UINT8 *)Buffer);\r
+  return QemuFlashRead (\r
+           (EFI_LBA)Lba,\r
+           (UINTN)Offset,\r
+           NumBytes,\r
+           (UINT8 *)Buffer\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 ValidateFvHeader (\r
-  EFI_FIRMWARE_VOLUME_HEADER            *FwVolHeader\r
+  EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -788,7 +827,7 @@ ValidateFvHeader (
 \r
 --*/\r
 {\r
-  UINT16 Checksum;\r
+  UINT16  Checksum;\r
 \r
   //\r
   // Verify the header revision, header signature, length\r
@@ -797,9 +836,10 @@ ValidateFvHeader (
   //\r
   if ((FwVolHeader->Revision != EFI_FVH_REVISION) ||\r
       (FwVolHeader->Signature != EFI_FVH_SIGNATURE) ||\r
-      (FwVolHeader->FvLength == ((UINTN) -1)) ||\r
+      (FwVolHeader->FvLength == ((UINTN)-1)) ||\r
       ((FwVolHeader->HeaderLength & 0x01) != 0)\r
-      ) {\r
+      )\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -807,16 +847,23 @@ ValidateFvHeader (
   // Verify the header checksum\r
   //\r
 \r
-  Checksum = CalculateSum16 ((UINT16 *) FwVolHeader,\r
-               FwVolHeader->HeaderLength);\r
+  Checksum = CalculateSum16 (\r
+               (UINT16 *)FwVolHeader,\r
+               FwVolHeader->HeaderLength\r
+               );\r
   if (Checksum != 0) {\r
-    UINT16 Expected;\r
+    UINT16  Expected;\r
 \r
     Expected =\r
-      (UINT16) (((UINTN) FwVolHeader->Checksum + 0x10000 - Checksum) & 0xffff);\r
-\r
-    DEBUG ((DEBUG_INFO, "FV@%p Checksum is 0x%x, expected 0x%x\n",\r
-            FwVolHeader, FwVolHeader->Checksum, Expected));\r
+      (UINT16)(((UINTN)FwVolHeader->Checksum + 0x10000 - Checksum) & 0xffff);\r
+\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "FV@%p Checksum is 0x%x, expected 0x%x\n",\r
+      FwVolHeader,\r
+      FwVolHeader->Checksum,\r
+      Expected\r
+      ));\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -829,16 +876,16 @@ InitializeVariableFvHeader (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  EFI_FIRMWARE_VOLUME_HEADER          *GoodFwVolHeader;\r
-  EFI_FIRMWARE_VOLUME_HEADER          *FwVolHeader;\r
-  UINTN                               Length;\r
-  UINTN                               WriteLength;\r
-  UINTN                               BlockSize;\r
+  EFI_STATUS                  Status;\r
+  EFI_FIRMWARE_VOLUME_HEADER  *GoodFwVolHeader;\r
+  EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;\r
+  UINTN                       Length;\r
+  UINTN                       WriteLength;\r
+  UINTN                       BlockSize;\r
 \r
   FwVolHeader =\r
-    (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN)\r
-      PcdGet32 (PcdOvmfFlashNvStorageVariableBase);\r
+    (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)\r
+    PcdGet32 (PcdOvmfFlashNvStorageVariableBase);\r
 \r
   Length =\r
     (FixedPcdGet32 (PcdFlashNvStorageVariableSize) +\r
@@ -848,19 +895,23 @@ InitializeVariableFvHeader (
 \r
   BlockSize = PcdGet32 (PcdOvmfFirmwareBlockSize);\r
 \r
-  Status      = ValidateFvHeader (FwVolHeader);\r
+  Status = ValidateFvHeader (FwVolHeader);\r
   if (!EFI_ERROR (Status)) {\r
-    if (FwVolHeader->FvLength != Length ||\r
-        FwVolHeader->BlockMap[0].Length != BlockSize) {\r
+    if ((FwVolHeader->FvLength != Length) ||\r
+        (FwVolHeader->BlockMap[0].Length != BlockSize))\r
+    {\r
       Status = EFI_VOLUME_CORRUPTED;\r
     }\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
-    UINTN   Offset;\r
-    UINTN   Start;\r
+    UINTN  Offset;\r
+    UINTN  Start;\r
 \r
-    DEBUG ((DEBUG_INFO,\r
-      "Variable FV header is not valid. It will be reinitialized.\n"));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "Variable FV header is not valid. It will be reinitialized.\n"\r
+      ));\r
 \r
     //\r
     // Get FvbInfo to provide in FwhInstance.\r
@@ -868,7 +919,7 @@ InitializeVariableFvHeader (
     Status = GetFvbInfo (Length, &GoodFwVolHeader);\r
     ASSERT (!EFI_ERROR (Status));\r
 \r
-    Start = (UINTN)(UINT8*) FwVolHeader - PcdGet32 (PcdOvmfFdBaseAddress);\r
+    Start = (UINTN)(UINT8 *)FwVolHeader - PcdGet32 (PcdOvmfFdBaseAddress);\r
     ASSERT (Start % BlockSize == 0 && Length % BlockSize == 0);\r
     ASSERT (GoodFwVolHeader->HeaderLength <= BlockSize);\r
 \r
@@ -884,11 +935,12 @@ InitializeVariableFvHeader (
     // Write good FV header\r
     //\r
     WriteLength = GoodFwVolHeader->HeaderLength;\r
-    Status = QemuFlashWrite (\r
-               Start / BlockSize,\r
-               0,\r
-               &WriteLength,\r
-               (UINT8 *) GoodFwVolHeader);\r
+    Status      = QemuFlashWrite (\r
+                    Start / BlockSize,\r
+                    0,\r
+                    &WriteLength,\r
+                    (UINT8 *)GoodFwVolHeader\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
     ASSERT (WriteLength == GoodFwVolHeader->HeaderLength);\r
   }\r
@@ -899,9 +951,10 @@ InitializeVariableFvHeader (
 EFI_STATUS\r
 EFIAPI\r
 FvbInitialize (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -913,24 +966,26 @@ FvbInitialize (
 \r
 --*/\r
 {\r
-  EFI_STATUS                          Status;\r
-  EFI_FW_VOL_INSTANCE                 *FwhInstance;\r
-  EFI_FIRMWARE_VOLUME_HEADER          *FwVolHeader;\r
-  UINT32                              BufferSize;\r
-  EFI_FV_BLOCK_MAP_ENTRY              *PtrBlockMapEntry;\r
-  EFI_FW_VOL_BLOCK_DEVICE             *FvbDevice;\r
-  UINT32                              MaxLbaSize;\r
-  EFI_PHYSICAL_ADDRESS                BaseAddress;\r
-  UINTN                               Length;\r
-  UINTN                               NumOfBlocks;\r
-  RETURN_STATUS                       PcdStatus;\r
+  EFI_STATUS                  Status;\r
+  EFI_FW_VOL_INSTANCE         *FwhInstance;\r
+  EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;\r
+  UINT32                      BufferSize;\r
+  EFI_FV_BLOCK_MAP_ENTRY      *PtrBlockMapEntry;\r
+  EFI_FW_VOL_BLOCK_DEVICE     *FvbDevice;\r
+  UINT32                      MaxLbaSize;\r
+  EFI_PHYSICAL_ADDRESS        BaseAddress;\r
+  UINTN                       Length;\r
+  UINTN                       NumOfBlocks;\r
+  RETURN_STATUS               PcdStatus;\r
 \r
   if (EFI_ERROR (QemuFlashInitialize ())) {\r
     //\r
     // Return an error so image will be unloaded\r
     //\r
-    DEBUG ((DEBUG_INFO,\r
-      "QEMU flash was not detected. Writable FVB is not being installed.\n"));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "QEMU flash was not detected. Writable FVB is not being installed.\n"\r
+      ));\r
     return EFI_WRITE_PROTECTED;\r
   }\r
 \r
@@ -941,17 +996,19 @@ FvbInitialize (
   mFvbModuleGlobal = AllocateRuntimePool (sizeof (ESAL_FWB_GLOBAL));\r
   ASSERT (mFvbModuleGlobal != NULL);\r
 \r
-  BaseAddress = (UINTN) PcdGet32 (PcdOvmfFdBaseAddress);\r
-  Length = PcdGet32 (PcdOvmfFirmwareFdSize);\r
+  BaseAddress = (UINTN)PcdGet32 (PcdOvmfFdBaseAddress);\r
+  Length      = PcdGet32 (PcdOvmfFirmwareFdSize);\r
 \r
   Status = InitializeVariableFvHeader ();\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_INFO,\r
-      "QEMU Flash: Unable to initialize variable FV header\n"));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "QEMU Flash: Unable to initialize variable FV header\n"\r
+      ));\r
     return EFI_WRITE_PROTECTED;\r
   }\r
 \r
-  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) BaseAddress;\r
+  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)BaseAddress;\r
   Status      = ValidateFvHeader (FwVolHeader);\r
   if (EFI_ERROR (Status)) {\r
     //\r
@@ -973,24 +1030,28 @@ FvbInitialize (
 \r
   FwhInstance = mFvbModuleGlobal->FvInstance;\r
 \r
-  mFvbModuleGlobal->NumFv                   = 0;\r
-  MaxLbaSize = 0;\r
+  mFvbModuleGlobal->NumFv = 0;\r
+  MaxLbaSize              = 0;\r
 \r
   FwVolHeader =\r
-    (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN)\r
-      PcdGet32 (PcdOvmfFlashNvStorageVariableBase);\r
+    (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)\r
+    PcdGet32 (PcdOvmfFlashNvStorageVariableBase);\r
 \r
-  FwhInstance->FvBase = (UINTN) BaseAddress;\r
+  FwhInstance->FvBase = (UINTN)BaseAddress;\r
 \r
-  CopyMem ((UINTN *) &(FwhInstance->VolumeHeader), (UINTN *) FwVolHeader,\r
-    FwVolHeader->HeaderLength);\r
+  CopyMem (\r
+    (UINTN *)&(FwhInstance->VolumeHeader),\r
+    (UINTN *)FwVolHeader,\r
+    FwVolHeader->HeaderLength\r
+    );\r
   FwVolHeader = &(FwhInstance->VolumeHeader);\r
 \r
   NumOfBlocks = 0;\r
 \r
   for (PtrBlockMapEntry = FwVolHeader->BlockMap;\r
        PtrBlockMapEntry->NumBlocks != 0;\r
-       PtrBlockMapEntry++) {\r
+       PtrBlockMapEntry++)\r
+  {\r
     //\r
     // Get the maximum size of a block.\r
     //\r
@@ -1021,22 +1082,26 @@ FvbInitialize (
   // Set up the devicepath\r
   //\r
   if (FwVolHeader->ExtHeaderOffset == 0) {\r
-    FV_MEMMAP_DEVICE_PATH *FvMemmapDevicePath;\r
+    FV_MEMMAP_DEVICE_PATH  *FvMemmapDevicePath;\r
 \r
     //\r
     // FV does not contains extension header, then produce MEMMAP_DEVICE_PATH\r
     //\r
-    FvMemmapDevicePath = AllocateCopyPool (sizeof (FV_MEMMAP_DEVICE_PATH),\r
-                           &mFvMemmapDevicePathTemplate);\r
+    FvMemmapDevicePath = AllocateCopyPool (\r
+                           sizeof (FV_MEMMAP_DEVICE_PATH),\r
+                           &mFvMemmapDevicePathTemplate\r
+                           );\r
     FvMemmapDevicePath->MemMapDevPath.StartingAddress = BaseAddress;\r
     FvMemmapDevicePath->MemMapDevPath.EndingAddress   =\r
       BaseAddress + FwVolHeader->FvLength - 1;\r
     FvbDevice->DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)FvMemmapDevicePath;\r
   } else {\r
-    FV_PIWG_DEVICE_PATH *FvPiwgDevicePath;\r
+    FV_PIWG_DEVICE_PATH  *FvPiwgDevicePath;\r
 \r
-    FvPiwgDevicePath = AllocateCopyPool (sizeof (FV_PIWG_DEVICE_PATH),\r
-                         &mFvPIWGDevicePathTemplate);\r
+    FvPiwgDevicePath = AllocateCopyPool (\r
+                         sizeof (FV_PIWG_DEVICE_PATH),\r
+                         &mFvPIWGDevicePathTemplate\r
+                         );\r
     CopyGuid (\r
       &FvPiwgDevicePath->FvDevPath.FvName,\r
       (GUID *)(UINTN)(BaseAddress + FwVolHeader->ExtHeaderOffset)\r
@@ -1054,10 +1119,10 @@ FvbInitialize (
   SetPcdFlashNvStorageBaseAddresses ();\r
 \r
   FwhInstance = (EFI_FW_VOL_INSTANCE *)\r
-    (\r
-      (UINTN) ((UINT8 *) FwhInstance) + FwVolHeader->HeaderLength +\r
-      (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
-    );\r
+                (\r
+                 (UINTN)((UINT8 *)FwhInstance) + FwVolHeader->HeaderLength +\r
+                 (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
+                );\r
 \r
   //\r
   // Module type specific hook.\r
index d064aee6ef55f214765a98f2d95256500296b4a4..639ad0471c50678f2a9cd79739dbaf13d9d53185 100644 (file)
 #define _FW_BLOCK_SERVICE_H\r
 \r
 typedef struct {\r
-  UINTN                       FvBase;\r
-  UINTN                       NumOfBlocks;\r
-  EFI_FIRMWARE_VOLUME_HEADER  VolumeHeader;\r
+  UINTN                         FvBase;\r
+  UINTN                         NumOfBlocks;\r
+  EFI_FIRMWARE_VOLUME_HEADER    VolumeHeader;\r
 } EFI_FW_VOL_INSTANCE;\r
 \r
 typedef struct {\r
-  UINT32              NumFv;\r
-  EFI_FW_VOL_INSTANCE *FvInstance;\r
+  UINT32                 NumFv;\r
+  EFI_FW_VOL_INSTANCE    *FvInstance;\r
 } ESAL_FWB_GLOBAL;\r
 \r
-extern ESAL_FWB_GLOBAL *mFvbModuleGlobal;\r
+extern ESAL_FWB_GLOBAL  *mFvbModuleGlobal;\r
 \r
 //\r
 // Fvb Protocol instance data\r
 //\r
-#define FVB_DEVICE_FROM_THIS(a) CR (a, EFI_FW_VOL_BLOCK_DEVICE, \\r
+#define FVB_DEVICE_FROM_THIS(a)  CR (a, EFI_FW_VOL_BLOCK_DEVICE,\\r
                                   FwVolBlockInstance, FVB_DEVICE_SIGNATURE)\r
 \r
-#define FVB_EXTEND_DEVICE_FROM_THIS(a) CR (a, EFI_FW_VOL_BLOCK_DEVICE, \\r
+#define FVB_EXTEND_DEVICE_FROM_THIS(a)  CR (a, EFI_FW_VOL_BLOCK_DEVICE,\\r
                                          FvbExtension, FVB_DEVICE_SIGNATURE)\r
 \r
-#define FVB_DEVICE_SIGNATURE            SIGNATURE_32 ('F', 'V', 'B', 'N')\r
+#define FVB_DEVICE_SIGNATURE  SIGNATURE_32 ('F', 'V', 'B', 'N')\r
 \r
 typedef struct {\r
-  MEDIA_FW_VOL_DEVICE_PATH  FvDevPath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevPath;\r
+  MEDIA_FW_VOL_DEVICE_PATH    FvDevPath;\r
+  EFI_DEVICE_PATH_PROTOCOL    EndDevPath;\r
 } FV_PIWG_DEVICE_PATH;\r
 \r
 typedef struct {\r
@@ -52,62 +52,61 @@ typedef struct {
 } FV_MEMMAP_DEVICE_PATH;\r
 \r
 typedef struct {\r
-  UINTN                               Signature;\r
-  EFI_DEVICE_PATH_PROTOCOL            *DevicePath;\r
-  UINTN                               Instance;\r
-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  FwVolBlockInstance;\r
+  UINTN                                 Signature;\r
+  EFI_DEVICE_PATH_PROTOCOL              *DevicePath;\r
+  UINTN                                 Instance;\r
+  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    FwVolBlockInstance;\r
 } EFI_FW_VOL_BLOCK_DEVICE;\r
 \r
 EFI_STATUS\r
 GetFvbInfo (\r
-  IN  UINT64                            FvLength,\r
-  OUT EFI_FIRMWARE_VOLUME_HEADER        **FvbInfo\r
+  IN  UINT64                      FvLength,\r
+  OUT EFI_FIRMWARE_VOLUME_HEADER  **FvbInfo\r
   );\r
 \r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r
-  IN UINTN                                Instance,\r
-  IN OUT EFI_FVB_ATTRIBUTES_2             *Attributes,\r
-  IN ESAL_FWB_GLOBAL                      *Global\r
+  IN UINTN                     Instance,\r
+  IN OUT EFI_FVB_ATTRIBUTES_2  *Attributes,\r
+  IN ESAL_FWB_GLOBAL           *Global\r
   );\r
 \r
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
-  IN UINTN                                Instance,\r
-  OUT EFI_FVB_ATTRIBUTES_2                *Attributes,\r
-  IN ESAL_FWB_GLOBAL                      *Global\r
+  IN UINTN                  Instance,\r
+  OUT EFI_FVB_ATTRIBUTES_2  *Attributes,\r
+  IN ESAL_FWB_GLOBAL        *Global\r
   );\r
 \r
 EFI_STATUS\r
 FvbGetPhysicalAddress (\r
-  IN UINTN                                Instance,\r
-  OUT EFI_PHYSICAL_ADDRESS                *Address,\r
-  IN ESAL_FWB_GLOBAL                      *Global\r
+  IN UINTN                  Instance,\r
+  OUT EFI_PHYSICAL_ADDRESS  *Address,\r
+  IN ESAL_FWB_GLOBAL        *Global\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbInitialize (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   );\r
 \r
-\r
 VOID\r
 EFIAPI\r
 FvbClassAddressChangeEvent (\r
-  IN EFI_EVENT        Event,\r
-  IN VOID             *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 EFI_STATUS\r
 FvbGetLbaAddress (\r
-  IN  UINTN                               Instance,\r
-  IN  EFI_LBA                             Lba,\r
-  OUT UINTN                               *LbaAddress,\r
-  OUT UINTN                               *LbaLength,\r
-  OUT UINTN                               *NumOfBlocks,\r
-  IN  ESAL_FWB_GLOBAL                     *Global\r
+  IN  UINTN            Instance,\r
+  IN  EFI_LBA          Lba,\r
+  OUT UINTN            *LbaAddress,\r
+  OUT UINTN            *LbaLength,\r
+  OUT UINTN            *NumOfBlocks,\r
+  IN  ESAL_FWB_GLOBAL  *Global\r
   );\r
 \r
 //\r
@@ -116,57 +115,57 @@ FvbGetLbaAddress (
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetAttributes (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  OUT EFI_FVB_ATTRIBUTES_2                              *Attributes\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  OUT EFI_FVB_ATTRIBUTES_2                     *Attributes\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  IN OUT EFI_FVB_ATTRIBUTES_2                           *Attributes\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  IN OUT EFI_FVB_ATTRIBUTES_2                  *Attributes\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetPhysicalAddress (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  OUT EFI_PHYSICAL_ADDRESS                        *Address\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  OUT EFI_PHYSICAL_ADDRESS                     *Address\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetBlockSize (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  IN CONST EFI_LBA                                     Lba,\r
-  OUT UINTN                                       *BlockSize,\r
-  OUT UINTN                                       *NumOfBlocks\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  IN CONST EFI_LBA                             Lba,\r
+  OUT UINTN                                    *BlockSize,\r
+  OUT UINTN                                    *NumOfBlocks\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolRead (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  IN CONST EFI_LBA                                      Lba,\r
-  IN CONST UINTN                                        Offset,\r
-  IN OUT UINTN                                    *NumBytes,\r
-  IN UINT8                                        *Buffer\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  IN CONST EFI_LBA                             Lba,\r
+  IN CONST UINTN                               Offset,\r
+  IN OUT UINTN                                 *NumBytes,\r
+  IN UINT8                                     *Buffer\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolWrite (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  IN       EFI_LBA                                      Lba,\r
-  IN       UINTN                                        Offset,\r
-  IN OUT   UINTN                                        *NumBytes,\r
-  IN       UINT8                                        *Buffer\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
+  IN       EFI_LBA                             Lba,\r
+  IN       UINTN                               Offset,\r
+  IN OUT   UINTN                               *NumBytes,\r
+  IN       UINT8                               *Buffer\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolEraseBlocks (\r
-  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *This,\r
+  IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *This,\r
   ...\r
   );\r
 \r
@@ -176,7 +175,7 @@ FvbProtocolEraseBlocks (
 //\r
 VOID\r
 InstallProtocolInterfaces (\r
-  IN EFI_FW_VOL_BLOCK_DEVICE *FvbDevice\r
+  IN EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice\r
   );\r
 \r
 VOID\r
@@ -186,8 +185,8 @@ InstallVirtualAddressChangeHandler (
 \r
 EFI_STATUS\r
 MarkIoMemoryRangeForRuntimeAccess (\r
-  IN EFI_PHYSICAL_ADDRESS   BaseAddress,\r
-  IN UINTN                  Length\r
+  IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN                 Length\r
   );\r
 \r
 VOID\r
index ab40087a8408624a828c54041ce1cc027e328bda..61e1f2e196e5c264de935223f67c5aa20a8e8786 100644 (file)
 \r
 VOID\r
 InstallProtocolInterfaces (\r
-  IN EFI_FW_VOL_BLOCK_DEVICE *FvbDevice\r
+  IN EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice\r
   )\r
 {\r
-  EFI_STATUS                         Status;\r
-  EFI_HANDLE                         FwbHandle;\r
-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *OldFwbInterface;\r
+  EFI_STATUS                          Status;\r
+  EFI_HANDLE                          FwbHandle;\r
+  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *OldFwbInterface;\r
 \r
   ASSERT (!FeaturePcdGet (PcdSmmSmramRequire));\r
 \r
@@ -37,8 +37,11 @@ InstallProtocolInterfaces (
   // Find a handle with a matching device path that has supports FW Block\r
   // protocol\r
   //\r
-  Status = gBS->LocateDevicePath (&gEfiFirmwareVolumeBlockProtocolGuid,\r
-                  &FvbDevice->DevicePath, &FwbHandle);\r
+  Status = gBS->LocateDevicePath (\r
+                  &gEfiFirmwareVolumeBlockProtocolGuid,\r
+                  &FvbDevice->DevicePath,\r
+                  &FwbHandle\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // LocateDevicePath fails so install a new interface and device path\r
@@ -61,7 +64,7 @@ InstallProtocolInterfaces (
     Status = gBS->HandleProtocol (\r
                     FwbHandle,\r
                     &gEfiFirmwareVolumeBlockProtocolGuid,\r
-                    (VOID**)&OldFwbInterface\r
+                    (VOID **)&OldFwbInterface\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
@@ -81,14 +84,14 @@ InstallProtocolInterfaces (
   }\r
 }\r
 \r
-\r
 STATIC\r
 VOID\r
 EFIAPI\r
 FvbVirtualAddressChangeEvent (\r
-  IN EFI_EVENT        Event,\r
-  IN VOID             *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -107,39 +110,38 @@ FvbVirtualAddressChangeEvent (
 \r
 --*/\r
 {\r
-  EFI_FW_VOL_INSTANCE *FwhInstance;\r
-  UINTN               Index;\r
+  EFI_FW_VOL_INSTANCE  *FwhInstance;\r
+  UINTN                Index;\r
 \r
   FwhInstance = mFvbModuleGlobal->FvInstance;\r
-  EfiConvertPointer (0x0, (VOID **) &mFvbModuleGlobal->FvInstance);\r
+  EfiConvertPointer (0x0, (VOID **)&mFvbModuleGlobal->FvInstance);\r
 \r
   //\r
   // Convert the base address of all the instances\r
   //\r
-  Index       = 0;\r
+  Index = 0;\r
   while (Index < mFvbModuleGlobal->NumFv) {\r
-    EfiConvertPointer (0x0, (VOID **) &FwhInstance->FvBase);\r
+    EfiConvertPointer (0x0, (VOID **)&FwhInstance->FvBase);\r
     FwhInstance = (EFI_FW_VOL_INSTANCE *)\r
-      (\r
-        (UINTN) ((UINT8 *) FwhInstance) +\r
-        FwhInstance->VolumeHeader.HeaderLength +\r
-        (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
-      );\r
+                  (\r
+                   (UINTN)((UINT8 *)FwhInstance) +\r
+                   FwhInstance->VolumeHeader.HeaderLength +\r
+                   (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
+                  );\r
     Index++;\r
   }\r
 \r
-  EfiConvertPointer (0x0, (VOID **) &mFvbModuleGlobal);\r
+  EfiConvertPointer (0x0, (VOID **)&mFvbModuleGlobal);\r
   QemuFlashConvertPointers ();\r
 }\r
 \r
-\r
 VOID\r
 InstallVirtualAddressChangeHandler (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  EFI_EVENT  VirtualAddressChangeEvent;\r
+  EFI_STATUS  Status;\r
+  EFI_EVENT   VirtualAddressChangeEvent;\r
 \r
   Status = gBS->CreateEventEx (\r
                   EVT_NOTIFY_SIGNAL,\r
@@ -154,12 +156,12 @@ InstallVirtualAddressChangeHandler (
 \r
 EFI_STATUS\r
 MarkIoMemoryRangeForRuntimeAccess (\r
-  IN EFI_PHYSICAL_ADDRESS                BaseAddress,\r
-  IN UINTN                               Length\r
+  IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN                 Length\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR     GcdDescriptor;\r
+  EFI_STATUS                       Status;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  GcdDescriptor;\r
 \r
   //\r
   // Mark flash region as runtime memory\r
@@ -221,24 +223,24 @@ SetPcdFlashNvStorageBaseAddresses (
   VOID\r
   )\r
 {\r
-  RETURN_STATUS PcdStatus;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   //\r
   // Set several PCD values to point to flash\r
   //\r
   PcdStatus = PcdSet64S (\r
-    PcdFlashNvStorageVariableBase64,\r
-    (UINTN) PcdGet32 (PcdOvmfFlashNvStorageVariableBase)\r
-    );\r
+                PcdFlashNvStorageVariableBase64,\r
+                (UINTN)PcdGet32 (PcdOvmfFlashNvStorageVariableBase)\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
   PcdStatus = PcdSet32S (\r
-    PcdFlashNvStorageFtwWorkingBase,\r
-    PcdGet32 (PcdOvmfFlashNvStorageFtwWorkingBase)\r
-    );\r
+                PcdFlashNvStorageFtwWorkingBase,\r
+                PcdGet32 (PcdOvmfFlashNvStorageFtwWorkingBase)\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
   PcdStatus = PcdSet32S (\r
-    PcdFlashNvStorageFtwSpareBase,\r
-    PcdGet32 (PcdOvmfFlashNvStorageFtwSpareBase)\r
-    );\r
+                PcdFlashNvStorageFtwSpareBase,\r
+                PcdGet32 (PcdOvmfFlashNvStorageFtwSpareBase)\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 }\r
index 544f88e661a85d7d94a4e515bafa419c4a50467a..19bd5aab7c704dc8a21c12762eff10703978f423 100644 (file)
 \r
 VOID\r
 InstallProtocolInterfaces (\r
-  IN EFI_FW_VOL_BLOCK_DEVICE *FvbDevice\r
+  IN EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice\r
   )\r
 {\r
-  EFI_HANDLE FvbHandle;\r
-  EFI_STATUS Status;\r
+  EFI_HANDLE  FvbHandle;\r
+  EFI_STATUS  Status;\r
 \r
   ASSERT (FeaturePcdGet (PcdSmmSmramRequire));\r
 \r
@@ -64,8 +64,8 @@ InstallVirtualAddressChangeHandler (
 \r
 EFI_STATUS\r
 MarkIoMemoryRangeForRuntimeAccess (\r
-  IN EFI_PHYSICAL_ADDRESS                BaseAddress,\r
-  IN UINTN                               Length\r
+  IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN                 Length\r
   )\r
 {\r
   //\r
index d19997032ec9c6d1453f24e777ee3b66bbbac26c..54f859de9ff9b61457dee3e2af229198dbef1e54 100644 (file)
 \r
 #define CLEARED_ARRAY_STATUS  0x00\r
 \r
+UINT8  *mFlashBase;\r
 \r
-UINT8 *mFlashBase;\r
-\r
-STATIC UINTN       mFdBlockSize = 0;\r
-STATIC UINTN       mFdBlockCount = 0;\r
+STATIC UINTN  mFdBlockSize  = 0;\r
+STATIC UINTN  mFdBlockCount = 0;\r
 \r
 STATIC\r
-volatile UINT8*\r
+volatile UINT8 *\r
 QemuFlashPtr (\r
-  IN        EFI_LBA                             Lba,\r
-  IN        UINTN                               Offset\r
+  IN        EFI_LBA  Lba,\r
+  IN        UINTN    Offset\r
   )\r
 {\r
   return mFlashBase + ((UINTN)Lba * mFdBlockSize) + Offset;\r
 }\r
 \r
-\r
 /**\r
   Determines if the QEMU flash memory device is present.\r
 \r
@@ -54,22 +52,23 @@ QemuFlashDetected (
   VOID\r
   )\r
 {\r
-  BOOLEAN  FlashDetected;\r
+  BOOLEAN         FlashDetected;\r
   volatile UINT8  *Ptr;\r
 \r
-  UINTN Offset;\r
-  UINT8 OriginalUint8;\r
-  UINT8 ProbeUint8;\r
+  UINTN  Offset;\r
+  UINT8  OriginalUint8;\r
+  UINT8  ProbeUint8;\r
 \r
   FlashDetected = FALSE;\r
-  Ptr = QemuFlashPtr (0, 0);\r
+  Ptr           = QemuFlashPtr (0, 0);\r
 \r
   for (Offset = 0; Offset < mFdBlockSize; Offset++) {\r
-    Ptr = QemuFlashPtr (0, Offset);\r
+    Ptr        = QemuFlashPtr (0, Offset);\r
     ProbeUint8 = *Ptr;\r
-    if (ProbeUint8 != CLEAR_STATUS_CMD &&\r
-        ProbeUint8 != READ_STATUS_CMD &&\r
-        ProbeUint8 != CLEARED_ARRAY_STATUS) {\r
+    if ((ProbeUint8 != CLEAR_STATUS_CMD) &&\r
+        (ProbeUint8 != READ_STATUS_CMD) &&\r
+        (ProbeUint8 != CLEARED_ARRAY_STATUS))\r
+    {\r
       break;\r
     }\r
   }\r
@@ -91,20 +90,23 @@ QemuFlashDetected (
     // the FD appears as ROM and not as FLASH, but report FLASH anyway because\r
     // FLASH behavior can be simulated using VMGEXIT.\r
     //\r
-    DEBUG ((DEBUG_INFO,\r
-      "QEMU Flash: SEV-ES enabled, assuming FD behaves as FLASH\n"));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "QEMU Flash: SEV-ES enabled, assuming FD behaves as FLASH\n"\r
+      ));\r
     return TRUE;\r
   }\r
 \r
   OriginalUint8 = *Ptr;\r
-  *Ptr = CLEAR_STATUS_CMD;\r
-  ProbeUint8 = *Ptr;\r
-  if (OriginalUint8 != CLEAR_STATUS_CMD &&\r
-      ProbeUint8 == CLEAR_STATUS_CMD) {\r
+  *Ptr          = CLEAR_STATUS_CMD;\r
+  ProbeUint8    = *Ptr;\r
+  if ((OriginalUint8 != CLEAR_STATUS_CMD) &&\r
+      (ProbeUint8 == CLEAR_STATUS_CMD))\r
+  {\r
     DEBUG ((DEBUG_INFO, "QemuFlashDetected => FD behaves as RAM\n"));\r
     *Ptr = OriginalUint8;\r
   } else {\r
-    *Ptr = READ_STATUS_CMD;\r
+    *Ptr       = READ_STATUS_CMD;\r
     ProbeUint8 = *Ptr;\r
     if (ProbeUint8 == OriginalUint8) {\r
       DEBUG ((DEBUG_INFO, "QemuFlashDetected => FD behaves as ROM\n"));\r
@@ -114,16 +116,18 @@ QemuFlashDetected (
     } else if (ProbeUint8 == CLEARED_ARRAY_STATUS) {\r
       DEBUG ((DEBUG_INFO, "QemuFlashDetected => FD behaves as FLASH\n"));\r
       FlashDetected = TRUE;\r
-      *Ptr = READ_ARRAY_CMD;\r
+      *Ptr          = READ_ARRAY_CMD;\r
     }\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO, "QemuFlashDetected => %a\n",\r
-                      FlashDetected ? "Yes" : "No"));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "QemuFlashDetected => %a\n",\r
+    FlashDetected ? "Yes" : "No"\r
+    ));\r
   return FlashDetected;\r
 }\r
 \r
-\r
 /**\r
   Read from QEMU Flash\r
 \r
@@ -136,10 +140,10 @@ QemuFlashDetected (
 **/\r
 EFI_STATUS\r
 QemuFlashRead (\r
-  IN        EFI_LBA                              Lba,\r
-  IN        UINTN                                Offset,\r
-  IN        UINTN                                *NumBytes,\r
-  IN        UINT8                                *Buffer\r
+  IN        EFI_LBA  Lba,\r
+  IN        UINTN    Offset,\r
+  IN        UINTN    *NumBytes,\r
+  IN        UINT8    *Buffer\r
   )\r
 {\r
   UINT8  *Ptr;\r
@@ -155,14 +159,13 @@ QemuFlashRead (
   //\r
   // Get flash address\r
   //\r
-  Ptr = (UINT8*) QemuFlashPtr (Lba, Offset);\r
+  Ptr = (UINT8 *)QemuFlashPtr (Lba, Offset);\r
 \r
   CopyMem (Buffer, Ptr, *NumBytes);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Write to QEMU Flash\r
 \r
@@ -175,10 +178,10 @@ QemuFlashRead (
 **/\r
 EFI_STATUS\r
 QemuFlashWrite (\r
-  IN        EFI_LBA                             Lba,\r
-  IN        UINTN                               Offset,\r
-  IN        UINTN                               *NumBytes,\r
-  IN        UINT8                               *Buffer\r
+  IN        EFI_LBA  Lba,\r
+  IN        UINTN    Offset,\r
+  IN        UINTN    *NumBytes,\r
+  IN        UINT8    *Buffer\r
   )\r
 {\r
   volatile UINT8  *Ptr;\r
@@ -213,7 +216,6 @@ QemuFlashWrite (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Erase a QEMU Flash block\r
 \r
@@ -222,7 +224,7 @@ QemuFlashWrite (
 **/\r
 EFI_STATUS\r
 QemuFlashEraseBlock (\r
-  IN   EFI_LBA      Lba\r
+  IN   EFI_LBA  Lba\r
   )\r
 {\r
   volatile UINT8  *Ptr;\r
@@ -237,7 +239,6 @@ QemuFlashEraseBlock (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Initializes QEMU flash memory support\r
 \r
@@ -250,16 +251,16 @@ QemuFlashInitialize (
   VOID\r
   )\r
 {\r
-  mFlashBase = (UINT8*)(UINTN) PcdGet32 (PcdOvmfFdBaseAddress);\r
+  mFlashBase   = (UINT8 *)(UINTN)PcdGet32 (PcdOvmfFdBaseAddress);\r
   mFdBlockSize = PcdGet32 (PcdOvmfFirmwareBlockSize);\r
-  ASSERT(PcdGet32 (PcdOvmfFirmwareFdSize) % mFdBlockSize == 0);\r
+  ASSERT (PcdGet32 (PcdOvmfFirmwareFdSize) % mFdBlockSize == 0);\r
   mFdBlockCount = PcdGet32 (PcdOvmfFirmwareFdSize) / mFdBlockSize;\r
 \r
   //\r
   // execute module specific hooks before probing the flash\r
   //\r
   QemuFlashBeforeProbe (\r
-    (EFI_PHYSICAL_ADDRESS)(UINTN) mFlashBase,\r
+    (EFI_PHYSICAL_ADDRESS)(UINTN)mFlashBase,\r
     mFdBlockSize,\r
     mFdBlockCount\r
     );\r
@@ -271,4 +272,3 @@ QemuFlashInitialize (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index 219d0d6e83cfdf0848b788f64695c9a6d8539ac5..ea895157da899409254805cd03c770ef6f1603ef 100644 (file)
@@ -12,7 +12,7 @@
 \r
 #include <Protocol/FirmwareVolumeBlock.h>\r
 \r
-extern UINT8 *mFlashBase;\r
+extern UINT8  *mFlashBase;\r
 \r
 /**\r
   Read from QEMU Flash\r
@@ -26,13 +26,12 @@ extern UINT8 *mFlashBase;
 **/\r
 EFI_STATUS\r
 QemuFlashRead (\r
-  IN        EFI_LBA                              Lba,\r
-  IN        UINTN                                Offset,\r
-  IN        UINTN                                *NumBytes,\r
-  IN        UINT8                                *Buffer\r
+  IN        EFI_LBA  Lba,\r
+  IN        UINTN    Offset,\r
+  IN        UINTN    *NumBytes,\r
+  IN        UINT8    *Buffer\r
   );\r
 \r
-\r
 /**\r
   Write to QEMU Flash\r
 \r
@@ -45,13 +44,12 @@ QemuFlashRead (
 **/\r
 EFI_STATUS\r
 QemuFlashWrite (\r
-  IN        EFI_LBA                              Lba,\r
-  IN        UINTN                                Offset,\r
-  IN        UINTN                                *NumBytes,\r
-  IN        UINT8                                *Buffer\r
+  IN        EFI_LBA  Lba,\r
+  IN        UINTN    Offset,\r
+  IN        UINTN    *NumBytes,\r
+  IN        UINT8    *Buffer\r
   );\r
 \r
-\r
 /**\r
   Erase a QEMU Flash block\r
 \r
@@ -60,10 +58,9 @@ QemuFlashWrite (
 **/\r
 EFI_STATUS\r
 QemuFlashEraseBlock (\r
-  IN   EFI_LBA      Lba\r
+  IN   EFI_LBA  Lba\r
   );\r
 \r
-\r
 /**\r
   Initializes QEMU flash memory support\r
 \r
@@ -76,7 +73,6 @@ QemuFlashInitialize (
   VOID\r
   );\r
 \r
-\r
 VOID\r
 QemuFlashConvertPointers (\r
   VOID\r
@@ -84,9 +80,9 @@ QemuFlashConvertPointers (
 \r
 VOID\r
 QemuFlashBeforeProbe (\r
-  IN  EFI_PHYSICAL_ADDRESS    BaseAddress,\r
-  IN  UINTN                   FdBlockSize,\r
-  IN  UINTN                   FdBlockCount\r
+  IN  EFI_PHYSICAL_ADDRESS  BaseAddress,\r
+  IN  UINTN                 FdBlockSize,\r
+  IN  UINTN                 FdBlockCount\r
   );\r
 \r
 /**\r
@@ -98,9 +94,8 @@ QemuFlashBeforeProbe (
 **/\r
 VOID\r
 QemuFlashPtrWrite (\r
-  IN        volatile UINT8    *Ptr,\r
-  IN        UINT8             Value\r
+  IN        volatile UINT8  *Ptr,\r
+  IN        UINT8           Value\r
   );\r
 \r
 #endif\r
-\r
index 63daa0b55b4955fb47bfb8a27d3b9f10326bcfa9..9e074c29bb2bd2f3ae729904ee5ca56c4b336a61 100644 (file)
@@ -16,7 +16,7 @@
 \r
 #include "QemuFlash.h"\r
 \r
-STATIC EFI_PHYSICAL_ADDRESS mSevEsFlashPhysBase;\r
+STATIC EFI_PHYSICAL_ADDRESS  mSevEsFlashPhysBase;\r
 \r
 VOID\r
 QemuFlashConvertPointers (\r
@@ -24,17 +24,17 @@ QemuFlashConvertPointers (
   )\r
 {\r
   if (MemEncryptSevEsIsEnabled ()) {\r
-    mSevEsFlashPhysBase = (UINTN) mFlashBase;\r
+    mSevEsFlashPhysBase = (UINTN)mFlashBase;\r
   }\r
 \r
-  EfiConvertPointer (0x0, (VOID **) &mFlashBase);\r
+  EfiConvertPointer (0x0, (VOID **)&mFlashBase);\r
 }\r
 \r
 VOID\r
 QemuFlashBeforeProbe (\r
-  IN  EFI_PHYSICAL_ADDRESS    BaseAddress,\r
-  IN  UINTN                   FdBlockSize,\r
-  IN  UINTN                   FdBlockCount\r
+  IN  EFI_PHYSICAL_ADDRESS  BaseAddress,\r
+  IN  UINTN                 FdBlockSize,\r
+  IN  UINTN                 FdBlockCount\r
   )\r
 {\r
   //\r
@@ -51,8 +51,8 @@ QemuFlashBeforeProbe (
 **/\r
 VOID\r
 QemuFlashPtrWrite (\r
-  IN        volatile UINT8    *Ptr,\r
-  IN        UINT8             Value\r
+  IN        volatile UINT8  *Ptr,\r
+  IN        UINT8           Value\r
   )\r
 {\r
   if (MemEncryptSevEsIsEnabled ()) {\r
@@ -62,7 +62,7 @@ QemuFlashPtrWrite (
     BOOLEAN                   InterruptState;\r
 \r
     Msr.GhcbPhysicalAddress = AsmReadMsr64 (MSR_SEV_ES_GHCB);\r
-    Ghcb = Msr.Ghcb;\r
+    Ghcb                    = Msr.Ghcb;\r
 \r
     //\r
     // The MMIO write needs to be to the physical address of the flash pointer.\r
@@ -70,7 +70,7 @@ QemuFlashPtrWrite (
     // account for a non-identity mapped VA after SetVirtualAddressMap().\r
     //\r
     if (mSevEsFlashPhysBase == 0) {\r
-      PhysAddr = (UINTN) Ptr;\r
+      PhysAddr = (UINTN)Ptr;\r
     } else {\r
       PhysAddr = mSevEsFlashPhysBase + (Ptr - mFlashBase);\r
     }\r
@@ -83,8 +83,8 @@ QemuFlashPtrWrite (
     // to perform the update.\r
     //\r
     VmgInit (Ghcb, &InterruptState);\r
-    Ghcb->SharedBuffer[0] = Value;\r
-    Ghcb->SaveArea.SwScratch = (UINT64) (UINTN) Ghcb->SharedBuffer;\r
+    Ghcb->SharedBuffer[0]    = Value;\r
+    Ghcb->SaveArea.SwScratch = (UINT64)(UINTN)Ghcb->SharedBuffer;\r
     VmgSetOffsetValid (Ghcb, GhcbSwScratch);\r
     VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, PhysAddr, 1);\r
     VmgDone (Ghcb, InterruptState);\r
index ea75b489c7fd403af366c1be3004efd8cdea584f..bfaabdb5de3cf52b0e1bc7a12d6ebea7217369d4 100644 (file)
 \r
 VOID\r
 QemuFlashBeforeProbe (\r
-  IN  EFI_PHYSICAL_ADDRESS    BaseAddress,\r
-  IN  UINTN                   FdBlockSize,\r
-  IN  UINTN                   FdBlockCount\r
+  IN  EFI_PHYSICAL_ADDRESS  BaseAddress,\r
+  IN  UINTN                 FdBlockSize,\r
+  IN  UINTN                 FdBlockCount\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
+  EFI_STATUS  Status;\r
 \r
   ASSERT (FeaturePcdGet (PcdSmmSmramRequire));\r
 \r
@@ -55,8 +55,8 @@ QemuFlashBeforeProbe (
 **/\r
 VOID\r
 QemuFlashPtrWrite (\r
-  IN        volatile UINT8    *Ptr,\r
-  IN        UINT8             Value\r
+  IN        volatile UINT8  *Ptr,\r
+  IN        UINT8           Value\r
   )\r
 {\r
   *Ptr = Value;\r
index 6832d563bcb0f3c5806352d4fafecb534284c44f..d4f3cd92255ffcfa0dc26c371bd00c44af260530 100644 (file)
@@ -39,29 +39,29 @@ typedef enum {
 } KERNEL_BLOB_TYPE;\r
 \r
 typedef struct {\r
-  CONST CHAR16                  Name[8];\r
+  CONST CHAR16    Name[8];\r
   struct {\r
-    FIRMWARE_CONFIG_ITEM CONST  SizeKey;\r
-    FIRMWARE_CONFIG_ITEM CONST  DataKey;\r
-    UINT32                      Size;\r
+    FIRMWARE_CONFIG_ITEM CONST    SizeKey;\r
+    FIRMWARE_CONFIG_ITEM CONST    DataKey;\r
+    UINT32                        Size;\r
   }                             FwCfgItem[2];\r
-  UINT32                        Size;\r
-  UINT8                         *Data;\r
+  UINT32          Size;\r
+  UINT8           *Data;\r
 } KERNEL_BLOB;\r
 \r
-STATIC KERNEL_BLOB mKernelBlob[KernelBlobTypeMax] = {\r
+STATIC KERNEL_BLOB  mKernelBlob[KernelBlobTypeMax] = {\r
   {\r
     L"kernel",\r
     {\r
       { QemuFwCfgItemKernelSetupSize, QemuFwCfgItemKernelSetupData, },\r
       { QemuFwCfgItemKernelSize,      QemuFwCfgItemKernelData,      },\r
     }\r
-  }, {\r
+  },  {\r
     L"initrd",\r
     {\r
       { QemuFwCfgItemInitrdSize,      QemuFwCfgItemInitrdData,      },\r
     }\r
-  }, {\r
+  },  {\r
     L"cmdline",\r
     {\r
       { QemuFwCfgItemCommandLineSize, QemuFwCfgItemCommandLineData, },\r
@@ -69,39 +69,39 @@ STATIC KERNEL_BLOB mKernelBlob[KernelBlobTypeMax] = {
   }\r
 };\r
 \r
-STATIC UINT64 mTotalBlobBytes;\r
+STATIC UINT64  mTotalBlobBytes;\r
 \r
 //\r
 // Device path for the handle that incorporates our "EFI stub filesystem".\r
 //\r
 #pragma pack (1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH       VenMediaNode;\r
-  EFI_DEVICE_PATH_PROTOCOL EndNode;\r
+  VENDOR_DEVICE_PATH          VenMediaNode;\r
+  EFI_DEVICE_PATH_PROTOCOL    EndNode;\r
 } SINGLE_VENMEDIA_NODE_DEVPATH;\r
 #pragma pack ()\r
 \r
-STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mFileSystemDevicePath = {\r
+STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH  mFileSystemDevicePath = {\r
   {\r
     {\r
       MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP,\r
-      { sizeof (VENDOR_DEVICE_PATH) }\r
+      { sizeof (VENDOR_DEVICE_PATH)       }\r
     },\r
     QEMU_KERNEL_LOADER_FS_MEDIA_GUID\r
-  }, {\r
+  },  {\r
     END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     { sizeof (EFI_DEVICE_PATH_PROTOCOL) }\r
   }\r
 };\r
 \r
-STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mInitrdDevicePath = {\r
+STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH  mInitrdDevicePath = {\r
   {\r
     {\r
       MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP,\r
-      { sizeof (VENDOR_DEVICE_PATH) }\r
+      { sizeof (VENDOR_DEVICE_PATH)       }\r
     },\r
     LINUX_EFI_INITRD_MEDIA_GUID\r
-  }, {\r
+  },  {\r
     END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     { sizeof (EFI_DEVICE_PATH_PROTOCOL) }\r
   }\r
@@ -110,21 +110,21 @@ STATIC CONST SINGLE_VENMEDIA_NODE_DEVPATH mInitrdDevicePath = {
 //\r
 // The "file in the EFI stub filesystem" abstraction.\r
 //\r
-STATIC EFI_TIME mInitTime;\r
+STATIC EFI_TIME  mInitTime;\r
 \r
-#define STUB_FILE_SIG SIGNATURE_64 ('S', 'T', 'U', 'B', 'F', 'I', 'L', 'E')\r
+#define STUB_FILE_SIG  SIGNATURE_64 ('S', 'T', 'U', 'B', 'F', 'I', 'L', 'E')\r
 \r
 typedef struct {\r
-  UINT64            Signature; // Carries STUB_FILE_SIG.\r
+  UINT64               Signature; // Carries STUB_FILE_SIG.\r
 \r
-  KERNEL_BLOB_TYPE  BlobType;  // Index into mKernelBlob. KernelBlobTypeMax\r
-                               // denotes the root directory of the filesystem.\r
+  KERNEL_BLOB_TYPE     BlobType; // Index into mKernelBlob. KernelBlobTypeMax\r
+                                 // denotes the root directory of the filesystem.\r
 \r
-  UINT64            Position;  // Byte position for regular files;\r
-                               // next directory entry to return for the root\r
-                               // directory.\r
+  UINT64               Position; // Byte position for regular files;\r
+                                 // next directory entry to return for the root\r
+                                 // directory.\r
 \r
-  EFI_FILE_PROTOCOL File;      // Standard protocol interface.\r
+  EFI_FILE_PROTOCOL    File;   // Standard protocol interface.\r
 } STUB_FILE;\r
 \r
 #define STUB_FILE_FROM_FILE(FilePointer) \\r
@@ -178,11 +178,11 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileOpen (\r
-  IN EFI_FILE_PROTOCOL  *This,\r
-  OUT EFI_FILE_PROTOCOL **NewHandle,\r
-  IN CHAR16             *FileName,\r
-  IN UINT64             OpenMode,\r
-  IN UINT64             Attributes\r
+  IN EFI_FILE_PROTOCOL   *This,\r
+  OUT EFI_FILE_PROTOCOL  **NewHandle,\r
+  IN CHAR16              *FileName,\r
+  IN UINT64              OpenMode,\r
+  IN UINT64              Attributes\r
   );\r
 \r
 /**\r
@@ -197,14 +197,13 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileClose (\r
-  IN EFI_FILE_PROTOCOL *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 {\r
   FreePool (STUB_FILE_FROM_FILE (This));\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Close and delete the file handle.\r
 \r
@@ -221,14 +220,13 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileDelete (\r
-  IN EFI_FILE_PROTOCOL *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 {\r
   FreePool (STUB_FILE_FROM_FILE (This));\r
   return EFI_WARN_DELETE_FAILURE;\r
 }\r
 \r
-\r
 /**\r
   Helper function that formats an EFI_FILE_INFO structure into the\r
   user-allocated buffer, for any valid KERNEL_BLOB_TYPE value (including\r
@@ -260,19 +258,19 @@ StubFileDelete (
 STATIC\r
 EFI_STATUS\r
 ConvertKernelBlobTypeToFileInfo (\r
-  IN KERNEL_BLOB_TYPE BlobType,\r
-  IN OUT UINTN        *BufferSize,\r
-  OUT VOID            *Buffer\r
+  IN KERNEL_BLOB_TYPE  BlobType,\r
+  IN OUT UINTN         *BufferSize,\r
+  OUT VOID             *Buffer\r
   )\r
 {\r
   CONST CHAR16  *Name;\r
   UINT64        FileSize;\r
   UINT64        Attribute;\r
 \r
-  UINTN         NameSize;\r
-  UINTN         FileInfoSize;\r
-  EFI_FILE_INFO *FileInfo;\r
-  UINTN         OriginalBufferSize;\r
+  UINTN          NameSize;\r
+  UINTN          FileInfoSize;\r
+  EFI_FILE_INFO  *FileInfo;\r
+  UINTN          OriginalBufferSize;\r
 \r
   if (BlobType == KernelBlobTypeMax) {\r
     //\r
@@ -282,7 +280,7 @@ ConvertKernelBlobTypeToFileInfo (
     FileSize  = KernelBlobTypeMax;\r
     Attribute = EFI_FILE_READ_ONLY | EFI_FILE_DIRECTORY;\r
   } else {\r
-    CONST KERNEL_BLOB *Blob;\r
+    CONST KERNEL_BLOB  *Blob;\r
 \r
     Blob      = &mKernelBlob[BlobType];\r
     Name      = Blob->Name;\r
@@ -290,7 +288,7 @@ ConvertKernelBlobTypeToFileInfo (
     Attribute = EFI_FILE_READ_ONLY;\r
   }\r
 \r
-  NameSize     = (StrLen(Name) + 1) * 2;\r
+  NameSize     = (StrLen (Name) + 1) * 2;\r
   FileInfoSize = OFFSET_OF (EFI_FILE_INFO, FileName) + NameSize;\r
   ASSERT (FileInfoSize >= sizeof *FileInfo);\r
 \r
@@ -306,15 +304,14 @@ ConvertKernelBlobTypeToFileInfo (
   FileInfo->PhysicalSize = FileSize;\r
   FileInfo->Attribute    = Attribute;\r
 \r
-  CopyMem (&FileInfo->CreateTime,       &mInitTime, sizeof mInitTime);\r
-  CopyMem (&FileInfo->LastAccessTime,   &mInitTime, sizeof mInitTime);\r
+  CopyMem (&FileInfo->CreateTime, &mInitTime, sizeof mInitTime);\r
+  CopyMem (&FileInfo->LastAccessTime, &mInitTime, sizeof mInitTime);\r
   CopyMem (&FileInfo->ModificationTime, &mInitTime, sizeof mInitTime);\r
-  CopyMem (FileInfo->FileName,          Name,       NameSize);\r
+  CopyMem (FileInfo->FileName, Name, NameSize);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Reads data from a file, or continues scanning a directory.\r
 \r
@@ -353,14 +350,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileRead (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN OUT UINTN         *BufferSize,\r
-  OUT VOID             *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN          *BufferSize,\r
+  OUT VOID              *Buffer\r
   )\r
 {\r
-  STUB_FILE         *StubFile;\r
-  CONST KERNEL_BLOB *Blob;\r
-  UINT64            Left;\r
+  STUB_FILE          *StubFile;\r
+  CONST KERNEL_BLOB  *Blob;\r
+  UINT64             Left;\r
 \r
   StubFile = STUB_FILE_FROM_FILE (This);\r
 \r
@@ -368,7 +365,7 @@ StubFileRead (
   // Scanning the root directory?\r
   //\r
   if (StubFile->BlobType == KernelBlobTypeMax) {\r
-    EFI_STATUS Status;\r
+    EFI_STATUS  Status;\r
 \r
     if (StubFile->Position == KernelBlobTypeMax) {\r
       //\r
@@ -381,7 +378,8 @@ StubFileRead (
     Status = ConvertKernelBlobTypeToFileInfo (\r
                (KERNEL_BLOB_TYPE)StubFile->Position,\r
                BufferSize,\r
-               Buffer);\r
+               Buffer\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -402,14 +400,15 @@ StubFileRead (
   if (*BufferSize > Left) {\r
     *BufferSize = (UINTN)Left;\r
   }\r
+\r
   if (Blob->Data != NULL) {\r
     CopyMem (Buffer, Blob->Data + StubFile->Position, *BufferSize);\r
   }\r
+\r
   StubFile->Position += *BufferSize;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Writes data to a file.\r
 \r
@@ -437,12 +436,12 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileWrite (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN OUT UINTN         *BufferSize,\r
-  IN VOID              *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN          *BufferSize,\r
+  IN VOID               *Buffer\r
   )\r
 {\r
-  STUB_FILE *StubFile;\r
+  STUB_FILE  *StubFile;\r
 \r
   StubFile = STUB_FILE_FROM_FILE (This);\r
   return (StubFile->BlobType == KernelBlobTypeMax) ?\r
@@ -450,7 +449,6 @@ StubFileWrite (
          EFI_WRITE_PROTECTED;\r
 }\r
 \r
-\r
 /**\r
   Returns a file's current position.\r
 \r
@@ -469,11 +467,11 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileGetPosition (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  OUT UINT64           *Position\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  OUT UINT64            *Position\r
   )\r
 {\r
-  STUB_FILE *StubFile;\r
+  STUB_FILE  *StubFile;\r
 \r
   StubFile = STUB_FILE_FROM_FILE (This);\r
   if (StubFile->BlobType == KernelBlobTypeMax) {\r
@@ -484,7 +482,6 @@ StubFileGetPosition (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Sets a file's current position.\r
 \r
@@ -505,12 +502,12 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileSetPosition (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN UINT64            Position\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINT64             Position\r
   )\r
 {\r
-  STUB_FILE   *StubFile;\r
-  KERNEL_BLOB *Blob;\r
+  STUB_FILE    *StubFile;\r
+  KERNEL_BLOB  *Blob;\r
 \r
   StubFile = STUB_FILE_FROM_FILE (This);\r
 \r
@@ -522,6 +519,7 @@ StubFileSetPosition (
       StubFile->Position = 0;\r
       return EFI_SUCCESS;\r
     }\r
+\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -540,10 +538,10 @@ StubFileSetPosition (
     //\r
     StubFile->Position = Position;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Returns information about a file.\r
 \r
@@ -586,26 +584,29 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileGetInfo (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN EFI_GUID          *InformationType,\r
-  IN OUT UINTN         *BufferSize,\r
-  OUT VOID             *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN EFI_GUID           *InformationType,\r
+  IN OUT UINTN          *BufferSize,\r
+  OUT VOID              *Buffer\r
   )\r
 {\r
-  CONST STUB_FILE *StubFile;\r
-  UINTN           OriginalBufferSize;\r
+  CONST STUB_FILE  *StubFile;\r
+  UINTN            OriginalBufferSize;\r
 \r
   StubFile = STUB_FILE_FROM_FILE (This);\r
 \r
   if (CompareGuid (InformationType, &gEfiFileInfoGuid)) {\r
-    return ConvertKernelBlobTypeToFileInfo (StubFile->BlobType, BufferSize,\r
-             Buffer);\r
+    return ConvertKernelBlobTypeToFileInfo (\r
+             StubFile->BlobType,\r
+             BufferSize,\r
+             Buffer\r
+             );\r
   }\r
 \r
   OriginalBufferSize = *BufferSize;\r
 \r
   if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid)) {\r
-    EFI_FILE_SYSTEM_INFO *FileSystemInfo;\r
+    EFI_FILE_SYSTEM_INFO  *FileSystemInfo;\r
 \r
     *BufferSize = sizeof *FileSystemInfo;\r
     if (OriginalBufferSize < *BufferSize) {\r
@@ -624,14 +625,14 @@ StubFileGetInfo (
   }\r
 \r
   if (CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
-    EFI_FILE_SYSTEM_VOLUME_LABEL *FileSystemVolumeLabel;\r
+    EFI_FILE_SYSTEM_VOLUME_LABEL  *FileSystemVolumeLabel;\r
 \r
     *BufferSize = sizeof *FileSystemVolumeLabel;\r
     if (OriginalBufferSize < *BufferSize) {\r
       return EFI_BUFFER_TOO_SMALL;\r
     }\r
 \r
-    FileSystemVolumeLabel = (EFI_FILE_SYSTEM_VOLUME_LABEL *)Buffer;\r
+    FileSystemVolumeLabel                 = (EFI_FILE_SYSTEM_VOLUME_LABEL *)Buffer;\r
     FileSystemVolumeLabel->VolumeLabel[0] = L'\0';\r
 \r
     return EFI_SUCCESS;\r
@@ -640,7 +641,6 @@ StubFileGetInfo (
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Sets information about a file.\r
 \r
@@ -686,16 +686,15 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileSetInfo (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN EFI_GUID          *InformationType,\r
-  IN UINTN             BufferSize,\r
-  IN VOID              *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN EFI_GUID           *InformationType,\r
+  IN UINTN              BufferSize,\r
+  IN VOID               *Buffer\r
   )\r
 {\r
   return EFI_WRITE_PROTECTED;\r
 }\r
 \r
-\r
 /**\r
   Flushes all modified data associated with a file to a device.\r
 \r
@@ -714,7 +713,7 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileFlush (\r
-  IN EFI_FILE_PROTOCOL *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 {\r
   return EFI_WRITE_PROTECTED;\r
@@ -723,7 +722,7 @@ StubFileFlush (
 //\r
 // External definition of the file protocol template.\r
 //\r
-STATIC CONST EFI_FILE_PROTOCOL mEfiFileProtocolTemplate = {\r
+STATIC CONST EFI_FILE_PROTOCOL  mEfiFileProtocolTemplate = {\r
   EFI_FILE_PROTOCOL_REVISION, // revision 1\r
   StubFileOpen,\r
   StubFileClose,\r
@@ -745,16 +744,16 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileOpen (\r
-  IN EFI_FILE_PROTOCOL  *This,\r
-  OUT EFI_FILE_PROTOCOL **NewHandle,\r
-  IN CHAR16             *FileName,\r
-  IN UINT64             OpenMode,\r
-  IN UINT64             Attributes\r
+  IN EFI_FILE_PROTOCOL   *This,\r
+  OUT EFI_FILE_PROTOCOL  **NewHandle,\r
+  IN CHAR16              *FileName,\r
+  IN UINT64              OpenMode,\r
+  IN UINT64              Attributes\r
   )\r
 {\r
-  CONST STUB_FILE *StubFile;\r
-  UINTN           BlobType;\r
-  STUB_FILE       *NewStubFile;\r
+  CONST STUB_FILE  *StubFile;\r
+  UINTN            BlobType;\r
+  STUB_FILE        *NewStubFile;\r
 \r
   //\r
   // We're read-only.\r
@@ -787,6 +786,7 @@ StubFileOpen (
       break;\r
     }\r
   }\r
+\r
   if (BlobType == KernelBlobTypeMax) {\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -802,14 +802,16 @@ StubFileOpen (
   NewStubFile->Signature = STUB_FILE_SIG;\r
   NewStubFile->BlobType  = (KERNEL_BLOB_TYPE)BlobType;\r
   NewStubFile->Position  = 0;\r
-  CopyMem (&NewStubFile->File, &mEfiFileProtocolTemplate,\r
-    sizeof mEfiFileProtocolTemplate);\r
+  CopyMem (\r
+    &NewStubFile->File,\r
+    &mEfiFileProtocolTemplate,\r
+    sizeof mEfiFileProtocolTemplate\r
+    );\r
   *NewHandle = &NewStubFile->File;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 //\r
 // Protocol member functions for SimpleFileSystem.\r
 //\r
@@ -841,11 +843,11 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 StubFileSystemOpenVolume (\r
-  IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
-  OUT EFI_FILE_PROTOCOL              **Root\r
+  IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *This,\r
+  OUT EFI_FILE_PROTOCOL               **Root\r
   )\r
 {\r
-  STUB_FILE *StubFile;\r
+  STUB_FILE  *StubFile;\r
 \r
   StubFile = AllocatePool (sizeof *StubFile);\r
   if (StubFile == NULL) {\r
@@ -855,14 +857,17 @@ StubFileSystemOpenVolume (
   StubFile->Signature = STUB_FILE_SIG;\r
   StubFile->BlobType  = KernelBlobTypeMax;\r
   StubFile->Position  = 0;\r
-  CopyMem (&StubFile->File, &mEfiFileProtocolTemplate,\r
-    sizeof mEfiFileProtocolTemplate);\r
+  CopyMem (\r
+    &StubFile->File,\r
+    &mEfiFileProtocolTemplate,\r
+    sizeof mEfiFileProtocolTemplate\r
+    );\r
   *Root = &StubFile->File;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC CONST EFI_SIMPLE_FILE_SYSTEM_PROTOCOL mFileSystem = {\r
+STATIC CONST EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  mFileSystem = {\r
   EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION,\r
   StubFileSystemOpenVolume\r
 };\r
@@ -871,14 +876,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 InitrdLoadFile2 (\r
-  IN      EFI_LOAD_FILE2_PROTOCOL       *This,\r
-  IN      EFI_DEVICE_PATH_PROTOCOL      *FilePath,\r
-  IN      BOOLEAN                       BootPolicy,\r
-  IN  OUT UINTN                         *BufferSize,\r
-  OUT     VOID                          *Buffer     OPTIONAL\r
+  IN      EFI_LOAD_FILE2_PROTOCOL   *This,\r
+  IN      EFI_DEVICE_PATH_PROTOCOL  *FilePath,\r
+  IN      BOOLEAN                   BootPolicy,\r
+  IN  OUT UINTN                     *BufferSize,\r
+  OUT     VOID                      *Buffer     OPTIONAL\r
   )\r
 {\r
-  CONST KERNEL_BLOB   *InitrdBlob = &mKernelBlob[KernelBlobTypeInitrd];\r
+  CONST KERNEL_BLOB  *InitrdBlob = &mKernelBlob[KernelBlobTypeInitrd];\r
 \r
   ASSERT (InitrdBlob->Size > 0);\r
 \r
@@ -886,16 +891,17 @@ InitrdLoadFile2 (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  if (BufferSize == NULL || !IsDevicePathValid (FilePath, 0)) {\r
+  if ((BufferSize == NULL) || !IsDevicePathValid (FilePath, 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (FilePath->Type != END_DEVICE_PATH_TYPE ||\r
-      FilePath->SubType != END_ENTIRE_DEVICE_PATH_SUBTYPE) {\r
+  if ((FilePath->Type != END_DEVICE_PATH_TYPE) ||\r
+      (FilePath->SubType != END_ENTIRE_DEVICE_PATH_SUBTYPE))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  if (Buffer == NULL || *BufferSize < InitrdBlob->Size) {\r
+  if ((Buffer == NULL) || (*BufferSize < InitrdBlob->Size)) {\r
     *BufferSize = InitrdBlob->Size;\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
@@ -906,7 +912,7 @@ InitrdLoadFile2 (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC CONST EFI_LOAD_FILE2_PROTOCOL     mInitrdLoadFile2 = {\r
+STATIC CONST EFI_LOAD_FILE2_PROTOCOL  mInitrdLoadFile2 = {\r
   InitrdLoadFile2,\r
 };\r
 \r
@@ -929,12 +935,12 @@ STATIC CONST EFI_LOAD_FILE2_PROTOCOL     mInitrdLoadFile2 = {
 STATIC\r
 EFI_STATUS\r
 FetchBlob (\r
-  IN OUT KERNEL_BLOB *Blob\r
+  IN OUT KERNEL_BLOB  *Blob\r
   )\r
 {\r
-  UINT32 Left;\r
-  UINTN  Idx;\r
-  UINT8  *ChunkData;\r
+  UINT32  Left;\r
+  UINTN   Idx;\r
+  UINT8   *ChunkData;\r
 \r
   //\r
   // Read blob size.\r
@@ -944,10 +950,12 @@ FetchBlob (
     if (Blob->FwCfgItem[Idx].SizeKey == 0) {\r
       break;\r
     }\r
+\r
     QemuFwCfgSelectItem (Blob->FwCfgItem[Idx].SizeKey);\r
     Blob->FwCfgItem[Idx].Size = QemuFwCfgRead32 ();\r
-    Blob->Size += Blob->FwCfgItem[Idx].Size;\r
+    Blob->Size               += Blob->FwCfgItem[Idx].Size;\r
   }\r
+\r
   if (Blob->Size == 0) {\r
     return EFI_SUCCESS;\r
   }\r
@@ -957,30 +965,47 @@ FetchBlob (
   //\r
   Blob->Data = AllocatePool (Blob->Size);\r
   if (Blob->Data == NULL) {\r
-    DEBUG ((DEBUG_ERROR, "%a: failed to allocate %Ld bytes for \"%s\"\n",\r
-      __FUNCTION__, (INT64)Blob->Size, Blob->Name));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: failed to allocate %Ld bytes for \"%s\"\n",\r
+      __FUNCTION__,\r
+      (INT64)Blob->Size,\r
+      Blob->Name\r
+      ));\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO, "%a: loading %Ld bytes for \"%s\"\n", __FUNCTION__,\r
-    (INT64)Blob->Size, Blob->Name));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: loading %Ld bytes for \"%s\"\n",\r
+    __FUNCTION__,\r
+    (INT64)Blob->Size,\r
+    Blob->Name\r
+    ));\r
 \r
   ChunkData = Blob->Data;\r
   for (Idx = 0; Idx < ARRAY_SIZE (Blob->FwCfgItem); Idx++) {\r
     if (Blob->FwCfgItem[Idx].DataKey == 0) {\r
       break;\r
     }\r
+\r
     QemuFwCfgSelectItem (Blob->FwCfgItem[Idx].DataKey);\r
 \r
     Left = Blob->FwCfgItem[Idx].Size;\r
     while (Left > 0) {\r
-      UINT32 Chunk;\r
+      UINT32  Chunk;\r
 \r
       Chunk = (Left < SIZE_1MB) ? Left : SIZE_1MB;\r
       QemuFwCfgReadBytes (Chunk, ChunkData + Blob->FwCfgItem[Idx].Size - Left);\r
       Left -= Chunk;\r
-      DEBUG ((DEBUG_VERBOSE, "%a: %Ld bytes remaining for \"%s\" (%d)\n",\r
-        __FUNCTION__, (INT64)Left, Blob->Name, (INT32)Idx));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "%a: %Ld bytes remaining for \"%s\" (%d)\n",\r
+        __FUNCTION__,\r
+        (INT64)Left,\r
+        Blob->Name,\r
+        (INT32)Idx\r
+        ));\r
     }\r
 \r
     ChunkData += Blob->FwCfgItem[Idx].Size;\r
@@ -989,7 +1014,6 @@ FetchBlob (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 //\r
 // The entry point of the feature.\r
 //\r
@@ -1010,16 +1034,16 @@ FetchBlob (
 EFI_STATUS\r
 EFIAPI\r
 QemuKernelLoaderFsDxeEntrypoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  UINTN                     BlobType;\r
-  KERNEL_BLOB               *CurrentBlob;\r
-  KERNEL_BLOB               *KernelBlob;\r
-  EFI_STATUS                Status;\r
-  EFI_HANDLE                FileSystemHandle;\r
-  EFI_HANDLE                InitrdLoadFile2Handle;\r
+  UINTN        BlobType;\r
+  KERNEL_BLOB  *CurrentBlob;\r
+  KERNEL_BLOB  *KernelBlob;\r
+  EFI_STATUS   Status;\r
+  EFI_HANDLE   FileSystemHandle;\r
+  EFI_HANDLE   InitrdLoadFile2Handle;\r
 \r
   if (!QemuFwCfgIsAvailable ()) {\r
     return EFI_NOT_FOUND;\r
@@ -1036,10 +1060,11 @@ QemuKernelLoaderFsDxeEntrypoint (
   //\r
   for (BlobType = 0; BlobType < KernelBlobTypeMax; ++BlobType) {\r
     CurrentBlob = &mKernelBlob[BlobType];\r
-    Status = FetchBlob (CurrentBlob);\r
+    Status      = FetchBlob (CurrentBlob);\r
     if (EFI_ERROR (Status)) {\r
       goto FreeBlobs;\r
     }\r
+\r
     Status = VerifyBlob (\r
                CurrentBlob->Name,\r
                CurrentBlob->Data,\r
@@ -1048,9 +1073,11 @@ QemuKernelLoaderFsDxeEntrypoint (
     if (EFI_ERROR (Status)) {\r
       goto FreeBlobs;\r
     }\r
+\r
     mTotalBlobBytes += CurrentBlob->Size;\r
   }\r
-  KernelBlob      = &mKernelBlob[KernelBlobTypeKernel];\r
+\r
+  KernelBlob = &mKernelBlob[KernelBlobTypeKernel];\r
 \r
   if (KernelBlob->Data == NULL) {\r
     Status = EFI_NOT_FOUND;\r
@@ -1062,25 +1089,41 @@ QemuKernelLoaderFsDxeEntrypoint (
   // it, plus a custom SimpleFileSystem protocol on it.\r
   //\r
   FileSystemHandle = NULL;\r
-  Status = gBS->InstallMultipleProtocolInterfaces (&FileSystemHandle,\r
-                  &gEfiDevicePathProtocolGuid,       &mFileSystemDevicePath,\r
-                  &gEfiSimpleFileSystemProtocolGuid, &mFileSystem,\r
-                  NULL);\r
+  Status           = gBS->InstallMultipleProtocolInterfaces (\r
+                            &FileSystemHandle,\r
+                            &gEfiDevicePathProtocolGuid,\r
+                            &mFileSystemDevicePath,\r
+                            &gEfiSimpleFileSystemProtocolGuid,\r
+                            &mFileSystem,\r
+                            NULL\r
+                            );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: InstallMultipleProtocolInterfaces(): %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: InstallMultipleProtocolInterfaces(): %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     goto FreeBlobs;\r
   }\r
 \r
   if (KernelBlob[KernelBlobTypeInitrd].Size > 0) {\r
     InitrdLoadFile2Handle = NULL;\r
-    Status = gBS->InstallMultipleProtocolInterfaces (&InitrdLoadFile2Handle,\r
-                    &gEfiDevicePathProtocolGuid,  &mInitrdDevicePath,\r
-                    &gEfiLoadFile2ProtocolGuid,   &mInitrdLoadFile2,\r
-                    NULL);\r
+    Status                = gBS->InstallMultipleProtocolInterfaces (\r
+                                   &InitrdLoadFile2Handle,\r
+                                   &gEfiDevicePathProtocolGuid,\r
+                                   &mInitrdDevicePath,\r
+                                   &gEfiLoadFile2ProtocolGuid,\r
+                                   &mInitrdLoadFile2,\r
+                                   NULL\r
+                                   );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: InstallMultipleProtocolInterfaces(): %r\n",\r
-        __FUNCTION__, Status));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: InstallMultipleProtocolInterfaces(): %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       goto UninstallFileSystemHandle;\r
     }\r
   }\r
@@ -1088,10 +1131,14 @@ QemuKernelLoaderFsDxeEntrypoint (
   return EFI_SUCCESS;\r
 \r
 UninstallFileSystemHandle:\r
-  Status = gBS->UninstallMultipleProtocolInterfaces (FileSystemHandle,\r
-                  &gEfiDevicePathProtocolGuid,       &mFileSystemDevicePath,\r
-                  &gEfiSimpleFileSystemProtocolGuid, &mFileSystem,\r
-                  NULL);\r
+  Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                  FileSystemHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  &mFileSystemDevicePath,\r
+                  &gEfiSimpleFileSystemProtocolGuid,\r
+                  &mFileSystem,\r
+                  NULL\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
 FreeBlobs:\r
index 881315f42d91185abb678b82f41d4ffad2223321..f5113fbc78a6e275979cc1ebecb8c54a972cae3b 100644 (file)
 \r
 #pragma pack (1)\r
 typedef struct RAMFB_CONFIG {\r
-  UINT64 Address;\r
-  UINT32 FourCC;\r
-  UINT32 Flags;\r
-  UINT32 Width;\r
-  UINT32 Height;\r
-  UINT32 Stride;\r
+  UINT64    Address;\r
+  UINT32    FourCC;\r
+  UINT32    Flags;\r
+  UINT32    Width;\r
+  UINT32    Height;\r
+  UINT32    Stride;\r
 } RAMFB_CONFIG;\r
 #pragma pack ()\r
 \r
-STATIC EFI_HANDLE                    mRamfbHandle;\r
-STATIC EFI_HANDLE                    mGopHandle;\r
-STATIC FRAME_BUFFER_CONFIGURE        *mQemuRamfbFrameBufferBltConfigure;\r
-STATIC UINTN                         mQemuRamfbFrameBufferBltConfigureSize;\r
-STATIC FIRMWARE_CONFIG_ITEM          mRamfbFwCfgItem;\r
+STATIC EFI_HANDLE              mRamfbHandle;\r
+STATIC EFI_HANDLE              mGopHandle;\r
+STATIC FRAME_BUFFER_CONFIGURE  *mQemuRamfbFrameBufferBltConfigure;\r
+STATIC UINTN                   mQemuRamfbFrameBufferBltConfigureSize;\r
+STATIC FIRMWARE_CONFIG_ITEM    mRamfbFwCfgItem;\r
 \r
-STATIC EFI_GRAPHICS_OUTPUT_MODE_INFORMATION mQemuRamfbModeInfo[] = {\r
+STATIC EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  mQemuRamfbModeInfo[] = {\r
   {\r
     0,    // Version\r
     640,  // HorizontalResolution\r
@@ -57,7 +57,7 @@ STATIC EFI_GRAPHICS_OUTPUT_MODE_INFORMATION mQemuRamfbModeInfo[] = {
   }\r
 };\r
 \r
-STATIC EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE mQemuRamfbMode = {\r
+STATIC EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE  mQemuRamfbMode = {\r
   ARRAY_SIZE (mQemuRamfbModeInfo),                // MaxMode\r
   0,                                              // Mode\r
   mQemuRamfbModeInfo,                             // Info\r
@@ -76,17 +76,22 @@ QemuRamfbGraphicsOutputQueryMode (
 {\r
   EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *ModeInfo;\r
 \r
-  if (Info == NULL || SizeOfInfo == NULL ||\r
-      ModeNumber >= mQemuRamfbMode.MaxMode) {\r
+  if ((Info == NULL) || (SizeOfInfo == NULL) ||\r
+      (ModeNumber >= mQemuRamfbMode.MaxMode))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   ModeInfo = &mQemuRamfbModeInfo[ModeNumber];\r
 \r
-  *Info = AllocateCopyPool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION),\r
-            ModeInfo);\r
+  *Info = AllocateCopyPool (\r
+            sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION),\r
+            ModeInfo\r
+            );\r
   if (*Info == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   *SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
 \r
   return EFI_SUCCESS;\r
@@ -96,8 +101,8 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 QemuRamfbGraphicsOutputSetMode (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL *This,\r
-  IN  UINT32                       ModeNumber\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL  *This,\r
+  IN  UINT32                        ModeNumber\r
   )\r
 {\r
   EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *ModeInfo;\r
@@ -108,10 +113,16 @@ QemuRamfbGraphicsOutputSetMode (
   if (ModeNumber >= mQemuRamfbMode.MaxMode) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   ModeInfo = &mQemuRamfbModeInfo[ModeNumber];\r
 \r
-  DEBUG ((DEBUG_INFO, "Ramfb: SetMode %u (%ux%u)\n", ModeNumber,\r
-    ModeInfo->HorizontalResolution, ModeInfo->VerticalResolution));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "Ramfb: SetMode %u (%ux%u)\n",\r
+    ModeNumber,\r
+    ModeInfo->HorizontalResolution,\r
+    ModeInfo->VerticalResolution\r
+    ));\r
 \r
   Config.Address = SwapBytes64 (mQemuRamfbMode.FrameBufferBase);\r
   Config.FourCC  = SwapBytes32 (RAMFB_FORMAT);\r
@@ -121,7 +132,7 @@ QemuRamfbGraphicsOutputSetMode (
   Config.Stride  = SwapBytes32 (ModeInfo->HorizontalResolution * RAMFB_BPP);\r
 \r
   Status = FrameBufferBltConfigure (\r
-             (VOID*)(UINTN)mQemuRamfbMode.FrameBufferBase,\r
+             (VOID *)(UINTN)mQemuRamfbMode.FrameBufferBase,\r
              ModeInfo,\r
              mQemuRamfbFrameBufferBltConfigure,\r
              &mQemuRamfbFrameBufferBltConfigureSize\r
@@ -131,6 +142,7 @@ QemuRamfbGraphicsOutputSetMode (
     if (mQemuRamfbFrameBufferBltConfigure != NULL) {\r
       FreePool (mQemuRamfbFrameBufferBltConfigure);\r
     }\r
+\r
     mQemuRamfbFrameBufferBltConfigure =\r
       AllocatePool (mQemuRamfbFrameBufferBltConfigureSize);\r
     if (mQemuRamfbFrameBufferBltConfigure == NULL) {\r
@@ -139,12 +151,13 @@ QemuRamfbGraphicsOutputSetMode (
     }\r
 \r
     Status = FrameBufferBltConfigure (\r
-               (VOID*)(UINTN)mQemuRamfbMode.FrameBufferBase,\r
+               (VOID *)(UINTN)mQemuRamfbMode.FrameBufferBase,\r
                ModeInfo,\r
                mQemuRamfbFrameBufferBltConfigure,\r
                &mQemuRamfbFrameBufferBltConfigureSize\r
                );\r
   }\r
+\r
   if (RETURN_ERROR (Status)) {\r
     ASSERT (Status == RETURN_UNSUPPORTED);\r
     return Status;\r
@@ -173,8 +186,12 @@ QemuRamfbGraphicsOutputSetMode (
              0                                // Delta -- ignored\r
              );\r
   if (RETURN_ERROR (Status)) {\r
-    DEBUG ((DEBUG_WARN, "%a: clearing the screen failed: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
+      "%a: clearing the screen failed: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -184,16 +201,16 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 QemuRamfbGraphicsOutputBlt (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL          *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL         *BltBuffer  OPTIONAL,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION     BltOperation,\r
-  IN  UINTN                                 SourceX,\r
-  IN  UINTN                                 SourceY,\r
-  IN  UINTN                                 DestinationX,\r
-  IN  UINTN                                 DestinationY,\r
-  IN  UINTN                                 Width,\r
-  IN  UINTN                                 Height,\r
-  IN  UINTN                                 Delta\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,\r
+  IN  UINTN                              SourceX,\r
+  IN  UINTN                              SourceY,\r
+  IN  UINTN                              DestinationX,\r
+  IN  UINTN                              DestinationY,\r
+  IN  UINTN                              Width,\r
+  IN  UINTN                              Height,\r
+  IN  UINTN                              Delta\r
   )\r
 {\r
   return FrameBufferBlt (\r
@@ -210,7 +227,7 @@ QemuRamfbGraphicsOutputBlt (
            );\r
 }\r
 \r
-STATIC EFI_GRAPHICS_OUTPUT_PROTOCOL mQemuRamfbGraphicsOutput = {\r
+STATIC EFI_GRAPHICS_OUTPUT_PROTOCOL  mQemuRamfbGraphicsOutput = {\r
   QemuRamfbGraphicsOutputQueryMode,\r
   QemuRamfbGraphicsOutputSetMode,\r
   QemuRamfbGraphicsOutputBlt,\r
@@ -220,8 +237,8 @@ STATIC EFI_GRAPHICS_OUTPUT_PROTOCOL mQemuRamfbGraphicsOutput = {
 EFI_STATUS\r
 EFIAPI\r
 InitializeQemuRamfb (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL  *RamfbDevicePath;\r
@@ -244,9 +261,14 @@ InitializeQemuRamfb (
   if (EFI_ERROR (Status)) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   if (FwCfgSize != sizeof (RAMFB_CONFIG)) {\r
-    DEBUG ((DEBUG_ERROR, "Ramfb: FwCfg size mismatch (expected %lu, got %lu)\n",\r
-      (UINT64)sizeof (RAMFB_CONFIG), (UINT64)FwCfgSize));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "Ramfb: FwCfg size mismatch (expected %lu, got %lu)\n",\r
+      (UINT64)sizeof (RAMFB_CONFIG),\r
+      (UINT64)FwCfgSize\r
+      ));\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
 \r
@@ -257,26 +279,37 @@ InitializeQemuRamfb (
     mQemuRamfbModeInfo[Index].PixelFormat =\r
       PixelBlueGreenRedReserved8BitPerColor;\r
     FbSize = RAMFB_BPP *\r
-      mQemuRamfbModeInfo[Index].HorizontalResolution *\r
-      mQemuRamfbModeInfo[Index].VerticalResolution;\r
+             mQemuRamfbModeInfo[Index].HorizontalResolution *\r
+             mQemuRamfbModeInfo[Index].VerticalResolution;\r
     if (MaxFbSize < FbSize) {\r
       MaxFbSize = FbSize;\r
     }\r
-    DEBUG ((DEBUG_INFO, "Ramfb: Mode %lu: %ux%u, %lu kB\n", (UINT64)Index,\r
+\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "Ramfb: Mode %lu: %ux%u, %lu kB\n",\r
+      (UINT64)Index,\r
       mQemuRamfbModeInfo[Index].HorizontalResolution,\r
       mQemuRamfbModeInfo[Index].VerticalResolution,\r
-      (UINT64)(FbSize / 1024)));\r
+      (UINT64)(FbSize / 1024)\r
+      ));\r
   }\r
 \r
-  Pages = EFI_SIZE_TO_PAGES (MaxFbSize);\r
+  Pages     = EFI_SIZE_TO_PAGES (MaxFbSize);\r
   MaxFbSize = EFI_PAGES_TO_SIZE (Pages);\r
-  FbBase = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedPages (Pages);\r
+  FbBase    = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedPages (Pages);\r
   if (FbBase == 0) {\r
     DEBUG ((DEBUG_ERROR, "Ramfb: memory allocation failed\n"));\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  DEBUG ((DEBUG_INFO, "Ramfb: Framebuffer at 0x%lx, %lu kB, %lu pages\n",\r
-    (UINT64)FbBase, (UINT64)(MaxFbSize / 1024), (UINT64)Pages));\r
+\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "Ramfb: Framebuffer at 0x%lx, %lu kB, %lu pages\n",\r
+    (UINT64)FbBase,\r
+    (UINT64)(MaxFbSize / 1024),\r
+    (UINT64)Pages\r
+    ));\r
   mQemuRamfbMode.FrameBufferSize = MaxFbSize;\r
   mQemuRamfbMode.FrameBufferBase = FbBase;\r
 \r
@@ -288,14 +321,18 @@ InitializeQemuRamfb (
   //\r
   // ramfb vendor devpath\r
   //\r
-  VendorDeviceNode.Header.Type = HARDWARE_DEVICE_PATH;\r
+  VendorDeviceNode.Header.Type    = HARDWARE_DEVICE_PATH;\r
   VendorDeviceNode.Header.SubType = HW_VENDOR_DP;\r
   CopyGuid (&VendorDeviceNode.Guid, &gQemuRamfbGuid);\r
-  SetDevicePathNodeLength (&VendorDeviceNode.Header,\r
-    sizeof (VENDOR_DEVICE_PATH));\r
+  SetDevicePathNodeLength (\r
+    &VendorDeviceNode.Header,\r
+    sizeof (VENDOR_DEVICE_PATH)\r
+    );\r
 \r
-  RamfbDevicePath = AppendDevicePathNode (NULL,\r
-    (EFI_DEVICE_PATH_PROTOCOL *) &VendorDeviceNode);\r
+  RamfbDevicePath = AppendDevicePathNode (\r
+                      NULL,\r
+                      (EFI_DEVICE_PATH_PROTOCOL *)&VendorDeviceNode\r
+                      );\r
   if (RamfbDevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeFramebuffer;\r
@@ -308,31 +345,38 @@ InitializeQemuRamfb (
                   NULL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "Ramfb: install Ramfb Vendor DevicePath failed: %r\n",\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "Ramfb: install Ramfb Vendor DevicePath failed: %r\n",\r
+      Status\r
+      ));\r
     goto FreeRamfbDevicePath;\r
   }\r
 \r
   //\r
   // gop devpath + protocol\r
   //\r
-  AcpiDeviceNode.Header.Type = ACPI_DEVICE_PATH;\r
+  AcpiDeviceNode.Header.Type    = ACPI_DEVICE_PATH;\r
   AcpiDeviceNode.Header.SubType = ACPI_ADR_DP;\r
-  AcpiDeviceNode.ADR = ACPI_DISPLAY_ADR (\r
-    1,                                       // DeviceIdScheme\r
-    0,                                       // HeadId\r
-    0,                                       // NonVgaOutput\r
-    1,                                       // BiosCanDetect\r
-    0,                                       // VendorInfo\r
-    ACPI_ADR_DISPLAY_TYPE_EXTERNAL_DIGITAL,  // Type\r
-    0,                                       // Port\r
-    0                                        // Index\r
+  AcpiDeviceNode.ADR            = ACPI_DISPLAY_ADR (\r
+                                    1,                                      // DeviceIdScheme\r
+                                    0,                                      // HeadId\r
+                                    0,                                      // NonVgaOutput\r
+                                    1,                                      // BiosCanDetect\r
+                                    0,                                      // VendorInfo\r
+                                    ACPI_ADR_DISPLAY_TYPE_EXTERNAL_DIGITAL, // Type\r
+                                    0,                                      // Port\r
+                                    0                                       // Index\r
+                                    );\r
+  SetDevicePathNodeLength (\r
+    &AcpiDeviceNode.Header,\r
+    sizeof (ACPI_ADR_DEVICE_PATH)\r
     );\r
-  SetDevicePathNodeLength (&AcpiDeviceNode.Header,\r
-    sizeof (ACPI_ADR_DEVICE_PATH));\r
 \r
-  GopDevicePath = AppendDevicePathNode (RamfbDevicePath,\r
-    (EFI_DEVICE_PATH_PROTOCOL *) &AcpiDeviceNode);\r
+  GopDevicePath = AppendDevicePathNode (\r
+                    RamfbDevicePath,\r
+                    (EFI_DEVICE_PATH_PROTOCOL *)&AcpiDeviceNode\r
+                    );\r
   if (GopDevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeRamfbHandle;\r
@@ -347,8 +391,11 @@ InitializeQemuRamfb (
                   NULL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "Ramfb: install GOP DevicePath failed: %r\n",\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "Ramfb: install GOP DevicePath failed: %r\n",\r
+      Status\r
+      ));\r
     goto FreeGopDevicePath;\r
   }\r
 \r
@@ -388,6 +435,6 @@ FreeRamfbHandle:
 FreeRamfbDevicePath:\r
   FreePool (RamfbDevicePath);\r
 FreeFramebuffer:\r
-  FreePages ((VOID*)(UINTN)mQemuRamfbMode.FrameBufferBase, Pages);\r
+  FreePages ((VOID *)(UINTN)mQemuRamfbMode.FrameBufferBase, Pages);\r
   return Status;\r
 }\r
index 82922f92c0203384eb0d21d1dcc6159e9410e579..7972b9309c03cf4d94f2ae57c5c77d687e7fa44f 100644 (file)
@@ -21,21 +21,20 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gQemuVideoComponentNa
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gQemuVideoComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) QemuVideoComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) QemuVideoComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gQemuVideoComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)QemuVideoComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)QemuVideoComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mQemuVideoDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mQemuVideoDriverNameTable[] = {\r
   { "eng;en", L"QEMU Video Driver" },\r
-  { NULL , NULL }\r
+  { NULL,     NULL                 }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mQemuVideoControllerNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mQemuVideoControllerNameTable[] = {\r
   { "eng;en", L"QEMU Video PCI Adapter" },\r
-  { NULL , NULL }\r
+  { NULL,     NULL                      }\r
 };\r
 \r
 /**\r
@@ -165,14 +164,14 @@ QemuVideoComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 QemuVideoComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // This is a device driver, so ChildHandle must be NULL.\r
index 85edfcb1d6df7079b6c75af9844c870b16585ef6..d9f0a2464aa3d4f2025b73c787c89accc70ea94f 100644 (file)
@@ -11,7 +11,7 @@
 #include "Qemu.h"\r
 #include <IndustryStandard/Acpi.h>\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gQemuVideoDriverBinding = {\r
   QemuVideoControllerDriverSupported,\r
   QemuVideoControllerDriverStart,\r
   QemuVideoControllerDriverStop,\r
@@ -20,77 +20,80 @@ EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding = {
   NULL\r
 };\r
 \r
-QEMU_VIDEO_CARD gQemuVideoCardList[] = {\r
-    {\r
-        PCI_CLASS_DISPLAY_VGA,\r
-        CIRRUS_LOGIC_VENDOR_ID,\r
-        CIRRUS_LOGIC_5430_DEVICE_ID,\r
-        QEMU_VIDEO_CIRRUS_5430,\r
-        L"Cirrus 5430"\r
-    },{\r
-        PCI_CLASS_DISPLAY_VGA,\r
-        CIRRUS_LOGIC_VENDOR_ID,\r
-        CIRRUS_LOGIC_5430_ALTERNATE_DEVICE_ID,\r
-        QEMU_VIDEO_CIRRUS_5430,\r
-        L"Cirrus 5430"\r
-    },{\r
-        PCI_CLASS_DISPLAY_VGA,\r
-        CIRRUS_LOGIC_VENDOR_ID,\r
-        CIRRUS_LOGIC_5446_DEVICE_ID,\r
-        QEMU_VIDEO_CIRRUS_5446,\r
-        L"Cirrus 5446"\r
-    },{\r
-        PCI_CLASS_DISPLAY_VGA,\r
-        0x1234,\r
-        0x1111,\r
-        QEMU_VIDEO_BOCHS_MMIO,\r
-        L"QEMU Standard VGA"\r
-    },{\r
-        PCI_CLASS_DISPLAY_OTHER,\r
-        0x1234,\r
-        0x1111,\r
-        QEMU_VIDEO_BOCHS_MMIO,\r
-        L"QEMU Standard VGA (secondary)"\r
-    },{\r
-        PCI_CLASS_DISPLAY_VGA,\r
-        0x1b36,\r
-        0x0100,\r
-        QEMU_VIDEO_BOCHS,\r
-        L"QEMU QXL VGA"\r
-    },{\r
-        PCI_CLASS_DISPLAY_VGA,\r
-        0x1af4,\r
-        0x1050,\r
-        QEMU_VIDEO_BOCHS_MMIO,\r
-        L"QEMU VirtIO VGA"\r
-    },{\r
-        PCI_CLASS_DISPLAY_VGA,\r
-        0x15ad,\r
-        0x0405,\r
-        QEMU_VIDEO_VMWARE_SVGA,\r
-        L"QEMU VMWare SVGA"\r
-    },{\r
-        0 /* end of list */\r
-    }\r
+QEMU_VIDEO_CARD  gQemuVideoCardList[] = {\r
+  {\r
+    PCI_CLASS_DISPLAY_VGA,\r
+    CIRRUS_LOGIC_VENDOR_ID,\r
+    CIRRUS_LOGIC_5430_DEVICE_ID,\r
+    QEMU_VIDEO_CIRRUS_5430,\r
+    L"Cirrus 5430"\r
+  },{\r
+    PCI_CLASS_DISPLAY_VGA,\r
+    CIRRUS_LOGIC_VENDOR_ID,\r
+    CIRRUS_LOGIC_5430_ALTERNATE_DEVICE_ID,\r
+    QEMU_VIDEO_CIRRUS_5430,\r
+    L"Cirrus 5430"\r
+  },{\r
+    PCI_CLASS_DISPLAY_VGA,\r
+    CIRRUS_LOGIC_VENDOR_ID,\r
+    CIRRUS_LOGIC_5446_DEVICE_ID,\r
+    QEMU_VIDEO_CIRRUS_5446,\r
+    L"Cirrus 5446"\r
+  },{\r
+    PCI_CLASS_DISPLAY_VGA,\r
+    0x1234,\r
+    0x1111,\r
+    QEMU_VIDEO_BOCHS_MMIO,\r
+    L"QEMU Standard VGA"\r
+  },{\r
+    PCI_CLASS_DISPLAY_OTHER,\r
+    0x1234,\r
+    0x1111,\r
+    QEMU_VIDEO_BOCHS_MMIO,\r
+    L"QEMU Standard VGA (secondary)"\r
+  },{\r
+    PCI_CLASS_DISPLAY_VGA,\r
+    0x1b36,\r
+    0x0100,\r
+    QEMU_VIDEO_BOCHS,\r
+    L"QEMU QXL VGA"\r
+  },{\r
+    PCI_CLASS_DISPLAY_VGA,\r
+    0x1af4,\r
+    0x1050,\r
+    QEMU_VIDEO_BOCHS_MMIO,\r
+    L"QEMU VirtIO VGA"\r
+  },{\r
+    PCI_CLASS_DISPLAY_VGA,\r
+    0x15ad,\r
+    0x0405,\r
+    QEMU_VIDEO_VMWARE_SVGA,\r
+    L"QEMU VMWare SVGA"\r
+  },{\r
+    0     /* end of list */\r
+  }\r
 };\r
 \r
-static QEMU_VIDEO_CARD*\r
-QemuVideoDetect(\r
-  IN UINT8 SubClass,\r
-  IN UINT16 VendorId,\r
-  IN UINT16 DeviceId\r
+static QEMU_VIDEO_CARD *\r
+QemuVideoDetect (\r
+  IN UINT8   SubClass,\r
+  IN UINT16  VendorId,\r
+  IN UINT16  DeviceId\r
   )\r
 {\r
-  UINTN Index = 0;\r
+  UINTN  Index = 0;\r
 \r
   while (gQemuVideoCardList[Index].VendorId != 0) {\r
-    if (gQemuVideoCardList[Index].SubClass == SubClass &&\r
-        gQemuVideoCardList[Index].VendorId == VendorId &&\r
-        gQemuVideoCardList[Index].DeviceId == DeviceId) {\r
+    if ((gQemuVideoCardList[Index].SubClass == SubClass) &&\r
+        (gQemuVideoCardList[Index].VendorId == VendorId) &&\r
+        (gQemuVideoCardList[Index].DeviceId == DeviceId))\r
+    {\r
       return gQemuVideoCardList + Index;\r
     }\r
+\r
     Index++;\r
   }\r
+\r
   return NULL;\r
 }\r
 \r
@@ -108,15 +111,15 @@ QemuVideoDetect(
 EFI_STATUS\r
 EFIAPI\r
 QemuVideoControllerDriverSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE00          Pci;\r
-  QEMU_VIDEO_CARD     *Card;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
+  QEMU_VIDEO_CARD      *Card;\r
 \r
   //\r
   // Open the PCI I/O Protocol\r
@@ -124,7 +127,7 @@ QemuVideoControllerDriverSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -151,7 +154,8 @@ QemuVideoControllerDriverSupported (
   if (!IS_PCI_DISPLAY (&Pci)) {\r
     goto Done;\r
   }\r
-  Card = QemuVideoDetect(Pci.Hdr.ClassCode[1], Pci.Hdr.VendorId, Pci.Hdr.DeviceId);\r
+\r
+  Card = QemuVideoDetect (Pci.Hdr.ClassCode[1], Pci.Hdr.VendorId, Pci.Hdr.DeviceId);\r
   if (Card != NULL) {\r
     DEBUG ((DEBUG_INFO, "QemuVideo: %s detected\n", Card->Name));\r
     Status = EFI_SUCCESS;\r
@@ -162,11 +166,11 @@ Done:
   // Close the PCI I/O Protocol\r
   //\r
   gBS->CloseProtocol (\r
-        Controller,\r
-        &gEfiPciIoProtocolGuid,\r
-        This->DriverBindingHandle,\r
-        Controller\r
-        );\r
+         Controller,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
   return Status;\r
 }\r
@@ -187,21 +191,21 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 QemuVideoControllerDriverStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_TPL                           OldTpl;\r
-  EFI_STATUS                        Status;\r
-  QEMU_VIDEO_PRIVATE_DATA           *Private;\r
-  BOOLEAN                           IsQxl;\r
-  EFI_DEVICE_PATH_PROTOCOL          *ParentDevicePath;\r
-  ACPI_ADR_DEVICE_PATH              AcpiDeviceNode;\r
-  PCI_TYPE00                        Pci;\r
-  QEMU_VIDEO_CARD                   *Card;\r
-  EFI_PCI_IO_PROTOCOL               *ChildPciIo;\r
-  UINT64                            SupportedVgaIo;\r
+  EFI_TPL                   OldTpl;\r
+  EFI_STATUS                Status;\r
+  QEMU_VIDEO_PRIVATE_DATA   *Private;\r
+  BOOLEAN                   IsQxl;\r
+  EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;\r
+  ACPI_ADR_DEVICE_PATH      AcpiDeviceNode;\r
+  PCI_TYPE00                Pci;\r
+  QEMU_VIDEO_CARD           *Card;\r
+  EFI_PCI_IO_PROTOCOL       *ChildPciIo;\r
+  UINT64                    SupportedVgaIo;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
@@ -217,7 +221,7 @@ QemuVideoControllerDriverStart (
   //\r
   // Set up context record\r
   //\r
-  Private->Signature  = QEMU_VIDEO_PRIVATE_DATA_SIGNATURE;\r
+  Private->Signature = QEMU_VIDEO_PRIVATE_DATA_SIGNATURE;\r
 \r
   //\r
   // Open PCI I/O Protocol\r
@@ -225,7 +229,7 @@ QemuVideoControllerDriverStart (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &Private->PciIo,\r
+                  (VOID **)&Private->PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -238,12 +242,12 @@ QemuVideoControllerDriverStart (
   // Read the PCI Configuration Header from the PCI Device\r
   //\r
   Status = Private->PciIo->Pci.Read (\r
-                        Private->PciIo,\r
-                        EfiPciIoWidthUint32,\r
-                        0,\r
-                        sizeof (Pci) / sizeof (UINT32),\r
-                        &Pci\r
-                        );\r
+                                 Private->PciIo,\r
+                                 EfiPciIoWidthUint32,\r
+                                 0,\r
+                                 sizeof (Pci) / sizeof (UINT32),\r
+                                 &Pci\r
+                                 );\r
   if (EFI_ERROR (Status)) {\r
     goto ClosePciIo;\r
   }\r
@@ -251,11 +255,12 @@ QemuVideoControllerDriverStart (
   //\r
   // Determine card variant.\r
   //\r
-  Card = QemuVideoDetect(Pci.Hdr.ClassCode[1], Pci.Hdr.VendorId, Pci.Hdr.DeviceId);\r
+  Card = QemuVideoDetect (Pci.Hdr.ClassCode[1], Pci.Hdr.VendorId, Pci.Hdr.DeviceId);\r
   if (Card == NULL) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto ClosePciIo;\r
   }\r
+\r
   Private->Variant = Card->Variant;\r
 \r
   //\r
@@ -268,11 +273,11 @@ QemuVideoControllerDriverStart (
   // Save original PCI attributes\r
   //\r
   Status = Private->PciIo->Attributes (\r
-                    Private->PciIo,\r
-                    EfiPciIoAttributeOperationGet,\r
-                    0,\r
-                    &Private->OriginalPciAttributes\r
-                    );\r
+                             Private->PciIo,\r
+                             EfiPciIoAttributeOperationGet,\r
+                             0,\r
+                             &Private->OriginalPciAttributes\r
+                             );\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto ClosePciIo;\r
@@ -292,7 +297,7 @@ QemuVideoControllerDriverStart (
   }\r
 \r
   SupportedVgaIo &= (UINT64)(EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16);\r
-  if (SupportedVgaIo == 0 && IS_PCI_VGA (&Pci)) {\r
+  if ((SupportedVgaIo == 0) && IS_PCI_VGA (&Pci)) {\r
     Status = EFI_UNSUPPORTED;\r
     goto ClosePciIo;\r
   }\r
@@ -301,11 +306,11 @@ QemuVideoControllerDriverStart (
   // Set new PCI attributes\r
   //\r
   Status = Private->PciIo->Attributes (\r
-                            Private->PciIo,\r
-                            EfiPciIoAttributeOperationEnable,\r
-                            EFI_PCI_DEVICE_ENABLE | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | SupportedVgaIo,\r
-                            NULL\r
-                            );\r
+                             Private->PciIo,\r
+                             EfiPciIoAttributeOperationEnable,\r
+                             EFI_PCI_DEVICE_ENABLE | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | SupportedVgaIo,\r
+                             NULL\r
+                             );\r
   if (EFI_ERROR (Status)) {\r
     goto ClosePciIo;\r
   }\r
@@ -314,21 +319,25 @@ QemuVideoControllerDriverStart (
   // Check whenever the qemu stdvga mmio bar is present (qemu 1.3+).\r
   //\r
   if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {\r
-    EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *MmioDesc;\r
+    EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *MmioDesc;\r
 \r
     Status = Private->PciIo->GetBarAttributes (\r
-                        Private->PciIo,\r
-                        PCI_BAR_IDX2,\r
-                        NULL,\r
-                        (VOID**) &MmioDesc\r
-                        );\r
+                               Private->PciIo,\r
+                               PCI_BAR_IDX2,\r
+                               NULL,\r
+                               (VOID **)&MmioDesc\r
+                               );\r
     if (EFI_ERROR (Status) ||\r
-        MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM) {\r
+        (MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM))\r
+    {\r
       DEBUG ((DEBUG_INFO, "QemuVideo: No mmio bar, fallback to port io\n"));\r
       Private->Variant = QEMU_VIDEO_BOCHS;\r
     } else {\r
-      DEBUG ((DEBUG_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n",\r
-              MmioDesc->AddrRangeMin));\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "QemuVideo: Using mmio bar @ 0x%lx\n",\r
+        MmioDesc->AddrRangeMin\r
+        ));\r
     }\r
 \r
     if (!EFI_ERROR (Status)) {\r
@@ -340,17 +349,18 @@ QemuVideoControllerDriverStart (
   // VMWare SVGA is handled like Bochs (with port IO only).\r
   //\r
   if (Private->Variant == QEMU_VIDEO_VMWARE_SVGA) {\r
-    Private->Variant = QEMU_VIDEO_BOCHS;\r
+    Private->Variant                 = QEMU_VIDEO_BOCHS;\r
     Private->FrameBufferVramBarIndex = PCI_BAR_IDX1;\r
   }\r
 \r
   //\r
   // Check if accessing the bochs interface works.\r
   //\r
-  if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO ||\r
-      Private->Variant == QEMU_VIDEO_BOCHS) {\r
-    UINT16 BochsId;\r
-    BochsId = BochsRead(Private, VBE_DISPI_INDEX_ID);\r
+  if ((Private->Variant == QEMU_VIDEO_BOCHS_MMIO) ||\r
+      (Private->Variant == QEMU_VIDEO_BOCHS))\r
+  {\r
+    UINT16  BochsId;\r
+    BochsId = BochsRead (Private, VBE_DISPI_INDEX_ID);\r
     if ((BochsId & 0xFFF0) != VBE_DISPI_ID0) {\r
       DEBUG ((DEBUG_INFO, "QemuVideo: BochsID mismatch (got 0x%x)\n", BochsId));\r
       Status = EFI_DEVICE_ERROR;\r
@@ -364,7 +374,7 @@ QemuVideoControllerDriverStart (
   Status = gBS->HandleProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath\r
+                  (VOID **)&ParentDevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     goto RestoreAttributes;\r
@@ -374,15 +384,15 @@ QemuVideoControllerDriverStart (
   // Set Gop Device Path\r
   //\r
   ZeroMem (&AcpiDeviceNode, sizeof (ACPI_ADR_DEVICE_PATH));\r
-  AcpiDeviceNode.Header.Type = ACPI_DEVICE_PATH;\r
+  AcpiDeviceNode.Header.Type    = ACPI_DEVICE_PATH;\r
   AcpiDeviceNode.Header.SubType = ACPI_ADR_DP;\r
-  AcpiDeviceNode.ADR = ACPI_DISPLAY_ADR (1, 0, 0, 1, 0, ACPI_ADR_DISPLAY_TYPE_VGA, 0, 0);\r
+  AcpiDeviceNode.ADR            = ACPI_DISPLAY_ADR (1, 0, 0, 1, 0, ACPI_ADR_DISPLAY_TYPE_VGA, 0, 0);\r
   SetDevicePathNodeLength (&AcpiDeviceNode.Header, sizeof (ACPI_ADR_DEVICE_PATH));\r
 \r
   Private->GopDevicePath = AppendDevicePathNode (\r
-                                      ParentDevicePath,\r
-                                      (EFI_DEVICE_PATH_PROTOCOL *) &AcpiDeviceNode\r
-                                      );\r
+                             ParentDevicePath,\r
+                             (EFI_DEVICE_PATH_PROTOCOL *)&AcpiDeviceNode\r
+                             );\r
   if (Private->GopDevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto RestoreAttributes;\r
@@ -405,19 +415,20 @@ QemuVideoControllerDriverStart (
   // Construct video mode buffer\r
   //\r
   switch (Private->Variant) {\r
-  case QEMU_VIDEO_CIRRUS_5430:\r
-  case QEMU_VIDEO_CIRRUS_5446:\r
-    Status = QemuVideoCirrusModeSetup (Private);\r
-    break;\r
-  case QEMU_VIDEO_BOCHS_MMIO:\r
-  case QEMU_VIDEO_BOCHS:\r
-    Status = QemuVideoBochsModeSetup (Private, IsQxl);\r
-    break;\r
-  default:\r
-    ASSERT (FALSE);\r
-    Status = EFI_DEVICE_ERROR;\r
-    break;\r
+    case QEMU_VIDEO_CIRRUS_5430:\r
+    case QEMU_VIDEO_CIRRUS_5446:\r
+      Status = QemuVideoCirrusModeSetup (Private);\r
+      break;\r
+    case QEMU_VIDEO_BOCHS_MMIO:\r
+    case QEMU_VIDEO_BOCHS:\r
+      Status = QemuVideoBochsModeSetup (Private, IsQxl);\r
+      break;\r
+    default:\r
+      ASSERT (FALSE);\r
+      Status = EFI_DEVICE_ERROR;\r
+      break;\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     goto UninstallGopDevicePath;\r
   }\r
@@ -444,30 +455,35 @@ QemuVideoControllerDriverStart (
   // Reference parent handle from child handle.\r
   //\r
   Status = gBS->OpenProtocol (\r
-                Controller,\r
-                &gEfiPciIoProtocolGuid,\r
-                (VOID **) &ChildPciIo,\r
-                This->DriverBindingHandle,\r
-                Private->Handle,\r
-                EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
-                );\r
+                  Controller,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  (VOID **)&ChildPciIo,\r
+                  This->DriverBindingHandle,\r
+                  Private->Handle,\r
+                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto UninstallGop;\r
   }\r
 \r
-#if defined MDE_CPU_IA32 || defined MDE_CPU_X64\r
-  if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO ||\r
-      Private->Variant == QEMU_VIDEO_BOCHS) {\r
+ #if defined MDE_CPU_IA32 || defined MDE_CPU_X64\r
+  if ((Private->Variant == QEMU_VIDEO_BOCHS_MMIO) ||\r
+      (Private->Variant == QEMU_VIDEO_BOCHS))\r
+  {\r
     InstallVbeShim (Card->Name, Private->GraphicsOutput.Mode->FrameBufferBase);\r
   }\r
-#endif\r
+\r
+ #endif\r
 \r
   gBS->RestoreTPL (OldTpl);\r
   return EFI_SUCCESS;\r
 \r
 UninstallGop:\r
-  gBS->UninstallProtocolInterface (Private->Handle,\r
-         &gEfiGraphicsOutputProtocolGuid, &Private->GraphicsOutput);\r
+  gBS->UninstallProtocolInterface (\r
+         Private->Handle,\r
+         &gEfiGraphicsOutputProtocolGuid,\r
+         &Private->GraphicsOutput\r
+         );\r
 \r
 DestructQemuVideoGraphics:\r
   QemuVideoGraphicsOutputDestructor (Private);\r
@@ -476,19 +492,30 @@ FreeModeData:
   FreePool (Private->ModeData);\r
 \r
 UninstallGopDevicePath:\r
-  gBS->UninstallProtocolInterface (Private->Handle,\r
-         &gEfiDevicePathProtocolGuid, Private->GopDevicePath);\r
+  gBS->UninstallProtocolInterface (\r
+         Private->Handle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         Private->GopDevicePath\r
+         );\r
 \r
 FreeGopDevicePath:\r
   FreePool (Private->GopDevicePath);\r
 \r
 RestoreAttributes:\r
-  Private->PciIo->Attributes (Private->PciIo, EfiPciIoAttributeOperationSet,\r
-                    Private->OriginalPciAttributes, NULL);\r
+  Private->PciIo->Attributes (\r
+                    Private->PciIo,\r
+                    EfiPciIoAttributeOperationSet,\r
+                    Private->OriginalPciAttributes,\r
+                    NULL\r
+                    );\r
 \r
 ClosePciIo:\r
-  gBS->CloseProtocol (Controller, &gEfiPciIoProtocolGuid,\r
-         This->DriverBindingHandle, Controller);\r
+  gBS->CloseProtocol (\r
+         Controller,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
 FreePrivate:\r
   FreePool (Private);\r
@@ -515,15 +542,15 @@ RestoreTpl:
 EFI_STATUS\r
 EFIAPI\r
 QemuVideoControllerDriverStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN UINTN                          NumberOfChildren,\r
-  IN EFI_HANDLE                     *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL    *GraphicsOutput;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *GraphicsOutput;\r
 \r
-  EFI_STATUS                      Status;\r
+  EFI_STATUS               Status;\r
   QEMU_VIDEO_PRIVATE_DATA  *Private;\r
 \r
   if (NumberOfChildren == 0) {\r
@@ -531,11 +558,11 @@ QemuVideoControllerDriverStop (
     // Close the PCI I/O Protocol\r
     //\r
     gBS->CloseProtocol (\r
-          Controller,\r
-          &gEfiPciIoProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Controller\r
-          );\r
+           Controller,\r
+           &gEfiPciIoProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Controller\r
+           );\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -547,7 +574,7 @@ QemuVideoControllerDriverStop (
   Status = gBS->OpenProtocol (\r
                   ChildHandleBuffer[0],\r
                   &gEfiGraphicsOutputProtocolGuid,\r
-                  (VOID **) &GraphicsOutput,\r
+                  (VOID **)&GraphicsOutput,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -581,22 +608,25 @@ QemuVideoControllerDriverStop (
   // Restore original PCI attributes\r
   //\r
   Private->PciIo->Attributes (\r
-                  Private->PciIo,\r
-                  EfiPciIoAttributeOperationSet,\r
-                  Private->OriginalPciAttributes,\r
-                  NULL\r
-                  );\r
+                    Private->PciIo,\r
+                    EfiPciIoAttributeOperationSet,\r
+                    Private->OriginalPciAttributes,\r
+                    NULL\r
+                    );\r
 \r
   gBS->CloseProtocol (\r
-        Controller,\r
-        &gEfiPciIoProtocolGuid,\r
-        This->DriverBindingHandle,\r
-        Private->Handle\r
-        );\r
+         Controller,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Private->Handle\r
+         );\r
 \r
   FreePool (Private->ModeData);\r
-  gBS->UninstallProtocolInterface (Private->Handle,\r
-         &gEfiDevicePathProtocolGuid, Private->GopDevicePath);\r
+  gBS->UninstallProtocolInterface (\r
+         Private->Handle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         Private->GopDevicePath\r
+         );\r
   FreePool (Private->GopDevicePath);\r
 \r
   //\r
@@ -620,18 +650,18 @@ QemuVideoControllerDriverStop (
 VOID\r
 outb (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           Address,\r
-  UINT8                           Data\r
+  UINTN                    Address,\r
+  UINT8                    Data\r
   )\r
 {\r
   Private->PciIo->Io.Write (\r
-                      Private->PciIo,\r
-                      EfiPciIoWidthUint8,\r
-                      EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                      Address,\r
-                      1,\r
-                      &Data\r
-                      );\r
+                       Private->PciIo,\r
+                       EfiPciIoWidthUint8,\r
+                       EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                       Address,\r
+                       1,\r
+                       &Data\r
+                       );\r
 }\r
 \r
 /**\r
@@ -647,18 +677,18 @@ outb (
 VOID\r
 outw (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           Address,\r
-  UINT16                          Data\r
+  UINTN                    Address,\r
+  UINT16                   Data\r
   )\r
 {\r
   Private->PciIo->Io.Write (\r
-                      Private->PciIo,\r
-                      EfiPciIoWidthUint16,\r
-                      EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                      Address,\r
-                      1,\r
-                      &Data\r
-                      );\r
+                       Private->PciIo,\r
+                       EfiPciIoWidthUint16,\r
+                       EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                       Address,\r
+                       1,\r
+                       &Data\r
+                       );\r
 }\r
 \r
 /**\r
@@ -673,19 +703,19 @@ outw (
 UINT8\r
 inb (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           Address\r
+  UINTN                    Address\r
   )\r
 {\r
-  UINT8 Data;\r
+  UINT8  Data;\r
 \r
   Private->PciIo->Io.Read (\r
-                      Private->PciIo,\r
-                      EfiPciIoWidthUint8,\r
-                      EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                      Address,\r
-                      1,\r
-                      &Data\r
-                      );\r
+                       Private->PciIo,\r
+                       EfiPciIoWidthUint8,\r
+                       EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                       Address,\r
+                       1,\r
+                       &Data\r
+                       );\r
   return Data;\r
 }\r
 \r
@@ -701,19 +731,19 @@ inb (
 UINT16\r
 inw (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           Address\r
+  UINTN                    Address\r
   )\r
 {\r
   UINT16  Data;\r
 \r
   Private->PciIo->Io.Read (\r
-                      Private->PciIo,\r
-                      EfiPciIoWidthUint16,\r
-                      EFI_PCI_IO_PASS_THROUGH_BAR,\r
-                      Address,\r
-                      1,\r
-                      &Data\r
-                      );\r
+                       Private->PciIo,\r
+                       EfiPciIoWidthUint16,\r
+                       EFI_PCI_IO_PASS_THROUGH_BAR,\r
+                       Address,\r
+                       1,\r
+                       &Data\r
+                       );\r
   return Data;\r
 }\r
 \r
@@ -732,16 +762,16 @@ inw (
 VOID\r
 SetPaletteColor (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           Index,\r
-  UINT8                           Red,\r
-  UINT8                           Green,\r
-  UINT8                           Blue\r
+  UINTN                    Index,\r
+  UINT8                    Red,\r
+  UINT8                    Green,\r
+  UINT8                    Blue\r
   )\r
 {\r
-  VgaOutb (Private, PALETTE_INDEX_REGISTER, (UINT8) Index);\r
-  VgaOutb (Private, PALETTE_DATA_REGISTER, (UINT8) (Red >> 2));\r
-  VgaOutb (Private, PALETTE_DATA_REGISTER, (UINT8) (Green >> 2));\r
-  VgaOutb (Private, PALETTE_DATA_REGISTER, (UINT8) (Blue >> 2));\r
+  VgaOutb (Private, PALETTE_INDEX_REGISTER, (UINT8)Index);\r
+  VgaOutb (Private, PALETTE_DATA_REGISTER, (UINT8)(Red >> 2));\r
+  VgaOutb (Private, PALETTE_DATA_REGISTER, (UINT8)(Green >> 2));\r
+  VgaOutb (Private, PALETTE_DATA_REGISTER, (UINT8)(Blue >> 2));\r
 }\r
 \r
 /**\r
@@ -757,16 +787,16 @@ SetDefaultPalette (
   QEMU_VIDEO_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  UINTN Index;\r
-  UINTN RedIndex;\r
-  UINTN GreenIndex;\r
-  UINTN BlueIndex;\r
+  UINTN  Index;\r
+  UINTN  RedIndex;\r
+  UINTN  GreenIndex;\r
+  UINTN  BlueIndex;\r
 \r
   Index = 0;\r
   for (RedIndex = 0; RedIndex < 8; RedIndex++) {\r
     for (GreenIndex = 0; GreenIndex < 8; GreenIndex++) {\r
       for (BlueIndex = 0; BlueIndex < 4; BlueIndex++) {\r
-        SetPaletteColor (Private, Index, (UINT8) (RedIndex << 5), (UINT8) (GreenIndex << 5), (UINT8) (BlueIndex << 6));\r
+        SetPaletteColor (Private, Index, (UINT8)(RedIndex << 5), (UINT8)(GreenIndex << 5), (UINT8)(BlueIndex << 6));\r
         Index++;\r
       }\r
     }\r
@@ -810,8 +840,8 @@ ClearScreen (
 VOID\r
 DrawLogo (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           ScreenWidth,\r
-  UINTN                           ScreenHeight\r
+  UINTN                    ScreenWidth,\r
+  UINTN                    ScreenHeight\r
   )\r
 {\r
 }\r
@@ -831,8 +861,8 @@ InitializeCirrusGraphicsMode (
   QEMU_VIDEO_CIRRUS_MODES  *ModeData\r
   )\r
 {\r
-  UINT8 Byte;\r
-  UINTN Index;\r
+  UINT8  Byte;\r
+  UINTN  Index;\r
 \r
   outw (Private, SEQ_ADDRESS_REGISTER, 0x1206);\r
   outw (Private, SEQ_ADDRESS_REGISTER, 0x0012);\r
@@ -843,7 +873,7 @@ InitializeCirrusGraphicsMode (
 \r
   if (Private->Variant == QEMU_VIDEO_CIRRUS_5430) {\r
     outb (Private, SEQ_ADDRESS_REGISTER, 0x0f);\r
-    Byte = (UINT8) ((inb (Private, SEQ_DATA_REGISTER) & 0xc7) ^ 0x30);\r
+    Byte = (UINT8)((inb (Private, SEQ_DATA_REGISTER) & 0xc7) ^ 0x30);\r
     outb (Private, SEQ_DATA_REGISTER, Byte);\r
   }\r
 \r
@@ -853,17 +883,17 @@ InitializeCirrusGraphicsMode (
   outw (Private, CRTC_ADDRESS_REGISTER, 0x2011);\r
 \r
   for (Index = 0; Index < 28; Index++) {\r
-    outw (Private, CRTC_ADDRESS_REGISTER, (UINT16) ((ModeData->CrtcSettings[Index] << 8) | Index));\r
+    outw (Private, CRTC_ADDRESS_REGISTER, (UINT16)((ModeData->CrtcSettings[Index] << 8) | Index));\r
   }\r
 \r
   for (Index = 0; Index < 9; Index++) {\r
-    outw (Private, GRAPH_ADDRESS_REGISTER, (UINT16) ((GraphicsController[Index] << 8) | Index));\r
+    outw (Private, GRAPH_ADDRESS_REGISTER, (UINT16)((GraphicsController[Index] << 8) | Index));\r
   }\r
 \r
   inb (Private, INPUT_STATUS_1_REGISTER);\r
 \r
   for (Index = 0; Index < 21; Index++) {\r
-    outb (Private, ATT_ADDRESS_REGISTER, (UINT8) Index);\r
+    outb (Private, ATT_ADDRESS_REGISTER, (UINT8)Index);\r
     outb (Private, ATT_ADDRESS_REGISTER, AttributeController[Index]);\r
   }\r
 \r
@@ -885,21 +915,21 @@ BochsWrite (
   UINT16                   Data\r
   )\r
 {\r
-  EFI_STATUS   Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {\r
     Status = Private->PciIo->Mem.Write (\r
-        Private->PciIo,\r
-        EfiPciIoWidthUint16,\r
-        PCI_BAR_IDX2,\r
-        0x500 + (Reg << 1),\r
-        1,\r
-        &Data\r
-        );\r
+                                   Private->PciIo,\r
+                                   EfiPciIoWidthUint16,\r
+                                   PCI_BAR_IDX2,\r
+                                   0x500 + (Reg << 1),\r
+                                   1,\r
+                                   &Data\r
+                                   );\r
     ASSERT_EFI_ERROR (Status);\r
   } else {\r
     outw (Private, VBE_DISPI_IOPORT_INDEX, Reg);\r
-    outw (Private, VBE_DISPI_IOPORT_DATA,  Data);\r
+    outw (Private, VBE_DISPI_IOPORT_DATA, Data);\r
   }\r
 }\r
 \r
@@ -909,23 +939,24 @@ BochsRead (
   UINT16                   Reg\r
   )\r
 {\r
-  EFI_STATUS   Status;\r
-  UINT16       Data;\r
+  EFI_STATUS  Status;\r
+  UINT16      Data;\r
 \r
   if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {\r
     Status = Private->PciIo->Mem.Read (\r
-        Private->PciIo,\r
-        EfiPciIoWidthUint16,\r
-        PCI_BAR_IDX2,\r
-        0x500 + (Reg << 1),\r
-        1,\r
-        &Data\r
-        );\r
+                                   Private->PciIo,\r
+                                   EfiPciIoWidthUint16,\r
+                                   PCI_BAR_IDX2,\r
+                                   0x500 + (Reg << 1),\r
+                                   1,\r
+                                   &Data\r
+                                   );\r
     ASSERT_EFI_ERROR (Status);\r
   } else {\r
     outw (Private, VBE_DISPI_IOPORT_INDEX, Reg);\r
     Data = inw (Private, VBE_DISPI_IOPORT_DATA);\r
   }\r
+\r
   return Data;\r
 }\r
 \r
@@ -936,17 +967,17 @@ VgaOutb (
   UINT8                    Data\r
   )\r
 {\r
-  EFI_STATUS   Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {\r
     Status = Private->PciIo->Mem.Write (\r
-        Private->PciIo,\r
-        EfiPciIoWidthUint8,\r
-        PCI_BAR_IDX2,\r
-        0x400 - 0x3c0 + Reg,\r
-        1,\r
-        &Data\r
-        );\r
+                                   Private->PciIo,\r
+                                   EfiPciIoWidthUint8,\r
+                                   PCI_BAR_IDX2,\r
+                                   0x400 - 0x3c0 + Reg,\r
+                                   1,\r
+                                   &Data\r
+                                   );\r
     ASSERT_EFI_ERROR (Status);\r
   } else {\r
     outb (Private, Reg, Data);\r
@@ -956,28 +987,36 @@ VgaOutb (
 VOID\r
 InitializeBochsGraphicsMode (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  QEMU_VIDEO_BOCHS_MODES  *ModeData\r
+  QEMU_VIDEO_BOCHS_MODES   *ModeData\r
   )\r
 {\r
-  DEBUG ((DEBUG_INFO, "InitializeBochsGraphicsMode: %dx%d @ %d\n",\r
-          ModeData->Width, ModeData->Height, ModeData->ColorDepth));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "InitializeBochsGraphicsMode: %dx%d @ %d\n",\r
+    ModeData->Width,\r
+    ModeData->Height,\r
+    ModeData->ColorDepth\r
+    ));\r
 \r
   /* unblank */\r
   VgaOutb (Private, ATT_ADDRESS_REGISTER, 0x20);\r
 \r
-  BochsWrite (Private, VBE_DISPI_INDEX_ENABLE,      0);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_BANK,        0);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_X_OFFSET,    0);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_Y_OFFSET,    0);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_ENABLE, 0);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_BANK, 0);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_X_OFFSET, 0);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_Y_OFFSET, 0);\r
 \r
-  BochsWrite (Private, VBE_DISPI_INDEX_BPP,         (UINT16) ModeData->ColorDepth);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_XRES,        (UINT16) ModeData->Width);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_VIRT_WIDTH,  (UINT16) ModeData->Width);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_YRES,        (UINT16) ModeData->Height);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_VIRT_HEIGHT, (UINT16) ModeData->Height);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_BPP, (UINT16)ModeData->ColorDepth);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_XRES, (UINT16)ModeData->Width);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_VIRT_WIDTH, (UINT16)ModeData->Width);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_YRES, (UINT16)ModeData->Height);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_VIRT_HEIGHT, (UINT16)ModeData->Height);\r
 \r
-  BochsWrite (Private, VBE_DISPI_INDEX_ENABLE,\r
-              VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);\r
+  BochsWrite (\r
+    Private,\r
+    VBE_DISPI_INDEX_ENABLE,\r
+    VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED\r
+    );\r
 \r
   SetDefaultPalette (Private);\r
   ClearScreen (Private);\r
@@ -986,11 +1025,11 @@ InitializeBochsGraphicsMode (
 EFI_STATUS\r
 EFIAPI\r
 InitializeQemuVideo (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = EfiLibInstallDriverBindingComponentName2 (\r
              ImageHandle,\r
index 6b0a11ec1218102928a86f5d542b77df49841195..5ad0afe883784608e1bcc18c8ce54e191377a528 100644 (file)
 STATIC\r
 VOID\r
 QemuVideoCompleteModeInfo (\r
-  IN  QEMU_VIDEO_MODE_DATA           *ModeData,\r
+  IN  QEMU_VIDEO_MODE_DATA                  *ModeData,\r
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info\r
   )\r
 {\r
   Info->Version = 0;\r
   if (ModeData->ColorDepth == 8) {\r
-    Info->PixelFormat = PixelBitMask;\r
-    Info->PixelInformation.RedMask = PIXEL_RED_MASK;\r
-    Info->PixelInformation.GreenMask = PIXEL_GREEN_MASK;\r
-    Info->PixelInformation.BlueMask = PIXEL_BLUE_MASK;\r
+    Info->PixelFormat                   = PixelBitMask;\r
+    Info->PixelInformation.RedMask      = PIXEL_RED_MASK;\r
+    Info->PixelInformation.GreenMask    = PIXEL_GREEN_MASK;\r
+    Info->PixelInformation.BlueMask     = PIXEL_BLUE_MASK;\r
     Info->PixelInformation.ReservedMask = 0;\r
   } else if (ModeData->ColorDepth == 24) {\r
-    Info->PixelFormat = PixelBitMask;\r
-    Info->PixelInformation.RedMask = PIXEL24_RED_MASK;\r
-    Info->PixelInformation.GreenMask = PIXEL24_GREEN_MASK;\r
-    Info->PixelInformation.BlueMask = PIXEL24_BLUE_MASK;\r
+    Info->PixelFormat                   = PixelBitMask;\r
+    Info->PixelInformation.RedMask      = PIXEL24_RED_MASK;\r
+    Info->PixelInformation.GreenMask    = PIXEL24_GREEN_MASK;\r
+    Info->PixelInformation.BlueMask     = PIXEL24_BLUE_MASK;\r
     Info->PixelInformation.ReservedMask = 0;\r
   } else if (ModeData->ColorDepth == 32) {\r
     DEBUG ((DEBUG_INFO, "PixelBlueGreenRedReserved8BitPerColor\n"));\r
     Info->PixelFormat = PixelBlueGreenRedReserved8BitPerColor;\r
   }\r
+\r
   Info->PixelsPerScanLine = Info->HorizontalResolution;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 QemuVideoCompleteModeData (\r
-  IN  QEMU_VIDEO_PRIVATE_DATA           *Private,\r
-  OUT EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode\r
+  IN  QEMU_VIDEO_PRIVATE_DATA            *Private,\r
+  OUT EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE  *Mode\r
   )\r
 {\r
   EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info;\r
   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR     *FrameBufDesc;\r
-  QEMU_VIDEO_MODE_DATA           *ModeData;\r
+  QEMU_VIDEO_MODE_DATA                  *ModeData;\r
 \r
   ModeData = &Private->ModeData[Mode->Mode];\r
-  Info = Mode->Info;\r
+  Info     = Mode->Info;\r
   QemuVideoCompleteModeInfo (ModeData, Info);\r
 \r
   Private->PciIo->GetBarAttributes (\r
-                        Private->PciIo,\r
-                        Private->FrameBufferVramBarIndex,\r
-                        NULL,\r
-                        (VOID**) &FrameBufDesc\r
-                        );\r
+                    Private->PciIo,\r
+                    Private->FrameBufferVramBarIndex,\r
+                    NULL,\r
+                    (VOID **)&FrameBufDesc\r
+                    );\r
 \r
   Mode->FrameBufferBase = FrameBufDesc->AddrRangeMin;\r
   Mode->FrameBufferSize = Info->HorizontalResolution * Info->VerticalResolution;\r
@@ -65,8 +65,12 @@ QemuVideoCompleteModeData (
   Mode->FrameBufferSize = EFI_PAGES_TO_SIZE (\r
                             EFI_SIZE_TO_PAGES (Mode->FrameBufferSize)\r
                             );\r
-  DEBUG ((DEBUG_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n",\r
-    Mode->FrameBufferBase, (UINT64)Mode->FrameBufferSize));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n",\r
+    Mode->FrameBufferBase,\r
+    (UINT64)Mode->FrameBufferSize\r
+    ));\r
 \r
   FreePool (FrameBufDesc);\r
   return EFI_SUCCESS;\r
@@ -83,6 +87,7 @@ QemuVideoGraphicsOutputQueryMode (
   OUT UINTN                                 *SizeOfInfo,\r
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  **Info\r
   )\r
+\r
 /*++\r
 \r
 Routine Description:\r
@@ -109,7 +114,7 @@ Routine Description:
 \r
   Private = QEMU_VIDEO_PRIVATE_DATA_FROM_GRAPHICS_OUTPUT_THIS (This);\r
 \r
-  if (Info == NULL || SizeOfInfo == NULL || ModeNumber >= This->Mode->MaxMode) {\r
+  if ((Info == NULL) || (SizeOfInfo == NULL) || (ModeNumber >= This->Mode->MaxMode)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -120,7 +125,7 @@ Routine Description:
 \r
   *SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
 \r
-  ModeData = &Private->ModeData[ModeNumber];\r
+  ModeData                      = &Private->ModeData[ModeNumber];\r
   (*Info)->HorizontalResolution = ModeData->HorizontalResolution;\r
   (*Info)->VerticalResolution   = ModeData->VerticalResolution;\r
   QemuVideoCompleteModeInfo (ModeData, *Info);\r
@@ -131,9 +136,10 @@ Routine Description:
 EFI_STATUS\r
 EFIAPI\r
 QemuVideoGraphicsOutputSetMode (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL *This,\r
-  IN  UINT32                       ModeNumber\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL  *This,\r
+  IN  UINT32                        ModeNumber\r
   )\r
+\r
 /*++\r
 \r
 Routine Description:\r
@@ -151,10 +157,10 @@ Routine Description:
 \r
 --*/\r
 {\r
-  QEMU_VIDEO_PRIVATE_DATA       *Private;\r
-  QEMU_VIDEO_MODE_DATA          *ModeData;\r
-  RETURN_STATUS                 Status;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL Black;\r
+  QEMU_VIDEO_PRIVATE_DATA        *Private;\r
+  QEMU_VIDEO_MODE_DATA           *ModeData;\r
+  RETURN_STATUS                  Status;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL  Black;\r
 \r
   Private = QEMU_VIDEO_PRIVATE_DATA_FROM_GRAPHICS_OUTPUT_THIS (This);\r
 \r
@@ -165,23 +171,23 @@ Routine Description:
   ModeData = &Private->ModeData[ModeNumber];\r
 \r
   switch (Private->Variant) {\r
-  case QEMU_VIDEO_CIRRUS_5430:\r
-  case QEMU_VIDEO_CIRRUS_5446:\r
-    InitializeCirrusGraphicsMode (Private, &QemuVideoCirrusModes[ModeData->InternalModeIndex]);\r
-    break;\r
-  case QEMU_VIDEO_BOCHS_MMIO:\r
-  case QEMU_VIDEO_BOCHS:\r
-    InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->InternalModeIndex]);\r
-    break;\r
-  default:\r
-    ASSERT (FALSE);\r
-    return EFI_DEVICE_ERROR;\r
+    case QEMU_VIDEO_CIRRUS_5430:\r
+    case QEMU_VIDEO_CIRRUS_5446:\r
+      InitializeCirrusGraphicsMode (Private, &QemuVideoCirrusModes[ModeData->InternalModeIndex]);\r
+      break;\r
+    case QEMU_VIDEO_BOCHS_MMIO:\r
+    case QEMU_VIDEO_BOCHS:\r
+      InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->InternalModeIndex]);\r
+      break;\r
+    default:\r
+      ASSERT (FALSE);\r
+      return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  This->Mode->Mode = ModeNumber;\r
+  This->Mode->Mode                       = ModeNumber;\r
   This->Mode->Info->HorizontalResolution = ModeData->HorizontalResolution;\r
-  This->Mode->Info->VerticalResolution = ModeData->VerticalResolution;\r
-  This->Mode->SizeOfInfo = sizeof(EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
+  This->Mode->Info->VerticalResolution   = ModeData->VerticalResolution;\r
+  This->Mode->SizeOfInfo                 = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
 \r
   QemuVideoCompleteModeData (Private, This->Mode);\r
 \r
@@ -189,7 +195,7 @@ Routine Description:
   // Re-initialize the frame buffer configure when mode changes.\r
   //\r
   Status = FrameBufferBltConfigure (\r
-             (VOID*) (UINTN) This->Mode->FrameBufferBase,\r
+             (VOID *)(UINTN)This->Mode->FrameBufferBase,\r
              This->Mode->Info,\r
              Private->FrameBufferBltConfigure,\r
              &Private->FrameBufferBltConfigureSize\r
@@ -201,6 +207,7 @@ Routine Description:
     if (Private->FrameBufferBltConfigure != NULL) {\r
       FreePool (Private->FrameBufferBltConfigure);\r
     }\r
+\r
     Private->FrameBufferBltConfigure =\r
       AllocatePool (Private->FrameBufferBltConfigureSize);\r
     ASSERT (Private->FrameBufferBltConfigure != NULL);\r
@@ -209,12 +216,13 @@ Routine Description:
     // Create the configuration for FrameBufferBltLib\r
     //\r
     Status = FrameBufferBltConfigure (\r
-                (VOID*) (UINTN) This->Mode->FrameBufferBase,\r
-                This->Mode->Info,\r
-                Private->FrameBufferBltConfigure,\r
-                &Private->FrameBufferBltConfigureSize\r
-                );\r
+               (VOID *)(UINTN)This->Mode->FrameBufferBase,\r
+               This->Mode->Info,\r
+               Private->FrameBufferBltConfigure,\r
+               &Private->FrameBufferBltConfigureSize\r
+               );\r
   }\r
+\r
   ASSERT (Status == RETURN_SUCCESS);\r
 \r
   //\r
@@ -225,9 +233,12 @@ Routine Description:
              Private->FrameBufferBltConfigure,\r
              &Black,\r
              EfiBltVideoFill,\r
-             0, 0,\r
-             0, 0,\r
-             This->Mode->Info->HorizontalResolution, This->Mode->Info->VerticalResolution,\r
+             0,\r
+             0,\r
+             0,\r
+             0,\r
+             This->Mode->Info->HorizontalResolution,\r
+             This->Mode->Info->VerticalResolution,\r
              0\r
              );\r
   ASSERT_RETURN_ERROR (Status);\r
@@ -238,17 +249,18 @@ Routine Description:
 EFI_STATUS\r
 EFIAPI\r
 QemuVideoGraphicsOutputBlt (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL          *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL         *BltBuffer  OPTIONAL,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION     BltOperation,\r
-  IN  UINTN                                 SourceX,\r
-  IN  UINTN                                 SourceY,\r
-  IN  UINTN                                 DestinationX,\r
-  IN  UINTN                                 DestinationY,\r
-  IN  UINTN                                 Width,\r
-  IN  UINTN                                 Height,\r
-  IN  UINTN                                 Delta\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,\r
+  IN  UINTN                              SourceX,\r
+  IN  UINTN                              SourceY,\r
+  IN  UINTN                              DestinationX,\r
+  IN  UINTN                              DestinationY,\r
+  IN  UINTN                              Width,\r
+  IN  UINTN                              Height,\r
+  IN  UINTN                              Delta\r
   )\r
+\r
 /*++\r
 \r
 Routine Description:\r
@@ -278,9 +290,9 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_TPL                         OriginalTPL;\r
-  QEMU_VIDEO_PRIVATE_DATA         *Private;\r
+  EFI_STATUS               Status;\r
+  EFI_TPL                  OriginalTPL;\r
+  QEMU_VIDEO_PRIVATE_DATA  *Private;\r
 \r
   Private = QEMU_VIDEO_PRIVATE_DATA_FROM_GRAPHICS_OUTPUT_THIS (This);\r
   //\r
@@ -291,27 +303,27 @@ Returns:
   OriginalTPL = gBS->RaiseTPL (TPL_NOTIFY);\r
 \r
   switch (BltOperation) {\r
-  case EfiBltVideoToBltBuffer:\r
-  case EfiBltBufferToVideo:\r
-  case EfiBltVideoFill:\r
-  case EfiBltVideoToVideo:\r
-    Status = FrameBufferBlt (\r
-      Private->FrameBufferBltConfigure,\r
-      BltBuffer,\r
-      BltOperation,\r
-      SourceX,\r
-      SourceY,\r
-      DestinationX,\r
-      DestinationY,\r
-      Width,\r
-      Height,\r
-      Delta\r
-      );\r
-    break;\r
-\r
-  default:\r
-    Status = EFI_INVALID_PARAMETER;\r
-    break;\r
+    case EfiBltVideoToBltBuffer:\r
+    case EfiBltBufferToVideo:\r
+    case EfiBltVideoFill:\r
+    case EfiBltVideoToVideo:\r
+      Status = FrameBufferBlt (\r
+                 Private->FrameBufferBltConfigure,\r
+                 BltBuffer,\r
+                 BltOperation,\r
+                 SourceX,\r
+                 SourceY,\r
+                 DestinationX,\r
+                 DestinationY,\r
+                 Width,\r
+                 Height,\r
+                 Delta\r
+                 );\r
+      break;\r
+\r
+    default:\r
+      Status = EFI_INVALID_PARAMETER;\r
+      break;\r
   }\r
 \r
   gBS->RestoreTPL (OriginalTPL);\r
@@ -324,9 +336,8 @@ QemuVideoGraphicsOutputConstructor (
   QEMU_VIDEO_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput;\r
-\r
+  EFI_STATUS                    Status;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *GraphicsOutput;\r
 \r
   GraphicsOutput            = &Private->GraphicsOutput;\r
   GraphicsOutput->QueryMode = QemuVideoGraphicsOutputQueryMode;\r
@@ -339,7 +350,7 @@ QemuVideoGraphicsOutputConstructor (
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
                   sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE),\r
-                  (VOID **) &Private->GraphicsOutput.Mode\r
+                  (VOID **)&Private->GraphicsOutput.Mode\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -348,12 +359,13 @@ QemuVideoGraphicsOutputConstructor (
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
                   sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION),\r
-                  (VOID **) &Private->GraphicsOutput.Mode->Info\r
+                  (VOID **)&Private->GraphicsOutput.Mode->Info\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeMode;\r
   }\r
-  Private->GraphicsOutput.Mode->MaxMode = (UINT32) Private->MaxMode;\r
+\r
+  Private->GraphicsOutput.Mode->MaxMode = (UINT32)Private->MaxMode;\r
   Private->GraphicsOutput.Mode->Mode    = GRAPHICS_OUTPUT_INVALIDE_MODE_NUMBER;\r
   Private->FrameBufferBltConfigure      = NULL;\r
   Private->FrameBufferBltConfigureSize  = 0;\r
@@ -388,6 +400,7 @@ EFI_STATUS
 QemuVideoGraphicsOutputDestructor (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private\r
   )\r
+\r
 /*++\r
 \r
 Routine Description:\r
@@ -408,6 +421,7 @@ Returns:
     if (Private->GraphicsOutput.Mode->Info != NULL) {\r
       gBS->FreePool (Private->GraphicsOutput.Mode->Info);\r
     }\r
+\r
     gBS->FreePool (Private->GraphicsOutput.Mode);\r
   }\r
 \r
index b5a5660ed2eed5481463b0ccf0695ab364b9f498..533ec661d64f5e54db9fe3af40d7d6936f9f9f15 100644 (file)
@@ -9,7 +9,6 @@
 \r
 #include "Qemu.h"\r
 \r
-\r
 ///\r
 /// Generic Attribute Controller Register Settings\r
 ///\r
@@ -22,33 +21,33 @@ UINT8  AttributeController[21] = {
 ///\r
 /// Generic Graphics Controller Register Settings\r
 ///\r
-UINT8 GraphicsController[9] = {\r
+UINT8  GraphicsController[9] = {\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F, 0xFF\r
 };\r
 \r
 //\r
 // 640 x 480 x 256 color @ 60 Hertz\r
 //\r
-UINT8 Crtc_640_480_256_60[28] = {\r
+UINT8  Crtc_640_480_256_60[28] = {\r
   0x5d, 0x4f, 0x50, 0x82, 0x53, 0x9f, 0x00, 0x3e,\r
   0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0xe1, 0x83, 0xdf, 0x50, 0x00, 0xe7, 0x04, 0xe3,\r
   0xff, 0x00, 0x00, 0x22\r
 };\r
 \r
-UINT8 Crtc_640_480_32bpp_60[28] = {\r
+UINT8  Crtc_640_480_32bpp_60[28] = {\r
   0x5d, 0x4f, 0x50, 0x82, 0x53, 0x9f, 0x00, 0x3e,\r
   0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0xe1, 0x83, 0xdf, 0x40, 0x00, 0xe7, 0x04, 0xe3,\r
   0xff, 0x00, 0x00, 0x32\r
 };\r
 \r
-UINT16 Seq_640_480_256_60[15] = {\r
+UINT16  Seq_640_480_256_60[15] = {\r
   0x0100, 0x0101, 0x0f02, 0x0003, 0x0e04, 0x1107, 0x0008, 0x4a0b,\r
   0x5b0c, 0x450d, 0x7e0e, 0x2b1b, 0x2f1c, 0x301d, 0x331e\r
 };\r
 \r
-UINT16 Seq_640_480_32bpp_60[15] = {\r
+UINT16  Seq_640_480_32bpp_60[15] = {\r
   0x0100, 0x0101, 0x0f02, 0x0003, 0x0e04, 0x1907, 0x0008, 0x4a0b,\r
   0x5b0c, 0x450d, 0x7e0e, 0x2b1b, 0x2f1c, 0x301d, 0x331e\r
 };\r
@@ -56,38 +55,38 @@ UINT16 Seq_640_480_32bpp_60[15] = {
 //\r
 // 800 x 600 x 256 color @ 60 Hertz\r
 //\r
-UINT8 Crtc_800_600_256_60[28] = {\r
+UINT8  Crtc_800_600_256_60[28] = {\r
   0x7F, 0x63, 0x64, 0x80, 0x6B, 0x1B, 0x72, 0xF0,\r
   0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x58, 0x8C, 0x57, 0x64, 0x00, 0x5F, 0x91, 0xE3,\r
   0xFF, 0x00, 0x00, 0x22\r
 };\r
 \r
-UINT8 Crtc_800_600_32bpp_60[28] = {\r
+UINT8  Crtc_800_600_32bpp_60[28] = {\r
   0x7F, 0x63, 0x64, 0x80, 0x6B, 0x1B, 0x72, 0xF0,\r
   0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x58, 0x8C, 0x57, 0x90, 0x00, 0x5F, 0x91, 0xE3,\r
   0xFF, 0x00, 0x00, 0x32\r
 };\r
 \r
-UINT16 Seq_800_600_256_60[15] = {\r
+UINT16  Seq_800_600_256_60[15] = {\r
   0x0100, 0x0101, 0x0f02, 0x0003, 0x0e04, 0x1107, 0x0008, 0x4a0b,\r
   0x5b0c, 0x450d, 0x510e, 0x2b1b, 0x2f1c, 0x301d, 0x3a1e\r
 };\r
 \r
-UINT16 Seq_800_600_32bpp_60[15] = {\r
+UINT16  Seq_800_600_32bpp_60[15] = {\r
   0x0100, 0x0101, 0x0f02, 0x0003, 0x0e04, 0x1907, 0x0008, 0x4a0b,\r
   0x5b0c, 0x450d, 0x510e, 0x2b1b, 0x2f1c, 0x301d, 0x3a1e\r
 };\r
 \r
-UINT8 Crtc_960_720_32bpp_60[28] = {\r
+UINT8  Crtc_960_720_32bpp_60[28] = {\r
   0xA3, 0x77, 0x80, 0x86, 0x85, 0x96, 0x24, 0xFD,\r
   0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x02, 0x88, 0xCF, 0xe0, 0x00, 0x00, 0x64, 0xE3,\r
   0xFF, 0x4A, 0x00, 0x32\r
 };\r
 \r
-UINT16 Seq_960_720_32bpp_60[15] = {\r
+UINT16  Seq_960_720_32bpp_60[15] = {\r
   0x0100, 0x0101, 0x0f02, 0x0003, 0x0e04, 0x1907, 0x0008, 0x4a0b,\r
   0x5b0c, 0x450d, 0x760e, 0x2b1b, 0x2f1c, 0x301d, 0x341e\r
 };\r
@@ -95,14 +94,14 @@ UINT16 Seq_960_720_32bpp_60[15] = {
 //\r
 // 1024 x 768 x 256 color @ 60 Hertz\r
 //\r
-UINT8 Crtc_1024_768_256_60[28] = {\r
+UINT8  Crtc_1024_768_256_60[28] = {\r
   0xA3, 0x7F, 0x80, 0x86, 0x85, 0x96, 0x24, 0xFD,\r
   0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x02, 0x88, 0xFF, 0x80, 0x00, 0x00, 0x24, 0xE3,\r
   0xFF, 0x4A, 0x00, 0x22\r
 };\r
 \r
-UINT16 Seq_1024_768_256_60[15] = {\r
+UINT16  Seq_1024_768_256_60[15] = {\r
   0x0100, 0x0101, 0x0f02, 0x0003, 0x0e04, 0x1107, 0x0008, 0x4a0b,\r
   0x5b0c, 0x450d, 0x760e, 0x2b1b, 0x2f1c, 0x301d, 0x341e\r
 };\r
@@ -110,26 +109,26 @@ UINT16 Seq_1024_768_256_60[15] = {
 //\r
 // 1024 x 768 x 24-bit color @ 60 Hertz\r
 //\r
-UINT8 Crtc_1024_768_24bpp_60[28] = {\r
+UINT8  Crtc_1024_768_24bpp_60[28] = {\r
   0xA3, 0x7F, 0x80, 0x86, 0x85, 0x96, 0x24, 0xFD,\r
   0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x02, 0x88, 0xFF, 0x80, 0x00, 0x00, 0x24, 0xE3,\r
   0xFF, 0x4A, 0x00, 0x32\r
 };\r
 \r
-UINT16 Seq_1024_768_24bpp_60[15] = {\r
+UINT16  Seq_1024_768_24bpp_60[15] = {\r
   0x0100, 0x0101, 0x0f02, 0x0003, 0x0e04, 0x1507, 0x0008, 0x4a0b,\r
   0x5b0c, 0x450d, 0x760e, 0x2b1b, 0x2f1c, 0x301d, 0x341e\r
 };\r
 \r
-UINT8 Crtc_1024_768_32bpp_60[28] = {\r
+UINT8  Crtc_1024_768_32bpp_60[28] = {\r
   0xA3, 0x7F, 0x80, 0x86, 0x85, 0x96, 0x24, 0xFD,\r
   0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x02, 0x88, 0xFF, 0xe0, 0x00, 0x00, 0x64, 0xE3,\r
   0xFF, 0x4A, 0x00, 0x32\r
 };\r
 \r
-UINT16 Seq_1024_768_32bpp_60[15] = {\r
+UINT16  Seq_1024_768_32bpp_60[15] = {\r
   0x0100, 0x0101, 0x0f02, 0x0003, 0x0e04, 0x1907, 0x0008, 0x4a0b,\r
   0x5b0c, 0x450d, 0x760e, 0x2b1b, 0x2f1c, 0x301d, 0x341e\r
 };\r
@@ -138,14 +137,14 @@ UINT16 Seq_1024_768_32bpp_60[15] = {
 /// Table of supported video modes\r
 ///\r
 QEMU_VIDEO_CIRRUS_MODES  QemuVideoCirrusModes[] = {\r
-//  {  640, 480, 8, Crtc_640_480_256_60,  Seq_640_480_256_60,  0xe3 },\r
-//  {  800, 600, 8, Crtc_800_600_256_60,  Seq_800_600_256_60,  0xef },\r
-  {  640, 480, 32, Crtc_640_480_32bpp_60,  Seq_640_480_32bpp_60,  0xef },\r
-  {  800, 600, 32, Crtc_800_600_32bpp_60,  Seq_800_600_32bpp_60,  0xef },\r
-//  { 1024, 768, 8, Crtc_1024_768_256_60, Seq_1024_768_256_60, 0xef }\r
+  //  {  640, 480, 8, Crtc_640_480_256_60,  Seq_640_480_256_60,  0xe3 },\r
+  //  {  800, 600, 8, Crtc_800_600_256_60,  Seq_800_600_256_60,  0xef },\r
+  { 640,  480, 32, Crtc_640_480_32bpp_60,  Seq_640_480_32bpp_60,  0xef },\r
+  { 800,  600, 32, Crtc_800_600_32bpp_60,  Seq_800_600_32bpp_60,  0xef },\r
+  //  { 1024, 768, 8, Crtc_1024_768_256_60, Seq_1024_768_256_60, 0xef }\r
   { 1024, 768, 24, Crtc_1024_768_24bpp_60, Seq_1024_768_24bpp_60, 0xef }\r
-//  { 1024, 768, 32, Crtc_1024_768_32bpp_60, Seq_1024_768_32bpp_60, 0xef }\r
-//  { 960, 720, 32, Crtc_960_720_32bpp_60, Seq_1024_768_32bpp_60, 0xef }\r
+  //  { 1024, 768, 32, Crtc_1024_768_32bpp_60, Seq_1024_768_32bpp_60, 0xef }\r
+  //  { 960, 720, 32, Crtc_960_720_32bpp_60, Seq_1024_768_32bpp_60, 0xef }\r
 };\r
 \r
 #define QEMU_VIDEO_CIRRUS_MODE_COUNT \\r
@@ -160,9 +159,9 @@ QemuVideoCirrusModeSetup (
   QEMU_VIDEO_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  UINT32                                 Index;\r
-  QEMU_VIDEO_MODE_DATA                   *ModeData;\r
-  QEMU_VIDEO_CIRRUS_MODES                *VideoMode;\r
+  UINT32                   Index;\r
+  QEMU_VIDEO_MODE_DATA     *ModeData;\r
+  QEMU_VIDEO_CIRRUS_MODES  *VideoMode;\r
 \r
   //\r
   // Setup Video Modes\r
@@ -173,25 +172,28 @@ QemuVideoCirrusModeSetup (
   if (Private->ModeData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  ModeData = Private->ModeData;\r
+\r
+  ModeData  = Private->ModeData;\r
   VideoMode = &QemuVideoCirrusModes[0];\r
-  for (Index = 0; Index < QEMU_VIDEO_CIRRUS_MODE_COUNT; Index ++) {\r
-    ModeData->InternalModeIndex = Index;\r
-    ModeData->HorizontalResolution          = VideoMode->Width;\r
-    ModeData->VerticalResolution            = VideoMode->Height;\r
-    ModeData->ColorDepth                    = VideoMode->ColorDepth;\r
-    DEBUG ((DEBUG_INFO,\r
+  for (Index = 0; Index < QEMU_VIDEO_CIRRUS_MODE_COUNT; Index++) {\r
+    ModeData->InternalModeIndex    = Index;\r
+    ModeData->HorizontalResolution = VideoMode->Width;\r
+    ModeData->VerticalResolution   = VideoMode->Height;\r
+    ModeData->ColorDepth           = VideoMode->ColorDepth;\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
       "Adding Mode %d as Cirrus Internal Mode %d: %dx%d, %d-bit\n",\r
-      (INT32) (ModeData - Private->ModeData),\r
+      (INT32)(ModeData - Private->ModeData),\r
       ModeData->InternalModeIndex,\r
       ModeData->HorizontalResolution,\r
       ModeData->VerticalResolution,\r
       ModeData->ColorDepth\r
       ));\r
 \r
-    ModeData ++ ;\r
-    VideoMode ++;\r
+    ModeData++;\r
+    VideoMode++;\r
   }\r
+\r
   Private->MaxMode = ModeData - Private->ModeData;\r
 \r
   return EFI_SUCCESS;\r
@@ -201,26 +203,26 @@ QemuVideoCirrusModeSetup (
 /// Table of supported video modes\r
 ///\r
 QEMU_VIDEO_BOCHS_MODES  QemuVideoBochsModes[] = {\r
-  {  640,  480, 32 },\r
-  {  800,  480, 32 },\r
-  {  800,  600, 32 },\r
-  {  832,  624, 32 },\r
-  {  960,  640, 32 },\r
-  { 1024,  600, 32 },\r
-  { 1024,  768, 32 },\r
-  { 1152,  864, 32 },\r
-  { 1152,  870, 32 },\r
-  { 1280,  720, 32 },\r
-  { 1280,  760, 32 },\r
-  { 1280,  768, 32 },\r
-  { 1280,  800, 32 },\r
-  { 1280,  960, 32 },\r
+  { 640,  480,  32 },\r
+  { 800,  480,  32 },\r
+  { 800,  600,  32 },\r
+  { 832,  624,  32 },\r
+  { 960,  640,  32 },\r
+  { 1024, 600,  32 },\r
+  { 1024, 768,  32 },\r
+  { 1152, 864,  32 },\r
+  { 1152, 870,  32 },\r
+  { 1280, 720,  32 },\r
+  { 1280, 760,  32 },\r
+  { 1280, 768,  32 },\r
+  { 1280, 800,  32 },\r
+  { 1280, 960,  32 },\r
   { 1280, 1024, 32 },\r
-  { 1360,  768, 32 },\r
-  { 1366,  768, 32 },\r
+  { 1360, 768,  32 },\r
+  { 1366, 768,  32 },\r
   { 1400, 1050, 32 },\r
-  { 1440,  900, 32 },\r
-  { 1600,  900, 32 },\r
+  { 1440, 900,  32 },\r
+  { 1600, 900,  32 },\r
   { 1600, 1200, 32 },\r
   { 1680, 1050, 32 },\r
   { 1920, 1080, 32 },\r
@@ -249,10 +251,10 @@ QemuVideoBochsModeSetup (
   BOOLEAN                  IsQxl\r
   )\r
 {\r
-  UINT32                                 AvailableFbSize;\r
-  UINT32                                 Index;\r
-  QEMU_VIDEO_MODE_DATA                   *ModeData;\r
-  QEMU_VIDEO_BOCHS_MODES                 *VideoMode;\r
+  UINT32                  AvailableFbSize;\r
+  UINT32                  Index;\r
+  QEMU_VIDEO_MODE_DATA    *ModeData;\r
+  QEMU_VIDEO_BOCHS_MODES  *VideoMode;\r
 \r
   //\r
   // Fetch the available framebuffer size.\r
@@ -272,33 +274,64 @@ QemuVideoBochsModeSetup (
   // where it is also available.\r
   //\r
   if (IsQxl) {\r
-    UINT32 Signature;\r
-    UINT32 DrawStart;\r
+    UINT32  Signature;\r
+    UINT32  DrawStart;\r
 \r
-    Signature = 0;\r
-    DrawStart = 0xFFFFFFFF;\r
+    Signature       = 0;\r
+    DrawStart       = 0xFFFFFFFF;\r
     AvailableFbSize = 0;\r
     if (EFI_ERROR (\r
-          Private->PciIo->Mem.Read (Private->PciIo, EfiPciIoWidthUint32,\r
-                                PCI_BAR_IDX2, 0, 1, &Signature)) ||\r
-        Signature != SIGNATURE_32 ('Q', 'X', 'R', 'O') ||\r
+          Private->PciIo->Mem.Read (\r
+                                Private->PciIo,\r
+                                EfiPciIoWidthUint32,\r
+                                PCI_BAR_IDX2,\r
+                                0,\r
+                                1,\r
+                                &Signature\r
+                                )\r
+          ) ||\r
+        (Signature != SIGNATURE_32 ('Q', 'X', 'R', 'O')) ||\r
         EFI_ERROR (\r
-          Private->PciIo->Mem.Read (Private->PciIo, EfiPciIoWidthUint32,\r
-                                PCI_BAR_IDX2, 36, 1, &DrawStart)) ||\r
-        DrawStart != 0 ||\r
+          Private->PciIo->Mem.Read (\r
+                                Private->PciIo,\r
+                                EfiPciIoWidthUint32,\r
+                                PCI_BAR_IDX2,\r
+                                36,\r
+                                1,\r
+                                &DrawStart\r
+                                )\r
+          ) ||\r
+        (DrawStart != 0) ||\r
         EFI_ERROR (\r
-          Private->PciIo->Mem.Read (Private->PciIo, EfiPciIoWidthUint32,\r
-                                PCI_BAR_IDX2, 40, 1, &AvailableFbSize))) {\r
-      DEBUG ((DEBUG_ERROR, "%a: can't read size of drawable buffer from QXL "\r
-        "ROM\n", __FUNCTION__));\r
+          Private->PciIo->Mem.Read (\r
+                                Private->PciIo,\r
+                                EfiPciIoWidthUint32,\r
+                                PCI_BAR_IDX2,\r
+                                40,\r
+                                1,\r
+                                &AvailableFbSize\r
+                                )\r
+          ))\r
+    {\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: can't read size of drawable buffer from QXL "\r
+        "ROM\n",\r
+        __FUNCTION__\r
+        ));\r
       return EFI_NOT_FOUND;\r
     }\r
   } else {\r
     AvailableFbSize  = BochsRead (Private, VBE_DISPI_INDEX_VIDEO_MEMORY_64K);\r
     AvailableFbSize *= SIZE_64KB;\r
   }\r
-  DEBUG ((DEBUG_INFO, "%a: AvailableFbSize=0x%x\n", __FUNCTION__,\r
-    AvailableFbSize));\r
+\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: AvailableFbSize=0x%x\n",\r
+    __FUNCTION__,\r
+    AvailableFbSize\r
+    ));\r
 \r
   //\r
   // Setup Video Modes\r
@@ -309,34 +342,37 @@ QemuVideoBochsModeSetup (
   if (Private->ModeData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  ModeData = Private->ModeData;\r
+\r
+  ModeData  = Private->ModeData;\r
   VideoMode = &QemuVideoBochsModes[0];\r
-  for (Index = 0; Index < QEMU_VIDEO_BOCHS_MODE_COUNT; Index ++) {\r
-    UINTN RequiredFbSize;\r
+  for (Index = 0; Index < QEMU_VIDEO_BOCHS_MODE_COUNT; Index++) {\r
+    UINTN  RequiredFbSize;\r
 \r
     ASSERT (VideoMode->ColorDepth % 8 == 0);\r
-    RequiredFbSize = (UINTN) VideoMode->Width * VideoMode->Height *\r
+    RequiredFbSize = (UINTN)VideoMode->Width * VideoMode->Height *\r
                      (VideoMode->ColorDepth / 8);\r
     if (RequiredFbSize <= AvailableFbSize) {\r
       ModeData->InternalModeIndex    = Index;\r
       ModeData->HorizontalResolution = VideoMode->Width;\r
       ModeData->VerticalResolution   = VideoMode->Height;\r
       ModeData->ColorDepth           = VideoMode->ColorDepth;\r
-      DEBUG ((DEBUG_INFO,\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
         "Adding Mode %d as Bochs Internal Mode %d: %dx%d, %d-bit\n",\r
-        (INT32) (ModeData - Private->ModeData),\r
+        (INT32)(ModeData - Private->ModeData),\r
         ModeData->InternalModeIndex,\r
         ModeData->HorizontalResolution,\r
         ModeData->VerticalResolution,\r
         ModeData->ColorDepth\r
         ));\r
 \r
-      ModeData ++ ;\r
+      ModeData++;\r
     }\r
-    VideoMode ++;\r
+\r
+    VideoMode++;\r
   }\r
+\r
   Private->MaxMode = ModeData - Private->ModeData;\r
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index 87c933935f59b6558f8aed006f80c692524b8e9f..8f05898f862ca4da4400ea76d50102a8f9747e05 100644 (file)
@@ -13,7 +13,6 @@
 #ifndef _QEMU_H_\r
 #define _QEMU_H_\r
 \r
-\r
 #include <Uefi.h>\r
 #include <Protocol/GraphicsOutput.h>\r
 #include <Protocol/PciIo.h>\r
 //\r
 // QEMU Video PCI Configuration Header values\r
 //\r
-#define CIRRUS_LOGIC_VENDOR_ID                0x1013\r
-#define CIRRUS_LOGIC_5430_DEVICE_ID           0x00a8\r
-#define CIRRUS_LOGIC_5430_ALTERNATE_DEVICE_ID 0x00a0\r
-#define CIRRUS_LOGIC_5446_DEVICE_ID           0x00b8\r
+#define CIRRUS_LOGIC_VENDOR_ID                 0x1013\r
+#define CIRRUS_LOGIC_5430_DEVICE_ID            0x00a8\r
+#define CIRRUS_LOGIC_5430_ALTERNATE_DEVICE_ID  0x00a0\r
+#define CIRRUS_LOGIC_5446_DEVICE_ID            0x00b8\r
 \r
 //\r
 // QEMU Vide Graphical Mode Data\r
 //\r
 typedef struct {\r
-  UINT32  InternalModeIndex; // points into card-specific mode table\r
-  UINT32  HorizontalResolution;\r
-  UINT32  VerticalResolution;\r
-  UINT32  ColorDepth;\r
+  UINT32    InternalModeIndex; // points into card-specific mode table\r
+  UINT32    HorizontalResolution;\r
+  UINT32    VerticalResolution;\r
+  UINT32    ColorDepth;\r
 } QEMU_VIDEO_MODE_DATA;\r
 \r
-#define PIXEL_RED_SHIFT   0\r
-#define PIXEL_GREEN_SHIFT 3\r
-#define PIXEL_BLUE_SHIFT  6\r
+#define PIXEL_RED_SHIFT    0\r
+#define PIXEL_GREEN_SHIFT  3\r
+#define PIXEL_BLUE_SHIFT   6\r
 \r
 #define PIXEL_RED_MASK    (BIT7 | BIT6 | BIT5)\r
 #define PIXEL_GREEN_MASK  (BIT4 | BIT3 | BIT2)\r
 #define PIXEL_BLUE_MASK   (BIT1 | BIT0)\r
 \r
-#define PIXEL_TO_COLOR_BYTE(pixel, mask, shift) ((UINT8) ((pixel & mask) << shift))\r
-#define PIXEL_TO_RED_BYTE(pixel) PIXEL_TO_COLOR_BYTE(pixel, PIXEL_RED_MASK, PIXEL_RED_SHIFT)\r
-#define PIXEL_TO_GREEN_BYTE(pixel) PIXEL_TO_COLOR_BYTE(pixel, PIXEL_GREEN_MASK, PIXEL_GREEN_SHIFT)\r
-#define PIXEL_TO_BLUE_BYTE(pixel) PIXEL_TO_COLOR_BYTE(pixel, PIXEL_BLUE_MASK, PIXEL_BLUE_SHIFT)\r
+#define PIXEL_TO_COLOR_BYTE(pixel, mask, shift)  ((UINT8) ((pixel & mask) << shift))\r
+#define PIXEL_TO_RED_BYTE(pixel)                 PIXEL_TO_COLOR_BYTE(pixel, PIXEL_RED_MASK, PIXEL_RED_SHIFT)\r
+#define PIXEL_TO_GREEN_BYTE(pixel)               PIXEL_TO_COLOR_BYTE(pixel, PIXEL_GREEN_MASK, PIXEL_GREEN_SHIFT)\r
+#define PIXEL_TO_BLUE_BYTE(pixel)                PIXEL_TO_COLOR_BYTE(pixel, PIXEL_BLUE_MASK, PIXEL_BLUE_SHIFT)\r
 \r
 #define RGB_BYTES_TO_PIXEL(Red, Green, Blue) \\r
   (UINT8) ( (((Red) >> PIXEL_RED_SHIFT) & PIXEL_RED_MASK) | \\r
@@ -90,117 +89,116 @@ typedef enum {
 } QEMU_VIDEO_VARIANT;\r
 \r
 typedef struct {\r
-  UINT8                                 SubClass;\r
-  UINT16                                VendorId;\r
-  UINT16                                DeviceId;\r
-  QEMU_VIDEO_VARIANT                    Variant;\r
-  CHAR16                                *Name;\r
+  UINT8                 SubClass;\r
+  UINT16                VendorId;\r
+  UINT16                DeviceId;\r
+  QEMU_VIDEO_VARIANT    Variant;\r
+  CHAR16                *Name;\r
 } QEMU_VIDEO_CARD;\r
 \r
 typedef struct {\r
-  UINT64                                Signature;\r
-  EFI_HANDLE                            Handle;\r
-  EFI_PCI_IO_PROTOCOL                   *PciIo;\r
-  UINT64                                OriginalPciAttributes;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL          GraphicsOutput;\r
-  EFI_DEVICE_PATH_PROTOCOL              *GopDevicePath;\r
+  UINT64                          Signature;\r
+  EFI_HANDLE                      Handle;\r
+  EFI_PCI_IO_PROTOCOL             *PciIo;\r
+  UINT64                          OriginalPciAttributes;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL    GraphicsOutput;\r
+  EFI_DEVICE_PATH_PROTOCOL        *GopDevicePath;\r
 \r
   //\r
   // The next two fields match the client-visible\r
   // EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE.MaxMode field.\r
   //\r
-  UINTN                                 MaxMode;\r
-  QEMU_VIDEO_MODE_DATA                  *ModeData;\r
+  UINTN                           MaxMode;\r
+  QEMU_VIDEO_MODE_DATA            *ModeData;\r
 \r
-  QEMU_VIDEO_VARIANT                    Variant;\r
-  FRAME_BUFFER_CONFIGURE                *FrameBufferBltConfigure;\r
-  UINTN                                 FrameBufferBltConfigureSize;\r
-  UINT8                                 FrameBufferVramBarIndex;\r
+  QEMU_VIDEO_VARIANT              Variant;\r
+  FRAME_BUFFER_CONFIGURE          *FrameBufferBltConfigure;\r
+  UINTN                           FrameBufferBltConfigureSize;\r
+  UINT8                           FrameBufferVramBarIndex;\r
 } QEMU_VIDEO_PRIVATE_DATA;\r
 \r
 ///\r
 /// Card-specific Video Mode structures\r
 ///\r
 typedef struct {\r
-  UINT32  Width;\r
-  UINT32  Height;\r
-  UINT32  ColorDepth;\r
-  UINT8   *CrtcSettings;\r
-  UINT16  *SeqSettings;\r
-  UINT8   MiscSetting;\r
+  UINT32    Width;\r
+  UINT32    Height;\r
+  UINT32    ColorDepth;\r
+  UINT8     *CrtcSettings;\r
+  UINT16    *SeqSettings;\r
+  UINT8     MiscSetting;\r
 } QEMU_VIDEO_CIRRUS_MODES;\r
 \r
 typedef struct {\r
-  UINT32  Width;\r
-  UINT32  Height;\r
-  UINT32  ColorDepth;\r
+  UINT32    Width;\r
+  UINT32    Height;\r
+  UINT32    ColorDepth;\r
 } QEMU_VIDEO_BOCHS_MODES;\r
 \r
 #define QEMU_VIDEO_PRIVATE_DATA_FROM_GRAPHICS_OUTPUT_THIS(a) \\r
   CR(a, QEMU_VIDEO_PRIVATE_DATA, GraphicsOutput, QEMU_VIDEO_PRIVATE_DATA_SIGNATURE)\r
 \r
-\r
 //\r
 // Global Variables\r
 //\r
-extern UINT8                                      AttributeController[];\r
-extern UINT8                                      GraphicsController[];\r
-extern UINT8                                      Crtc_640_480_256_60[];\r
-extern UINT16                                     Seq_640_480_256_60[];\r
-extern UINT8                                      Crtc_800_600_256_60[];\r
-extern UINT16                                     Seq_800_600_256_60[];\r
-extern UINT8                                      Crtc_1024_768_256_60[];\r
-extern UINT16                                     Seq_1024_768_256_60[];\r
-extern QEMU_VIDEO_CIRRUS_MODES                    QemuVideoCirrusModes[];\r
-extern QEMU_VIDEO_BOCHS_MODES                     QemuVideoBochsModes[];\r
-extern EFI_DRIVER_BINDING_PROTOCOL                gQemuVideoDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL                gQemuVideoComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL               gQemuVideoComponentName2;\r
+extern UINT8                         AttributeController[];\r
+extern UINT8                         GraphicsController[];\r
+extern UINT8                         Crtc_640_480_256_60[];\r
+extern UINT16                        Seq_640_480_256_60[];\r
+extern UINT8                         Crtc_800_600_256_60[];\r
+extern UINT16                        Seq_800_600_256_60[];\r
+extern UINT8                         Crtc_1024_768_256_60[];\r
+extern UINT16                        Seq_1024_768_256_60[];\r
+extern QEMU_VIDEO_CIRRUS_MODES       QemuVideoCirrusModes[];\r
+extern QEMU_VIDEO_BOCHS_MODES        QemuVideoBochsModes[];\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gQemuVideoDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gQemuVideoComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gQemuVideoComponentName2;\r
 \r
 //\r
 // Io Registers defined by VGA\r
 //\r
-#define CRTC_ADDRESS_REGISTER   0x3d4\r
-#define CRTC_DATA_REGISTER      0x3d5\r
-#define SEQ_ADDRESS_REGISTER    0x3c4\r
-#define SEQ_DATA_REGISTER       0x3c5\r
-#define GRAPH_ADDRESS_REGISTER  0x3ce\r
-#define GRAPH_DATA_REGISTER     0x3cf\r
-#define ATT_ADDRESS_REGISTER    0x3c0\r
-#define MISC_OUTPUT_REGISTER    0x3c2\r
-#define INPUT_STATUS_1_REGISTER 0x3da\r
-#define DAC_PIXEL_MASK_REGISTER 0x3c6\r
-#define PALETTE_INDEX_REGISTER  0x3c8\r
-#define PALETTE_DATA_REGISTER   0x3c9\r
-\r
-#define VBE_DISPI_IOPORT_INDEX           0x01CE\r
-#define VBE_DISPI_IOPORT_DATA            0x01D0\r
-\r
-#define VBE_DISPI_INDEX_ID               0x0\r
-#define VBE_DISPI_INDEX_XRES             0x1\r
-#define VBE_DISPI_INDEX_YRES             0x2\r
-#define VBE_DISPI_INDEX_BPP              0x3\r
-#define VBE_DISPI_INDEX_ENABLE           0x4\r
-#define VBE_DISPI_INDEX_BANK             0x5\r
-#define VBE_DISPI_INDEX_VIRT_WIDTH       0x6\r
-#define VBE_DISPI_INDEX_VIRT_HEIGHT      0x7\r
-#define VBE_DISPI_INDEX_X_OFFSET         0x8\r
-#define VBE_DISPI_INDEX_Y_OFFSET         0x9\r
-#define VBE_DISPI_INDEX_VIDEO_MEMORY_64K 0xa\r
-\r
-#define VBE_DISPI_ID0                    0xB0C0\r
-#define VBE_DISPI_ID1                    0xB0C1\r
-#define VBE_DISPI_ID2                    0xB0C2\r
-#define VBE_DISPI_ID3                    0xB0C3\r
-#define VBE_DISPI_ID4                    0xB0C4\r
-#define VBE_DISPI_ID5                    0xB0C5\r
-\r
-#define VBE_DISPI_DISABLED               0x00\r
-#define VBE_DISPI_ENABLED                0x01\r
-#define VBE_DISPI_GETCAPS                0x02\r
-#define VBE_DISPI_8BIT_DAC               0x20\r
-#define VBE_DISPI_LFB_ENABLED            0x40\r
-#define VBE_DISPI_NOCLEARMEM             0x80\r
+#define CRTC_ADDRESS_REGISTER    0x3d4\r
+#define CRTC_DATA_REGISTER       0x3d5\r
+#define SEQ_ADDRESS_REGISTER     0x3c4\r
+#define SEQ_DATA_REGISTER        0x3c5\r
+#define GRAPH_ADDRESS_REGISTER   0x3ce\r
+#define GRAPH_DATA_REGISTER      0x3cf\r
+#define ATT_ADDRESS_REGISTER     0x3c0\r
+#define MISC_OUTPUT_REGISTER     0x3c2\r
+#define INPUT_STATUS_1_REGISTER  0x3da\r
+#define DAC_PIXEL_MASK_REGISTER  0x3c6\r
+#define PALETTE_INDEX_REGISTER   0x3c8\r
+#define PALETTE_DATA_REGISTER    0x3c9\r
+\r
+#define VBE_DISPI_IOPORT_INDEX  0x01CE\r
+#define VBE_DISPI_IOPORT_DATA   0x01D0\r
+\r
+#define VBE_DISPI_INDEX_ID                0x0\r
+#define VBE_DISPI_INDEX_XRES              0x1\r
+#define VBE_DISPI_INDEX_YRES              0x2\r
+#define VBE_DISPI_INDEX_BPP               0x3\r
+#define VBE_DISPI_INDEX_ENABLE            0x4\r
+#define VBE_DISPI_INDEX_BANK              0x5\r
+#define VBE_DISPI_INDEX_VIRT_WIDTH        0x6\r
+#define VBE_DISPI_INDEX_VIRT_HEIGHT       0x7\r
+#define VBE_DISPI_INDEX_X_OFFSET          0x8\r
+#define VBE_DISPI_INDEX_Y_OFFSET          0x9\r
+#define VBE_DISPI_INDEX_VIDEO_MEMORY_64K  0xa\r
+\r
+#define VBE_DISPI_ID0  0xB0C0\r
+#define VBE_DISPI_ID1  0xB0C1\r
+#define VBE_DISPI_ID2  0xB0C2\r
+#define VBE_DISPI_ID3  0xB0C3\r
+#define VBE_DISPI_ID4  0xB0C4\r
+#define VBE_DISPI_ID5  0xB0C5\r
+\r
+#define VBE_DISPI_DISABLED     0x00\r
+#define VBE_DISPI_ENABLED      0x01\r
+#define VBE_DISPI_GETCAPS      0x02\r
+#define VBE_DISPI_8BIT_DAC     0x20\r
+#define VBE_DISPI_LFB_ENABLED  0x40\r
+#define VBE_DISPI_NOCLEARMEM   0x80\r
 \r
 //\r
 // Graphics Output Hardware abstraction internal worker functions\r
@@ -215,10 +213,10 @@ QemuVideoGraphicsOutputDestructor (
   QEMU_VIDEO_PRIVATE_DATA  *Private\r
   );\r
 \r
-\r
 //\r
 // EFI_DRIVER_BINDING_PROTOCOL Protocol Interface\r
 //\r
+\r
 /**\r
   TODO: Add function description\r
 \r
@@ -278,6 +276,7 @@ QemuVideoControllerDriverStop (
 //\r
 // EFI Component Name Functions\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -325,7 +324,6 @@ QemuVideoComponentNameGetDriverName (
   OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -397,14 +395,13 @@ QemuVideoComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 QemuVideoComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 //\r
 // Local Function Prototypes\r
 //\r
@@ -423,10 +420,10 @@ InitializeBochsGraphicsMode (
 VOID\r
 SetPaletteColor (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           Index,\r
-  UINT8                           Red,\r
-  UINT8                           Green,\r
-  UINT8                           Blue\r
+  UINTN                    Index,\r
+  UINT8                    Red,\r
+  UINT8                    Green,\r
+  UINT8                    Blue\r
   );\r
 \r
 VOID\r
@@ -437,34 +434,34 @@ SetDefaultPalette (
 VOID\r
 DrawLogo (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           ScreenWidth,\r
-  UINTN                           ScreenHeight\r
+  UINTN                    ScreenWidth,\r
+  UINTN                    ScreenHeight\r
   );\r
 \r
 VOID\r
 outb (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           Address,\r
-  UINT8                           Data\r
+  UINTN                    Address,\r
+  UINT8                    Data\r
   );\r
 \r
 VOID\r
 outw (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           Address,\r
-  UINT16                          Data\r
+  UINTN                    Address,\r
+  UINT16                   Data\r
   );\r
 \r
 UINT8\r
 inb (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           Address\r
+  UINTN                    Address\r
   );\r
 \r
 UINT16\r
 inw (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  UINTN                           Address\r
+  UINTN                    Address\r
   );\r
 \r
 VOID\r
@@ -500,7 +497,8 @@ QemuVideoBochsModeSetup (
 \r
 VOID\r
 InstallVbeShim (\r
-  IN CONST CHAR16         *CardName,\r
-  IN EFI_PHYSICAL_ADDRESS FrameBufferBase\r
+  IN CONST CHAR16          *CardName,\r
+  IN EFI_PHYSICAL_ADDRESS  FrameBufferBase\r
   );\r
+\r
 #endif\r
index 048ffa7058caceecf49c5ecb41b40955f6ef790a..8faa146b6cce948d51d1f22803ac12fd114e2995 100644 (file)
@@ -26,8 +26,8 @@
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  UINT16 Offset;\r
-  UINT16 Segment;\r
+  UINT16    Offset;\r
+  UINT16    Segment;\r
 } IVT_ENTRY;\r
 #pragma pack ()\r
 \r
@@ -35,7 +35,7 @@ typedef struct {
 // This string is displayed by Windows 2008 R2 SP1 in the Screen Resolution,\r
 // Advanced Settings dialog. It should be short.\r
 //\r
-STATIC CONST CHAR8 mProductRevision[] = "OVMF Int10h (fake)";\r
+STATIC CONST CHAR8  mProductRevision[] = "OVMF Int10h (fake)";\r
 \r
 /**\r
   Install the VBE Info and VBE Mode Info structures, and the VBE service\r
@@ -51,23 +51,23 @@ STATIC CONST CHAR8 mProductRevision[] = "OVMF Int10h (fake)";
 **/\r
 VOID\r
 InstallVbeShim (\r
-  IN CONST CHAR16         *CardName,\r
-  IN EFI_PHYSICAL_ADDRESS FrameBufferBase\r
+  IN CONST CHAR16          *CardName,\r
+  IN EFI_PHYSICAL_ADDRESS  FrameBufferBase\r
   )\r
 {\r
-  EFI_PHYSICAL_ADDRESS Segment0, SegmentC, SegmentF;\r
-  UINTN                Segment0Pages;\r
-  IVT_ENTRY            *Int0x10;\r
-  EFI_STATUS           Segment0AllocationStatus;\r
-  UINT16               HostBridgeDevId;\r
-  UINTN                Pam1Address;\r
-  UINT8                Pam1;\r
-  UINTN                SegmentCPages;\r
-  VBE_INFO             *VbeInfoFull;\r
-  VBE_INFO_BASE        *VbeInfo;\r
-  UINT8                *Ptr;\r
-  UINTN                Printed;\r
-  VBE_MODE_INFO        *VbeModeInfo;\r
+  EFI_PHYSICAL_ADDRESS  Segment0, SegmentC, SegmentF;\r
+  UINTN                 Segment0Pages;\r
+  IVT_ENTRY             *Int0x10;\r
+  EFI_STATUS            Segment0AllocationStatus;\r
+  UINT16                HostBridgeDevId;\r
+  UINTN                 Pam1Address;\r
+  UINT8                 Pam1;\r
+  UINTN                 SegmentCPages;\r
+  VBE_INFO              *VbeInfoFull;\r
+  VBE_INFO_BASE         *VbeInfo;\r
+  UINT8                 *Ptr;\r
+  UINTN                 Printed;\r
+  VBE_MODE_INFO         *VbeModeInfo;\r
 \r
   if ((PcdGet8 (PcdNullPointerDetectionPropertyMask) & (BIT0|BIT7)) == BIT0) {\r
     DEBUG ((\r
@@ -95,8 +95,8 @@ InstallVbeShim (
   //\r
   // The allocation request may fail, eg. if LegacyBiosDxe has already run.\r
   //\r
-  Segment0Pages = 1;\r
-  Int0x10       = (IVT_ENTRY *)(UINTN)(Segment0 + 0x10 * sizeof (IVT_ENTRY));\r
+  Segment0Pages            = 1;\r
+  Int0x10                  = (IVT_ENTRY *)(UINTN)(Segment0 + 0x10 * sizeof (IVT_ENTRY));\r
   Segment0AllocationStatus = gBS->AllocatePages (\r
                                     AllocateAddress,\r
                                     EfiBootServicesCode,\r
@@ -105,7 +105,7 @@ InstallVbeShim (
                                     );\r
 \r
   if (EFI_ERROR (Segment0AllocationStatus)) {\r
-    EFI_PHYSICAL_ADDRESS Handler;\r
+    EFI_PHYSICAL_ADDRESS  Handler;\r
 \r
     //\r
     // Check if a video BIOS handler has been installed previously -- we\r
@@ -113,9 +113,14 @@ InstallVbeShim (
     // it's already present.\r
     //\r
     Handler = (Int0x10->Segment << 4) + Int0x10->Offset;\r
-    if (Handler >= SegmentC && Handler < SegmentF) {\r
-      DEBUG ((DEBUG_INFO, "%a: Video BIOS handler found at %04x:%04x\n",\r
-        __FUNCTION__, Int0x10->Segment, Int0x10->Offset));\r
+    if ((Handler >= SegmentC) && (Handler < SegmentF)) {\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "%a: Video BIOS handler found at %04x:%04x\n",\r
+        __FUNCTION__,\r
+        Int0x10->Segment,\r
+        Int0x10->Offset\r
+        ));\r
       return;\r
     }\r
 \r
@@ -145,26 +150,28 @@ InstallVbeShim (
   //\r
   HostBridgeDevId = PcdGet16 (PcdOvmfHostBridgePciDevId);\r
   switch (HostBridgeDevId) {\r
-  case INTEL_82441_DEVICE_ID:\r
-    Pam1Address = PMC_REGISTER_PIIX4 (PIIX4_PAM1);\r
-    break;\r
-  case INTEL_Q35_MCH_DEVICE_ID:\r
-    Pam1Address = DRAMC_REGISTER_Q35 (MCH_PAM1);\r
-    break;\r
-  default:\r
-    DEBUG ((\r
-      DEBUG_ERROR,\r
-      "%a: unknown host bridge device ID: 0x%04x\n",\r
-      __FUNCTION__,\r
-      HostBridgeDevId\r
-      ));\r
-    ASSERT (FALSE);\r
+    case INTEL_82441_DEVICE_ID:\r
+      Pam1Address = PMC_REGISTER_PIIX4 (PIIX4_PAM1);\r
+      break;\r
+    case INTEL_Q35_MCH_DEVICE_ID:\r
+      Pam1Address = DRAMC_REGISTER_Q35 (MCH_PAM1);\r
+      break;\r
+    default:\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: unknown host bridge device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        HostBridgeDevId\r
+        ));\r
+      ASSERT (FALSE);\r
+\r
+      if (!EFI_ERROR (Segment0AllocationStatus)) {\r
+        gBS->FreePages (Segment0, Segment0Pages);\r
+      }\r
 \r
-    if (!EFI_ERROR (Segment0AllocationStatus)) {\r
-      gBS->FreePages (Segment0, Segment0Pages);\r
-    }\r
-    return;\r
+      return;\r
   }\r
+\r
   //\r
   // low nibble covers 0xC0000 to 0xC3FFF\r
   // high nibble covers 0xC4000 to 0xC7FFF\r
@@ -201,12 +208,12 @@ InstallVbeShim (
   VbeInfo->Capabilities = BIT0; // DAC can be switched into 8-bit mode\r
 \r
   VbeInfo->ModeListAddress = (UINT32)SegmentC << 12 | (UINT16)(UINTN)Ptr;\r
-  *(UINT16*)Ptr = 0x00f1; // mode number\r
-  Ptr += 2;\r
-  *(UINT16*)Ptr = 0xFFFF; // mode list terminator\r
-  Ptr += 2;\r
+  *(UINT16 *)Ptr           = 0x00f1; // mode number\r
+  Ptr                     += 2;\r
+  *(UINT16 *)Ptr           = 0xFFFF; // mode list terminator\r
+  Ptr                     += 2;\r
 \r
-  VbeInfo->VideoMem64K = (UINT16)((1024 * 768 * 4 + 65535) / 65536);\r
+  VbeInfo->VideoMem64K        = (UINT16)((1024 * 768 * 4 + 65535) / 65536);\r
   VbeInfo->OemSoftwareVersion = 0x0000;\r
 \r
   VbeInfo->VendorNameAddress = (UINT32)SegmentC << 12 | (UINT16)(UINTN)Ptr;\r
@@ -214,9 +221,12 @@ InstallVbeShim (
   Ptr += 5;\r
 \r
   VbeInfo->ProductNameAddress = (UINT32)SegmentC << 12 | (UINT16)(UINTN)Ptr;\r
-  Printed = AsciiSPrint ((CHAR8 *)Ptr,\r
-              sizeof VbeInfoFull->Buffer - (Ptr - VbeInfoFull->Buffer), "%s",\r
-              CardName);\r
+  Printed                     = AsciiSPrint (\r
+                                  (CHAR8 *)Ptr,\r
+                                  sizeof VbeInfoFull->Buffer - (Ptr - VbeInfoFull->Buffer),\r
+                                  "%s",\r
+                                  CardName\r
+                                  );\r
   Ptr += Printed + 1;\r
 \r
   VbeInfo->ProductRevAddress = (UINT32)SegmentC << 12 | (UINT16)(UINTN)Ptr;\r
@@ -246,7 +256,7 @@ InstallVbeShim (
   // bit1: bit1: readable\r
   // bit2: writeable\r
   //\r
-  VbeModeInfo->WindowAAttr              = BIT2 | BIT1 | BIT0;\r
+  VbeModeInfo->WindowAAttr = BIT2 | BIT1 | BIT0;\r
 \r
   VbeModeInfo->WindowBAttr              = 0x00;\r
   VbeModeInfo->WindowGranularityKB      = 0x0040;\r
@@ -309,8 +319,8 @@ InstallVbeShim (
   //\r
   // Second, point the Int10h vector at the shim.\r
   //\r
-  Int0x10->Segment = (UINT16) ((UINT32)SegmentC >> 4);\r
-  Int0x10->Offset  = (UINT16) ((UINTN) (VbeModeInfo + 1) - SegmentC);\r
+  Int0x10->Segment = (UINT16)((UINT32)SegmentC >> 4);\r
+  Int0x10->Offset  = (UINT16)((UINTN)(VbeModeInfo + 1) - SegmentC);\r
 \r
   DEBUG ((DEBUG_INFO, "%a: VBE shim installed\n", __FUNCTION__));\r
 }\r
index cc9b6e14cdcd179f80c3effed628f189e65f73f0..f72e18843fd3f7022488d10d7ee4a65f8fc6d3b1 100644 (file)
 //\r
 // THIS FILE WAS GENERATED BY "VbeShim.sh". DO NOT EDIT.\r
 //\r
+\r
 #ifndef _VBE_SHIM_H_\r
 #define _VBE_SHIM_H_\r
-STATIC CONST UINT8 mVbeShim[] = {\r
-  /* 00000000 nop                            */  0x90,\r
-  /* 00000001 nop                            */  0x90,\r
-  /* 00000002 nop                            */  0x90,\r
-  /* 00000003 nop                            */  0x90,\r
-  /* 00000004 nop                            */  0x90,\r
-  /* 00000005 nop                            */  0x90,\r
-  /* 00000006 nop                            */  0x90,\r
-  /* 00000007 nop                            */  0x90,\r
-  /* 00000008 nop                            */  0x90,\r
-  /* 00000009 nop                            */  0x90,\r
-  /* 0000000A nop                            */  0x90,\r
-  /* 0000000B nop                            */  0x90,\r
-  /* 0000000C nop                            */  0x90,\r
-  /* 0000000D nop                            */  0x90,\r
-  /* 0000000E nop                            */  0x90,\r
-  /* 0000000F nop                            */  0x90,\r
-  /* 00000010 nop                            */  0x90,\r
-  /* 00000011 nop                            */  0x90,\r
-  /* 00000012 nop                            */  0x90,\r
-  /* 00000013 nop                            */  0x90,\r
-  /* 00000014 nop                            */  0x90,\r
-  /* 00000015 nop                            */  0x90,\r
-  /* 00000016 nop                            */  0x90,\r
-  /* 00000017 nop                            */  0x90,\r
-  /* 00000018 nop                            */  0x90,\r
-  /* 00000019 nop                            */  0x90,\r
-  /* 0000001A nop                            */  0x90,\r
-  /* 0000001B nop                            */  0x90,\r
-  /* 0000001C nop                            */  0x90,\r
-  /* 0000001D nop                            */  0x90,\r
-  /* 0000001E nop                            */  0x90,\r
-  /* 0000001F nop                            */  0x90,\r
-  /* 00000020 nop                            */  0x90,\r
-  /* 00000021 nop                            */  0x90,\r
-  /* 00000022 nop                            */  0x90,\r
-  /* 00000023 nop                            */  0x90,\r
-  /* 00000024 nop                            */  0x90,\r
-  /* 00000025 nop                            */  0x90,\r
-  /* 00000026 nop                            */  0x90,\r
-  /* 00000027 nop                            */  0x90,\r
-  /* 00000028 nop                            */  0x90,\r
-  /* 00000029 nop                            */  0x90,\r
-  /* 0000002A nop                            */  0x90,\r
-  /* 0000002B nop                            */  0x90,\r
-  /* 0000002C nop                            */  0x90,\r
-  /* 0000002D nop                            */  0x90,\r
-  /* 0000002E nop                            */  0x90,\r
-  /* 0000002F nop                            */  0x90,\r
-  /* 00000030 nop                            */  0x90,\r
-  /* 00000031 nop                            */  0x90,\r
-  /* 00000032 nop                            */  0x90,\r
-  /* 00000033 nop                            */  0x90,\r
-  /* 00000034 nop                            */  0x90,\r
-  /* 00000035 nop                            */  0x90,\r
-  /* 00000036 nop                            */  0x90,\r
-  /* 00000037 nop                            */  0x90,\r
-  /* 00000038 nop                            */  0x90,\r
-  /* 00000039 nop                            */  0x90,\r
-  /* 0000003A nop                            */  0x90,\r
-  /* 0000003B nop                            */  0x90,\r
-  /* 0000003C nop                            */  0x90,\r
-  /* 0000003D nop                            */  0x90,\r
-  /* 0000003E nop                            */  0x90,\r
-  /* 0000003F nop                            */  0x90,\r
-  /* 00000040 nop                            */  0x90,\r
-  /* 00000041 nop                            */  0x90,\r
-  /* 00000042 nop                            */  0x90,\r
-  /* 00000043 nop                            */  0x90,\r
-  /* 00000044 nop                            */  0x90,\r
-  /* 00000045 nop                            */  0x90,\r
-  /* 00000046 nop                            */  0x90,\r
-  /* 00000047 nop                            */  0x90,\r
-  /* 00000048 nop                            */  0x90,\r
-  /* 00000049 nop                            */  0x90,\r
-  /* 0000004A nop                            */  0x90,\r
-  /* 0000004B nop                            */  0x90,\r
-  /* 0000004C nop                            */  0x90,\r
-  /* 0000004D nop                            */  0x90,\r
-  /* 0000004E nop                            */  0x90,\r
-  /* 0000004F nop                            */  0x90,\r
-  /* 00000050 nop                            */  0x90,\r
-  /* 00000051 nop                            */  0x90,\r
-  /* 00000052 nop                            */  0x90,\r
-  /* 00000053 nop                            */  0x90,\r
-  /* 00000054 nop                            */  0x90,\r
-  /* 00000055 nop                            */  0x90,\r
-  /* 00000056 nop                            */  0x90,\r
-  /* 00000057 nop                            */  0x90,\r
-  /* 00000058 nop                            */  0x90,\r
-  /* 00000059 nop                            */  0x90,\r
-  /* 0000005A nop                            */  0x90,\r
-  /* 0000005B nop                            */  0x90,\r
-  /* 0000005C nop                            */  0x90,\r
-  /* 0000005D nop                            */  0x90,\r
-  /* 0000005E nop                            */  0x90,\r
-  /* 0000005F nop                            */  0x90,\r
-  /* 00000060 nop                            */  0x90,\r
-  /* 00000061 nop                            */  0x90,\r
-  /* 00000062 nop                            */  0x90,\r
-  /* 00000063 nop                            */  0x90,\r
-  /* 00000064 nop                            */  0x90,\r
-  /* 00000065 nop                            */  0x90,\r
-  /* 00000066 nop                            */  0x90,\r
-  /* 00000067 nop                            */  0x90,\r
-  /* 00000068 nop                            */  0x90,\r
-  /* 00000069 nop                            */  0x90,\r
-  /* 0000006A nop                            */  0x90,\r
-  /* 0000006B nop                            */  0x90,\r
-  /* 0000006C nop                            */  0x90,\r
-  /* 0000006D nop                            */  0x90,\r
-  /* 0000006E nop                            */  0x90,\r
-  /* 0000006F nop                            */  0x90,\r
-  /* 00000070 nop                            */  0x90,\r
-  /* 00000071 nop                            */  0x90,\r
-  /* 00000072 nop                            */  0x90,\r
-  /* 00000073 nop                            */  0x90,\r
-  /* 00000074 nop                            */  0x90,\r
-  /* 00000075 nop                            */  0x90,\r
-  /* 00000076 nop                            */  0x90,\r
-  /* 00000077 nop                            */  0x90,\r
-  /* 00000078 nop                            */  0x90,\r
-  /* 00000079 nop                            */  0x90,\r
-  /* 0000007A nop                            */  0x90,\r
-  /* 0000007B nop                            */  0x90,\r
-  /* 0000007C nop                            */  0x90,\r
-  /* 0000007D nop                            */  0x90,\r
-  /* 0000007E nop                            */  0x90,\r
-  /* 0000007F nop                            */  0x90,\r
-  /* 00000080 nop                            */  0x90,\r
-  /* 00000081 nop                            */  0x90,\r
-  /* 00000082 nop                            */  0x90,\r
-  /* 00000083 nop                            */  0x90,\r
-  /* 00000084 nop                            */  0x90,\r
-  /* 00000085 nop                            */  0x90,\r
-  /* 00000086 nop                            */  0x90,\r
-  /* 00000087 nop                            */  0x90,\r
-  /* 00000088 nop                            */  0x90,\r
-  /* 00000089 nop                            */  0x90,\r
-  /* 0000008A nop                            */  0x90,\r
-  /* 0000008B nop                            */  0x90,\r
-  /* 0000008C nop                            */  0x90,\r
-  /* 0000008D nop                            */  0x90,\r
-  /* 0000008E nop                            */  0x90,\r
-  /* 0000008F nop                            */  0x90,\r
-  /* 00000090 nop                            */  0x90,\r
-  /* 00000091 nop                            */  0x90,\r
-  /* 00000092 nop                            */  0x90,\r
-  /* 00000093 nop                            */  0x90,\r
-  /* 00000094 nop                            */  0x90,\r
-  /* 00000095 nop                            */  0x90,\r
-  /* 00000096 nop                            */  0x90,\r
-  /* 00000097 nop                            */  0x90,\r
-  /* 00000098 nop                            */  0x90,\r
-  /* 00000099 nop                            */  0x90,\r
-  /* 0000009A nop                            */  0x90,\r
-  /* 0000009B nop                            */  0x90,\r
-  /* 0000009C nop                            */  0x90,\r
-  /* 0000009D nop                            */  0x90,\r
-  /* 0000009E nop                            */  0x90,\r
-  /* 0000009F nop                            */  0x90,\r
-  /* 000000A0 nop                            */  0x90,\r
-  /* 000000A1 nop                            */  0x90,\r
-  /* 000000A2 nop                            */  0x90,\r
-  /* 000000A3 nop                            */  0x90,\r
-  /* 000000A4 nop                            */  0x90,\r
-  /* 000000A5 nop                            */  0x90,\r
-  /* 000000A6 nop                            */  0x90,\r
-  /* 000000A7 nop                            */  0x90,\r
-  /* 000000A8 nop                            */  0x90,\r
-  /* 000000A9 nop                            */  0x90,\r
-  /* 000000AA nop                            */  0x90,\r
-  /* 000000AB nop                            */  0x90,\r
-  /* 000000AC nop                            */  0x90,\r
-  /* 000000AD nop                            */  0x90,\r
-  /* 000000AE nop                            */  0x90,\r
-  /* 000000AF nop                            */  0x90,\r
-  /* 000000B0 nop                            */  0x90,\r
-  /* 000000B1 nop                            */  0x90,\r
-  /* 000000B2 nop                            */  0x90,\r
-  /* 000000B3 nop                            */  0x90,\r
-  /* 000000B4 nop                            */  0x90,\r
-  /* 000000B5 nop                            */  0x90,\r
-  /* 000000B6 nop                            */  0x90,\r
-  /* 000000B7 nop                            */  0x90,\r
-  /* 000000B8 nop                            */  0x90,\r
-  /* 000000B9 nop                            */  0x90,\r
-  /* 000000BA nop                            */  0x90,\r
-  /* 000000BB nop                            */  0x90,\r
-  /* 000000BC nop                            */  0x90,\r
-  /* 000000BD nop                            */  0x90,\r
-  /* 000000BE nop                            */  0x90,\r
-  /* 000000BF nop                            */  0x90,\r
-  /* 000000C0 nop                            */  0x90,\r
-  /* 000000C1 nop                            */  0x90,\r
-  /* 000000C2 nop                            */  0x90,\r
-  /* 000000C3 nop                            */  0x90,\r
-  /* 000000C4 nop                            */  0x90,\r
-  /* 000000C5 nop                            */  0x90,\r
-  /* 000000C6 nop                            */  0x90,\r
-  /* 000000C7 nop                            */  0x90,\r
-  /* 000000C8 nop                            */  0x90,\r
-  /* 000000C9 nop                            */  0x90,\r
-  /* 000000CA nop                            */  0x90,\r
-  /* 000000CB nop                            */  0x90,\r
-  /* 000000CC nop                            */  0x90,\r
-  /* 000000CD nop                            */  0x90,\r
-  /* 000000CE nop                            */  0x90,\r
-  /* 000000CF nop                            */  0x90,\r
-  /* 000000D0 nop                            */  0x90,\r
-  /* 000000D1 nop                            */  0x90,\r
-  /* 000000D2 nop                            */  0x90,\r
-  /* 000000D3 nop                            */  0x90,\r
-  /* 000000D4 nop                            */  0x90,\r
-  /* 000000D5 nop                            */  0x90,\r
-  /* 000000D6 nop                            */  0x90,\r
-  /* 000000D7 nop                            */  0x90,\r
-  /* 000000D8 nop                            */  0x90,\r
-  /* 000000D9 nop                            */  0x90,\r
-  /* 000000DA nop                            */  0x90,\r
-  /* 000000DB nop                            */  0x90,\r
-  /* 000000DC nop                            */  0x90,\r
-  /* 000000DD nop                            */  0x90,\r
-  /* 000000DE nop                            */  0x90,\r
-  /* 000000DF nop                            */  0x90,\r
-  /* 000000E0 nop                            */  0x90,\r
-  /* 000000E1 nop                            */  0x90,\r
-  /* 000000E2 nop                            */  0x90,\r
-  /* 000000E3 nop                            */  0x90,\r
-  /* 000000E4 nop                            */  0x90,\r
-  /* 000000E5 nop                            */  0x90,\r
-  /* 000000E6 nop                            */  0x90,\r
-  /* 000000E7 nop                            */  0x90,\r
-  /* 000000E8 nop                            */  0x90,\r
-  /* 000000E9 nop                            */  0x90,\r
-  /* 000000EA nop                            */  0x90,\r
-  /* 000000EB nop                            */  0x90,\r
-  /* 000000EC nop                            */  0x90,\r
-  /* 000000ED nop                            */  0x90,\r
-  /* 000000EE nop                            */  0x90,\r
-  /* 000000EF nop                            */  0x90,\r
-  /* 000000F0 nop                            */  0x90,\r
-  /* 000000F1 nop                            */  0x90,\r
-  /* 000000F2 nop                            */  0x90,\r
-  /* 000000F3 nop                            */  0x90,\r
-  /* 000000F4 nop                            */  0x90,\r
-  /* 000000F5 nop                            */  0x90,\r
-  /* 000000F6 nop                            */  0x90,\r
-  /* 000000F7 nop                            */  0x90,\r
-  /* 000000F8 nop                            */  0x90,\r
-  /* 000000F9 nop                            */  0x90,\r
-  /* 000000FA nop                            */  0x90,\r
-  /* 000000FB nop                            */  0x90,\r
-  /* 000000FC nop                            */  0x90,\r
-  /* 000000FD nop                            */  0x90,\r
-  /* 000000FE nop                            */  0x90,\r
-  /* 000000FF nop                            */  0x90,\r
-  /* 00000100 nop                            */  0x90,\r
-  /* 00000101 nop                            */  0x90,\r
-  /* 00000102 nop                            */  0x90,\r
-  /* 00000103 nop                            */  0x90,\r
-  /* 00000104 nop                            */  0x90,\r
-  /* 00000105 nop                            */  0x90,\r
-  /* 00000106 nop                            */  0x90,\r
-  /* 00000107 nop                            */  0x90,\r
-  /* 00000108 nop                            */  0x90,\r
-  /* 00000109 nop                            */  0x90,\r
-  /* 0000010A nop                            */  0x90,\r
-  /* 0000010B nop                            */  0x90,\r
-  /* 0000010C nop                            */  0x90,\r
-  /* 0000010D nop                            */  0x90,\r
-  /* 0000010E nop                            */  0x90,\r
-  /* 0000010F nop                            */  0x90,\r
-  /* 00000110 nop                            */  0x90,\r
-  /* 00000111 nop                            */  0x90,\r
-  /* 00000112 nop                            */  0x90,\r
-  /* 00000113 nop                            */  0x90,\r
-  /* 00000114 nop                            */  0x90,\r
-  /* 00000115 nop                            */  0x90,\r
-  /* 00000116 nop                            */  0x90,\r
-  /* 00000117 nop                            */  0x90,\r
-  /* 00000118 nop                            */  0x90,\r
-  /* 00000119 nop                            */  0x90,\r
-  /* 0000011A nop                            */  0x90,\r
-  /* 0000011B nop                            */  0x90,\r
-  /* 0000011C nop                            */  0x90,\r
-  /* 0000011D nop                            */  0x90,\r
-  /* 0000011E nop                            */  0x90,\r
-  /* 0000011F nop                            */  0x90,\r
-  /* 00000120 nop                            */  0x90,\r
-  /* 00000121 nop                            */  0x90,\r
-  /* 00000122 nop                            */  0x90,\r
-  /* 00000123 nop                            */  0x90,\r
-  /* 00000124 nop                            */  0x90,\r
-  /* 00000125 nop                            */  0x90,\r
-  /* 00000126 nop                            */  0x90,\r
-  /* 00000127 nop                            */  0x90,\r
-  /* 00000128 nop                            */  0x90,\r
-  /* 00000129 nop                            */  0x90,\r
-  /* 0000012A nop                            */  0x90,\r
-  /* 0000012B nop                            */  0x90,\r
-  /* 0000012C nop                            */  0x90,\r
-  /* 0000012D nop                            */  0x90,\r
-  /* 0000012E nop                            */  0x90,\r
-  /* 0000012F nop                            */  0x90,\r
-  /* 00000130 nop                            */  0x90,\r
-  /* 00000131 nop                            */  0x90,\r
-  /* 00000132 nop                            */  0x90,\r
-  /* 00000133 nop                            */  0x90,\r
-  /* 00000134 nop                            */  0x90,\r
-  /* 00000135 nop                            */  0x90,\r
-  /* 00000136 nop                            */  0x90,\r
-  /* 00000137 nop                            */  0x90,\r
-  /* 00000138 nop                            */  0x90,\r
-  /* 00000139 nop                            */  0x90,\r
-  /* 0000013A nop                            */  0x90,\r
-  /* 0000013B nop                            */  0x90,\r
-  /* 0000013C nop                            */  0x90,\r
-  /* 0000013D nop                            */  0x90,\r
-  /* 0000013E nop                            */  0x90,\r
-  /* 0000013F nop                            */  0x90,\r
-  /* 00000140 nop                            */  0x90,\r
-  /* 00000141 nop                            */  0x90,\r
-  /* 00000142 nop                            */  0x90,\r
-  /* 00000143 nop                            */  0x90,\r
-  /* 00000144 nop                            */  0x90,\r
-  /* 00000145 nop                            */  0x90,\r
-  /* 00000146 nop                            */  0x90,\r
-  /* 00000147 nop                            */  0x90,\r
-  /* 00000148 nop                            */  0x90,\r
-  /* 00000149 nop                            */  0x90,\r
-  /* 0000014A nop                            */  0x90,\r
-  /* 0000014B nop                            */  0x90,\r
-  /* 0000014C nop                            */  0x90,\r
-  /* 0000014D nop                            */  0x90,\r
-  /* 0000014E nop                            */  0x90,\r
-  /* 0000014F nop                            */  0x90,\r
-  /* 00000150 nop                            */  0x90,\r
-  /* 00000151 nop                            */  0x90,\r
-  /* 00000152 nop                            */  0x90,\r
-  /* 00000153 nop                            */  0x90,\r
-  /* 00000154 nop                            */  0x90,\r
-  /* 00000155 nop                            */  0x90,\r
-  /* 00000156 nop                            */  0x90,\r
-  /* 00000157 nop                            */  0x90,\r
-  /* 00000158 nop                            */  0x90,\r
-  /* 00000159 nop                            */  0x90,\r
-  /* 0000015A nop                            */  0x90,\r
-  /* 0000015B nop                            */  0x90,\r
-  /* 0000015C nop                            */  0x90,\r
-  /* 0000015D nop                            */  0x90,\r
-  /* 0000015E nop                            */  0x90,\r
-  /* 0000015F nop                            */  0x90,\r
-  /* 00000160 nop                            */  0x90,\r
-  /* 00000161 nop                            */  0x90,\r
-  /* 00000162 nop                            */  0x90,\r
-  /* 00000163 nop                            */  0x90,\r
-  /* 00000164 nop                            */  0x90,\r
-  /* 00000165 nop                            */  0x90,\r
-  /* 00000166 nop                            */  0x90,\r
-  /* 00000167 nop                            */  0x90,\r
-  /* 00000168 nop                            */  0x90,\r
-  /* 00000169 nop                            */  0x90,\r
-  /* 0000016A nop                            */  0x90,\r
-  /* 0000016B nop                            */  0x90,\r
-  /* 0000016C nop                            */  0x90,\r
-  /* 0000016D nop                            */  0x90,\r
-  /* 0000016E nop                            */  0x90,\r
-  /* 0000016F nop                            */  0x90,\r
-  /* 00000170 nop                            */  0x90,\r
-  /* 00000171 nop                            */  0x90,\r
-  /* 00000172 nop                            */  0x90,\r
-  /* 00000173 nop                            */  0x90,\r
-  /* 00000174 nop                            */  0x90,\r
-  /* 00000175 nop                            */  0x90,\r
-  /* 00000176 nop                            */  0x90,\r
-  /* 00000177 nop                            */  0x90,\r
-  /* 00000178 nop                            */  0x90,\r
-  /* 00000179 nop                            */  0x90,\r
-  /* 0000017A nop                            */  0x90,\r
-  /* 0000017B nop                            */  0x90,\r
-  /* 0000017C nop                            */  0x90,\r
-  /* 0000017D nop                            */  0x90,\r
-  /* 0000017E nop                            */  0x90,\r
-  /* 0000017F nop                            */  0x90,\r
-  /* 00000180 nop                            */  0x90,\r
-  /* 00000181 nop                            */  0x90,\r
-  /* 00000182 nop                            */  0x90,\r
-  /* 00000183 nop                            */  0x90,\r
-  /* 00000184 nop                            */  0x90,\r
-  /* 00000185 nop                            */  0x90,\r
-  /* 00000186 nop                            */  0x90,\r
-  /* 00000187 nop                            */  0x90,\r
-  /* 00000188 nop                            */  0x90,\r
-  /* 00000189 nop                            */  0x90,\r
-  /* 0000018A nop                            */  0x90,\r
-  /* 0000018B nop                            */  0x90,\r
-  /* 0000018C nop                            */  0x90,\r
-  /* 0000018D nop                            */  0x90,\r
-  /* 0000018E nop                            */  0x90,\r
-  /* 0000018F nop                            */  0x90,\r
-  /* 00000190 nop                            */  0x90,\r
-  /* 00000191 nop                            */  0x90,\r
-  /* 00000192 nop                            */  0x90,\r
-  /* 00000193 nop                            */  0x90,\r
-  /* 00000194 nop                            */  0x90,\r
-  /* 00000195 nop                            */  0x90,\r
-  /* 00000196 nop                            */  0x90,\r
-  /* 00000197 nop                            */  0x90,\r
-  /* 00000198 nop                            */  0x90,\r
-  /* 00000199 nop                            */  0x90,\r
-  /* 0000019A nop                            */  0x90,\r
-  /* 0000019B nop                            */  0x90,\r
-  /* 0000019C nop                            */  0x90,\r
-  /* 0000019D nop                            */  0x90,\r
-  /* 0000019E nop                            */  0x90,\r
-  /* 0000019F nop                            */  0x90,\r
-  /* 000001A0 nop                            */  0x90,\r
-  /* 000001A1 nop                            */  0x90,\r
-  /* 000001A2 nop                            */  0x90,\r
-  /* 000001A3 nop                            */  0x90,\r
-  /* 000001A4 nop                            */  0x90,\r
-  /* 000001A5 nop                            */  0x90,\r
-  /* 000001A6 nop                            */  0x90,\r
-  /* 000001A7 nop                            */  0x90,\r
-  /* 000001A8 nop                            */  0x90,\r
-  /* 000001A9 nop                            */  0x90,\r
-  /* 000001AA nop                            */  0x90,\r
-  /* 000001AB nop                            */  0x90,\r
-  /* 000001AC nop                            */  0x90,\r
-  /* 000001AD nop                            */  0x90,\r
-  /* 000001AE nop                            */  0x90,\r
-  /* 000001AF nop                            */  0x90,\r
-  /* 000001B0 nop                            */  0x90,\r
-  /* 000001B1 nop                            */  0x90,\r
-  /* 000001B2 nop                            */  0x90,\r
-  /* 000001B3 nop                            */  0x90,\r
-  /* 000001B4 nop                            */  0x90,\r
-  /* 000001B5 nop                            */  0x90,\r
-  /* 000001B6 nop                            */  0x90,\r
-  /* 000001B7 nop                            */  0x90,\r
-  /* 000001B8 nop                            */  0x90,\r
-  /* 000001B9 nop                            */  0x90,\r
-  /* 000001BA nop                            */  0x90,\r
-  /* 000001BB nop                            */  0x90,\r
-  /* 000001BC nop                            */  0x90,\r
-  /* 000001BD nop                            */  0x90,\r
-  /* 000001BE nop                            */  0x90,\r
-  /* 000001BF nop                            */  0x90,\r
-  /* 000001C0 nop                            */  0x90,\r
-  /* 000001C1 nop                            */  0x90,\r
-  /* 000001C2 nop                            */  0x90,\r
-  /* 000001C3 nop                            */  0x90,\r
-  /* 000001C4 nop                            */  0x90,\r
-  /* 000001C5 nop                            */  0x90,\r
-  /* 000001C6 nop                            */  0x90,\r
-  /* 000001C7 nop                            */  0x90,\r
-  /* 000001C8 nop                            */  0x90,\r
-  /* 000001C9 nop                            */  0x90,\r
-  /* 000001CA nop                            */  0x90,\r
-  /* 000001CB nop                            */  0x90,\r
-  /* 000001CC nop                            */  0x90,\r
-  /* 000001CD nop                            */  0x90,\r
-  /* 000001CE nop                            */  0x90,\r
-  /* 000001CF nop                            */  0x90,\r
-  /* 000001D0 nop                            */  0x90,\r
-  /* 000001D1 nop                            */  0x90,\r
-  /* 000001D2 nop                            */  0x90,\r
-  /* 000001D3 nop                            */  0x90,\r
-  /* 000001D4 nop                            */  0x90,\r
-  /* 000001D5 nop                            */  0x90,\r
-  /* 000001D6 nop                            */  0x90,\r
-  /* 000001D7 nop                            */  0x90,\r
-  /* 000001D8 nop                            */  0x90,\r
-  /* 000001D9 nop                            */  0x90,\r
-  /* 000001DA nop                            */  0x90,\r
-  /* 000001DB nop                            */  0x90,\r
-  /* 000001DC nop                            */  0x90,\r
-  /* 000001DD nop                            */  0x90,\r
-  /* 000001DE nop                            */  0x90,\r
-  /* 000001DF nop                            */  0x90,\r
-  /* 000001E0 nop                            */  0x90,\r
-  /* 000001E1 nop                            */  0x90,\r
-  /* 000001E2 nop                            */  0x90,\r
-  /* 000001E3 nop                            */  0x90,\r
-  /* 000001E4 nop                            */  0x90,\r
-  /* 000001E5 nop                            */  0x90,\r
-  /* 000001E6 nop                            */  0x90,\r
-  /* 000001E7 nop                            */  0x90,\r
-  /* 000001E8 nop                            */  0x90,\r
-  /* 000001E9 nop                            */  0x90,\r
-  /* 000001EA nop                            */  0x90,\r
-  /* 000001EB nop                            */  0x90,\r
-  /* 000001EC nop                            */  0x90,\r
-  /* 000001ED nop                            */  0x90,\r
-  /* 000001EE nop                            */  0x90,\r
-  /* 000001EF nop                            */  0x90,\r
-  /* 000001F0 nop                            */  0x90,\r
-  /* 000001F1 nop                            */  0x90,\r
-  /* 000001F2 nop                            */  0x90,\r
-  /* 000001F3 nop                            */  0x90,\r
-  /* 000001F4 nop                            */  0x90,\r
-  /* 000001F5 nop                            */  0x90,\r
-  /* 000001F6 nop                            */  0x90,\r
-  /* 000001F7 nop                            */  0x90,\r
-  /* 000001F8 nop                            */  0x90,\r
-  /* 000001F9 nop                            */  0x90,\r
-  /* 000001FA nop                            */  0x90,\r
-  /* 000001FB nop                            */  0x90,\r
-  /* 000001FC nop                            */  0x90,\r
-  /* 000001FD nop                            */  0x90,\r
-  /* 000001FE nop                            */  0x90,\r
-  /* 000001FF nop                            */  0x90,\r
-  /* 00000200 cmp ax,0x4f00                  */  0x3D, 0x00, 0x4F,\r
-  /* 00000203 jz 0x22d                       */  0x74, 0x28,\r
-  /* 00000205 cmp ax,0x4f01                  */  0x3D, 0x01, 0x4F,\r
-  /* 00000208 jz 0x245                       */  0x74, 0x3B,\r
-  /* 0000020A cmp ax,0x4f02                  */  0x3D, 0x02, 0x4F,\r
-  /* 0000020D jz 0x269                       */  0x74, 0x5A,\r
-  /* 0000020F cmp ax,0x4f03                  */  0x3D, 0x03, 0x4F,\r
-  /* 00000212 jz word 0x331                  */  0x0F, 0x84, 0x1B, 0x01,\r
-  /* 00000216 cmp ax,0x4f10                  */  0x3D, 0x10, 0x4F,\r
-  /* 00000219 jz word 0x336                  */  0x0F, 0x84, 0x19, 0x01,\r
-  /* 0000021D cmp ax,0x4f15                  */  0x3D, 0x15, 0x4F,\r
-  /* 00000220 jz word 0x338                  */  0x0F, 0x84, 0x14, 0x01,\r
-  /* 00000224 cmp ah,0x0                     */  0x80, 0xFC, 0x00,\r
-  /* 00000227 jz word 0x33a                  */  0x0F, 0x84, 0x0F, 0x01,\r
-  /* 0000022B jmp short 0x22b                */  0xEB, 0xFE,\r
-  /* 0000022D push es                        */  0x06,\r
-  /* 0000022E push di                        */  0x57,\r
-  /* 0000022F push ds                        */  0x1E,\r
-  /* 00000230 push si                        */  0x56,\r
-  /* 00000231 push cx                        */  0x51,\r
-  /* 00000232 push cs                        */  0x0E,\r
-  /* 00000233 pop ds                         */  0x1F,\r
-  /* 00000234 mov si,0x0                     */  0xBE, 0x00, 0x00,\r
-  /* 00000237 mov cx,0x100                   */  0xB9, 0x00, 0x01,\r
-  /* 0000023A cld                            */  0xFC,\r
-  /* 0000023B rep movsb                      */  0xF3, 0xA4,\r
-  /* 0000023D pop cx                         */  0x59,\r
-  /* 0000023E pop si                         */  0x5E,\r
-  /* 0000023F pop ds                         */  0x1F,\r
-  /* 00000240 pop di                         */  0x5F,\r
-  /* 00000241 pop es                         */  0x07,\r
-  /* 00000242 jmp word 0x34c                 */  0xE9, 0x07, 0x01,\r
-  /* 00000245 push es                        */  0x06,\r
-  /* 00000246 push di                        */  0x57,\r
-  /* 00000247 push ds                        */  0x1E,\r
-  /* 00000248 push si                        */  0x56,\r
-  /* 00000249 push cx                        */  0x51,\r
-  /* 0000024A and cx,0xbfff                  */  0x81, 0xE1, 0xFF, 0xBF,\r
-  /* 0000024E cmp cx,0xf1                    */  0x81, 0xF9, 0xF1, 0x00,\r
-  /* 00000252 jz 0x256                       */  0x74, 0x02,\r
-  /* 00000254 jmp short 0x22b                */  0xEB, 0xD5,\r
-  /* 00000256 push cs                        */  0x0E,\r
-  /* 00000257 pop ds                         */  0x1F,\r
-  /* 00000258 mov si,0x100                   */  0xBE, 0x00, 0x01,\r
-  /* 0000025B mov cx,0x100                   */  0xB9, 0x00, 0x01,\r
-  /* 0000025E cld                            */  0xFC,\r
-  /* 0000025F rep movsb                      */  0xF3, 0xA4,\r
-  /* 00000261 pop cx                         */  0x59,\r
-  /* 00000262 pop si                         */  0x5E,\r
-  /* 00000263 pop ds                         */  0x1F,\r
-  /* 00000264 pop di                         */  0x5F,\r
-  /* 00000265 pop es                         */  0x07,\r
-  /* 00000266 jmp word 0x34c                 */  0xE9, 0xE3, 0x00,\r
-  /* 00000269 push dx                        */  0x52,\r
-  /* 0000026A push ax                        */  0x50,\r
-  /* 0000026B cmp bx,0x40f1                  */  0x81, 0xFB, 0xF1, 0x40,\r
-  /* 0000026F jz 0x273                       */  0x74, 0x02,\r
-  /* 00000271 jmp short 0x22b                */  0xEB, 0xB8,\r
-  /* 00000273 mov dx,0x3c0                   */  0xBA, 0xC0, 0x03,\r
-  /* 00000276 mov al,0x20                    */  0xB0, 0x20,\r
-  /* 00000278 out dx,al                      */  0xEE,\r
-  /* 00000279 push dx                        */  0x52,\r
-  /* 0000027A push ax                        */  0x50,\r
-  /* 0000027B mov dx,0x1ce                   */  0xBA, 0xCE, 0x01,\r
-  /* 0000027E mov ax,0x4                     */  0xB8, 0x04, 0x00,\r
-  /* 00000281 out dx,ax                      */  0xEF,\r
-  /* 00000282 mov dx,0x1d0                   */  0xBA, 0xD0, 0x01,\r
-  /* 00000285 mov ax,0x0                     */  0xB8, 0x00, 0x00,\r
-  /* 00000288 out dx,ax                      */  0xEF,\r
-  /* 00000289 pop ax                         */  0x58,\r
-  /* 0000028A pop dx                         */  0x5A,\r
-  /* 0000028B push dx                        */  0x52,\r
-  /* 0000028C push ax                        */  0x50,\r
-  /* 0000028D mov dx,0x1ce                   */  0xBA, 0xCE, 0x01,\r
-  /* 00000290 mov ax,0x5                     */  0xB8, 0x05, 0x00,\r
-  /* 00000293 out dx,ax                      */  0xEF,\r
-  /* 00000294 mov dx,0x1d0                   */  0xBA, 0xD0, 0x01,\r
-  /* 00000297 mov ax,0x0                     */  0xB8, 0x00, 0x00,\r
-  /* 0000029A out dx,ax                      */  0xEF,\r
-  /* 0000029B pop ax                         */  0x58,\r
-  /* 0000029C pop dx                         */  0x5A,\r
-  /* 0000029D push dx                        */  0x52,\r
-  /* 0000029E push ax                        */  0x50,\r
-  /* 0000029F mov dx,0x1ce                   */  0xBA, 0xCE, 0x01,\r
-  /* 000002A2 mov ax,0x8                     */  0xB8, 0x08, 0x00,\r
-  /* 000002A5 out dx,ax                      */  0xEF,\r
-  /* 000002A6 mov dx,0x1d0                   */  0xBA, 0xD0, 0x01,\r
-  /* 000002A9 mov ax,0x0                     */  0xB8, 0x00, 0x00,\r
-  /* 000002AC out dx,ax                      */  0xEF,\r
-  /* 000002AD pop ax                         */  0x58,\r
-  /* 000002AE pop dx                         */  0x5A,\r
-  /* 000002AF push dx                        */  0x52,\r
-  /* 000002B0 push ax                        */  0x50,\r
-  /* 000002B1 mov dx,0x1ce                   */  0xBA, 0xCE, 0x01,\r
-  /* 000002B4 mov ax,0x9                     */  0xB8, 0x09, 0x00,\r
-  /* 000002B7 out dx,ax                      */  0xEF,\r
-  /* 000002B8 mov dx,0x1d0                   */  0xBA, 0xD0, 0x01,\r
-  /* 000002BB mov ax,0x0                     */  0xB8, 0x00, 0x00,\r
-  /* 000002BE out dx,ax                      */  0xEF,\r
-  /* 000002BF pop ax                         */  0x58,\r
-  /* 000002C0 pop dx                         */  0x5A,\r
-  /* 000002C1 push dx                        */  0x52,\r
-  /* 000002C2 push ax                        */  0x50,\r
-  /* 000002C3 mov dx,0x1ce                   */  0xBA, 0xCE, 0x01,\r
-  /* 000002C6 mov ax,0x3                     */  0xB8, 0x03, 0x00,\r
-  /* 000002C9 out dx,ax                      */  0xEF,\r
-  /* 000002CA mov dx,0x1d0                   */  0xBA, 0xD0, 0x01,\r
-  /* 000002CD mov ax,0x20                    */  0xB8, 0x20, 0x00,\r
-  /* 000002D0 out dx,ax                      */  0xEF,\r
-  /* 000002D1 pop ax                         */  0x58,\r
-  /* 000002D2 pop dx                         */  0x5A,\r
-  /* 000002D3 push dx                        */  0x52,\r
-  /* 000002D4 push ax                        */  0x50,\r
-  /* 000002D5 mov dx,0x1ce                   */  0xBA, 0xCE, 0x01,\r
-  /* 000002D8 mov ax,0x1                     */  0xB8, 0x01, 0x00,\r
-  /* 000002DB out dx,ax                      */  0xEF,\r
-  /* 000002DC mov dx,0x1d0                   */  0xBA, 0xD0, 0x01,\r
-  /* 000002DF mov ax,0x400                   */  0xB8, 0x00, 0x04,\r
-  /* 000002E2 out dx,ax                      */  0xEF,\r
-  /* 000002E3 pop ax                         */  0x58,\r
-  /* 000002E4 pop dx                         */  0x5A,\r
-  /* 000002E5 push dx                        */  0x52,\r
-  /* 000002E6 push ax                        */  0x50,\r
-  /* 000002E7 mov dx,0x1ce                   */  0xBA, 0xCE, 0x01,\r
-  /* 000002EA mov ax,0x6                     */  0xB8, 0x06, 0x00,\r
-  /* 000002ED out dx,ax                      */  0xEF,\r
-  /* 000002EE mov dx,0x1d0                   */  0xBA, 0xD0, 0x01,\r
-  /* 000002F1 mov ax,0x400                   */  0xB8, 0x00, 0x04,\r
-  /* 000002F4 out dx,ax                      */  0xEF,\r
-  /* 000002F5 pop ax                         */  0x58,\r
-  /* 000002F6 pop dx                         */  0x5A,\r
-  /* 000002F7 push dx                        */  0x52,\r
-  /* 000002F8 push ax                        */  0x50,\r
-  /* 000002F9 mov dx,0x1ce                   */  0xBA, 0xCE, 0x01,\r
-  /* 000002FC mov ax,0x2                     */  0xB8, 0x02, 0x00,\r
-  /* 000002FF out dx,ax                      */  0xEF,\r
-  /* 00000300 mov dx,0x1d0                   */  0xBA, 0xD0, 0x01,\r
-  /* 00000303 mov ax,0x300                   */  0xB8, 0x00, 0x03,\r
-  /* 00000306 out dx,ax                      */  0xEF,\r
-  /* 00000307 pop ax                         */  0x58,\r
-  /* 00000308 pop dx                         */  0x5A,\r
-  /* 00000309 push dx                        */  0x52,\r
-  /* 0000030A push ax                        */  0x50,\r
-  /* 0000030B mov dx,0x1ce                   */  0xBA, 0xCE, 0x01,\r
-  /* 0000030E mov ax,0x7                     */  0xB8, 0x07, 0x00,\r
-  /* 00000311 out dx,ax                      */  0xEF,\r
-  /* 00000312 mov dx,0x1d0                   */  0xBA, 0xD0, 0x01,\r
-  /* 00000315 mov ax,0x300                   */  0xB8, 0x00, 0x03,\r
-  /* 00000318 out dx,ax                      */  0xEF,\r
-  /* 00000319 pop ax                         */  0x58,\r
-  /* 0000031A pop dx                         */  0x5A,\r
-  /* 0000031B push dx                        */  0x52,\r
-  /* 0000031C push ax                        */  0x50,\r
-  /* 0000031D mov dx,0x1ce                   */  0xBA, 0xCE, 0x01,\r
-  /* 00000320 mov ax,0x4                     */  0xB8, 0x04, 0x00,\r
-  /* 00000323 out dx,ax                      */  0xEF,\r
-  /* 00000324 mov dx,0x1d0                   */  0xBA, 0xD0, 0x01,\r
-  /* 00000327 mov ax,0x41                    */  0xB8, 0x41, 0x00,\r
-  /* 0000032A out dx,ax                      */  0xEF,\r
-  /* 0000032B pop ax                         */  0x58,\r
-  /* 0000032C pop dx                         */  0x5A,\r
-  /* 0000032D pop ax                         */  0x58,\r
-  /* 0000032E pop dx                         */  0x5A,\r
-  /* 0000032F jmp short 0x34c                */  0xEB, 0x1B,\r
-  /* 00000331 mov bx,0x40f1                  */  0xBB, 0xF1, 0x40,\r
-  /* 00000334 jmp short 0x34c                */  0xEB, 0x16,\r
-  /* 00000336 jmp short 0x350                */  0xEB, 0x18,\r
-  /* 00000338 jmp short 0x350                */  0xEB, 0x16,\r
-  /* 0000033A cmp al,0x3                     */  0x3C, 0x03,\r
-  /* 0000033C jz 0x345                       */  0x74, 0x07,\r
-  /* 0000033E cmp al,0x12                    */  0x3C, 0x12,\r
-  /* 00000340 jz 0x349                       */  0x74, 0x07,\r
-  /* 00000342 jmp word 0x22b                 */  0xE9, 0xE6, 0xFE,\r
-  /* 00000345 mov al,0x30                    */  0xB0, 0x30,\r
-  /* 00000347 jmp short 0x34b                */  0xEB, 0x02,\r
-  /* 00000349 mov al,0x20                    */  0xB0, 0x20,\r
-  /* 0000034B iretw                          */  0xCF,\r
-  /* 0000034C mov ax,0x4f                    */  0xB8, 0x4F, 0x00,\r
-  /* 0000034F iretw                          */  0xCF,\r
-  /* 00000350 mov ax,0x14f                   */  0xB8, 0x4F, 0x01,\r
-  /* 00000353 iretw                          */  0xCF,\r
+STATIC CONST UINT8  mVbeShim[] = {\r
+  /* 00000000 nop                            */ 0x90,\r
+  /* 00000001 nop                            */ 0x90,\r
+  /* 00000002 nop                            */ 0x90,\r
+  /* 00000003 nop                            */ 0x90,\r
+  /* 00000004 nop                            */ 0x90,\r
+  /* 00000005 nop                            */ 0x90,\r
+  /* 00000006 nop                            */ 0x90,\r
+  /* 00000007 nop                            */ 0x90,\r
+  /* 00000008 nop                            */ 0x90,\r
+  /* 00000009 nop                            */ 0x90,\r
+  /* 0000000A nop                            */ 0x90,\r
+  /* 0000000B nop                            */ 0x90,\r
+  /* 0000000C nop                            */ 0x90,\r
+  /* 0000000D nop                            */ 0x90,\r
+  /* 0000000E nop                            */ 0x90,\r
+  /* 0000000F nop                            */ 0x90,\r
+  /* 00000010 nop                            */ 0x90,\r
+  /* 00000011 nop                            */ 0x90,\r
+  /* 00000012 nop                            */ 0x90,\r
+  /* 00000013 nop                            */ 0x90,\r
+  /* 00000014 nop                            */ 0x90,\r
+  /* 00000015 nop                            */ 0x90,\r
+  /* 00000016 nop                            */ 0x90,\r
+  /* 00000017 nop                            */ 0x90,\r
+  /* 00000018 nop                            */ 0x90,\r
+  /* 00000019 nop                            */ 0x90,\r
+  /* 0000001A nop                            */ 0x90,\r
+  /* 0000001B nop                            */ 0x90,\r
+  /* 0000001C nop                            */ 0x90,\r
+  /* 0000001D nop                            */ 0x90,\r
+  /* 0000001E nop                            */ 0x90,\r
+  /* 0000001F nop                            */ 0x90,\r
+  /* 00000020 nop                            */ 0x90,\r
+  /* 00000021 nop                            */ 0x90,\r
+  /* 00000022 nop                            */ 0x90,\r
+  /* 00000023 nop                            */ 0x90,\r
+  /* 00000024 nop                            */ 0x90,\r
+  /* 00000025 nop                            */ 0x90,\r
+  /* 00000026 nop                            */ 0x90,\r
+  /* 00000027 nop                            */ 0x90,\r
+  /* 00000028 nop                            */ 0x90,\r
+  /* 00000029 nop                            */ 0x90,\r
+  /* 0000002A nop                            */ 0x90,\r
+  /* 0000002B nop                            */ 0x90,\r
+  /* 0000002C nop                            */ 0x90,\r
+  /* 0000002D nop                            */ 0x90,\r
+  /* 0000002E nop                            */ 0x90,\r
+  /* 0000002F nop                            */ 0x90,\r
+  /* 00000030 nop                            */ 0x90,\r
+  /* 00000031 nop                            */ 0x90,\r
+  /* 00000032 nop                            */ 0x90,\r
+  /* 00000033 nop                            */ 0x90,\r
+  /* 00000034 nop                            */ 0x90,\r
+  /* 00000035 nop                            */ 0x90,\r
+  /* 00000036 nop                            */ 0x90,\r
+  /* 00000037 nop                            */ 0x90,\r
+  /* 00000038 nop                            */ 0x90,\r
+  /* 00000039 nop                            */ 0x90,\r
+  /* 0000003A nop                            */ 0x90,\r
+  /* 0000003B nop                            */ 0x90,\r
+  /* 0000003C nop                            */ 0x90,\r
+  /* 0000003D nop                            */ 0x90,\r
+  /* 0000003E nop                            */ 0x90,\r
+  /* 0000003F nop                            */ 0x90,\r
+  /* 00000040 nop                            */ 0x90,\r
+  /* 00000041 nop                            */ 0x90,\r
+  /* 00000042 nop                            */ 0x90,\r
+  /* 00000043 nop                            */ 0x90,\r
+  /* 00000044 nop                            */ 0x90,\r
+  /* 00000045 nop                            */ 0x90,\r
+  /* 00000046 nop                            */ 0x90,\r
+  /* 00000047 nop                            */ 0x90,\r
+  /* 00000048 nop                            */ 0x90,\r
+  /* 00000049 nop                            */ 0x90,\r
+  /* 0000004A nop                            */ 0x90,\r
+  /* 0000004B nop                            */ 0x90,\r
+  /* 0000004C nop                            */ 0x90,\r
+  /* 0000004D nop                            */ 0x90,\r
+  /* 0000004E nop                            */ 0x90,\r
+  /* 0000004F nop                            */ 0x90,\r
+  /* 00000050 nop                            */ 0x90,\r
+  /* 00000051 nop                            */ 0x90,\r
+  /* 00000052 nop                            */ 0x90,\r
+  /* 00000053 nop                            */ 0x90,\r
+  /* 00000054 nop                            */ 0x90,\r
+  /* 00000055 nop                            */ 0x90,\r
+  /* 00000056 nop                            */ 0x90,\r
+  /* 00000057 nop                            */ 0x90,\r
+  /* 00000058 nop                            */ 0x90,\r
+  /* 00000059 nop                            */ 0x90,\r
+  /* 0000005A nop                            */ 0x90,\r
+  /* 0000005B nop                            */ 0x90,\r
+  /* 0000005C nop                            */ 0x90,\r
+  /* 0000005D nop                            */ 0x90,\r
+  /* 0000005E nop                            */ 0x90,\r
+  /* 0000005F nop                            */ 0x90,\r
+  /* 00000060 nop                            */ 0x90,\r
+  /* 00000061 nop                            */ 0x90,\r
+  /* 00000062 nop                            */ 0x90,\r
+  /* 00000063 nop                            */ 0x90,\r
+  /* 00000064 nop                            */ 0x90,\r
+  /* 00000065 nop                            */ 0x90,\r
+  /* 00000066 nop                            */ 0x90,\r
+  /* 00000067 nop                            */ 0x90,\r
+  /* 00000068 nop                            */ 0x90,\r
+  /* 00000069 nop                            */ 0x90,\r
+  /* 0000006A nop                            */ 0x90,\r
+  /* 0000006B nop                            */ 0x90,\r
+  /* 0000006C nop                            */ 0x90,\r
+  /* 0000006D nop                            */ 0x90,\r
+  /* 0000006E nop                            */ 0x90,\r
+  /* 0000006F nop                            */ 0x90,\r
+  /* 00000070 nop                            */ 0x90,\r
+  /* 00000071 nop                            */ 0x90,\r
+  /* 00000072 nop                            */ 0x90,\r
+  /* 00000073 nop                            */ 0x90,\r
+  /* 00000074 nop                            */ 0x90,\r
+  /* 00000075 nop                            */ 0x90,\r
+  /* 00000076 nop                            */ 0x90,\r
+  /* 00000077 nop                            */ 0x90,\r
+  /* 00000078 nop                            */ 0x90,\r
+  /* 00000079 nop                            */ 0x90,\r
+  /* 0000007A nop                            */ 0x90,\r
+  /* 0000007B nop                            */ 0x90,\r
+  /* 0000007C nop                            */ 0x90,\r
+  /* 0000007D nop                            */ 0x90,\r
+  /* 0000007E nop                            */ 0x90,\r
+  /* 0000007F nop                            */ 0x90,\r
+  /* 00000080 nop                            */ 0x90,\r
+  /* 00000081 nop                            */ 0x90,\r
+  /* 00000082 nop                            */ 0x90,\r
+  /* 00000083 nop                            */ 0x90,\r
+  /* 00000084 nop                            */ 0x90,\r
+  /* 00000085 nop                            */ 0x90,\r
+  /* 00000086 nop                            */ 0x90,\r
+  /* 00000087 nop                            */ 0x90,\r
+  /* 00000088 nop                            */ 0x90,\r
+  /* 00000089 nop                            */ 0x90,\r
+  /* 0000008A nop                            */ 0x90,\r
+  /* 0000008B nop                            */ 0x90,\r
+  /* 0000008C nop                            */ 0x90,\r
+  /* 0000008D nop                            */ 0x90,\r
+  /* 0000008E nop                            */ 0x90,\r
+  /* 0000008F nop                            */ 0x90,\r
+  /* 00000090 nop                            */ 0x90,\r
+  /* 00000091 nop                            */ 0x90,\r
+  /* 00000092 nop                            */ 0x90,\r
+  /* 00000093 nop                            */ 0x90,\r
+  /* 00000094 nop                            */ 0x90,\r
+  /* 00000095 nop                            */ 0x90,\r
+  /* 00000096 nop                            */ 0x90,\r
+  /* 00000097 nop                            */ 0x90,\r
+  /* 00000098 nop                            */ 0x90,\r
+  /* 00000099 nop                            */ 0x90,\r
+  /* 0000009A nop                            */ 0x90,\r
+  /* 0000009B nop                            */ 0x90,\r
+  /* 0000009C nop                            */ 0x90,\r
+  /* 0000009D nop                            */ 0x90,\r
+  /* 0000009E nop                            */ 0x90,\r
+  /* 0000009F nop                            */ 0x90,\r
+  /* 000000A0 nop                            */ 0x90,\r
+  /* 000000A1 nop                            */ 0x90,\r
+  /* 000000A2 nop                            */ 0x90,\r
+  /* 000000A3 nop                            */ 0x90,\r
+  /* 000000A4 nop                            */ 0x90,\r
+  /* 000000A5 nop                            */ 0x90,\r
+  /* 000000A6 nop                            */ 0x90,\r
+  /* 000000A7 nop                            */ 0x90,\r
+  /* 000000A8 nop                            */ 0x90,\r
+  /* 000000A9 nop                            */ 0x90,\r
+  /* 000000AA nop                            */ 0x90,\r
+  /* 000000AB nop                            */ 0x90,\r
+  /* 000000AC nop                            */ 0x90,\r
+  /* 000000AD nop                            */ 0x90,\r
+  /* 000000AE nop                            */ 0x90,\r
+  /* 000000AF nop                            */ 0x90,\r
+  /* 000000B0 nop                            */ 0x90,\r
+  /* 000000B1 nop                            */ 0x90,\r
+  /* 000000B2 nop                            */ 0x90,\r
+  /* 000000B3 nop                            */ 0x90,\r
+  /* 000000B4 nop                            */ 0x90,\r
+  /* 000000B5 nop                            */ 0x90,\r
+  /* 000000B6 nop                            */ 0x90,\r
+  /* 000000B7 nop                            */ 0x90,\r
+  /* 000000B8 nop                            */ 0x90,\r
+  /* 000000B9 nop                            */ 0x90,\r
+  /* 000000BA nop                            */ 0x90,\r
+  /* 000000BB nop                            */ 0x90,\r
+  /* 000000BC nop                            */ 0x90,\r
+  /* 000000BD nop                            */ 0x90,\r
+  /* 000000BE nop                            */ 0x90,\r
+  /* 000000BF nop                            */ 0x90,\r
+  /* 000000C0 nop                            */ 0x90,\r
+  /* 000000C1 nop                            */ 0x90,\r
+  /* 000000C2 nop                            */ 0x90,\r
+  /* 000000C3 nop                            */ 0x90,\r
+  /* 000000C4 nop                            */ 0x90,\r
+  /* 000000C5 nop                            */ 0x90,\r
+  /* 000000C6 nop                            */ 0x90,\r
+  /* 000000C7 nop                            */ 0x90,\r
+  /* 000000C8 nop                            */ 0x90,\r
+  /* 000000C9 nop                            */ 0x90,\r
+  /* 000000CA nop                            */ 0x90,\r
+  /* 000000CB nop                            */ 0x90,\r
+  /* 000000CC nop                            */ 0x90,\r
+  /* 000000CD nop                            */ 0x90,\r
+  /* 000000CE nop                            */ 0x90,\r
+  /* 000000CF nop                            */ 0x90,\r
+  /* 000000D0 nop                            */ 0x90,\r
+  /* 000000D1 nop                            */ 0x90,\r
+  /* 000000D2 nop                            */ 0x90,\r
+  /* 000000D3 nop                            */ 0x90,\r
+  /* 000000D4 nop                            */ 0x90,\r
+  /* 000000D5 nop                            */ 0x90,\r
+  /* 000000D6 nop                            */ 0x90,\r
+  /* 000000D7 nop                            */ 0x90,\r
+  /* 000000D8 nop                            */ 0x90,\r
+  /* 000000D9 nop                            */ 0x90,\r
+  /* 000000DA nop                            */ 0x90,\r
+  /* 000000DB nop                            */ 0x90,\r
+  /* 000000DC nop                            */ 0x90,\r
+  /* 000000DD nop                            */ 0x90,\r
+  /* 000000DE nop                            */ 0x90,\r
+  /* 000000DF nop                            */ 0x90,\r
+  /* 000000E0 nop                            */ 0x90,\r
+  /* 000000E1 nop                            */ 0x90,\r
+  /* 000000E2 nop                            */ 0x90,\r
+  /* 000000E3 nop                            */ 0x90,\r
+  /* 000000E4 nop                            */ 0x90,\r
+  /* 000000E5 nop                            */ 0x90,\r
+  /* 000000E6 nop                            */ 0x90,\r
+  /* 000000E7 nop                            */ 0x90,\r
+  /* 000000E8 nop                            */ 0x90,\r
+  /* 000000E9 nop                            */ 0x90,\r
+  /* 000000EA nop                            */ 0x90,\r
+  /* 000000EB nop                            */ 0x90,\r
+  /* 000000EC nop                            */ 0x90,\r
+  /* 000000ED nop                            */ 0x90,\r
+  /* 000000EE nop                            */ 0x90,\r
+  /* 000000EF nop                            */ 0x90,\r
+  /* 000000F0 nop                            */ 0x90,\r
+  /* 000000F1 nop                            */ 0x90,\r
+  /* 000000F2 nop                            */ 0x90,\r
+  /* 000000F3 nop                            */ 0x90,\r
+  /* 000000F4 nop                            */ 0x90,\r
+  /* 000000F5 nop                            */ 0x90,\r
+  /* 000000F6 nop                            */ 0x90,\r
+  /* 000000F7 nop                            */ 0x90,\r
+  /* 000000F8 nop                            */ 0x90,\r
+  /* 000000F9 nop                            */ 0x90,\r
+  /* 000000FA nop                            */ 0x90,\r
+  /* 000000FB nop                            */ 0x90,\r
+  /* 000000FC nop                            */ 0x90,\r
+  /* 000000FD nop                            */ 0x90,\r
+  /* 000000FE nop                            */ 0x90,\r
+  /* 000000FF nop                            */ 0x90,\r
+  /* 00000100 nop                            */ 0x90,\r
+  /* 00000101 nop                            */ 0x90,\r
+  /* 00000102 nop                            */ 0x90,\r
+  /* 00000103 nop                            */ 0x90,\r
+  /* 00000104 nop                            */ 0x90,\r
+  /* 00000105 nop                            */ 0x90,\r
+  /* 00000106 nop                            */ 0x90,\r
+  /* 00000107 nop                            */ 0x90,\r
+  /* 00000108 nop                            */ 0x90,\r
+  /* 00000109 nop                            */ 0x90,\r
+  /* 0000010A nop                            */ 0x90,\r
+  /* 0000010B nop                            */ 0x90,\r
+  /* 0000010C nop                            */ 0x90,\r
+  /* 0000010D nop                            */ 0x90,\r
+  /* 0000010E nop                            */ 0x90,\r
+  /* 0000010F nop                            */ 0x90,\r
+  /* 00000110 nop                            */ 0x90,\r
+  /* 00000111 nop                            */ 0x90,\r
+  /* 00000112 nop                            */ 0x90,\r
+  /* 00000113 nop                            */ 0x90,\r
+  /* 00000114 nop                            */ 0x90,\r
+  /* 00000115 nop                            */ 0x90,\r
+  /* 00000116 nop                            */ 0x90,\r
+  /* 00000117 nop                            */ 0x90,\r
+  /* 00000118 nop                            */ 0x90,\r
+  /* 00000119 nop                            */ 0x90,\r
+  /* 0000011A nop                            */ 0x90,\r
+  /* 0000011B nop                            */ 0x90,\r
+  /* 0000011C nop                            */ 0x90,\r
+  /* 0000011D nop                            */ 0x90,\r
+  /* 0000011E nop                            */ 0x90,\r
+  /* 0000011F nop                            */ 0x90,\r
+  /* 00000120 nop                            */ 0x90,\r
+  /* 00000121 nop                            */ 0x90,\r
+  /* 00000122 nop                            */ 0x90,\r
+  /* 00000123 nop                            */ 0x90,\r
+  /* 00000124 nop                            */ 0x90,\r
+  /* 00000125 nop                            */ 0x90,\r
+  /* 00000126 nop                            */ 0x90,\r
+  /* 00000127 nop                            */ 0x90,\r
+  /* 00000128 nop                            */ 0x90,\r
+  /* 00000129 nop                            */ 0x90,\r
+  /* 0000012A nop                            */ 0x90,\r
+  /* 0000012B nop                            */ 0x90,\r
+  /* 0000012C nop                            */ 0x90,\r
+  /* 0000012D nop                            */ 0x90,\r
+  /* 0000012E nop                            */ 0x90,\r
+  /* 0000012F nop                            */ 0x90,\r
+  /* 00000130 nop                            */ 0x90,\r
+  /* 00000131 nop                            */ 0x90,\r
+  /* 00000132 nop                            */ 0x90,\r
+  /* 00000133 nop                            */ 0x90,\r
+  /* 00000134 nop                            */ 0x90,\r
+  /* 00000135 nop                            */ 0x90,\r
+  /* 00000136 nop                            */ 0x90,\r
+  /* 00000137 nop                            */ 0x90,\r
+  /* 00000138 nop                            */ 0x90,\r
+  /* 00000139 nop                            */ 0x90,\r
+  /* 0000013A nop                            */ 0x90,\r
+  /* 0000013B nop                            */ 0x90,\r
+  /* 0000013C nop                            */ 0x90,\r
+  /* 0000013D nop                            */ 0x90,\r
+  /* 0000013E nop                            */ 0x90,\r
+  /* 0000013F nop                            */ 0x90,\r
+  /* 00000140 nop                            */ 0x90,\r
+  /* 00000141 nop                            */ 0x90,\r
+  /* 00000142 nop                            */ 0x90,\r
+  /* 00000143 nop                            */ 0x90,\r
+  /* 00000144 nop                            */ 0x90,\r
+  /* 00000145 nop                            */ 0x90,\r
+  /* 00000146 nop                            */ 0x90,\r
+  /* 00000147 nop                            */ 0x90,\r
+  /* 00000148 nop                            */ 0x90,\r
+  /* 00000149 nop                            */ 0x90,\r
+  /* 0000014A nop                            */ 0x90,\r
+  /* 0000014B nop                            */ 0x90,\r
+  /* 0000014C nop                            */ 0x90,\r
+  /* 0000014D nop                            */ 0x90,\r
+  /* 0000014E nop                            */ 0x90,\r
+  /* 0000014F nop                            */ 0x90,\r
+  /* 00000150 nop                            */ 0x90,\r
+  /* 00000151 nop                            */ 0x90,\r
+  /* 00000152 nop                            */ 0x90,\r
+  /* 00000153 nop                            */ 0x90,\r
+  /* 00000154 nop                            */ 0x90,\r
+  /* 00000155 nop                            */ 0x90,\r
+  /* 00000156 nop                            */ 0x90,\r
+  /* 00000157 nop                            */ 0x90,\r
+  /* 00000158 nop                            */ 0x90,\r
+  /* 00000159 nop                            */ 0x90,\r
+  /* 0000015A nop                            */ 0x90,\r
+  /* 0000015B nop                            */ 0x90,\r
+  /* 0000015C nop                            */ 0x90,\r
+  /* 0000015D nop                            */ 0x90,\r
+  /* 0000015E nop                            */ 0x90,\r
+  /* 0000015F nop                            */ 0x90,\r
+  /* 00000160 nop                            */ 0x90,\r
+  /* 00000161 nop                            */ 0x90,\r
+  /* 00000162 nop                            */ 0x90,\r
+  /* 00000163 nop                            */ 0x90,\r
+  /* 00000164 nop                            */ 0x90,\r
+  /* 00000165 nop                            */ 0x90,\r
+  /* 00000166 nop                            */ 0x90,\r
+  /* 00000167 nop                            */ 0x90,\r
+  /* 00000168 nop                            */ 0x90,\r
+  /* 00000169 nop                            */ 0x90,\r
+  /* 0000016A nop                            */ 0x90,\r
+  /* 0000016B nop                            */ 0x90,\r
+  /* 0000016C nop                            */ 0x90,\r
+  /* 0000016D nop                            */ 0x90,\r
+  /* 0000016E nop                            */ 0x90,\r
+  /* 0000016F nop                            */ 0x90,\r
+  /* 00000170 nop                            */ 0x90,\r
+  /* 00000171 nop                            */ 0x90,\r
+  /* 00000172 nop                            */ 0x90,\r
+  /* 00000173 nop                            */ 0x90,\r
+  /* 00000174 nop                            */ 0x90,\r
+  /* 00000175 nop                            */ 0x90,\r
+  /* 00000176 nop                            */ 0x90,\r
+  /* 00000177 nop                            */ 0x90,\r
+  /* 00000178 nop                            */ 0x90,\r
+  /* 00000179 nop                            */ 0x90,\r
+  /* 0000017A nop                            */ 0x90,\r
+  /* 0000017B nop                            */ 0x90,\r
+  /* 0000017C nop                            */ 0x90,\r
+  /* 0000017D nop                            */ 0x90,\r
+  /* 0000017E nop                            */ 0x90,\r
+  /* 0000017F nop                            */ 0x90,\r
+  /* 00000180 nop                            */ 0x90,\r
+  /* 00000181 nop                            */ 0x90,\r
+  /* 00000182 nop                            */ 0x90,\r
+  /* 00000183 nop                            */ 0x90,\r
+  /* 00000184 nop                            */ 0x90,\r
+  /* 00000185 nop                            */ 0x90,\r
+  /* 00000186 nop                            */ 0x90,\r
+  /* 00000187 nop                            */ 0x90,\r
+  /* 00000188 nop                            */ 0x90,\r
+  /* 00000189 nop                            */ 0x90,\r
+  /* 0000018A nop                            */ 0x90,\r
+  /* 0000018B nop                            */ 0x90,\r
+  /* 0000018C nop                            */ 0x90,\r
+  /* 0000018D nop                            */ 0x90,\r
+  /* 0000018E nop                            */ 0x90,\r
+  /* 0000018F nop                            */ 0x90,\r
+  /* 00000190 nop                            */ 0x90,\r
+  /* 00000191 nop                            */ 0x90,\r
+  /* 00000192 nop                            */ 0x90,\r
+  /* 00000193 nop                            */ 0x90,\r
+  /* 00000194 nop                            */ 0x90,\r
+  /* 00000195 nop                            */ 0x90,\r
+  /* 00000196 nop                            */ 0x90,\r
+  /* 00000197 nop                            */ 0x90,\r
+  /* 00000198 nop                            */ 0x90,\r
+  /* 00000199 nop                            */ 0x90,\r
+  /* 0000019A nop                            */ 0x90,\r
+  /* 0000019B nop                            */ 0x90,\r
+  /* 0000019C nop                            */ 0x90,\r
+  /* 0000019D nop                            */ 0x90,\r
+  /* 0000019E nop                            */ 0x90,\r
+  /* 0000019F nop                            */ 0x90,\r
+  /* 000001A0 nop                            */ 0x90,\r
+  /* 000001A1 nop                            */ 0x90,\r
+  /* 000001A2 nop                            */ 0x90,\r
+  /* 000001A3 nop                            */ 0x90,\r
+  /* 000001A4 nop                            */ 0x90,\r
+  /* 000001A5 nop                            */ 0x90,\r
+  /* 000001A6 nop                            */ 0x90,\r
+  /* 000001A7 nop                            */ 0x90,\r
+  /* 000001A8 nop                            */ 0x90,\r
+  /* 000001A9 nop                            */ 0x90,\r
+  /* 000001AA nop                            */ 0x90,\r
+  /* 000001AB nop                            */ 0x90,\r
+  /* 000001AC nop                            */ 0x90,\r
+  /* 000001AD nop                            */ 0x90,\r
+  /* 000001AE nop                            */ 0x90,\r
+  /* 000001AF nop                            */ 0x90,\r
+  /* 000001B0 nop                            */ 0x90,\r
+  /* 000001B1 nop                            */ 0x90,\r
+  /* 000001B2 nop                            */ 0x90,\r
+  /* 000001B3 nop                            */ 0x90,\r
+  /* 000001B4 nop                            */ 0x90,\r
+  /* 000001B5 nop                            */ 0x90,\r
+  /* 000001B6 nop                            */ 0x90,\r
+  /* 000001B7 nop                            */ 0x90,\r
+  /* 000001B8 nop                            */ 0x90,\r
+  /* 000001B9 nop                            */ 0x90,\r
+  /* 000001BA nop                            */ 0x90,\r
+  /* 000001BB nop                            */ 0x90,\r
+  /* 000001BC nop                            */ 0x90,\r
+  /* 000001BD nop                            */ 0x90,\r
+  /* 000001BE nop                            */ 0x90,\r
+  /* 000001BF nop                            */ 0x90,\r
+  /* 000001C0 nop                            */ 0x90,\r
+  /* 000001C1 nop                            */ 0x90,\r
+  /* 000001C2 nop                            */ 0x90,\r
+  /* 000001C3 nop                            */ 0x90,\r
+  /* 000001C4 nop                            */ 0x90,\r
+  /* 000001C5 nop                            */ 0x90,\r
+  /* 000001C6 nop                            */ 0x90,\r
+  /* 000001C7 nop                            */ 0x90,\r
+  /* 000001C8 nop                            */ 0x90,\r
+  /* 000001C9 nop                            */ 0x90,\r
+  /* 000001CA nop                            */ 0x90,\r
+  /* 000001CB nop                            */ 0x90,\r
+  /* 000001CC nop                            */ 0x90,\r
+  /* 000001CD nop                            */ 0x90,\r
+  /* 000001CE nop                            */ 0x90,\r
+  /* 000001CF nop                            */ 0x90,\r
+  /* 000001D0 nop                            */ 0x90,\r
+  /* 000001D1 nop                            */ 0x90,\r
+  /* 000001D2 nop                            */ 0x90,\r
+  /* 000001D3 nop                            */ 0x90,\r
+  /* 000001D4 nop                            */ 0x90,\r
+  /* 000001D5 nop                            */ 0x90,\r
+  /* 000001D6 nop                            */ 0x90,\r
+  /* 000001D7 nop                            */ 0x90,\r
+  /* 000001D8 nop                            */ 0x90,\r
+  /* 000001D9 nop                            */ 0x90,\r
+  /* 000001DA nop                            */ 0x90,\r
+  /* 000001DB nop                            */ 0x90,\r
+  /* 000001DC nop                            */ 0x90,\r
+  /* 000001DD nop                            */ 0x90,\r
+  /* 000001DE nop                            */ 0x90,\r
+  /* 000001DF nop                            */ 0x90,\r
+  /* 000001E0 nop                            */ 0x90,\r
+  /* 000001E1 nop                            */ 0x90,\r
+  /* 000001E2 nop                            */ 0x90,\r
+  /* 000001E3 nop                            */ 0x90,\r
+  /* 000001E4 nop                            */ 0x90,\r
+  /* 000001E5 nop                            */ 0x90,\r
+  /* 000001E6 nop                            */ 0x90,\r
+  /* 000001E7 nop                            */ 0x90,\r
+  /* 000001E8 nop                            */ 0x90,\r
+  /* 000001E9 nop                            */ 0x90,\r
+  /* 000001EA nop                            */ 0x90,\r
+  /* 000001EB nop                            */ 0x90,\r
+  /* 000001EC nop                            */ 0x90,\r
+  /* 000001ED nop                            */ 0x90,\r
+  /* 000001EE nop                            */ 0x90,\r
+  /* 000001EF nop                            */ 0x90,\r
+  /* 000001F0 nop                            */ 0x90,\r
+  /* 000001F1 nop                            */ 0x90,\r
+  /* 000001F2 nop                            */ 0x90,\r
+  /* 000001F3 nop                            */ 0x90,\r
+  /* 000001F4 nop                            */ 0x90,\r
+  /* 000001F5 nop                            */ 0x90,\r
+  /* 000001F6 nop                            */ 0x90,\r
+  /* 000001F7 nop                            */ 0x90,\r
+  /* 000001F8 nop                            */ 0x90,\r
+  /* 000001F9 nop                            */ 0x90,\r
+  /* 000001FA nop                            */ 0x90,\r
+  /* 000001FB nop                            */ 0x90,\r
+  /* 000001FC nop                            */ 0x90,\r
+  /* 000001FD nop                            */ 0x90,\r
+  /* 000001FE nop                            */ 0x90,\r
+  /* 000001FF nop                            */ 0x90,\r
+  /* 00000200 cmp ax,0x4f00                  */ 0x3D,0x00,  0x4F,\r
+  /* 00000203 jz 0x22d                       */ 0x74,0x28,\r
+  /* 00000205 cmp ax,0x4f01                  */ 0x3D,0x01,  0x4F,\r
+  /* 00000208 jz 0x245                       */ 0x74,0x3B,\r
+  /* 0000020A cmp ax,0x4f02                  */ 0x3D,0x02,  0x4F,\r
+  /* 0000020D jz 0x269                       */ 0x74,0x5A,\r
+  /* 0000020F cmp ax,0x4f03                  */ 0x3D,0x03,  0x4F,\r
+  /* 00000212 jz word 0x331                  */ 0x0F,0x84,  0x1B,0x01,\r
+  /* 00000216 cmp ax,0x4f10                  */ 0x3D,0x10,  0x4F,\r
+  /* 00000219 jz word 0x336                  */ 0x0F,0x84,  0x19,0x01,\r
+  /* 0000021D cmp ax,0x4f15                  */ 0x3D,0x15,  0x4F,\r
+  /* 00000220 jz word 0x338                  */ 0x0F,0x84,  0x14,0x01,\r
+  /* 00000224 cmp ah,0x0                     */ 0x80,0xFC,  0x00,\r
+  /* 00000227 jz word 0x33a                  */ 0x0F,0x84,  0x0F,0x01,\r
+  /* 0000022B jmp short 0x22b                */ 0xEB,0xFE,\r
+  /* 0000022D push es                        */ 0x06,\r
+  /* 0000022E push di                        */ 0x57,\r
+  /* 0000022F push ds                        */ 0x1E,\r
+  /* 00000230 push si                        */ 0x56,\r
+  /* 00000231 push cx                        */ 0x51,\r
+  /* 00000232 push cs                        */ 0x0E,\r
+  /* 00000233 pop ds                         */ 0x1F,\r
+  /* 00000234 mov si,0x0                     */ 0xBE,0x00,  0x00,\r
+  /* 00000237 mov cx,0x100                   */ 0xB9,0x00,  0x01,\r
+  /* 0000023A cld                            */ 0xFC,\r
+  /* 0000023B rep movsb                      */ 0xF3,0xA4,\r
+  /* 0000023D pop cx                         */ 0x59,\r
+  /* 0000023E pop si                         */ 0x5E,\r
+  /* 0000023F pop ds                         */ 0x1F,\r
+  /* 00000240 pop di                         */ 0x5F,\r
+  /* 00000241 pop es                         */ 0x07,\r
+  /* 00000242 jmp word 0x34c                 */ 0xE9,0x07,  0x01,\r
+  /* 00000245 push es                        */ 0x06,\r
+  /* 00000246 push di                        */ 0x57,\r
+  /* 00000247 push ds                        */ 0x1E,\r
+  /* 00000248 push si                        */ 0x56,\r
+  /* 00000249 push cx                        */ 0x51,\r
+  /* 0000024A and cx,0xbfff                  */ 0x81,0xE1,  0xFF,0xBF,\r
+  /* 0000024E cmp cx,0xf1                    */ 0x81,0xF9,  0xF1,0x00,\r
+  /* 00000252 jz 0x256                       */ 0x74,0x02,\r
+  /* 00000254 jmp short 0x22b                */ 0xEB,0xD5,\r
+  /* 00000256 push cs                        */ 0x0E,\r
+  /* 00000257 pop ds                         */ 0x1F,\r
+  /* 00000258 mov si,0x100                   */ 0xBE,0x00,  0x01,\r
+  /* 0000025B mov cx,0x100                   */ 0xB9,0x00,  0x01,\r
+  /* 0000025E cld                            */ 0xFC,\r
+  /* 0000025F rep movsb                      */ 0xF3,0xA4,\r
+  /* 00000261 pop cx                         */ 0x59,\r
+  /* 00000262 pop si                         */ 0x5E,\r
+  /* 00000263 pop ds                         */ 0x1F,\r
+  /* 00000264 pop di                         */ 0x5F,\r
+  /* 00000265 pop es                         */ 0x07,\r
+  /* 00000266 jmp word 0x34c                 */ 0xE9,0xE3,  0x00,\r
+  /* 00000269 push dx                        */ 0x52,\r
+  /* 0000026A push ax                        */ 0x50,\r
+  /* 0000026B cmp bx,0x40f1                  */ 0x81,0xFB,  0xF1,0x40,\r
+  /* 0000026F jz 0x273                       */ 0x74,0x02,\r
+  /* 00000271 jmp short 0x22b                */ 0xEB,0xB8,\r
+  /* 00000273 mov dx,0x3c0                   */ 0xBA,0xC0,  0x03,\r
+  /* 00000276 mov al,0x20                    */ 0xB0,0x20,\r
+  /* 00000278 out dx,al                      */ 0xEE,\r
+  /* 00000279 push dx                        */ 0x52,\r
+  /* 0000027A push ax                        */ 0x50,\r
+  /* 0000027B mov dx,0x1ce                   */ 0xBA,0xCE,  0x01,\r
+  /* 0000027E mov ax,0x4                     */ 0xB8,0x04,  0x00,\r
+  /* 00000281 out dx,ax                      */ 0xEF,\r
+  /* 00000282 mov dx,0x1d0                   */ 0xBA,0xD0,  0x01,\r
+  /* 00000285 mov ax,0x0                     */ 0xB8,0x00,  0x00,\r
+  /* 00000288 out dx,ax                      */ 0xEF,\r
+  /* 00000289 pop ax                         */ 0x58,\r
+  /* 0000028A pop dx                         */ 0x5A,\r
+  /* 0000028B push dx                        */ 0x52,\r
+  /* 0000028C push ax                        */ 0x50,\r
+  /* 0000028D mov dx,0x1ce                   */ 0xBA,0xCE,  0x01,\r
+  /* 00000290 mov ax,0x5                     */ 0xB8,0x05,  0x00,\r
+  /* 00000293 out dx,ax                      */ 0xEF,\r
+  /* 00000294 mov dx,0x1d0                   */ 0xBA,0xD0,  0x01,\r
+  /* 00000297 mov ax,0x0                     */ 0xB8,0x00,  0x00,\r
+  /* 0000029A out dx,ax                      */ 0xEF,\r
+  /* 0000029B pop ax                         */ 0x58,\r
+  /* 0000029C pop dx                         */ 0x5A,\r
+  /* 0000029D push dx                        */ 0x52,\r
+  /* 0000029E push ax                        */ 0x50,\r
+  /* 0000029F mov dx,0x1ce                   */ 0xBA,0xCE,  0x01,\r
+  /* 000002A2 mov ax,0x8                     */ 0xB8,0x08,  0x00,\r
+  /* 000002A5 out dx,ax                      */ 0xEF,\r
+  /* 000002A6 mov dx,0x1d0                   */ 0xBA,0xD0,  0x01,\r
+  /* 000002A9 mov ax,0x0                     */ 0xB8,0x00,  0x00,\r
+  /* 000002AC out dx,ax                      */ 0xEF,\r
+  /* 000002AD pop ax                         */ 0x58,\r
+  /* 000002AE pop dx                         */ 0x5A,\r
+  /* 000002AF push dx                        */ 0x52,\r
+  /* 000002B0 push ax                        */ 0x50,\r
+  /* 000002B1 mov dx,0x1ce                   */ 0xBA,0xCE,  0x01,\r
+  /* 000002B4 mov ax,0x9                     */ 0xB8,0x09,  0x00,\r
+  /* 000002B7 out dx,ax                      */ 0xEF,\r
+  /* 000002B8 mov dx,0x1d0                   */ 0xBA,0xD0,  0x01,\r
+  /* 000002BB mov ax,0x0                     */ 0xB8,0x00,  0x00,\r
+  /* 000002BE out dx,ax                      */ 0xEF,\r
+  /* 000002BF pop ax                         */ 0x58,\r
+  /* 000002C0 pop dx                         */ 0x5A,\r
+  /* 000002C1 push dx                        */ 0x52,\r
+  /* 000002C2 push ax                        */ 0x50,\r
+  /* 000002C3 mov dx,0x1ce                   */ 0xBA,0xCE,  0x01,\r
+  /* 000002C6 mov ax,0x3                     */ 0xB8,0x03,  0x00,\r
+  /* 000002C9 out dx,ax                      */ 0xEF,\r
+  /* 000002CA mov dx,0x1d0                   */ 0xBA,0xD0,  0x01,\r
+  /* 000002CD mov ax,0x20                    */ 0xB8,0x20,  0x00,\r
+  /* 000002D0 out dx,ax                      */ 0xEF,\r
+  /* 000002D1 pop ax                         */ 0x58,\r
+  /* 000002D2 pop dx                         */ 0x5A,\r
+  /* 000002D3 push dx                        */ 0x52,\r
+  /* 000002D4 push ax                        */ 0x50,\r
+  /* 000002D5 mov dx,0x1ce                   */ 0xBA,0xCE,  0x01,\r
+  /* 000002D8 mov ax,0x1                     */ 0xB8,0x01,  0x00,\r
+  /* 000002DB out dx,ax                      */ 0xEF,\r
+  /* 000002DC mov dx,0x1d0                   */ 0xBA,0xD0,  0x01,\r
+  /* 000002DF mov ax,0x400                   */ 0xB8,0x00,  0x04,\r
+  /* 000002E2 out dx,ax                      */ 0xEF,\r
+  /* 000002E3 pop ax                         */ 0x58,\r
+  /* 000002E4 pop dx                         */ 0x5A,\r
+  /* 000002E5 push dx                        */ 0x52,\r
+  /* 000002E6 push ax                        */ 0x50,\r
+  /* 000002E7 mov dx,0x1ce                   */ 0xBA,0xCE,  0x01,\r
+  /* 000002EA mov ax,0x6                     */ 0xB8,0x06,  0x00,\r
+  /* 000002ED out dx,ax                      */ 0xEF,\r
+  /* 000002EE mov dx,0x1d0                   */ 0xBA,0xD0,  0x01,\r
+  /* 000002F1 mov ax,0x400                   */ 0xB8,0x00,  0x04,\r
+  /* 000002F4 out dx,ax                      */ 0xEF,\r
+  /* 000002F5 pop ax                         */ 0x58,\r
+  /* 000002F6 pop dx                         */ 0x5A,\r
+  /* 000002F7 push dx                        */ 0x52,\r
+  /* 000002F8 push ax                        */ 0x50,\r
+  /* 000002F9 mov dx,0x1ce                   */ 0xBA,0xCE,  0x01,\r
+  /* 000002FC mov ax,0x2                     */ 0xB8,0x02,  0x00,\r
+  /* 000002FF out dx,ax                      */ 0xEF,\r
+  /* 00000300 mov dx,0x1d0                   */ 0xBA,0xD0,  0x01,\r
+  /* 00000303 mov ax,0x300                   */ 0xB8,0x00,  0x03,\r
+  /* 00000306 out dx,ax                      */ 0xEF,\r
+  /* 00000307 pop ax                         */ 0x58,\r
+  /* 00000308 pop dx                         */ 0x5A,\r
+  /* 00000309 push dx                        */ 0x52,\r
+  /* 0000030A push ax                        */ 0x50,\r
+  /* 0000030B mov dx,0x1ce                   */ 0xBA,0xCE,  0x01,\r
+  /* 0000030E mov ax,0x7                     */ 0xB8,0x07,  0x00,\r
+  /* 00000311 out dx,ax                      */ 0xEF,\r
+  /* 00000312 mov dx,0x1d0                   */ 0xBA,0xD0,  0x01,\r
+  /* 00000315 mov ax,0x300                   */ 0xB8,0x00,  0x03,\r
+  /* 00000318 out dx,ax                      */ 0xEF,\r
+  /* 00000319 pop ax                         */ 0x58,\r
+  /* 0000031A pop dx                         */ 0x5A,\r
+  /* 0000031B push dx                        */ 0x52,\r
+  /* 0000031C push ax                        */ 0x50,\r
+  /* 0000031D mov dx,0x1ce                   */ 0xBA,0xCE,  0x01,\r
+  /* 00000320 mov ax,0x4                     */ 0xB8,0x04,  0x00,\r
+  /* 00000323 out dx,ax                      */ 0xEF,\r
+  /* 00000324 mov dx,0x1d0                   */ 0xBA,0xD0,  0x01,\r
+  /* 00000327 mov ax,0x41                    */ 0xB8,0x41,  0x00,\r
+  /* 0000032A out dx,ax                      */ 0xEF,\r
+  /* 0000032B pop ax                         */ 0x58,\r
+  /* 0000032C pop dx                         */ 0x5A,\r
+  /* 0000032D pop ax                         */ 0x58,\r
+  /* 0000032E pop dx                         */ 0x5A,\r
+  /* 0000032F jmp short 0x34c                */ 0xEB,0x1B,\r
+  /* 00000331 mov bx,0x40f1                  */ 0xBB,0xF1,  0x40,\r
+  /* 00000334 jmp short 0x34c                */ 0xEB,0x16,\r
+  /* 00000336 jmp short 0x350                */ 0xEB,0x18,\r
+  /* 00000338 jmp short 0x350                */ 0xEB,0x16,\r
+  /* 0000033A cmp al,0x3                     */ 0x3C,0x03,\r
+  /* 0000033C jz 0x345                       */ 0x74,0x07,\r
+  /* 0000033E cmp al,0x12                    */ 0x3C,0x12,\r
+  /* 00000340 jz 0x349                       */ 0x74,0x07,\r
+  /* 00000342 jmp word 0x22b                 */ 0xE9,0xE6,  0xFE,\r
+  /* 00000345 mov al,0x30                    */ 0xB0,0x30,\r
+  /* 00000347 jmp short 0x34b                */ 0xEB,0x02,\r
+  /* 00000349 mov al,0x20                    */ 0xB0,0x20,\r
+  /* 0000034B iretw                          */ 0xCF,\r
+  /* 0000034C mov ax,0x4f                    */ 0xB8,0x4F,  0x00,\r
+  /* 0000034F iretw                          */ 0xCF,\r
+  /* 00000350 mov ax,0x14f                   */ 0xB8,0x4F,  0x01,\r
+  /* 00000353 iretw                          */ 0xCF,\r
 };\r
 #endif\r
index 320dca382a1d1dc8f3a12a5abac78c95fe2d639b..d45803f95f6e2bdb053aa25f71c040ee0bc8f096 100644 (file)
@@ -20,16 +20,16 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gSataControllerCompon
 //\r
 /// EFI Component Name 2 Protocol\r
 ///\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gSataControllerComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) SataControllerComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) SataControllerComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gSataControllerComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)SataControllerComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)SataControllerComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
 //\r
 /// Driver Name Strings\r
 ///\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mSataControllerDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mSataControllerDriverNameTable[] = {\r
   {\r
     "eng;en",\r
     (CHAR16 *)L"Sata Controller Init Driver"\r
@@ -43,7 +43,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mSataControllerDriverName
 ///\r
 /// Controller Name Strings\r
 ///\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mSataControllerControllerNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mSataControllerControllerNameTable[] = {\r
   {\r
     "eng;en",\r
     (CHAR16 *)L"Sata Controller"\r
@@ -78,9 +78,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mSataControllerController
 EFI_STATUS\r
 EFIAPI\r
 SataControllerComponentNameGetDriverName (\r
-  IN EFI_COMPONENT_NAME_PROTOCOL    *This,\r
-  IN CHAR8                          *Language,\r
-  OUT CHAR16                        **DriverName\r
+  IN EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN CHAR8                        *Language,\r
+  OUT CHAR16                      **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -135,14 +135,14 @@ SataControllerComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 SataControllerComponentNameGetControllerName (\r
-  IN EFI_COMPONENT_NAME_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_HANDLE                     ChildHandle OPTIONAL,\r
-  IN CHAR8                          *Language,\r
-  OUT CHAR16                        **ControllerName\r
+  IN EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_HANDLE                   ChildHandle OPTIONAL,\r
+  IN CHAR8                        *Language,\r
+  OUT CHAR16                      **ControllerName\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Make sure this driver is currently managing ControllHandle\r
@@ -161,10 +161,10 @@ SataControllerComponentNameGetControllerName (
   }\r
 \r
   return LookupUnicodeString2 (\r
-          Language,\r
-          This->SupportedLanguages,\r
-          mSataControllerControllerNameTable,\r
-          ControllerName,\r
-          (BOOLEAN)(This == &gSataControllerComponentName)\r
-          );\r
+           Language,\r
+           This->SupportedLanguages,\r
+           mSataControllerControllerNameTable,\r
+           ControllerName,\r
+           (BOOLEAN)(This == &gSataControllerComponentName)\r
+           );\r
 }\r
index a5b5f04d270881eb494c47c61b0dc83eeb3540bd..2b550b0a3ec0c74f52cb550b4e053be65819261e 100644 (file)
@@ -11,7 +11,7 @@
 ///\r
 /// EFI_DRIVER_BINDING_PROTOCOL instance\r
 ///\r
-EFI_DRIVER_BINDING_PROTOCOL gSataControllerDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gSataControllerDriverBinding = {\r
   SataControllerSupported,\r
   SataControllerStart,\r
   SataControllerStop,\r
@@ -32,11 +32,11 @@ EFI_DRIVER_BINDING_PROTOCOL gSataControllerDriverBinding = {
 UINT32\r
 EFIAPI\r
 AhciReadReg (\r
-  IN EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  IN UINT32                 Offset\r
+  IN EFI_PCI_IO_PROTOCOL  *PciIo,\r
+  IN UINT32               Offset\r
   )\r
 {\r
-  UINT32    Data;\r
+  UINT32  Data;\r
 \r
   ASSERT (PciIo != NULL);\r
 \r
@@ -46,7 +46,7 @@ AhciReadReg (
                PciIo,\r
                EfiPciIoWidthUint32,\r
                AHCI_BAR_INDEX,\r
-               (UINT64) Offset,\r
+               (UINT64)Offset,\r
                1,\r
                &Data\r
                );\r
@@ -65,9 +65,9 @@ AhciReadReg (
 VOID\r
 EFIAPI\r
 AhciWriteReg (\r
-  IN EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  IN UINT32                 Offset,\r
-  IN UINT32                 Data\r
+  IN EFI_PCI_IO_PROTOCOL  *PciIo,\r
+  IN UINT32               Offset,\r
+  IN UINT32               Data\r
   )\r
 {\r
   ASSERT (PciIo != NULL);\r
@@ -76,7 +76,7 @@ AhciWriteReg (
                PciIo,\r
                EfiPciIoWidthUint32,\r
                AHCI_BAR_INDEX,\r
-               (UINT64) Offset,\r
+               (UINT64)Offset,\r
                1,\r
                &Data\r
                );\r
@@ -102,21 +102,20 @@ CalculateBestPioMode (
   OUT UINT16            *SelectedMode\r
   )\r
 {\r
-  UINT16    PioMode;\r
-  UINT16    AdvancedPioMode;\r
-  UINT16    Temp;\r
-  UINT16    Index;\r
-  UINT16    MinimumPioCycleTime;\r
+  UINT16  PioMode;\r
+  UINT16  AdvancedPioMode;\r
+  UINT16  Temp;\r
+  UINT16  Index;\r
+  UINT16  MinimumPioCycleTime;\r
 \r
   Temp = 0xff;\r
 \r
-  PioMode = (UINT8) (((ATA5_IDENTIFY_DATA *) (&(IdentifyData->AtaData)))->pio_cycle_timing >> 8);\r
+  PioMode = (UINT8)(((ATA5_IDENTIFY_DATA *)(&(IdentifyData->AtaData)))->pio_cycle_timing >> 8);\r
 \r
   //\r
   // See whether Identify Data word 64 - 70 are valid\r
   //\r
   if ((IdentifyData->AtaData.field_validity & 0x02) == 0x02) {\r
-\r
     AdvancedPioMode = IdentifyData->AtaData.advanced_pio_modes;\r
     DEBUG ((DEBUG_INFO, "CalculateBestPioMode: AdvancedPioMode = %x\n", AdvancedPioMode));\r
 \r
@@ -134,7 +133,7 @@ CalculateBestPioMode (
     // the best PIO Mode is the value in pio_cycle_timing.\r
     //\r
     if (Temp != 0xff) {\r
-      AdvancedPioMode = (UINT16) (Temp + 3);\r
+      AdvancedPioMode = (UINT16)(Temp + 3);\r
     } else {\r
       AdvancedPioMode = PioMode;\r
     }\r
@@ -142,16 +141,16 @@ CalculateBestPioMode (
     //\r
     // Limit the PIO mode to at most PIO4.\r
     //\r
-    PioMode = (UINT16) MIN (AdvancedPioMode, 4);\r
+    PioMode = (UINT16)MIN (AdvancedPioMode, 4);\r
 \r
     MinimumPioCycleTime = IdentifyData->AtaData.min_pio_cycle_time_with_flow_control;\r
 \r
     if (MinimumPioCycleTime <= 120) {\r
-      PioMode = (UINT16) MIN (4, PioMode);\r
+      PioMode = (UINT16)MIN (4, PioMode);\r
     } else if (MinimumPioCycleTime <= 180) {\r
-      PioMode = (UINT16) MIN (3, PioMode);\r
+      PioMode = (UINT16)MIN (3, PioMode);\r
     } else if (MinimumPioCycleTime <= 240) {\r
-      PioMode = (UINT16) MIN (2, PioMode);\r
+      PioMode = (UINT16)MIN (2, PioMode);\r
     } else {\r
       PioMode = 0;\r
     }\r
@@ -165,7 +164,7 @@ CalculateBestPioMode (
       }\r
 \r
       if (PioMode >= *DisPioMode) {\r
-        PioMode = (UINT16) (*DisPioMode - 1);\r
+        PioMode = (UINT16)(*DisPioMode - 1);\r
       }\r
     }\r
 \r
@@ -174,7 +173,6 @@ CalculateBestPioMode (
     } else {\r
       *SelectedMode = PioMode;  // ATA_PIO_MODE_2 to ATA_PIO_MODE_4;\r
     }\r
-\r
   } else {\r
     //\r
     // Identify Data word 64 - 70 are not valid\r
@@ -195,7 +193,6 @@ CalculateBestPioMode (
     } else {\r
       *SelectedMode = 2;        // ATA_PIO_MODE_2;\r
     }\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -219,8 +216,8 @@ CalculateBestUdmaMode (
   OUT UINT16            *SelectedMode\r
   )\r
 {\r
-  UINT16    TempMode;\r
-  UINT16    DeviceUDmaMode;\r
+  UINT16  TempMode;\r
+  UINT16  DeviceUDmaMode;\r
 \r
   DeviceUDmaMode = 0;\r
 \r
@@ -234,7 +231,7 @@ CalculateBestUdmaMode (
   DeviceUDmaMode = IdentifyData->AtaData.ultra_dma_mode;\r
   DEBUG ((DEBUG_INFO, "CalculateBestUdmaMode: DeviceUDmaMode = %x\n", DeviceUDmaMode));\r
   DeviceUDmaMode &= 0x3f;\r
-  TempMode = 0;                 // initialize it to UDMA-0\r
+  TempMode        = 0;          // initialize it to UDMA-0\r
 \r
   while ((DeviceUDmaMode >>= 1) != 0) {\r
     TempMode++;\r
@@ -250,7 +247,7 @@ CalculateBestUdmaMode (
     }\r
 \r
     if (TempMode >= *DisUDmaMode) {\r
-      TempMode = (UINT16) (*DisUDmaMode - 1);\r
+      TempMode = (UINT16)(*DisUDmaMode - 1);\r
     }\r
   }\r
 \r
@@ -275,11 +272,11 @@ CalculateBestUdmaMode (
 EFI_STATUS\r
 EFIAPI\r
 InitializeSataControllerDriver (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Install driver model protocol(s).\r
@@ -314,14 +311,14 @@ InitializeSataControllerDriver (
 EFI_STATUS\r
 EFIAPI\r
 SataControllerSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  EFI_PCI_IO_PROTOCOL   *PciIo;\r
-  PCI_TYPE00            PciData;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           PciData;\r
 \r
   //\r
   // Attempt to open PCI I/O Protocol\r
@@ -329,7 +326,7 @@ SataControllerSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -377,9 +374,9 @@ SataControllerSupported (
 EFI_STATUS\r
 EFIAPI\r
 SataControllerStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
   UINTN                             BailLogMask;\r
@@ -393,7 +390,7 @@ SataControllerStart (
 \r
   DEBUG ((DEBUG_INFO, "SataControllerStart START\n"));\r
 \r
-  BailLogMask = DEBUG_ERROR;\r
+  BailLogMask     = DEBUG_ERROR;\r
   SataPrivateData = NULL;\r
 \r
   //\r
@@ -402,7 +399,7 @@ SataControllerStart (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -416,6 +413,7 @@ SataControllerStart (
       //\r
       BailLogMask = DEBUG_INFO;\r
     }\r
+\r
     goto Bail;\r
   }\r
 \r
@@ -423,13 +421,22 @@ SataControllerStart (
   // Save original PCI attributes, and enable IO space access, memory space\r
   // access, and Bus Master (DMA).\r
   //\r
-  Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationGet, 0,\r
-                    &OriginalPciAttributes);\r
+  Status = PciIo->Attributes (\r
+                    PciIo,\r
+                    EfiPciIoAttributeOperationGet,\r
+                    0,\r
+                    &OriginalPciAttributes\r
+                    );\r
   if (EFI_ERROR (Status)) {\r
     goto ClosePciIo;\r
   }\r
-  Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationEnable,\r
-                    EFI_PCI_DEVICE_ENABLE, NULL);\r
+\r
+  Status = PciIo->Attributes (\r
+                    PciIo,\r
+                    EfiPciIoAttributeOperationEnable,\r
+                    EFI_PCI_DEVICE_ENABLE,\r
+                    NULL\r
+                    );\r
   if (EFI_ERROR (Status)) {\r
     goto ClosePciIo;\r
   }\r
@@ -446,16 +453,16 @@ SataControllerStart (
   //\r
   // Initialize Sata Private Data\r
   //\r
-  SataPrivateData->Signature = SATA_CONTROLLER_SIGNATURE;\r
-  SataPrivateData->PciIo = PciIo;\r
-  SataPrivateData->OriginalPciAttributes = OriginalPciAttributes;\r
+  SataPrivateData->Signature              = SATA_CONTROLLER_SIGNATURE;\r
+  SataPrivateData->PciIo                  = PciIo;\r
+  SataPrivateData->OriginalPciAttributes  = OriginalPciAttributes;\r
   SataPrivateData->IdeInit.GetChannelInfo = IdeInitGetChannelInfo;\r
-  SataPrivateData->IdeInit.NotifyPhase = IdeInitNotifyPhase;\r
-  SataPrivateData->IdeInit.SubmitData = IdeInitSubmitData;\r
+  SataPrivateData->IdeInit.NotifyPhase    = IdeInitNotifyPhase;\r
+  SataPrivateData->IdeInit.SubmitData     = IdeInitSubmitData;\r
   SataPrivateData->IdeInit.DisqualifyMode = IdeInitDisqualifyMode;\r
-  SataPrivateData->IdeInit.CalculateMode = IdeInitCalculateMode;\r
-  SataPrivateData->IdeInit.SetTiming = IdeInitSetTiming;\r
-  SataPrivateData->IdeInit.EnumAll = SATA_ENUMER_ALL;\r
+  SataPrivateData->IdeInit.CalculateMode  = IdeInitCalculateMode;\r
+  SataPrivateData->IdeInit.SetTiming      = IdeInitSetTiming;\r
+  SataPrivateData->IdeInit.EnumAll        = SATA_ENUMER_ALL;\r
 \r
   Status = PciIo->Pci.Read (\r
                         PciIo,\r
@@ -470,22 +477,22 @@ SataControllerStart (
 \r
   if (IS_PCI_IDE (&PciData)) {\r
     SataPrivateData->IdeInit.ChannelCount = IDE_MAX_CHANNEL;\r
-    SataPrivateData->DeviceCount = IDE_MAX_DEVICES;\r
+    SataPrivateData->DeviceCount          = IDE_MAX_DEVICES;\r
   } else if (IS_PCI_SATADPA (&PciData)) {\r
     //\r
     // Read Host Capability Register(CAP) to get Number of Ports(NPS) and Supports Port Multiplier(SPM)\r
     //   NPS is 0's based value indicating the maximum number of ports supported by the HBA silicon.\r
     //   A maximum of 32 ports can be supported. A value of '0h', indicating one port, is the minimum requirement.\r
     //\r
-    Data32 = AhciReadReg (PciIo, R_AHCI_CAP);\r
-    SataPrivateData->IdeInit.ChannelCount = (UINT8) ((Data32 & B_AHCI_CAP_NPS) + 1);\r
-    SataPrivateData->DeviceCount = AHCI_MAX_DEVICES;\r
+    Data32                                = AhciReadReg (PciIo, R_AHCI_CAP);\r
+    SataPrivateData->IdeInit.ChannelCount = (UINT8)((Data32 & B_AHCI_CAP_NPS) + 1);\r
+    SataPrivateData->DeviceCount          = AHCI_MAX_DEVICES;\r
     if ((Data32 & B_AHCI_CAP_SPM) == B_AHCI_CAP_SPM) {\r
       SataPrivateData->DeviceCount = AHCI_MULTI_MAX_DEVICES;\r
     }\r
   }\r
 \r
-  ChannelDeviceCount = (UINTN) (SataPrivateData->IdeInit.ChannelCount) * (UINTN) (SataPrivateData->DeviceCount);\r
+  ChannelDeviceCount                 = (UINTN)(SataPrivateData->IdeInit.ChannelCount) * (UINTN)(SataPrivateData->DeviceCount);\r
   SataPrivateData->DisqualifiedModes = AllocateZeroPool ((sizeof (EFI_ATA_COLLECTIVE_MODE)) * ChannelDeviceCount);\r
   if (SataPrivateData->DisqualifiedModes == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -534,8 +541,12 @@ FreeSataPrivateData:
   FreePool (SataPrivateData);\r
 \r
 RestorePciAttributes:\r
-  PciIo->Attributes (PciIo, EfiPciIoAttributeOperationSet,\r
-           OriginalPciAttributes, NULL);\r
+  PciIo->Attributes (\r
+           PciIo,\r
+           EfiPciIoAttributeOperationSet,\r
+           OriginalPciAttributes,\r
+           NULL\r
+           );\r
 \r
 ClosePciIo:\r
   gBS->CloseProtocol (\r
@@ -546,8 +557,11 @@ ClosePciIo:
          );\r
 \r
 Bail:\r
-  DEBUG ((BailLogMask, "SataControllerStart error return status = %r\n",\r
-    Status));\r
+  DEBUG ((\r
+    BailLogMask,\r
+    "SataControllerStart error return status = %r\n",\r
+    Status\r
+    ));\r
   return Status;\r
 }\r
 \r
@@ -566,10 +580,10 @@ Bail:
 EFI_STATUS\r
 EFIAPI\r
 SataControllerStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN UINTN                          NumberOfChildren,\r
-  IN EFI_HANDLE                     *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
   EFI_STATUS                        Status;\r
@@ -584,7 +598,7 @@ SataControllerStop (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiIdeControllerInitProtocolGuid,\r
-                  (VOID **) &IdeInit,\r
+                  (VOID **)&IdeInit,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -615,12 +629,15 @@ SataControllerStop (
   if (SataPrivateData->DisqualifiedModes != NULL) {\r
     FreePool (SataPrivateData->DisqualifiedModes);\r
   }\r
+\r
   if (SataPrivateData->IdentifyData != NULL) {\r
     FreePool (SataPrivateData->IdentifyData);\r
   }\r
+\r
   if (SataPrivateData->IdentifyValid != NULL) {\r
     FreePool (SataPrivateData->IdentifyValid);\r
   }\r
+\r
   FreePool (SataPrivateData);\r
 \r
   //\r
@@ -678,6 +695,7 @@ FlatDeviceIndex (
 //\r
 // Interface functions of IDE_CONTROLLER_INIT protocol\r
 //\r
+\r
 /**\r
   Returns the information about the specified IDE channel.\r
 \r
@@ -717,18 +735,19 @@ FlatDeviceIndex (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitGetChannelInfo (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN UINT8                              Channel,\r
-  OUT BOOLEAN                           *Enabled,\r
-  OUT UINT8                             *MaxDevices\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN UINT8                             Channel,\r
+  OUT BOOLEAN                          *Enabled,\r
+  OUT UINT8                            *MaxDevices\r
   )\r
 {\r
   EFI_SATA_CONTROLLER_PRIVATE_DATA  *SataPrivateData;\r
+\r
   SataPrivateData = SATA_CONTROLLER_PRIVATE_DATA_FROM_THIS (This);\r
   ASSERT (SataPrivateData != NULL);\r
 \r
   if (Channel < This->ChannelCount) {\r
-    *Enabled = TRUE;\r
+    *Enabled    = TRUE;\r
     *MaxDevices = SataPrivateData->DeviceCount;\r
     return EFI_SUCCESS;\r
   }\r
@@ -764,9 +783,9 @@ IdeInitGetChannelInfo (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitNotifyPhase (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN EFI_IDE_CONTROLLER_ENUM_PHASE      Phase,\r
-  IN UINT8                              Channel\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN EFI_IDE_CONTROLLER_ENUM_PHASE     Phase,\r
+  IN UINT8                             Channel\r
   )\r
 {\r
   return EFI_SUCCESS;\r
@@ -814,10 +833,10 @@ IdeInitNotifyPhase (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitSubmitData (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN UINT8                              Channel,\r
-  IN UINT8                              Device,\r
-  IN EFI_IDENTIFY_DATA                  *IdentifyData\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN UINT8                             Channel,\r
+  IN UINT8                             Device,\r
+  IN EFI_IDENTIFY_DATA                 *IdentifyData\r
   )\r
 {\r
   EFI_SATA_CONTROLLER_PRIVATE_DATA  *SataPrivateData;\r
@@ -893,10 +912,10 @@ IdeInitSubmitData (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitDisqualifyMode (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN UINT8                              Channel,\r
-  IN UINT8                              Device,\r
-  IN EFI_ATA_COLLECTIVE_MODE            *BadModes\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN UINT8                             Channel,\r
+  IN UINT8                             Device,\r
+  IN EFI_ATA_COLLECTIVE_MODE           *BadModes\r
   )\r
 {\r
   EFI_SATA_CONTROLLER_PRIVATE_DATA  *SataPrivateData;\r
@@ -981,10 +1000,10 @@ IdeInitDisqualifyMode (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitCalculateMode (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN UINT8                              Channel,\r
-  IN UINT8                              Device,\r
-  OUT EFI_ATA_COLLECTIVE_MODE           **SupportedModes\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN UINT8                             Channel,\r
+  IN UINT8                             Device,\r
+  OUT EFI_ATA_COLLECTIVE_MODE          **SupportedModes\r
   )\r
 {\r
   EFI_SATA_CONTROLLER_PRIVATE_DATA  *SataPrivateData;\r
@@ -1010,8 +1029,8 @@ IdeInitCalculateMode (
 \r
   DeviceIndex = FlatDeviceIndex (SataPrivateData, Channel, Device);\r
 \r
-  IdentifyData = &(SataPrivateData->IdentifyData[DeviceIndex]);\r
-  IdentifyValid = SataPrivateData->IdentifyValid[DeviceIndex];\r
+  IdentifyData      = &(SataPrivateData->IdentifyData[DeviceIndex]);\r
+  IdentifyValid     = SataPrivateData->IdentifyValid[DeviceIndex];\r
   DisqualifiedModes = &(SataPrivateData->DisqualifiedModes[DeviceIndex]);\r
 \r
   //\r
@@ -1023,32 +1042,32 @@ IdeInitCalculateMode (
   }\r
 \r
   Status = CalculateBestPioMode (\r
-            IdentifyData,\r
-            (DisqualifiedModes->PioMode.Valid ? ((UINT16 *) &(DisqualifiedModes->PioMode.Mode)) : NULL),\r
-            &SelectedMode\r
-            );\r
+             IdentifyData,\r
+             (DisqualifiedModes->PioMode.Valid ? ((UINT16 *)&(DisqualifiedModes->PioMode.Mode)) : NULL),\r
+             &SelectedMode\r
+             );\r
   if (!EFI_ERROR (Status)) {\r
     (*SupportedModes)->PioMode.Valid = TRUE;\r
-    (*SupportedModes)->PioMode.Mode = SelectedMode;\r
-\r
+    (*SupportedModes)->PioMode.Mode  = SelectedMode;\r
   } else {\r
     (*SupportedModes)->PioMode.Valid = FALSE;\r
   }\r
+\r
   DEBUG ((DEBUG_INFO, "IdeInitCalculateMode: PioMode = %x\n", (*SupportedModes)->PioMode.Mode));\r
 \r
   Status = CalculateBestUdmaMode (\r
-            IdentifyData,\r
-            (DisqualifiedModes->UdmaMode.Valid ? ((UINT16 *) &(DisqualifiedModes->UdmaMode.Mode)) : NULL),\r
-            &SelectedMode\r
-            );\r
+             IdentifyData,\r
+             (DisqualifiedModes->UdmaMode.Valid ? ((UINT16 *)&(DisqualifiedModes->UdmaMode.Mode)) : NULL),\r
+             &SelectedMode\r
+             );\r
 \r
   if (!EFI_ERROR (Status)) {\r
     (*SupportedModes)->UdmaMode.Valid = TRUE;\r
     (*SupportedModes)->UdmaMode.Mode  = SelectedMode;\r
-\r
   } else {\r
     (*SupportedModes)->UdmaMode.Valid = FALSE;\r
   }\r
+\r
   DEBUG ((DEBUG_INFO, "IdeInitCalculateMode: UdmaMode = %x\n", (*SupportedModes)->UdmaMode.Mode));\r
 \r
   //\r
@@ -1083,10 +1102,10 @@ IdeInitCalculateMode (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitSetTiming (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN UINT8                              Channel,\r
-  IN UINT8                              Device,\r
-  IN EFI_ATA_COLLECTIVE_MODE            *Modes\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN UINT8                             Channel,\r
+  IN UINT8                             Device,\r
+  IN EFI_ATA_COLLECTIVE_MODE           *Modes\r
   )\r
 {\r
   return EFI_SUCCESS;\r
index 4ef7f56e2249354c02ffed725f4bdd3b5dbff701..ad93ab1d98c31cd0f7c9de9daf0ab491199eb87a 100644 (file)
 //\r
 // Global Variables definitions\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL  gSataControllerDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gSataControllerComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gSataControllerComponentName2;\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gSataControllerDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gSataControllerComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gSataControllerComponentName2;\r
 \r
-#define AHCI_BAR_INDEX 0x05\r
-#define R_AHCI_CAP 0x0\r
-#define   B_AHCI_CAP_NPS (BIT4 | BIT3 | BIT2 | BIT1 | BIT0) // Number of Ports\r
-#define   B_AHCI_CAP_SPM BIT17 // Supports Port Multiplier\r
+#define AHCI_BAR_INDEX    0x05\r
+#define R_AHCI_CAP        0x0\r
+#define   B_AHCI_CAP_NPS  (BIT4 | BIT3 | BIT2 | BIT1 | BIT0) // Number of Ports\r
+#define   B_AHCI_CAP_SPM  BIT17                              // Supports Port Multiplier\r
 \r
 ///\r
 /// AHCI each channel can have up to 1 device\r
 ///\r
-#define AHCI_MAX_DEVICES 0x01\r
+#define AHCI_MAX_DEVICES  0x01\r
 \r
 ///\r
 /// AHCI each channel can have 15 devices in the presence of a multiplier\r
 ///\r
-#define AHCI_MULTI_MAX_DEVICES 0x0F\r
+#define AHCI_MULTI_MAX_DEVICES  0x0F\r
 \r
 ///\r
 /// IDE supports 2 channel max\r
 ///\r
-#define IDE_MAX_CHANNEL 0x02\r
+#define IDE_MAX_CHANNEL  0x02\r
 \r
 ///\r
 /// IDE supports 2 devices max\r
 ///\r
-#define IDE_MAX_DEVICES 0x02\r
+#define IDE_MAX_DEVICES  0x02\r
 \r
-#define SATA_ENUMER_ALL FALSE\r
+#define SATA_ENUMER_ALL  FALSE\r
 \r
 //\r
 // Sata Controller driver private data structure\r
 //\r
 \r
-#define SATA_CONTROLLER_SIGNATURE SIGNATURE_32('S','A','T','A')\r
+#define SATA_CONTROLLER_SIGNATURE  SIGNATURE_32('S','A','T','A')\r
 \r
 typedef struct _EFI_SATA_CONTROLLER_PRIVATE_DATA {\r
   //\r
   // Standard signature used to identify Sata Controller private data\r
   //\r
-  UINT32                            Signature;\r
+  UINT32                              Signature;\r
 \r
   //\r
   // Protocol instance of IDE_CONTROLLER_INIT produced by this driver\r
   //\r
-  EFI_IDE_CONTROLLER_INIT_PROTOCOL  IdeInit;\r
+  EFI_IDE_CONTROLLER_INIT_PROTOCOL    IdeInit;\r
 \r
   //\r
   // Copy of protocol pointers used by this driver\r
   //\r
-  EFI_PCI_IO_PROTOCOL               *PciIo;\r
+  EFI_PCI_IO_PROTOCOL                 *PciIo;\r
 \r
   //\r
   // Original PCI attributes\r
   //\r
-  UINT64                            OriginalPciAttributes;\r
+  UINT64                              OriginalPciAttributes;\r
 \r
   //\r
   // The number of devices that are supported by this channel\r
   //\r
-  UINT8                             DeviceCount;\r
+  UINT8                               DeviceCount;\r
 \r
   //\r
   // The highest disqulified mode for each attached device,\r
   // From ATA/ATAPI spec, if a mode is not supported,\r
   // the modes higher than it is also not supported\r
   //\r
-  EFI_ATA_COLLECTIVE_MODE           *DisqualifiedModes;\r
+  EFI_ATA_COLLECTIVE_MODE             *DisqualifiedModes;\r
 \r
   //\r
   // A copy of EFI_IDENTIFY_DATA data for each attached SATA device and its flag\r
   //\r
-  EFI_IDENTIFY_DATA                 *IdentifyData;\r
-  BOOLEAN                           *IdentifyValid;\r
+  EFI_IDENTIFY_DATA                   *IdentifyData;\r
+  BOOLEAN                             *IdentifyValid;\r
 } EFI_SATA_CONTROLLER_PRIVATE_DATA;\r
 \r
-#define SATA_CONTROLLER_PRIVATE_DATA_FROM_THIS(a) CR(a, EFI_SATA_CONTROLLER_PRIVATE_DATA, IdeInit, SATA_CONTROLLER_SIGNATURE)\r
+#define SATA_CONTROLLER_PRIVATE_DATA_FROM_THIS(a)  CR(a, EFI_SATA_CONTROLLER_PRIVATE_DATA, IdeInit, SATA_CONTROLLER_SIGNATURE)\r
 \r
 //\r
 // Driver binding functions declaration\r
 //\r
+\r
 /**\r
   Supported function of Driver Binding protocol for this driver.\r
   Test to see if this driver supports ControllerHandle.\r
@@ -125,9 +126,9 @@ typedef struct _EFI_SATA_CONTROLLER_PRIVATE_DATA {
 EFI_STATUS\r
 EFIAPI\r
 SataControllerSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 ;\r
 \r
@@ -148,9 +149,9 @@ SataControllerSupported (
 EFI_STATUS\r
 EFIAPI\r
 SataControllerStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 ;\r
 \r
@@ -169,16 +170,17 @@ SataControllerStart (
 EFI_STATUS\r
 EFIAPI\r
 SataControllerStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN UINTN                          NumberOfChildren,\r
-  IN EFI_HANDLE                     *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 ;\r
 \r
 //\r
 // IDE controller init functions declaration\r
 //\r
+\r
 /**\r
   Returns the information about the specified IDE channel.\r
 \r
@@ -218,10 +220,10 @@ SataControllerStop (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitGetChannelInfo (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN UINT8                              Channel,\r
-  OUT BOOLEAN                           *Enabled,\r
-  OUT UINT8                             *MaxDevices\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN UINT8                             Channel,\r
+  OUT BOOLEAN                          *Enabled,\r
+  OUT UINT8                            *MaxDevices\r
   )\r
 ;\r
 \r
@@ -252,9 +254,9 @@ IdeInitGetChannelInfo (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitNotifyPhase (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN EFI_IDE_CONTROLLER_ENUM_PHASE      Phase,\r
-  IN UINT8                              Channel\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN EFI_IDE_CONTROLLER_ENUM_PHASE     Phase,\r
+  IN UINT8                             Channel\r
   )\r
 ;\r
 \r
@@ -300,10 +302,10 @@ IdeInitNotifyPhase (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitSubmitData (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN UINT8                              Channel,\r
-  IN UINT8                              Device,\r
-  IN EFI_IDENTIFY_DATA                  *IdentifyData\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN UINT8                             Channel,\r
+  IN UINT8                             Device,\r
+  IN EFI_IDENTIFY_DATA                 *IdentifyData\r
   )\r
 ;\r
 \r
@@ -350,10 +352,10 @@ IdeInitSubmitData (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitDisqualifyMode (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN UINT8                              Channel,\r
-  IN UINT8                              Device,\r
-  IN EFI_ATA_COLLECTIVE_MODE            *BadModes\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN UINT8                             Channel,\r
+  IN UINT8                             Device,\r
+  IN EFI_ATA_COLLECTIVE_MODE           *BadModes\r
   )\r
 ;\r
 \r
@@ -414,10 +416,10 @@ IdeInitDisqualifyMode (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitCalculateMode (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN UINT8                              Channel,\r
-  IN UINT8                              Device,\r
-  OUT EFI_ATA_COLLECTIVE_MODE           **SupportedModes\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN UINT8                             Channel,\r
+  IN UINT8                             Device,\r
+  OUT EFI_ATA_COLLECTIVE_MODE          **SupportedModes\r
   )\r
 ;\r
 \r
@@ -447,16 +449,17 @@ IdeInitCalculateMode (
 EFI_STATUS\r
 EFIAPI\r
 IdeInitSetTiming (\r
-  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL   *This,\r
-  IN UINT8                              Channel,\r
-  IN UINT8                              Device,\r
-  IN EFI_ATA_COLLECTIVE_MODE            *Modes\r
+  IN EFI_IDE_CONTROLLER_INIT_PROTOCOL  *This,\r
+  IN UINT8                             Channel,\r
+  IN UINT8                             Device,\r
+  IN EFI_ATA_COLLECTIVE_MODE           *Modes\r
   )\r
 ;\r
 \r
 //\r
 // Forward reference declaration\r
 //\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the UEFI Driver.\r
 \r
@@ -481,9 +484,9 @@ IdeInitSetTiming (
 EFI_STATUS\r
 EFIAPI\r
 SataControllerComponentNameGetDriverName (\r
-  IN EFI_COMPONENT_NAME_PROTOCOL    *This,\r
-  IN CHAR8                          *Language,\r
-  OUT CHAR16                        **DriverName\r
+  IN EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN CHAR8                        *Language,\r
+  OUT CHAR16                      **DriverName\r
   )\r
 ;\r
 \r
@@ -530,11 +533,11 @@ SataControllerComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 SataControllerComponentNameGetControllerName (\r
-  IN EFI_COMPONENT_NAME_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_HANDLE                     ChildHandle OPTIONAL,\r
-  IN CHAR8                          *Language,\r
-  OUT CHAR16                        **ControllerName\r
+  IN EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_HANDLE                   ChildHandle OPTIONAL,\r
+  IN CHAR8                        *Language,\r
+  OUT CHAR16                      **ControllerName\r
   )\r
 ;\r
 \r
index 707b0d4bbff4e86b292aaef4f3e66563d6a08b5c..6d81d5b629880051ca66b119434914ad07eeeb8a 100644 (file)
 #define SEC_IDT_ENTRY_COUNT  34\r
 \r
 typedef struct _SEC_IDT_TABLE {\r
-  EFI_PEI_SERVICES          *PeiService;\r
-  IA32_IDT_GATE_DESCRIPTOR  IdtTable[SEC_IDT_ENTRY_COUNT];\r
+  EFI_PEI_SERVICES            *PeiService;\r
+  IA32_IDT_GATE_DESCRIPTOR    IdtTable[SEC_IDT_ENTRY_COUNT];\r
 } SEC_IDT_TABLE;\r
 \r
 VOID\r
 EFIAPI\r
 SecStartupPhase2 (\r
-  IN VOID                     *Context\r
+  IN VOID  *Context\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 TemporaryRamMigration (\r
-  IN CONST EFI_PEI_SERVICES   **PeiServices,\r
-  IN EFI_PHYSICAL_ADDRESS     TemporaryMemoryBase,\r
-  IN EFI_PHYSICAL_ADDRESS     PermanentMemoryBase,\r
-  IN UINTN                    CopySize\r
+  IN CONST EFI_PEI_SERVICES  **PeiServices,\r
+  IN EFI_PHYSICAL_ADDRESS    TemporaryMemoryBase,\r
+  IN EFI_PHYSICAL_ADDRESS    PermanentMemoryBase,\r
+  IN UINTN                   CopySize\r
   );\r
 \r
 //\r
 //\r
 //\r
-EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mTemporaryRamSupportPpi = {\r
+EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI  mTemporaryRamSupportPpi = {\r
   TemporaryRamMigration\r
 };\r
 \r
-EFI_PEI_PPI_DESCRIPTOR mPrivateDispatchTable[] = {\r
+EFI_PEI_PPI_DESCRIPTOR  mPrivateDispatchTable[] = {\r
   {\r
     (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
     &gEfiTemporaryRamSupportPpiGuid,\r
@@ -94,18 +94,18 @@ IA32_IDT_GATE_DESCRIPTOR  mIdtEntryTemplate = {
 **/\r
 EFI_STATUS\r
 FindMainFv (\r
-  IN OUT  EFI_FIRMWARE_VOLUME_HEADER   **BootFv\r
+  IN OUT  EFI_FIRMWARE_VOLUME_HEADER  **BootFv\r
   )\r
 {\r
   EFI_FIRMWARE_VOLUME_HEADER  *Fv;\r
   UINTN                       Distance;\r
 \r
-  ASSERT (((UINTN) *BootFv & EFI_PAGE_MASK) == 0);\r
+  ASSERT (((UINTN)*BootFv & EFI_PAGE_MASK) == 0);\r
 \r
-  Fv = *BootFv;\r
-  Distance = (UINTN) (*BootFv)->FvLength;\r
+  Fv       = *BootFv;\r
+  Distance = (UINTN)(*BootFv)->FvLength;\r
   do {\r
-    Fv = (EFI_FIRMWARE_VOLUME_HEADER*) ((UINT8*) Fv - EFI_PAGE_SIZE);\r
+    Fv        = (EFI_FIRMWARE_VOLUME_HEADER *)((UINT8 *)Fv - EFI_PAGE_SIZE);\r
     Distance += EFI_PAGE_SIZE;\r
     if (Distance > SIZE_32MB) {\r
       return EFI_NOT_FOUND;\r
@@ -115,13 +115,12 @@ FindMainFv (
       continue;\r
     }\r
 \r
-    if ((UINTN) Fv->FvLength > Distance) {\r
+    if ((UINTN)Fv->FvLength > Distance) {\r
       continue;\r
     }\r
 \r
     *BootFv = Fv;\r
     return EFI_SUCCESS;\r
-\r
   } while (TRUE);\r
 }\r
 \r
@@ -145,34 +144,35 @@ FindMainFv (
 **/\r
 EFI_STATUS\r
 FindFfsSectionInstance (\r
-  IN  VOID                             *Sections,\r
-  IN  UINTN                            SizeOfSections,\r
-  IN  EFI_SECTION_TYPE                 SectionType,\r
-  IN  UINTN                            Instance,\r
-  OUT EFI_COMMON_SECTION_HEADER        **FoundSection\r
+  IN  VOID                       *Sections,\r
+  IN  UINTN                      SizeOfSections,\r
+  IN  EFI_SECTION_TYPE           SectionType,\r
+  IN  UINTN                      Instance,\r
+  OUT EFI_COMMON_SECTION_HEADER  **FoundSection\r
   )\r
 {\r
-  EFI_PHYSICAL_ADDRESS        CurrentAddress;\r
-  UINT32                      Size;\r
-  EFI_PHYSICAL_ADDRESS        EndOfSections;\r
-  EFI_COMMON_SECTION_HEADER   *Section;\r
-  EFI_PHYSICAL_ADDRESS        EndOfSection;\r
+  EFI_PHYSICAL_ADDRESS       CurrentAddress;\r
+  UINT32                     Size;\r
+  EFI_PHYSICAL_ADDRESS       EndOfSections;\r
+  EFI_COMMON_SECTION_HEADER  *Section;\r
+  EFI_PHYSICAL_ADDRESS       EndOfSection;\r
 \r
   //\r
   // Loop through the FFS file sections within the PEI Core FFS file\r
   //\r
-  EndOfSection = (EFI_PHYSICAL_ADDRESS)(UINTN) Sections;\r
+  EndOfSection  = (EFI_PHYSICAL_ADDRESS)(UINTN)Sections;\r
   EndOfSections = EndOfSection + SizeOfSections;\r
-  for (;;) {\r
+  for ( ; ;) {\r
     if (EndOfSection == EndOfSections) {\r
       break;\r
     }\r
+\r
     CurrentAddress = (EndOfSection + 3) & ~(3ULL);\r
     if (CurrentAddress >= EndOfSections) {\r
       return EFI_VOLUME_CORRUPTED;\r
     }\r
 \r
-    Section = (EFI_COMMON_SECTION_HEADER*)(UINTN) CurrentAddress;\r
+    Section = (EFI_COMMON_SECTION_HEADER *)(UINTN)CurrentAddress;\r
 \r
     Size = SECTION_SIZE (Section);\r
     if (Size < sizeof (*Section)) {\r
@@ -216,10 +216,10 @@ FindFfsSectionInstance (
 **/\r
 EFI_STATUS\r
 FindFfsSectionInSections (\r
-  IN  VOID                             *Sections,\r
-  IN  UINTN                            SizeOfSections,\r
-  IN  EFI_SECTION_TYPE                 SectionType,\r
-  OUT EFI_COMMON_SECTION_HEADER        **FoundSection\r
+  IN  VOID                       *Sections,\r
+  IN  UINTN                      SizeOfSections,\r
+  IN  EFI_SECTION_TYPE           SectionType,\r
+  OUT EFI_COMMON_SECTION_HEADER  **FoundSection\r
   )\r
 {\r
   return FindFfsSectionInstance (\r
@@ -247,38 +247,37 @@ FindFfsSectionInSections (
 **/\r
 EFI_STATUS\r
 FindFfsFileAndSection (\r
-  IN  EFI_FIRMWARE_VOLUME_HEADER       *Fv,\r
-  IN  EFI_FV_FILETYPE                  FileType,\r
-  IN  EFI_SECTION_TYPE                 SectionType,\r
-  OUT EFI_COMMON_SECTION_HEADER        **FoundSection\r
+  IN  EFI_FIRMWARE_VOLUME_HEADER  *Fv,\r
+  IN  EFI_FV_FILETYPE             FileType,\r
+  IN  EFI_SECTION_TYPE            SectionType,\r
+  OUT EFI_COMMON_SECTION_HEADER   **FoundSection\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_PHYSICAL_ADDRESS        CurrentAddress;\r
-  EFI_PHYSICAL_ADDRESS        EndOfFirmwareVolume;\r
-  EFI_FFS_FILE_HEADER         *File;\r
-  UINT32                      Size;\r
-  EFI_PHYSICAL_ADDRESS        EndOfFile;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  CurrentAddress;\r
+  EFI_PHYSICAL_ADDRESS  EndOfFirmwareVolume;\r
+  EFI_FFS_FILE_HEADER   *File;\r
+  UINT32                Size;\r
+  EFI_PHYSICAL_ADDRESS  EndOfFile;\r
 \r
   if (Fv->Signature != EFI_FVH_SIGNATURE) {\r
     DEBUG ((DEBUG_ERROR, "FV at %p does not have FV header signature\n", Fv));\r
     return EFI_VOLUME_CORRUPTED;\r
   }\r
 \r
-  CurrentAddress = (EFI_PHYSICAL_ADDRESS)(UINTN) Fv;\r
+  CurrentAddress      = (EFI_PHYSICAL_ADDRESS)(UINTN)Fv;\r
   EndOfFirmwareVolume = CurrentAddress + Fv->FvLength;\r
 \r
   //\r
   // Loop through the FFS files in the Boot Firmware Volume\r
   //\r
   for (EndOfFile = CurrentAddress + Fv->HeaderLength; ; ) {\r
-\r
     CurrentAddress = (EndOfFile + 7) & ~(7ULL);\r
     if (CurrentAddress > EndOfFirmwareVolume) {\r
       return EFI_VOLUME_CORRUPTED;\r
     }\r
 \r
-    File = (EFI_FFS_FILE_HEADER*)(UINTN) CurrentAddress;\r
+    File = (EFI_FFS_FILE_HEADER *)(UINTN)CurrentAddress;\r
     Size = FFS_FILE_SIZE (File);\r
     if (Size < (sizeof (*File) + sizeof (EFI_COMMON_SECTION_HEADER))) {\r
       return EFI_VOLUME_CORRUPTED;\r
@@ -297,8 +296,8 @@ FindFfsFileAndSection (
     }\r
 \r
     Status = FindFfsSectionInSections (\r
-               (VOID*) (File + 1),\r
-               (UINTN) EndOfFile - (UINTN) (File + 1),\r
+               (VOID *)(File + 1),\r
+               (UINTN)EndOfFile - (UINTN)(File + 1),\r
                SectionType,\r
                FoundSection\r
                );\r
@@ -321,30 +320,30 @@ FindFfsFileAndSection (
 **/\r
 EFI_STATUS\r
 DecompressMemFvs (\r
-  IN OUT EFI_FIRMWARE_VOLUME_HEADER       **Fv\r
+  IN OUT EFI_FIRMWARE_VOLUME_HEADER  **Fv\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_GUID_DEFINED_SECTION          *Section;\r
-  UINT32                            OutputBufferSize;\r
-  UINT32                            ScratchBufferSize;\r
-  UINT16                            SectionAttribute;\r
-  UINT32                            AuthenticationStatus;\r
-  VOID                              *OutputBuffer;\r
-  VOID                              *ScratchBuffer;\r
-  EFI_COMMON_SECTION_HEADER         *FvSection;\r
-  EFI_FIRMWARE_VOLUME_HEADER        *PeiMemFv;\r
-  EFI_FIRMWARE_VOLUME_HEADER        *DxeMemFv;\r
-  UINT32                            FvHeaderSize;\r
-  UINT32                            FvSectionSize;\r
-\r
-  FvSection = (EFI_COMMON_SECTION_HEADER*) NULL;\r
+  EFI_STATUS                  Status;\r
+  EFI_GUID_DEFINED_SECTION    *Section;\r
+  UINT32                      OutputBufferSize;\r
+  UINT32                      ScratchBufferSize;\r
+  UINT16                      SectionAttribute;\r
+  UINT32                      AuthenticationStatus;\r
+  VOID                        *OutputBuffer;\r
+  VOID                        *ScratchBuffer;\r
+  EFI_COMMON_SECTION_HEADER   *FvSection;\r
+  EFI_FIRMWARE_VOLUME_HEADER  *PeiMemFv;\r
+  EFI_FIRMWARE_VOLUME_HEADER  *DxeMemFv;\r
+  UINT32                      FvHeaderSize;\r
+  UINT32                      FvSectionSize;\r
+\r
+  FvSection = (EFI_COMMON_SECTION_HEADER *)NULL;\r
 \r
   Status = FindFfsFileAndSection (\r
              *Fv,\r
              EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE,\r
              EFI_SECTION_GUID_DEFINED,\r
-             (EFI_COMMON_SECTION_HEADER**) &Section\r
+             (EFI_COMMON_SECTION_HEADER **)&Section\r
              );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "Unable to find GUID defined section\n"));\r
@@ -362,15 +361,24 @@ DecompressMemFvs (
     return Status;\r
   }\r
 \r
-  OutputBuffer = (VOID*) ((UINT8*)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase) + SIZE_1MB);\r
-  ScratchBuffer = ALIGN_POINTER ((UINT8*) OutputBuffer + OutputBufferSize, SIZE_1MB);\r
-\r
-  DEBUG ((DEBUG_VERBOSE, "%a: OutputBuffer@%p+0x%x ScratchBuffer@%p+0x%x "\r
-    "PcdOvmfDecompressionScratchEnd=0x%x\n", __FUNCTION__, OutputBuffer,\r
-    OutputBufferSize, ScratchBuffer, ScratchBufferSize,\r
-    PcdGet32 (PcdOvmfDecompressionScratchEnd)));\r
-  ASSERT ((UINTN)ScratchBuffer + ScratchBufferSize ==\r
-    PcdGet32 (PcdOvmfDecompressionScratchEnd));\r
+  OutputBuffer  = (VOID *)((UINT8 *)(UINTN)PcdGet32 (PcdOvmfDxeMemFvBase) + SIZE_1MB);\r
+  ScratchBuffer = ALIGN_POINTER ((UINT8 *)OutputBuffer + OutputBufferSize, SIZE_1MB);\r
+\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: OutputBuffer@%p+0x%x ScratchBuffer@%p+0x%x "\r
+    "PcdOvmfDecompressionScratchEnd=0x%x\n",\r
+    __FUNCTION__,\r
+    OutputBuffer,\r
+    OutputBufferSize,\r
+    ScratchBuffer,\r
+    ScratchBufferSize,\r
+    PcdGet32 (PcdOvmfDecompressionScratchEnd)\r
+    ));\r
+  ASSERT (\r
+    (UINTN)ScratchBuffer + ScratchBufferSize ==\r
+    PcdGet32 (PcdOvmfDecompressionScratchEnd)\r
+    );\r
 \r
   Status = ExtractGuidedSectionDecode (\r
              Section,\r
@@ -395,12 +403,14 @@ DecompressMemFvs (
     return Status;\r
   }\r
 \r
-  ASSERT (SECTION_SIZE (FvSection) ==\r
-          (PcdGet32 (PcdOvmfPeiMemFvSize) + sizeof (*FvSection)));\r
+  ASSERT (\r
+    SECTION_SIZE (FvSection) ==\r
+    (PcdGet32 (PcdOvmfPeiMemFvSize) + sizeof (*FvSection))\r
+    );\r
   ASSERT (FvSection->Type == EFI_SECTION_FIRMWARE_VOLUME_IMAGE);\r
 \r
-  PeiMemFv = (EFI_FIRMWARE_VOLUME_HEADER*)(UINTN) PcdGet32 (PcdOvmfPeiMemFvBase);\r
-  CopyMem (PeiMemFv, (VOID*) (FvSection + 1), PcdGet32 (PcdOvmfPeiMemFvSize));\r
+  PeiMemFv = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdOvmfPeiMemFvBase);\r
+  CopyMem (PeiMemFv, (VOID *)(FvSection + 1), PcdGet32 (PcdOvmfPeiMemFvSize));\r
 \r
   if (PeiMemFv->Signature != EFI_FVH_SIGNATURE) {\r
     DEBUG ((DEBUG_ERROR, "Extracted FV at %p does not have FV header signature\n", PeiMemFv));\r
@@ -424,16 +434,16 @@ DecompressMemFvs (
 \r
   if (IS_SECTION2 (FvSection)) {\r
     FvSectionSize = SECTION2_SIZE (FvSection);\r
-    FvHeaderSize = sizeof (EFI_COMMON_SECTION_HEADER2);\r
+    FvHeaderSize  = sizeof (EFI_COMMON_SECTION_HEADER2);\r
   } else {\r
     FvSectionSize = SECTION_SIZE (FvSection);\r
-    FvHeaderSize = sizeof (EFI_COMMON_SECTION_HEADER);\r
+    FvHeaderSize  = sizeof (EFI_COMMON_SECTION_HEADER);\r
   }\r
 \r
   ASSERT (FvSectionSize == (PcdGet32 (PcdOvmfDxeMemFvSize) + FvHeaderSize));\r
 \r
-  DxeMemFv = (EFI_FIRMWARE_VOLUME_HEADER*)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase);\r
-  CopyMem (DxeMemFv, (VOID*) ((UINTN)FvSection + FvHeaderSize), PcdGet32 (PcdOvmfDxeMemFvSize));\r
+  DxeMemFv = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdOvmfDxeMemFvBase);\r
+  CopyMem (DxeMemFv, (VOID *)((UINTN)FvSection + FvHeaderSize), PcdGet32 (PcdOvmfDxeMemFvSize));\r
 \r
   if (DxeMemFv->Signature != EFI_FVH_SIGNATURE) {\r
     DEBUG ((DEBUG_ERROR, "Extracted FV at %p does not have FV header signature\n", DxeMemFv));\r
@@ -458,12 +468,12 @@ DecompressMemFvs (
 **/\r
 EFI_STATUS\r
 FindPeiCoreImageBaseInFv (\r
-  IN  EFI_FIRMWARE_VOLUME_HEADER       *Fv,\r
-  OUT  EFI_PHYSICAL_ADDRESS             *PeiCoreImageBase\r
+  IN  EFI_FIRMWARE_VOLUME_HEADER  *Fv,\r
+  OUT  EFI_PHYSICAL_ADDRESS       *PeiCoreImageBase\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_COMMON_SECTION_HEADER   *Section;\r
+  EFI_STATUS                 Status;\r
+  EFI_COMMON_SECTION_HEADER  *Section;\r
 \r
   Status = FindFfsFileAndSection (\r
              Fv,\r
@@ -488,7 +498,6 @@ FindPeiCoreImageBaseInFv (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Reads 8-bits of CMOS data.\r
 \r
@@ -503,14 +512,13 @@ FindPeiCoreImageBaseInFv (
 STATIC\r
 UINT8\r
 CmosRead8 (\r
-  IN      UINTN                     Index\r
+  IN      UINTN  Index\r
   )\r
 {\r
-  IoWrite8 (0x70, (UINT8) Index);\r
+  IoWrite8 (0x70, (UINT8)Index);\r
   return IoRead8 (0x71);\r
 }\r
 \r
-\r
 STATIC\r
 BOOLEAN\r
 IsS3Resume (\r
@@ -520,18 +528,16 @@ IsS3Resume (
   return (CmosRead8 (0xF) == 0xFE);\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 GetS3ResumePeiFv (\r
-  IN OUT EFI_FIRMWARE_VOLUME_HEADER       **PeiFv\r
+  IN OUT EFI_FIRMWARE_VOLUME_HEADER  **PeiFv\r
   )\r
 {\r
-  *PeiFv = (EFI_FIRMWARE_VOLUME_HEADER*)(UINTN) PcdGet32 (PcdOvmfPeiMemFvBase);\r
+  *PeiFv = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdOvmfPeiMemFvBase);\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Locates the PEI Core entry point address\r
 \r
@@ -545,11 +551,11 @@ GetS3ResumePeiFv (
 **/\r
 VOID\r
 FindPeiCoreImageBase (\r
-  IN OUT  EFI_FIRMWARE_VOLUME_HEADER       **BootFv,\r
-     OUT  EFI_PHYSICAL_ADDRESS             *PeiCoreImageBase\r
+  IN OUT  EFI_FIRMWARE_VOLUME_HEADER  **BootFv,\r
+  OUT  EFI_PHYSICAL_ADDRESS           *PeiCoreImageBase\r
   )\r
 {\r
-  BOOLEAN S3Resume;\r
+  BOOLEAN  S3Resume;\r
 \r
   *PeiCoreImageBase = 0;\r
 \r
@@ -566,8 +572,11 @@ FindPeiCoreImageBase (
     // We're either not resuming, or resuming "securely" -- we'll decompress\r
     // both PEI FV and DXE FV from pristine flash.\r
     //\r
-    DEBUG ((DEBUG_VERBOSE, "SEC: %a\n",\r
-      S3Resume ? "S3 resume (with PEI decompression)" : "Normal boot"));\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "SEC: %a\n",\r
+      S3Resume ? "S3 resume (with PEI decompression)" : "Normal boot"\r
+      ));\r
     FindMainFv (BootFv);\r
 \r
     DecompressMemFvs (BootFv);\r
@@ -582,34 +591,33 @@ FindPeiCoreImageBase (
 **/\r
 EFI_STATUS\r
 FindImageBase (\r
-  IN  EFI_FIRMWARE_VOLUME_HEADER       *BootFirmwareVolumePtr,\r
-  OUT EFI_PHYSICAL_ADDRESS             *SecCoreImageBase\r
+  IN  EFI_FIRMWARE_VOLUME_HEADER  *BootFirmwareVolumePtr,\r
+  OUT EFI_PHYSICAL_ADDRESS        *SecCoreImageBase\r
   )\r
 {\r
-  EFI_PHYSICAL_ADDRESS        CurrentAddress;\r
-  EFI_PHYSICAL_ADDRESS        EndOfFirmwareVolume;\r
-  EFI_FFS_FILE_HEADER         *File;\r
-  UINT32                      Size;\r
-  EFI_PHYSICAL_ADDRESS        EndOfFile;\r
-  EFI_COMMON_SECTION_HEADER   *Section;\r
-  EFI_PHYSICAL_ADDRESS        EndOfSection;\r
+  EFI_PHYSICAL_ADDRESS       CurrentAddress;\r
+  EFI_PHYSICAL_ADDRESS       EndOfFirmwareVolume;\r
+  EFI_FFS_FILE_HEADER        *File;\r
+  UINT32                     Size;\r
+  EFI_PHYSICAL_ADDRESS       EndOfFile;\r
+  EFI_COMMON_SECTION_HEADER  *Section;\r
+  EFI_PHYSICAL_ADDRESS       EndOfSection;\r
 \r
   *SecCoreImageBase = 0;\r
 \r
-  CurrentAddress = (EFI_PHYSICAL_ADDRESS)(UINTN) BootFirmwareVolumePtr;\r
+  CurrentAddress      = (EFI_PHYSICAL_ADDRESS)(UINTN)BootFirmwareVolumePtr;\r
   EndOfFirmwareVolume = CurrentAddress + BootFirmwareVolumePtr->FvLength;\r
 \r
   //\r
   // Loop through the FFS files in the Boot Firmware Volume\r
   //\r
   for (EndOfFile = CurrentAddress + BootFirmwareVolumePtr->HeaderLength; ; ) {\r
-\r
     CurrentAddress = (EndOfFile + 7) & 0xfffffffffffffff8ULL;\r
     if (CurrentAddress > EndOfFirmwareVolume) {\r
       return EFI_NOT_FOUND;\r
     }\r
 \r
-    File = (EFI_FFS_FILE_HEADER*)(UINTN) CurrentAddress;\r
+    File = (EFI_FFS_FILE_HEADER *)(UINTN)CurrentAddress;\r
     Size = FFS_FILE_SIZE (File);\r
     if (Size < sizeof (*File)) {\r
       return EFI_NOT_FOUND;\r
@@ -630,10 +638,10 @@ FindImageBase (
     //\r
     // Loop through the FFS file sections within the FFS file\r
     //\r
-    EndOfSection = (EFI_PHYSICAL_ADDRESS)(UINTN) (File + 1);\r
-    for (;;) {\r
+    EndOfSection = (EFI_PHYSICAL_ADDRESS)(UINTN)(File + 1);\r
+    for ( ; ;) {\r
       CurrentAddress = (EndOfSection + 3) & 0xfffffffffffffffcULL;\r
-      Section = (EFI_COMMON_SECTION_HEADER*)(UINTN) CurrentAddress;\r
+      Section        = (EFI_COMMON_SECTION_HEADER *)(UINTN)CurrentAddress;\r
 \r
       Size = SECTION_SIZE (Section);\r
       if (Size < sizeof (*Section)) {\r
@@ -648,10 +656,11 @@ FindImageBase (
       //\r
       // Look for executable sections\r
       //\r
-      if (Section->Type == EFI_SECTION_PE32 || Section->Type == EFI_SECTION_TE) {\r
+      if ((Section->Type == EFI_SECTION_PE32) || (Section->Type == EFI_SECTION_TE)) {\r
         if (File->Type == EFI_FV_FILETYPE_SECURITY_CORE) {\r
-          *SecCoreImageBase = (PHYSICAL_ADDRESS) (UINTN) (Section + 1);\r
+          *SecCoreImageBase = (PHYSICAL_ADDRESS)(UINTN)(Section + 1);\r
         }\r
+\r
         break;\r
       }\r
     }\r
@@ -674,42 +683,42 @@ FindImageBase (
 **/\r
 VOID\r
 FindAndReportEntryPoints (\r
-  IN  EFI_FIRMWARE_VOLUME_HEADER       **BootFirmwareVolumePtr,\r
-  OUT EFI_PEI_CORE_ENTRY_POINT         *PeiCoreEntryPoint\r
+  IN  EFI_FIRMWARE_VOLUME_HEADER  **BootFirmwareVolumePtr,\r
+  OUT EFI_PEI_CORE_ENTRY_POINT    *PeiCoreEntryPoint\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_PHYSICAL_ADDRESS             SecCoreImageBase;\r
-  EFI_PHYSICAL_ADDRESS             PeiCoreImageBase;\r
-  PE_COFF_LOADER_IMAGE_CONTEXT     ImageContext;\r
+  EFI_STATUS                    Status;\r
+  EFI_PHYSICAL_ADDRESS          SecCoreImageBase;\r
+  EFI_PHYSICAL_ADDRESS          PeiCoreImageBase;\r
+  PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;\r
 \r
   //\r
   // Find SEC Core and PEI Core image base\r
-   //\r
+  //\r
   Status = FindImageBase (*BootFirmwareVolumePtr, &SecCoreImageBase);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   FindPeiCoreImageBase (BootFirmwareVolumePtr, &PeiCoreImageBase);\r
 \r
-  ZeroMem ((VOID *) &ImageContext, sizeof (PE_COFF_LOADER_IMAGE_CONTEXT));\r
+  ZeroMem ((VOID *)&ImageContext, sizeof (PE_COFF_LOADER_IMAGE_CONTEXT));\r
   //\r
   // Report SEC Core debug information when remote debug is enabled\r
   //\r
   ImageContext.ImageAddress = SecCoreImageBase;\r
-  ImageContext.PdbPointer = PeCoffLoaderGetPdbPointer ((VOID*) (UINTN) ImageContext.ImageAddress);\r
+  ImageContext.PdbPointer   = PeCoffLoaderGetPdbPointer ((VOID *)(UINTN)ImageContext.ImageAddress);\r
   PeCoffLoaderRelocateImageExtraAction (&ImageContext);\r
 \r
   //\r
   // Report PEI Core debug information when remote debug is enabled\r
   //\r
   ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)PeiCoreImageBase;\r
-  ImageContext.PdbPointer = PeCoffLoaderGetPdbPointer ((VOID*) (UINTN) ImageContext.ImageAddress);\r
+  ImageContext.PdbPointer   = PeCoffLoaderGetPdbPointer ((VOID *)(UINTN)ImageContext.ImageAddress);\r
   PeCoffLoaderRelocateImageExtraAction (&ImageContext);\r
 \r
   //\r
   // Find PEI Core entry point\r
   //\r
-  Status = PeCoffLoaderGetEntryPoint ((VOID *) (UINTN) PeiCoreImageBase, (VOID**) PeiCoreEntryPoint);\r
+  Status = PeCoffLoaderGetEntryPoint ((VOID *)(UINTN)PeiCoreImageBase, (VOID **)PeiCoreEntryPoint);\r
   if (EFI_ERROR (Status)) {\r
     *PeiCoreEntryPoint = 0;\r
   }\r
@@ -738,10 +747,10 @@ SevEsProtocolFailure (
   //\r
   // Use the GHCB MSR Protocol to request termination by the hypervisor\r
   //\r
-  Msr.GhcbPhysicalAddress = 0;\r
-  Msr.GhcbTerminate.Function = GHCB_INFO_TERMINATE_REQUEST;\r
+  Msr.GhcbPhysicalAddress         = 0;\r
+  Msr.GhcbTerminate.Function      = GHCB_INFO_TERMINATE_REQUEST;\r
   Msr.GhcbTerminate.ReasonCodeSet = GHCB_TERMINATE_GHCB;\r
-  Msr.GhcbTerminate.ReasonCode = ReasonCode;\r
+  Msr.GhcbTerminate.ReasonCode    = ReasonCode;\r
   AsmWriteMsr64 (MSR_SEV_ES_GHCB, Msr.GhcbPhysicalAddress);\r
 \r
   AsmVmgExit ();\r
@@ -771,7 +780,7 @@ SevEsProtocolCheck (
   // protocol checking\r
   //\r
   Msr.GhcbPhysicalAddress = 0;\r
-  Msr.GhcbInfo.Function = GHCB_INFO_SEV_INFO_GET;\r
+  Msr.GhcbInfo.Function   = GHCB_INFO_SEV_INFO_GET;\r
   AsmWriteMsr64 (MSR_SEV_ES_GHCB, Msr.GhcbPhysicalAddress);\r
 \r
   AsmVmgExit ();\r
@@ -787,7 +796,8 @@ SevEsProtocolCheck (
   }\r
 \r
   if ((Msr.GhcbProtocol.SevEsProtocolMin > GHCB_VERSION_MAX) ||\r
-      (Msr.GhcbProtocol.SevEsProtocolMax < GHCB_VERSION_MIN)) {\r
+      (Msr.GhcbProtocol.SevEsProtocolMax < GHCB_VERSION_MIN))\r
+  {\r
     SevEsProtocolFailure (GHCB_TERMINATE_GHCB_PROTOCOL);\r
   }\r
 \r
@@ -804,7 +814,7 @@ SevEsProtocolCheck (
   // Set the version to the maximum that can be supported\r
   //\r
   Ghcb->ProtocolVersion = MIN (Msr.GhcbProtocol.SevEsProtocolMax, GHCB_VERSION_MAX);\r
-  Ghcb->GhcbUsage = GHCB_STANDARD_USAGE;\r
+  Ghcb->GhcbUsage       = GHCB_STANDARD_USAGE;\r
 }\r
 \r
 /**\r
@@ -823,16 +833,18 @@ IsSevGuest (
   VOID\r
   )\r
 {\r
-  OVMF_WORK_AREA             *WorkArea;\r
+  OVMF_WORK_AREA  *WorkArea;\r
 \r
   //\r
   // Ensure that the size of the Confidential Computing work area header\r
   // is same as what is provided through a fixed PCD.\r
   //\r
-  ASSERT ((UINTN) FixedPcdGet32 (PcdOvmfConfidentialComputingWorkAreaHeader) ==\r
-          sizeof(CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER));\r
+  ASSERT (\r
+    (UINTN)FixedPcdGet32 (PcdOvmfConfidentialComputingWorkAreaHeader) ==\r
+    sizeof (CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER)\r
+    );\r
 \r
-  WorkArea = (OVMF_WORK_AREA *) FixedPcdGet32 (PcdOvmfWorkAreaBase);\r
+  WorkArea = (OVMF_WORK_AREA *)FixedPcdGet32 (PcdOvmfWorkAreaBase);\r
 \r
   return ((WorkArea != NULL) && (WorkArea->Header.GuestType == GUEST_TYPE_AMD_SEV));\r
 }\r
@@ -856,11 +868,11 @@ SevEsIsEnabled (
 {\r
   SEC_SEV_ES_WORK_AREA  *SevEsWorkArea;\r
 \r
-  if (!IsSevGuest()) {\r
+  if (!IsSevGuest ()) {\r
     return FALSE;\r
   }\r
 \r
-  SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *) FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
+  SevEsWorkArea = (SEC_SEV_ES_WORK_AREA *)FixedPcdGet32 (PcdSevEsWorkAreaBase);\r
 \r
   return (SevEsWorkArea->SevEsEnabled != 0);\r
 }\r
@@ -868,25 +880,26 @@ SevEsIsEnabled (
 VOID\r
 EFIAPI\r
 SecCoreStartupWithStack (\r
-  IN EFI_FIRMWARE_VOLUME_HEADER       *BootFv,\r
-  IN VOID                             *TopOfCurrentStack\r
+  IN EFI_FIRMWARE_VOLUME_HEADER  *BootFv,\r
+  IN VOID                        *TopOfCurrentStack\r
   )\r
 {\r
-  EFI_SEC_PEI_HAND_OFF        SecCoreData;\r
-  SEC_IDT_TABLE               IdtTableInStack;\r
-  IA32_DESCRIPTOR             IdtDescriptor;\r
-  UINT32                      Index;\r
-  volatile UINT8              *Table;\r
+  EFI_SEC_PEI_HAND_OFF  SecCoreData;\r
+  SEC_IDT_TABLE         IdtTableInStack;\r
+  IA32_DESCRIPTOR       IdtDescriptor;\r
+  UINT32                Index;\r
+  volatile UINT8        *Table;\r
 \r
   //\r
   // To ensure SMM can't be compromised on S3 resume, we must force re-init of\r
   // the BaseExtractGuidedSectionLib. Since this is before library contructors\r
   // are called, we must use a loop rather than SetMem.\r
   //\r
-  Table = (UINT8*)(UINTN)FixedPcdGet64 (PcdGuidedExtractHandlerTableAddress);\r
+  Table = (UINT8 *)(UINTN)FixedPcdGet64 (PcdGuidedExtractHandlerTableAddress);\r
   for (Index = 0;\r
        Index < FixedPcdGet32 (PcdGuidedExtractHandlerTableSize);\r
-       ++Index) {\r
+       ++Index)\r
+  {\r
     Table[Index] = 0;\r
   }\r
 \r
@@ -895,13 +908,13 @@ SecCoreStartupWithStack (
   // we use a loop rather than CopyMem.\r
   //\r
   IdtTableInStack.PeiService = NULL;\r
-  for (Index = 0; Index < SEC_IDT_ENTRY_COUNT; Index ++) {\r
+  for (Index = 0; Index < SEC_IDT_ENTRY_COUNT; Index++) {\r
     UINT8  *Src;\r
     UINT8  *Dst;\r
     UINTN  Byte;\r
 \r
-    Src = (UINT8 *) &mIdtEntryTemplate;\r
-    Dst = (UINT8 *) &IdtTableInStack.IdtTable[Index];\r
+    Src = (UINT8 *)&mIdtEntryTemplate;\r
+    Dst = (UINT8 *)&IdtTableInStack.IdtTable[Index];\r
     for (Byte = 0; Byte < sizeof (mIdtEntryTemplate); Byte++) {\r
       Dst[Byte] = Src[Byte];\r
     }\r
@@ -947,7 +960,8 @@ SecCoreStartupWithStack (
     AsmEnableCache ();\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO,\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
     "SecCoreStartupWithStack(0x%x, 0x%x)\n",\r
     (UINT32)(UINTN)BootFv,\r
     (UINT32)(UINTN)TopOfCurrentStack\r
@@ -959,13 +973,13 @@ SecCoreStartupWithStack (
   //\r
   InitializeFloatingPointUnits ();\r
 \r
-#if defined (MDE_CPU_X64)\r
+ #if defined (MDE_CPU_X64)\r
   //\r
   // ASSERT that the Page Tables were set by the reset vector code to\r
   // the address we expect.\r
   //\r
-  ASSERT (AsmReadCr3 () == (UINTN) PcdGet32 (PcdOvmfSecPageTablesBase));\r
-#endif\r
+  ASSERT (AsmReadCr3 () == (UINTN)PcdGet32 (PcdOvmfSecPageTablesBase));\r
+ #endif\r
 \r
   //\r
   // |-------------|       <-- TopOfCurrentStack\r
@@ -975,26 +989,28 @@ SecCoreStartupWithStack (
   // |-------------|       <-- SecCoreData.TemporaryRamBase\r
   //\r
 \r
-  ASSERT ((UINTN) (PcdGet32 (PcdOvmfSecPeiTempRamBase) +\r
-                   PcdGet32 (PcdOvmfSecPeiTempRamSize)) ==\r
-          (UINTN) TopOfCurrentStack);\r
+  ASSERT (\r
+    (UINTN)(PcdGet32 (PcdOvmfSecPeiTempRamBase) +\r
+            PcdGet32 (PcdOvmfSecPeiTempRamSize)) ==\r
+    (UINTN)TopOfCurrentStack\r
+    );\r
 \r
   //\r
   // Initialize SEC hand-off state\r
   //\r
-  SecCoreData.DataSize = sizeof(EFI_SEC_PEI_HAND_OFF);\r
+  SecCoreData.DataSize = sizeof (EFI_SEC_PEI_HAND_OFF);\r
 \r
-  SecCoreData.TemporaryRamSize       = (UINTN) PcdGet32 (PcdOvmfSecPeiTempRamSize);\r
-  SecCoreData.TemporaryRamBase       = (VOID*)((UINT8 *)TopOfCurrentStack - SecCoreData.TemporaryRamSize);\r
+  SecCoreData.TemporaryRamSize = (UINTN)PcdGet32 (PcdOvmfSecPeiTempRamSize);\r
+  SecCoreData.TemporaryRamBase = (VOID *)((UINT8 *)TopOfCurrentStack - SecCoreData.TemporaryRamSize);\r
 \r
-  SecCoreData.PeiTemporaryRamBase    = SecCoreData.TemporaryRamBase;\r
-  SecCoreData.PeiTemporaryRamSize    = SecCoreData.TemporaryRamSize >> 1;\r
+  SecCoreData.PeiTemporaryRamBase = SecCoreData.TemporaryRamBase;\r
+  SecCoreData.PeiTemporaryRamSize = SecCoreData.TemporaryRamSize >> 1;\r
 \r
-  SecCoreData.StackBase              = (UINT8 *)SecCoreData.TemporaryRamBase + SecCoreData.PeiTemporaryRamSize;\r
-  SecCoreData.StackSize              = SecCoreData.TemporaryRamSize >> 1;\r
+  SecCoreData.StackBase = (UINT8 *)SecCoreData.TemporaryRamBase + SecCoreData.PeiTemporaryRamSize;\r
+  SecCoreData.StackSize = SecCoreData.TemporaryRamSize >> 1;\r
 \r
   SecCoreData.BootFirmwareVolumeBase = BootFv;\r
-  SecCoreData.BootFirmwareVolumeSize = (UINTN) BootFv->FvLength;\r
+  SecCoreData.BootFirmwareVolumeSize = (UINTN)BootFv->FvLength;\r
 \r
   //\r
   // Make sure the 8259 is masked before initializing the Debug Agent and the debug timer is enabled\r
@@ -1028,15 +1044,15 @@ SecCoreStartupWithStack (
 **/\r
 VOID\r
 EFIAPI\r
-SecStartupPhase2(\r
-  IN VOID                     *Context\r
+SecStartupPhase2 (\r
+  IN VOID  *Context\r
   )\r
 {\r
   EFI_SEC_PEI_HAND_OFF        *SecCoreData;\r
   EFI_FIRMWARE_VOLUME_HEADER  *BootFv;\r
   EFI_PEI_CORE_ENTRY_POINT    PeiCoreEntryPoint;\r
 \r
-  SecCoreData = (EFI_SEC_PEI_HAND_OFF *) Context;\r
+  SecCoreData = (EFI_SEC_PEI_HAND_OFF *)Context;\r
 \r
   //\r
   // Find PEI Core entry point. It will report SEC and Pei Core debug information if remote debug\r
@@ -1045,12 +1061,12 @@ SecStartupPhase2(
   BootFv = (EFI_FIRMWARE_VOLUME_HEADER *)SecCoreData->BootFirmwareVolumeBase;\r
   FindAndReportEntryPoints (&BootFv, &PeiCoreEntryPoint);\r
   SecCoreData->BootFirmwareVolumeBase = BootFv;\r
-  SecCoreData->BootFirmwareVolumeSize = (UINTN) BootFv->FvLength;\r
+  SecCoreData->BootFirmwareVolumeSize = (UINTN)BootFv->FvLength;\r
 \r
   //\r
   // Transfer the control to the PEI core\r
   //\r
-  (*PeiCoreEntryPoint) (SecCoreData, (EFI_PEI_PPI_DESCRIPTOR *)&mPrivateDispatchTable);\r
+  (*PeiCoreEntryPoint)(SecCoreData, (EFI_PEI_PPI_DESCRIPTOR *)&mPrivateDispatchTable);\r
 \r
   //\r
   // If we get here then the PEI Core returned, which is not recoverable.\r
@@ -1062,10 +1078,10 @@ SecStartupPhase2(
 EFI_STATUS\r
 EFIAPI\r
 TemporaryRamMigration (\r
-  IN CONST EFI_PEI_SERVICES   **PeiServices,\r
-  IN EFI_PHYSICAL_ADDRESS     TemporaryMemoryBase,\r
-  IN EFI_PHYSICAL_ADDRESS     PermanentMemoryBase,\r
-  IN UINTN                    CopySize\r
+  IN CONST EFI_PEI_SERVICES  **PeiServices,\r
+  IN EFI_PHYSICAL_ADDRESS    TemporaryMemoryBase,\r
+  IN EFI_PHYSICAL_ADDRESS    PermanentMemoryBase,\r
+  IN UINTN                   CopySize\r
   )\r
 {\r
   IA32_DESCRIPTOR                  IdtDescriptor;\r
@@ -1077,24 +1093,25 @@ TemporaryRamMigration (
   BOOLEAN                          OldStatus;\r
   BASE_LIBRARY_JUMP_BUFFER         JumpBuffer;\r
 \r
-  DEBUG ((DEBUG_INFO,\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
     "TemporaryRamMigration(0x%Lx, 0x%Lx, 0x%Lx)\n",\r
     TemporaryMemoryBase,\r
     PermanentMemoryBase,\r
     (UINT64)CopySize\r
     ));\r
 \r
-  OldHeap = (VOID*)(UINTN)TemporaryMemoryBase;\r
-  NewHeap = (VOID*)((UINTN)PermanentMemoryBase + (CopySize >> 1));\r
+  OldHeap = (VOID *)(UINTN)TemporaryMemoryBase;\r
+  NewHeap = (VOID *)((UINTN)PermanentMemoryBase + (CopySize >> 1));\r
 \r
-  OldStack = (VOID*)((UINTN)TemporaryMemoryBase + (CopySize >> 1));\r
-  NewStack = (VOID*)(UINTN)PermanentMemoryBase;\r
+  OldStack = (VOID *)((UINTN)TemporaryMemoryBase + (CopySize >> 1));\r
+  NewStack = (VOID *)(UINTN)PermanentMemoryBase;\r
 \r
-  DebugAgentContext.HeapMigrateOffset = (UINTN)NewHeap - (UINTN)OldHeap;\r
+  DebugAgentContext.HeapMigrateOffset  = (UINTN)NewHeap - (UINTN)OldHeap;\r
   DebugAgentContext.StackMigrateOffset = (UINTN)NewStack - (UINTN)OldStack;\r
 \r
   OldStatus = SaveAndSetDebugTimerInterrupt (FALSE);\r
-  InitializeDebugAgent (DEBUG_AGENT_INIT_POSTMEM_SEC, (VOID *) &DebugAgentContext, NULL);\r
+  InitializeDebugAgent (DEBUG_AGENT_INIT_POSTMEM_SEC, (VOID *)&DebugAgentContext, NULL);\r
 \r
   //\r
   // Migrate Heap\r
@@ -1118,14 +1135,14 @@ TemporaryRamMigration (
   // Use SetJump()/LongJump() to switch to a new stack.\r
   //\r
   if (SetJump (&JumpBuffer) == 0) {\r
-#if defined (MDE_CPU_IA32)\r
+ #if defined (MDE_CPU_IA32)\r
     JumpBuffer.Esp = JumpBuffer.Esp + DebugAgentContext.StackMigrateOffset;\r
     JumpBuffer.Ebp = JumpBuffer.Ebp + DebugAgentContext.StackMigrateOffset;\r
-#endif\r
-#if defined (MDE_CPU_X64)\r
+ #endif\r
+ #if defined (MDE_CPU_X64)\r
     JumpBuffer.Rsp = JumpBuffer.Rsp + DebugAgentContext.StackMigrateOffset;\r
     JumpBuffer.Rbp = JumpBuffer.Rbp + DebugAgentContext.StackMigrateOffset;\r
-#endif\r
+ #endif\r
     LongJump (&JumpBuffer, (UINTN)-1);\r
   }\r
 \r
@@ -1133,4 +1150,3 @@ TemporaryRamMigration (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index 197dc6f7461f787d1517bd7530c4d16f7fa75b1f..b7e4ae3898d25e58401aba91f51253758248e2c1 100644 (file)
@@ -12,9 +12,9 @@
 //\r
 // Driver name table\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mSioBusDriverNameTable[] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mSioBusDriverNameTable[] = {\r
   { "eng;en", L"OVMF Sio Bus Driver" },\r
-  { NULL , NULL }\r
+  { NULL,     NULL                   }\r
 };\r
 \r
 //\r
@@ -29,13 +29,12 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL  gSioBusComponentName
 //\r
 // EFI Component Name 2 Protocol\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gSioBusComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) SioBusComponentNameGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) SioBusComponentNameGetControllerName,\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gSioBusComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)SioBusComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)SioBusComponentNameGetControllerName,\r
   "en"\r
 };\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -73,9 +72,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gSioBusComponentName2
 EFI_STATUS\r
 EFIAPI\r
 SioBusComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL    *This,\r
-  IN  CHAR8                          *Language,\r
-  OUT CHAR16                         **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -149,11 +148,11 @@ SioBusComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 SioBusComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     ControllerHandle,\r
-  IN  EFI_HANDLE                     ChildHandle        OPTIONAL,\r
-  IN  CHAR8                          *Language,\r
-  OUT CHAR16                         **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
index 43a1701afa48b4e5db4504d2ff59a0005746fcc1..bb2c5bf80b030b48431e4dbabe06e607ca485385 100644 (file)
@@ -13,7 +13,7 @@
 //\r
 // SioBus Driver Binding Protocol\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL gSioBusDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gSioBusDriverBinding = {\r
   SioBusDriverBindingSupported,\r
   SioBusDriverBindingStart,\r
   SioBusDriverBindingStop,\r
@@ -22,7 +22,6 @@ EFI_DRIVER_BINDING_PROTOCOL gSioBusDriverBinding = {
   NULL\r
 };\r
 \r
-\r
 /**\r
   Tests to see if this driver supports a given controller. If a child device is\r
   provided, it further tests to see if this driver supports creating a handle\r
@@ -79,18 +78,18 @@ EFI_DRIVER_BINDING_PROTOCOL gSioBusDriverBinding = {
 EFI_STATUS\r
 EFIAPI\r
 SioBusDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  EFI_PCI_IO_PROTOCOL    *PciIo;\r
-  PCI_TYPE00             Pci;\r
-  UINTN                  SegmentNumber;\r
-  UINTN                  BusNumber;\r
-  UINTN                  DeviceNumber;\r
-  UINTN                  FunctionNumber;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
+  UINTN                SegmentNumber;\r
+  UINTN                BusNumber;\r
+  UINTN                DeviceNumber;\r
+  UINTN                FunctionNumber;\r
 \r
   //\r
   // Get PciIo protocol instance\r
@@ -98,21 +97,22 @@ SioBusDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID**)&PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   Status = PciIo->Pci.Read (\r
-                    PciIo,\r
-                    EfiPciIoWidthUint32,\r
-                    0,\r
-                    sizeof(Pci) / sizeof(UINT32),\r
-                    &Pci);\r
+                        PciIo,\r
+                        EfiPciIoWidthUint32,\r
+                        0,\r
+                        sizeof (Pci) / sizeof (UINT32),\r
+                        &Pci\r
+                        );\r
 \r
   if (!EFI_ERROR (Status)) {\r
     Status = EFI_UNSUPPORTED;\r
@@ -129,8 +129,9 @@ SioBusDriverBindingSupported (
         //\r
         // See if this is an Intel PCI to ISA bridge in Positive Decode Mode\r
         //\r
-        if (Pci.Hdr.ClassCode[1] == PCI_CLASS_BRIDGE_ISA_PDECODE &&\r
-            Pci.Hdr.VendorId     == 0x8086) {\r
+        if ((Pci.Hdr.ClassCode[1] == PCI_CLASS_BRIDGE_ISA_PDECODE) &&\r
+            (Pci.Hdr.VendorId     == 0x8086))\r
+        {\r
           //\r
           // See if this is on Function #0 to avoid false positives on\r
           // PCI_CLASS_BRIDGE_OTHER that has the same value as\r
@@ -143,7 +144,7 @@ SioBusDriverBindingSupported (
                             &DeviceNumber,\r
                             &FunctionNumber\r
                             );\r
-          if (!EFI_ERROR (Status) && FunctionNumber == 0) {\r
+          if (!EFI_ERROR (Status) && (FunctionNumber == 0)) {\r
             Status = EFI_SUCCESS;\r
           } else {\r
             Status = EFI_UNSUPPORTED;\r
@@ -212,20 +213,20 @@ SioBusDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 SioBusDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  EFI_PCI_IO_PROTOCOL            *PciIo;\r
-  EFI_DEVICE_PATH_PROTOCOL       *ParentDevicePath;\r
-  UINT64                         Supports;\r
-  UINT64                         OriginalAttributes;\r
-  UINT64                         Attributes;\r
-  BOOLEAN                        Enabled;\r
-  SIO_BUS_DRIVER_PRIVATE_DATA    *Private;\r
-  UINT32                         ChildDeviceNumber;\r
+  EFI_STATUS                   Status;\r
+  EFI_PCI_IO_PROTOCOL          *PciIo;\r
+  EFI_DEVICE_PATH_PROTOCOL     *ParentDevicePath;\r
+  UINT64                       Supports;\r
+  UINT64                       OriginalAttributes;\r
+  UINT64                       Attributes;\r
+  BOOLEAN                      Enabled;\r
+  SIO_BUS_DRIVER_PRIVATE_DATA  *Private;\r
+  UINT32                       ChildDeviceNumber;\r
 \r
   Enabled            = FALSE;\r
   Supports           = 0;\r
@@ -235,11 +236,11 @@ SioBusDriverBindingStart (
   //\r
   // Open the PCI I/O Protocol Interface\r
   //\r
-  PciIo = NULL;\r
+  PciIo  = NULL;\r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID**) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -254,7 +255,7 @@ SioBusDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath,\r
+                  (VOID **)&ParentDevicePath,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -282,11 +283,12 @@ SioBusDriverBindingStart (
     goto Done;\r
   }\r
 \r
-  Supports &= (UINT64) (EFI_PCI_IO_ATTRIBUTE_ISA_IO |\r
-                        EFI_PCI_IO_ATTRIBUTE_ISA_IO_16);\r
-  if (Supports == 0 ||\r
-      Supports == (EFI_PCI_IO_ATTRIBUTE_ISA_IO |\r
-                   EFI_PCI_IO_ATTRIBUTE_ISA_IO_16)) {\r
+  Supports &= (UINT64)(EFI_PCI_IO_ATTRIBUTE_ISA_IO |\r
+                       EFI_PCI_IO_ATTRIBUTE_ISA_IO_16);\r
+  if ((Supports == 0) ||\r
+      (Supports == (EFI_PCI_IO_ATTRIBUTE_ISA_IO |\r
+                    EFI_PCI_IO_ATTRIBUTE_ISA_IO_16)))\r
+  {\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
@@ -324,6 +326,7 @@ SioBusDriverBindingStart (
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
   }\r
+\r
   Private->PciIo              = PciIo;\r
   Private->OriginalAttributes = OriginalAttributes;\r
 \r
@@ -370,7 +373,7 @@ SioBusDriverBindingStart (
 \r
 Done:\r
   if (EFI_ERROR (Status)) {\r
-    if (PciIo != NULL && Enabled) {\r
+    if ((PciIo != NULL) && Enabled) {\r
       PciIo->Attributes (\r
                PciIo,\r
                EfiPciIoAttributeOperationSet,\r
@@ -445,19 +448,19 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 SioBusDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Controller,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  SIO_BUS_DRIVER_PRIVATE_DATA    *Private;\r
-  UINTN                          Index;\r
-  BOOLEAN                        AllChildrenStopped;\r
-  EFI_SIO_PROTOCOL               *Sio;\r
-  SIO_DEV                        *SioDevice;\r
-  EFI_PCI_IO_PROTOCOL            *PciIo;\r
+  EFI_STATUS                   Status;\r
+  SIO_BUS_DRIVER_PRIVATE_DATA  *Private;\r
+  UINTN                        Index;\r
+  BOOLEAN                      AllChildrenStopped;\r
+  EFI_SIO_PROTOCOL             *Sio;\r
+  SIO_DEV                      *SioDevice;\r
+  EFI_PCI_IO_PROTOCOL          *PciIo;\r
 \r
   if (NumberOfChildren == 0) {\r
     //\r
@@ -466,7 +469,7 @@ SioBusDriverBindingStop (
     Status = gBS->OpenProtocol (\r
                     Controller,\r
                     &gEfiCallerIdGuid,\r
-                    (VOID **) &Private,\r
+                    (VOID **)&Private,\r
                     This->DriverBindingHandle,\r
                     Controller,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -486,10 +489,10 @@ SioBusDriverBindingStop (
     }\r
 \r
     gBS->UninstallProtocolInterface (\r
-          Controller,\r
-          &gEfiCallerIdGuid,\r
-          Private\r
-          );\r
+           Controller,\r
+           &gEfiCallerIdGuid,\r
+           Private\r
+           );\r
     FreePool (Private);\r
 \r
     //\r
@@ -527,7 +530,7 @@ SioBusDriverBindingStop (
     Status = gBS->OpenProtocol (\r
                     ChildHandleBuffer[Index],\r
                     &gEfiSioProtocolGuid,\r
-                    (VOID **) &Sio,\r
+                    (VOID **)&Sio,\r
                     This->DriverBindingHandle,\r
                     Controller,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -564,7 +567,7 @@ SioBusDriverBindingStop (
         gBS->OpenProtocol (\r
                Controller,\r
                &gEfiPciIoProtocolGuid,\r
-               (VOID **) &PciIo,\r
+               (VOID **)&PciIo,\r
                This->DriverBindingHandle,\r
                ChildHandleBuffer[Index],\r
                EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -597,8 +600,8 @@ SioBusDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 SioBusDxeDriverEntryPoint (\r
-  IN EFI_HANDLE          ImageHandle,\r
-  IN EFI_SYSTEM_TABLE    *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   //\r
index ae338787e872c5bc2f5cea1059540455283221ad..0fc4ed8cf72d74c85282ad3bb06ba6b36ed08d2e 100644 (file)
@@ -37,13 +37,11 @@ typedef struct {
   UINT64                 OriginalAttributes;\r
 } SIO_BUS_DRIVER_PRIVATE_DATA;\r
 \r
-\r
 //\r
 // Global Variables\r
 //\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gSioBusComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gSioBusComponentName2;\r
-\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gSioBusComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gSioBusComponentName2;\r
 \r
 //\r
 // EFI Component Name Functions\r
@@ -86,9 +84,9 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gSioBusComponentName2;
 EFI_STATUS\r
 EFIAPI\r
 SioBusComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL    *This,\r
-  IN  CHAR8                          *Language,\r
-  OUT CHAR16                         **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   );\r
 \r
 /**\r
@@ -153,14 +151,13 @@ SioBusComponentNameGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 SioBusComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     ControllerHandle,\r
-  IN  EFI_HANDLE                     ChildHandle        OPTIONAL,\r
-  IN  CHAR8                          *Language,\r
-  OUT CHAR16                         **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle        OPTIONAL,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
-\r
 //\r
 // Driver Binding Protocol interfaces\r
 //\r
@@ -221,9 +218,9 @@ SioBusComponentNameGetControllerName (
 EFI_STATUS\r
 EFIAPI\r
 SioBusDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   );\r
 \r
 /**\r
@@ -275,9 +272,9 @@ SioBusDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 SioBusDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   );\r
 \r
 /**\r
@@ -316,10 +313,10 @@ SioBusDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 SioBusDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Controller,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
   );\r
 \r
-#endif  // __SIO_BUS_DXE_H__\r
+#endif // __SIO_BUS_DXE_H__\r
index ab8fa7676fedf91eefa595e29c46b1f28a4341f0..66c5a08cf9cc6e5cf9accafe6d1f64198bd2bc6d 100644 (file)
@@ -13,7 +13,7 @@
 //\r
 // Super I/O Protocol interfaces\r
 //\r
-EFI_SIO_PROTOCOL mSioInterface = {\r
+EFI_SIO_PROTOCOL  mSioInterface = {\r
   SioRegisterAccess,\r
   SioGetResources,\r
   SioSetResources,\r
@@ -25,48 +25,54 @@ EFI_SIO_PROTOCOL mSioInterface = {
 // COM 1 UART Controller\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-SIO_RESOURCES_IO mCom1Resources = {\r
-  { { ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR }, 0x3F8, 8 },\r
-  { ACPI_END_TAG_DESCRIPTOR,                    0        }\r
+SIO_RESOURCES_IO  mCom1Resources = {\r
+  {\r
+    { ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR }, 0x3F8, 8\r
+  },\r
+  { ACPI_END_TAG_DESCRIPTOR, 0             }\r
 };\r
 \r
 //\r
 // COM 2 UART Controller\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-SIO_RESOURCES_IO mCom2Resources = {\r
-  { { ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR }, 0x2F8, 8 },\r
-  { ACPI_END_TAG_DESCRIPTOR,                    0        }\r
+SIO_RESOURCES_IO  mCom2Resources = {\r
+  {\r
+    { ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR }, 0x2F8, 8\r
+  },\r
+  { ACPI_END_TAG_DESCRIPTOR, 0             }\r
 };\r
 \r
 //\r
 // PS/2 Keyboard Controller\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-SIO_RESOURCES_IO mPs2KeyboardDeviceResources = {\r
-  { { ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR }, 0x60, 5 },\r
-  { ACPI_END_TAG_DESCRIPTOR,                    0       }\r
+SIO_RESOURCES_IO  mPs2KeyboardDeviceResources = {\r
+  {\r
+    { ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR }, 0x60, 5\r
+  },\r
+  { ACPI_END_TAG_DESCRIPTOR, 0             }\r
 };\r
 \r
 //\r
 // Table of SIO Controllers\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-SIO_DEVICE_INFO mDevicesInfo[] = {\r
+SIO_DEVICE_INFO  mDevicesInfo[] = {\r
   {\r
     EISA_PNP_ID (0x501),\r
     0,\r
-    { (ACPI_SMALL_RESOURCE_HEADER *) &mCom1Resources }\r
+    { (ACPI_SMALL_RESOURCE_HEADER *)&mCom1Resources              }\r
   },  // COM 1 UART Controller\r
   {\r
     EISA_PNP_ID (0x501),\r
     1,\r
-    { (ACPI_SMALL_RESOURCE_HEADER *) &mCom2Resources }\r
+    { (ACPI_SMALL_RESOURCE_HEADER *)&mCom2Resources              }\r
   },  // COM 2 UART Controller\r
   {\r
-    EISA_PNP_ID(0x303),\r
+    EISA_PNP_ID (0x303),\r
     0,\r
-    { (ACPI_SMALL_RESOURCE_HEADER *) &mPs2KeyboardDeviceResources }\r
+    { (ACPI_SMALL_RESOURCE_HEADER *)&mPs2KeyboardDeviceResources }\r
   }   // PS/2 Keyboard Controller\r
 };\r
 \r
@@ -74,20 +80,19 @@ SIO_DEVICE_INFO mDevicesInfo[] = {
 // ACPI Device Path Node template\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-ACPI_HID_DEVICE_PATH mAcpiDeviceNodeTemplate = {\r
+ACPI_HID_DEVICE_PATH  mAcpiDeviceNodeTemplate = {\r
   {        // Header\r
     ACPI_DEVICE_PATH,\r
     ACPI_DP,\r
     {\r
-      (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)),\r
-      (UINT8) ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8)\r
+      (UINT8)(sizeof (ACPI_HID_DEVICE_PATH)),\r
+      (UINT8)((sizeof (ACPI_HID_DEVICE_PATH)) >> 8)\r
     }\r
   },\r
   0x0,     // HID\r
   0x0      // UID\r
 };\r
 \r
-\r
 /**\r
   Provides a low level access to the registers for the Super I/O.\r
 \r
@@ -124,11 +129,11 @@ ACPI_HID_DEVICE_PATH mAcpiDeviceNodeTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 SioRegisterAccess (\r
-  IN CONST EFI_SIO_PROTOCOL    *This,\r
-  IN       BOOLEAN             Write,\r
-  IN       BOOLEAN             ExitCfgMode,\r
-  IN       UINT8               Register,\r
-  IN OUT   UINT8               *Value\r
+  IN CONST EFI_SIO_PROTOCOL  *This,\r
+  IN       BOOLEAN           Write,\r
+  IN       BOOLEAN           ExitCfgMode,\r
+  IN       UINT8             Register,\r
+  IN OUT   UINT8             *Value\r
   )\r
 {\r
   return EFI_SUCCESS;\r
@@ -156,11 +161,11 @@ SioRegisterAccess (
 EFI_STATUS\r
 EFIAPI\r
 SioGetResources (\r
-  IN CONST EFI_SIO_PROTOCOL            *This,\r
-  OUT      ACPI_RESOURCE_HEADER_PTR    *ResourceList\r
+  IN CONST EFI_SIO_PROTOCOL          *This,\r
+  OUT      ACPI_RESOURCE_HEADER_PTR  *ResourceList\r
   )\r
 {\r
-  SIO_DEV    *SioDevice;\r
+  SIO_DEV  *SioDevice;\r
 \r
   if (ResourceList == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -189,8 +194,8 @@ SioGetResources (
 EFI_STATUS\r
 EFIAPI\r
 SioSetResources (\r
-  IN CONST EFI_SIO_PROTOCOL            *This,\r
-  IN       ACPI_RESOURCE_HEADER_PTR    ResourceList\r
+  IN CONST EFI_SIO_PROTOCOL          *This,\r
+  IN       ACPI_RESOURCE_HEADER_PTR  ResourceList\r
   )\r
 {\r
   return EFI_SUCCESS;\r
@@ -212,8 +217,8 @@ SioSetResources (
 EFI_STATUS\r
 EFIAPI\r
 SioPossibleResources (\r
-  IN CONST EFI_SIO_PROTOCOL            *This,\r
-  OUT      ACPI_RESOURCE_HEADER_PTR    *ResourceCollection\r
+  IN CONST EFI_SIO_PROTOCOL          *This,\r
+  OUT      ACPI_RESOURCE_HEADER_PTR  *ResourceCollection\r
   )\r
 {\r
   return EFI_SUCCESS;\r
@@ -247,9 +252,9 @@ SioPossibleResources (
 EFI_STATUS\r
 EFIAPI\r
 SioModify (\r
-  IN CONST EFI_SIO_PROTOCOL           *This,\r
-  IN CONST EFI_SIO_REGISTER_MODIFY    *Command,\r
-  IN       UINTN                      NumberOfCommands\r
+  IN CONST EFI_SIO_PROTOCOL         *This,\r
+  IN CONST EFI_SIO_REGISTER_MODIFY  *Command,\r
+  IN       UINTN                    NumberOfCommands\r
   )\r
 {\r
   return EFI_SUCCESS;\r
@@ -277,8 +282,8 @@ SioCreateChildDevice (
   IN UINT32                       DeviceIndex\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  SIO_DEV       *SioDevice;\r
+  EFI_STATUS  Status;\r
+  SIO_DEV     *SioDevice;\r
 \r
   //\r
   // Initialize the SIO_DEV structure\r
@@ -288,19 +293,19 @@ SioCreateChildDevice (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  SioDevice->Signature  = SIO_DEV_SIGNATURE;\r
-  SioDevice->Handle     = NULL;\r
-  SioDevice->PciIo      = PciIo;\r
+  SioDevice->Signature = SIO_DEV_SIGNATURE;\r
+  SioDevice->Handle    = NULL;\r
+  SioDevice->PciIo     = PciIo;\r
 \r
   //\r
   // Construct the child device path\r
   //\r
   mAcpiDeviceNodeTemplate.HID = mDevicesInfo[DeviceIndex].Hid;\r
   mAcpiDeviceNodeTemplate.UID = mDevicesInfo[DeviceIndex].Uid;\r
-  SioDevice->DevicePath = AppendDevicePathNode (\r
-                            ParentDevicePath,\r
-                            (EFI_DEVICE_PATH_PROTOCOL *) &mAcpiDeviceNodeTemplate\r
-                            );\r
+  SioDevice->DevicePath       = AppendDevicePathNode (\r
+                                  ParentDevicePath,\r
+                                  (EFI_DEVICE_PATH_PROTOCOL *)&mAcpiDeviceNodeTemplate\r
+                                  );\r
   if (SioDevice->DevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
@@ -327,7 +332,7 @@ SioCreateChildDevice (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   SioDevice->Handle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -375,9 +380,9 @@ SioCreateAllChildDevices (
   IN EFI_DEVICE_PATH_PROTOCOL     *ParentDevicePath\r
   )\r
 {\r
-  UINT32        Index;\r
-  UINT32        ChildDeviceNumber;\r
-  EFI_STATUS    Status;\r
+  UINT32      Index;\r
+  UINT32      ChildDeviceNumber;\r
+  EFI_STATUS  Status;\r
 \r
   ChildDeviceNumber = 0;\r
 \r
index 0a180caa828488c456c4b2c1885945c5833d181a..d30caed9f652dccd66be163db3426db756a21c95 100644 (file)
@@ -14,8 +14,8 @@
 #pragma pack(1)\r
 \r
 typedef struct {\r
-  EFI_ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR  Io;\r
-  EFI_ACPI_END_TAG_DESCRIPTOR                 End;\r
+  EFI_ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR    Io;\r
+  EFI_ACPI_END_TAG_DESCRIPTOR                   End;\r
 } SIO_RESOURCES_IO;\r
 \r
 #pragma pack()\r
@@ -38,9 +38,8 @@ typedef struct {
   EFI_SIO_PROTOCOL            Sio;\r
   UINT32                      DeviceIndex;\r
 } SIO_DEV;\r
-#define SIO_DEV_SIGNATURE      SIGNATURE_32 ('S', 'I', 'O', 'D')\r
-#define SIO_DEV_FROM_SIO(a)    CR (a, SIO_DEV, Sio, SIO_DEV_SIGNATURE)\r
-\r
+#define SIO_DEV_SIGNATURE  SIGNATURE_32 ('S', 'I', 'O', 'D')\r
+#define SIO_DEV_FROM_SIO(a)  CR (a, SIO_DEV, Sio, SIO_DEV_SIGNATURE)\r
 \r
 //\r
 // Super I/O Protocol interfaces\r
@@ -82,11 +81,11 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 SioRegisterAccess (\r
-  IN CONST EFI_SIO_PROTOCOL    *This,\r
-  IN       BOOLEAN             Write,\r
-  IN       BOOLEAN             ExitCfgMode,\r
-  IN       UINT8               Register,\r
-  IN OUT   UINT8               *Value\r
+  IN CONST EFI_SIO_PROTOCOL  *This,\r
+  IN       BOOLEAN           Write,\r
+  IN       BOOLEAN           ExitCfgMode,\r
+  IN       UINT8             Register,\r
+  IN OUT   UINT8             *Value\r
   );\r
 \r
 /**\r
@@ -111,8 +110,8 @@ SioRegisterAccess (
 EFI_STATUS\r
 EFIAPI\r
 SioGetResources (\r
-  IN CONST EFI_SIO_PROTOCOL            *This,\r
-  OUT      ACPI_RESOURCE_HEADER_PTR    *ResourceList\r
+  IN CONST EFI_SIO_PROTOCOL          *This,\r
+  OUT      ACPI_RESOURCE_HEADER_PTR  *ResourceList\r
   );\r
 \r
 /**\r
@@ -130,8 +129,8 @@ SioGetResources (
 EFI_STATUS\r
 EFIAPI\r
 SioSetResources (\r
-  IN CONST EFI_SIO_PROTOCOL            *This,\r
-  IN       ACPI_RESOURCE_HEADER_PTR    ResourceList\r
+  IN CONST EFI_SIO_PROTOCOL          *This,\r
+  IN       ACPI_RESOURCE_HEADER_PTR  ResourceList\r
   );\r
 \r
 /**\r
@@ -150,8 +149,8 @@ SioSetResources (
 EFI_STATUS\r
 EFIAPI\r
 SioPossibleResources (\r
-  IN CONST EFI_SIO_PROTOCOL            *This,\r
-  OUT      ACPI_RESOURCE_HEADER_PTR    *ResourceCollection\r
+  IN CONST EFI_SIO_PROTOCOL          *This,\r
+  OUT      ACPI_RESOURCE_HEADER_PTR  *ResourceCollection\r
   );\r
 \r
 /**\r
@@ -182,9 +181,9 @@ SioPossibleResources (
 EFI_STATUS\r
 EFIAPI\r
 SioModify (\r
-  IN CONST EFI_SIO_PROTOCOL           *This,\r
-  IN CONST EFI_SIO_REGISTER_MODIFY    *Command,\r
-  IN       UINTN                      NumberOfCommands\r
+  IN CONST EFI_SIO_PROTOCOL         *This,\r
+  IN CONST EFI_SIO_REGISTER_MODIFY  *Command,\r
+  IN       UINTN                    NumberOfCommands\r
   );\r
 \r
 //\r
@@ -211,4 +210,4 @@ SioCreateAllChildDevices (
   IN EFI_DEVICE_PATH_PROTOCOL     *ParentDevicePath\r
   );\r
 \r
-#endif  // __SIO_SERVICE_H__\r
+#endif // __SIO_SERVICE_H__\r
index a668c6ac2123f75d5fc984d3eb3952082aa0cee7..4dae4b0b98f1d37cc3c51da79fa337b325f0b7cb 100644 (file)
@@ -24,17 +24,20 @@ GetQemuSmbiosTables (
   VOID\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  FIRMWARE_CONFIG_ITEM     Tables;\r
-  UINTN                    TablesSize;\r
-  UINT8                    *QemuTables;\r
+  EFI_STATUS            Status;\r
+  FIRMWARE_CONFIG_ITEM  Tables;\r
+  UINTN                 TablesSize;\r
+  UINT8                 *QemuTables;\r
 \r
   if (!PcdGetBool (PcdQemuSmbiosValidated)) {\r
     return NULL;\r
   }\r
 \r
-  Status = QemuFwCfgFindFile ("etc/smbios/smbios-tables", &Tables,\r
-             &TablesSize);\r
+  Status = QemuFwCfgFindFile (\r
+             "etc/smbios/smbios-tables",\r
+             &Tables,\r
+             &TablesSize\r
+             );\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (TablesSize > 0);\r
 \r
@@ -62,12 +65,12 @@ GetQemuSmbiosTables (
 EFI_STATUS\r
 EFIAPI\r
 SmbiosTablePublishEntry (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  UINT8                     *SmbiosTables;\r
+  EFI_STATUS  Status;\r
+  UINT8       *SmbiosTables;\r
 \r
   Status = EFI_NOT_FOUND;\r
   //\r
index 7bcf83762e9b960d71aee9525b203e49a617de5c..94249d3ff1b0fb21363af713f0c37dbfc970f72d 100644 (file)
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  SMBIOS_TABLE_TYPE0 Base;\r
-  UINT8              Strings[sizeof(TYPE0_STRINGS)];\r
+  SMBIOS_TABLE_TYPE0    Base;\r
+  UINT8                 Strings[sizeof (TYPE0_STRINGS)];\r
 } OVMF_TYPE0;\r
 #pragma pack()\r
 \r
-STATIC CONST OVMF_TYPE0 mOvmfDefaultType0 = {\r
+STATIC CONST OVMF_TYPE0  mOvmfDefaultType0 = {\r
   {\r
     // SMBIOS_STRUCTURE Hdr\r
     {\r
       EFI_SMBIOS_TYPE_BIOS_INFORMATION, // UINT8 Type\r
       sizeof (SMBIOS_TABLE_TYPE0),      // UINT8 Length\r
     },\r
-    1,     // SMBIOS_TABLE_STRING       Vendor\r
-    2,     // SMBIOS_TABLE_STRING       BiosVersion\r
-    0xE800,// UINT16                    BiosSegment\r
-    3,     // SMBIOS_TABLE_STRING       BiosReleaseDate\r
-    0,     // UINT8                     BiosSize\r
+    1,      // SMBIOS_TABLE_STRING       Vendor\r
+    2,      // SMBIOS_TABLE_STRING       BiosVersion\r
+    0xE800, // UINT16                    BiosSegment\r
+    3,      // SMBIOS_TABLE_STRING       BiosReleaseDate\r
+    0,      // UINT8                     BiosSize\r
     {      // MISC_BIOS_CHARACTERISTICS BiosCharacteristics\r
-      0,     // Reserved                                      :2\r
-      0,     // Unknown                                       :1\r
-      1,     // BiosCharacteristicsNotSupported               :1\r
-             // Remaining BiosCharacteristics bits left unset :60\r
+      0,   // Reserved                                      :2\r
+      0,   // Unknown                                       :1\r
+      1,   // BiosCharacteristicsNotSupported               :1\r
+           // Remaining BiosCharacteristics bits left unset :60\r
     },\r
     {      // BIOSCharacteristicsExtensionBytes[2]\r
-      0,     // BiosReserved\r
-      0x1C   // SystemReserved = VirtualMachineSupported |\r
-             //                  UefiSpecificationSupported |\r
-             //                  TargetContentDistributionEnabled\r
+      0,   // BiosReserved\r
+      0x1C // SystemReserved = VirtualMachineSupported |\r
+           //                  UefiSpecificationSupported |\r
+           //                  TargetContentDistributionEnabled\r
     },\r
     0,     // UINT8                     SystemBiosMajorRelease\r
     0,     // UINT8                     SystemBiosMinorRelease\r
@@ -62,7 +62,6 @@ STATIC CONST OVMF_TYPE0 mOvmfDefaultType0 = {
   TYPE0_STRINGS\r
 };\r
 \r
-\r
 /**\r
   Get SMBIOS record length.\r
 \r
@@ -71,7 +70,7 @@ STATIC CONST OVMF_TYPE0 mOvmfDefaultType0 = {
 **/\r
 UINTN\r
 SmbiosTableLength (\r
-  IN SMBIOS_STRUCTURE_POINTER SmbiosTable\r
+  IN SMBIOS_STRUCTURE_POINTER  SmbiosTable\r
   )\r
 {\r
   CHAR8  *AChar;\r
@@ -83,14 +82,14 @@ SmbiosTableLength (
   // Each structure shall be terminated by a double-null (SMBIOS spec.7.1)\r
   //\r
   while ((*AChar != 0) || (*(AChar + 1) != 0)) {\r
-    AChar ++;\r
+    AChar++;\r
   }\r
+\r
   Length = ((UINTN)AChar - (UINTN)SmbiosTable.Raw + 2);\r
 \r
   return Length;\r
 }\r
 \r
-\r
 /**\r
   Install all structures from the given SMBIOS structures block\r
 \r
@@ -99,7 +98,7 @@ SmbiosTableLength (
 **/\r
 EFI_STATUS\r
 InstallAllStructures (\r
-  IN UINT8                     *TableAddress\r
+  IN UINT8  *TableAddress\r
   )\r
 {\r
   EFI_SMBIOS_PROTOCOL       *Smbios;\r
@@ -114,7 +113,7 @@ InstallAllStructures (
   Status = gBS->LocateProtocol (\r
                   &gEfiSmbiosProtocolGuid,\r
                   NULL,\r
-                  (VOID**)&Smbios\r
+                  (VOID **)&Smbios\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -132,12 +131,12 @@ InstallAllStructures (
     // Log the SMBIOS data for this structure\r
     //\r
     SmbiosHandle = SmbiosTable.Hdr->Handle;\r
-    Status = Smbios->Add (\r
-                       Smbios,\r
-                       NULL,\r
-                       &SmbiosHandle,\r
-                       (EFI_SMBIOS_TABLE_HEADER*) SmbiosTable.Raw\r
-                       );\r
+    Status       = Smbios->Add (\r
+                             Smbios,\r
+                             NULL,\r
+                             &SmbiosHandle,\r
+                             (EFI_SMBIOS_TABLE_HEADER *)SmbiosTable.Raw\r
+                             );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     if (SmbiosTable.Hdr->Type == 0) {\r
@@ -155,12 +154,12 @@ InstallAllStructures (
     // Add OVMF default Type 0 (BIOS Information) table\r
     //\r
     SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
-    Status = Smbios->Add (\r
-                       Smbios,\r
-                       NULL,\r
-                       &SmbiosHandle,\r
-                       (EFI_SMBIOS_TABLE_HEADER*) &mOvmfDefaultType0\r
-                       );\r
+    Status       = Smbios->Add (\r
+                             Smbios,\r
+                             NULL,\r
+                             &SmbiosHandle,\r
+                             (EFI_SMBIOS_TABLE_HEADER *)&mOvmfDefaultType0\r
+                             );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
index 213a7f39e91d0b81a47a5c61bbaebd78e0f13789..74e314a8957ae1696ada4e881c8cd48db019692a 100644 (file)
@@ -19,7 +19,7 @@
 **/\r
 EFI_STATUS\r
 InstallAllStructures (\r
-  IN UINT8                     *TableAddress\r
+  IN UINT8  *TableAddress\r
   );\r
 \r
 #endif\r
index 0acedf8995da28ac0382a9da61ffb51c9c7bdba4..d8746b614a08695a05262fca0b555ecd9b3c197a 100644 (file)
@@ -14,8 +14,8 @@
 \r
 #include "XenSmbiosPlatformDxe.h"\r
 \r
-#define XEN_SMBIOS_PHYSICAL_ADDRESS       0x000EB000\r
-#define XEN_SMBIOS_PHYSICAL_END           0x000F0000\r
+#define XEN_SMBIOS_PHYSICAL_ADDRESS  0x000EB000\r
+#define XEN_SMBIOS_PHYSICAL_END      0x000F0000\r
 \r
 /**\r
   Validates the SMBIOS entry point structure\r
@@ -32,17 +32,17 @@ IsEntryPointStructureValid (
   IN SMBIOS_TABLE_ENTRY_POINT  *EntryPointStructure\r
   )\r
 {\r
-  UINTN                     Index;\r
-  UINT8                     Length;\r
-  UINT8                     Checksum;\r
-  UINT8                     *BytePtr;\r
+  UINTN  Index;\r
+  UINT8  Length;\r
+  UINT8  Checksum;\r
+  UINT8  *BytePtr;\r
 \r
-  BytePtr = (UINT8*) EntryPointStructure;\r
-  Length = EntryPointStructure->EntryPointLength;\r
+  BytePtr  = (UINT8 *)EntryPointStructure;\r
+  Length   = EntryPointStructure->EntryPointLength;\r
   Checksum = 0;\r
 \r
   for (Index = 0; Index < Length; Index++) {\r
-    Checksum = Checksum + (UINT8) BytePtr[Index];\r
+    Checksum = Checksum + (UINT8)BytePtr[Index];\r
   }\r
 \r
   if (Checksum != 0) {\r
@@ -75,18 +75,17 @@ GetXenSmbiosTables (
     return NULL;\r
   }\r
 \r
-  for (XenSmbiosPtr = (UINT8*)(UINTN) XEN_SMBIOS_PHYSICAL_ADDRESS;\r
-       XenSmbiosPtr < (UINT8*)(UINTN) XEN_SMBIOS_PHYSICAL_END;\r
-       XenSmbiosPtr += 0x10) {\r
-\r
-    XenSmbiosEntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) XenSmbiosPtr;\r
-\r
-    if (!AsciiStrnCmp ((CHAR8 *) XenSmbiosEntryPointStructure->AnchorString, "_SM_", 4) &&\r
-        !AsciiStrnCmp ((CHAR8 *) XenSmbiosEntryPointStructure->IntermediateAnchorString, "_DMI_", 5) &&\r
-        IsEntryPointStructureValid (XenSmbiosEntryPointStructure)) {\r
+  for (XenSmbiosPtr = (UINT8 *)(UINTN)XEN_SMBIOS_PHYSICAL_ADDRESS;\r
+       XenSmbiosPtr < (UINT8 *)(UINTN)XEN_SMBIOS_PHYSICAL_END;\r
+       XenSmbiosPtr += 0x10)\r
+  {\r
+    XenSmbiosEntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *)XenSmbiosPtr;\r
 \r
+    if (!AsciiStrnCmp ((CHAR8 *)XenSmbiosEntryPointStructure->AnchorString, "_SM_", 4) &&\r
+        !AsciiStrnCmp ((CHAR8 *)XenSmbiosEntryPointStructure->IntermediateAnchorString, "_DMI_", 5) &&\r
+        IsEntryPointStructureValid (XenSmbiosEntryPointStructure))\r
+    {\r
       return XenSmbiosEntryPointStructure;\r
-\r
     }\r
   }\r
 \r
index 75d9550913d1f71ae180ec7cc6104e3620e00b85..34526eacb24520470351a093785bef25dac45b87 100644 (file)
@@ -25,8 +25,8 @@
 EFI_STATUS\r
 EFIAPI\r
 XenSmbiosTablePublishEntry (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -39,7 +39,7 @@ XenSmbiosTablePublishEntry (
   //\r
   EntryPointStructure = GetXenSmbiosTables ();\r
   if (EntryPointStructure != NULL) {\r
-    SmbiosTables = (UINT8*)(UINTN)EntryPointStructure->TableAddress;\r
+    SmbiosTables = (UINT8 *)(UINTN)EntryPointStructure->TableAddress;\r
     if (SmbiosTables != NULL) {\r
       Status = InstallAllStructures (SmbiosTables);\r
     }\r
index 3691a6cd1f10ff14cebd1ffc646adcc6df4887c4..4b9e6df37feb664b2e82314fa82647f66df12ae1 100644 (file)
@@ -114,14 +114,18 @@ SmmAccess2DxeGetCapabilities (
   IN OUT EFI_SMRAM_DESCRIPTOR        *SmramMap\r
   )\r
 {\r
-  return SmramAccessGetCapabilities (This->LockState, This->OpenState,\r
-           SmramMapSize, SmramMap);\r
+  return SmramAccessGetCapabilities (\r
+           This->LockState,\r
+           This->OpenState,\r
+           SmramMapSize,\r
+           SmramMap\r
+           );\r
 }\r
 \r
 //\r
 // LockState and OpenState will be filled in by the entry point.\r
 //\r
-STATIC EFI_SMM_ACCESS2_PROTOCOL mAccess2 = {\r
+STATIC EFI_SMM_ACCESS2_PROTOCOL  mAccess2 = {\r
   &SmmAccess2DxeOpen,\r
   &SmmAccess2DxeClose,\r
   &SmmAccess2DxeLock,\r
@@ -134,8 +138,8 @@ STATIC EFI_SMM_ACCESS2_PROTOCOL mAccess2 = {
 EFI_STATUS\r
 EFIAPI\r
 SmmAccess2DxeEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   //\r
@@ -152,7 +156,10 @@ SmmAccess2DxeEntryPoint (
   //\r
   InitQ35SmramAtDefaultSmbase ();\r
 \r
-  return gBS->InstallMultipleProtocolInterfaces (&ImageHandle,\r
-                &gEfiSmmAccess2ProtocolGuid, &mAccess2,\r
-                NULL);\r
+  return gBS->InstallMultipleProtocolInterfaces (\r
+                &ImageHandle,\r
+                &gEfiSmmAccess2ProtocolGuid,\r
+                &mAccess2,\r
+                NULL\r
+                );\r
 }\r
index ec4e9a2761959662eaebf46d5df7a3bc95806c70..4be5f2423e17ae269263710d5f5c0e501cd06221 100644 (file)
@@ -59,9 +59,9 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 SmmAccessPeiOpen (\r
-  IN EFI_PEI_SERVICES                **PeiServices,\r
-  IN PEI_SMM_ACCESS_PPI              *This,\r
-  IN UINTN                           DescriptorIndex\r
+  IN EFI_PEI_SERVICES    **PeiServices,\r
+  IN PEI_SMM_ACCESS_PPI  *This,\r
+  IN UINTN               DescriptorIndex\r
   )\r
 {\r
   if (DescriptorIndex >= DescIdxCount) {\r
@@ -97,9 +97,9 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 SmmAccessPeiClose (\r
-  IN EFI_PEI_SERVICES                **PeiServices,\r
-  IN PEI_SMM_ACCESS_PPI              *This,\r
-  IN UINTN                           DescriptorIndex\r
+  IN EFI_PEI_SERVICES    **PeiServices,\r
+  IN PEI_SMM_ACCESS_PPI  *This,\r
+  IN UINTN               DescriptorIndex\r
   )\r
 {\r
   if (DescriptorIndex >= DescIdxCount) {\r
@@ -134,9 +134,9 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 SmmAccessPeiLock (\r
-  IN EFI_PEI_SERVICES                **PeiServices,\r
-  IN PEI_SMM_ACCESS_PPI              *This,\r
-  IN UINTN                           DescriptorIndex\r
+  IN EFI_PEI_SERVICES    **PeiServices,\r
+  IN PEI_SMM_ACCESS_PPI  *This,\r
+  IN UINTN               DescriptorIndex\r
   )\r
 {\r
   if (DescriptorIndex >= DescIdxCount) {\r
@@ -171,42 +171,44 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 SmmAccessPeiGetCapabilities (\r
-  IN EFI_PEI_SERVICES                **PeiServices,\r
-  IN PEI_SMM_ACCESS_PPI              *This,\r
-  IN OUT UINTN                       *SmramMapSize,\r
-  IN OUT EFI_SMRAM_DESCRIPTOR        *SmramMap\r
+  IN EFI_PEI_SERVICES          **PeiServices,\r
+  IN PEI_SMM_ACCESS_PPI        *This,\r
+  IN OUT UINTN                 *SmramMapSize,\r
+  IN OUT EFI_SMRAM_DESCRIPTOR  *SmramMap\r
   )\r
 {\r
-  return SmramAccessGetCapabilities (This->LockState, This->OpenState,\r
-           SmramMapSize, SmramMap);\r
+  return SmramAccessGetCapabilities (\r
+           This->LockState,\r
+           This->OpenState,\r
+           SmramMapSize,\r
+           SmramMap\r
+           );\r
 }\r
 \r
 //\r
 // LockState and OpenState will be filled in by the entry point.\r
 //\r
-STATIC PEI_SMM_ACCESS_PPI mAccess = {\r
+STATIC PEI_SMM_ACCESS_PPI  mAccess = {\r
   &SmmAccessPeiOpen,\r
   &SmmAccessPeiClose,\r
   &SmmAccessPeiLock,\r
   &SmmAccessPeiGetCapabilities\r
 };\r
 \r
-\r
-STATIC EFI_PEI_PPI_DESCRIPTOR mPpiList[] = {\r
+STATIC EFI_PEI_PPI_DESCRIPTOR  mPpiList[] = {\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
     &gPeiSmmAccessPpiGuid, &mAccess\r
   }\r
 };\r
 \r
-\r
 //\r
 // Utility functions.\r
 //\r
 STATIC\r
 UINT8\r
 CmosRead8 (\r
-  IN UINT8 Index\r
+  IN UINT8  Index\r
   )\r
 {\r
   IoWrite8 (0x70, Index);\r
@@ -219,8 +221,8 @@ GetSystemMemorySizeBelow4gb (
   VOID\r
   )\r
 {\r
-  UINT32 Cmos0x34;\r
-  UINT32 Cmos0x35;\r
+  UINT32  Cmos0x34;\r
+  UINT32  Cmos0x35;\r
 \r
   Cmos0x34 = CmosRead8 (0x34);\r
   Cmos0x35 = CmosRead8 (0x35);\r
@@ -228,7 +230,6 @@ GetSystemMemorySizeBelow4gb (
   return ((Cmos0x35 << 8 | Cmos0x34) << 16) + SIZE_16MB;\r
 }\r
 \r
-\r
 //\r
 // Entry point of this driver.\r
 //\r
@@ -239,14 +240,14 @@ SmmAccessPeiEntryPoint (
   IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
-  UINT16               HostBridgeDevId;\r
-  UINT8                EsmramcVal;\r
-  UINT8                RegMask8;\r
-  UINT32               TopOfLowRam, TopOfLowRamMb;\r
-  EFI_STATUS           Status;\r
-  UINTN                SmramMapSize;\r
-  EFI_SMRAM_DESCRIPTOR SmramMap[DescIdxCount];\r
-  VOID                 *GuidHob;\r
+  UINT16                HostBridgeDevId;\r
+  UINT8                 EsmramcVal;\r
+  UINT8                 RegMask8;\r
+  UINT32                TopOfLowRam, TopOfLowRamMb;\r
+  EFI_STATUS            Status;\r
+  UINTN                 SmramMapSize;\r
+  EFI_SMRAM_DESCRIPTOR  SmramMap[DescIdxCount];\r
+  VOID                  *GuidHob;\r
 \r
   //\r
   // This module should only be included if SMRAM support is required.\r
@@ -258,9 +259,14 @@ SmmAccessPeiEntryPoint (
   //\r
   HostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID);\r
   if (HostBridgeDevId != INTEL_Q35_MCH_DEVICE_ID) {\r
-    DEBUG ((DEBUG_ERROR, "%a: no SMRAM with host bridge DID=0x%04x; only "\r
-      "DID=0x%04x (Q35) is supported\n", __FUNCTION__, HostBridgeDevId,\r
-      INTEL_Q35_MCH_DEVICE_ID));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: no SMRAM with host bridge DID=0x%04x; only "\r
+      "DID=0x%04x (Q35) is supported\n",\r
+      __FUNCTION__,\r
+      HostBridgeDevId,\r
+      INTEL_Q35_MCH_DEVICE_ID\r
+      ));\r
     goto WrongConfig;\r
   }\r
 \r
@@ -272,10 +278,13 @@ SmmAccessPeiEntryPoint (
   // bits are hard-coded as 1 by QEMU.\r
   //\r
   EsmramcVal = PciRead8 (DRAMC_REGISTER_Q35 (MCH_ESMRAMC));\r
-  RegMask8 = MCH_ESMRAMC_SM_CACHE | MCH_ESMRAMC_SM_L1 | MCH_ESMRAMC_SM_L2;\r
+  RegMask8   = MCH_ESMRAMC_SM_CACHE | MCH_ESMRAMC_SM_L1 | MCH_ESMRAMC_SM_L2;\r
   if ((EsmramcVal & RegMask8) != RegMask8) {\r
-    DEBUG ((DEBUG_ERROR, "%a: this Q35 implementation lacks SMRAM\n",\r
-      __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: this Q35 implementation lacks SMRAM\n",\r
+      __FUNCTION__\r
+      ));\r
     goto WrongConfig;\r
   }\r
 \r
@@ -297,24 +306,32 @@ SmmAccessPeiEntryPoint (
   //\r
   // Set Top of Low Usable DRAM.\r
   //\r
-  PciWrite16 (DRAMC_REGISTER_Q35 (MCH_TOLUD),\r
-    (UINT16)(TopOfLowRamMb << MCH_TOLUD_MB_SHIFT));\r
+  PciWrite16 (\r
+    DRAMC_REGISTER_Q35 (MCH_TOLUD),\r
+    (UINT16)(TopOfLowRamMb << MCH_TOLUD_MB_SHIFT)\r
+    );\r
 \r
   //\r
   // Given the zero graphics memory sizes configured above, set the\r
   // graphics-related stolen memory bases to the same as TOLUD.\r
   //\r
-  PciWrite32 (DRAMC_REGISTER_Q35 (MCH_GBSM),\r
-    TopOfLowRamMb << MCH_GBSM_MB_SHIFT);\r
-  PciWrite32 (DRAMC_REGISTER_Q35 (MCH_BGSM),\r
-    TopOfLowRamMb << MCH_BGSM_MB_SHIFT);\r
+  PciWrite32 (\r
+    DRAMC_REGISTER_Q35 (MCH_GBSM),\r
+    TopOfLowRamMb << MCH_GBSM_MB_SHIFT\r
+    );\r
+  PciWrite32 (\r
+    DRAMC_REGISTER_Q35 (MCH_BGSM),\r
+    TopOfLowRamMb << MCH_BGSM_MB_SHIFT\r
+    );\r
 \r
   //\r
   // Set TSEG Memory Base.\r
   //\r
   InitQ35TsegMbytes ();\r
-  PciWrite32 (DRAMC_REGISTER_Q35 (MCH_TSEGMB),\r
-    (TopOfLowRamMb - mQ35TsegMbytes) << MCH_TSEGMB_MB_SHIFT);\r
+  PciWrite32 (\r
+    DRAMC_REGISTER_Q35 (MCH_TSEGMB),\r
+    (TopOfLowRamMb - mQ35TsegMbytes) << MCH_TSEGMB_MB_SHIFT\r
+    );\r
 \r
   //\r
   // Set TSEG size, and disable TSEG visibility outside of SMM. Note that the\r
@@ -333,44 +350,71 @@ SmmAccessPeiEntryPoint (
   // TSEG should be closed (see above), but unlocked, initially. Set G_SMRAME\r
   // (Global SMRAM Enable) too, as both D_LCK and T_EN depend on it.\r
   //\r
-  PciAndThenOr8 (DRAMC_REGISTER_Q35 (MCH_SMRAM),\r
-    (UINT8)((~(UINT32)MCH_SMRAM_D_LCK) & 0xff), MCH_SMRAM_G_SMRAME);\r
+  PciAndThenOr8 (\r
+    DRAMC_REGISTER_Q35 (MCH_SMRAM),\r
+    (UINT8)((~(UINT32)MCH_SMRAM_D_LCK) & 0xff),\r
+    MCH_SMRAM_G_SMRAME\r
+    );\r
 \r
   //\r
   // Create the GUID HOB and point it to the first SMRAM range.\r
   //\r
   GetStates (&mAccess.LockState, &mAccess.OpenState);\r
   SmramMapSize = sizeof SmramMap;\r
-  Status = SmramAccessGetCapabilities (mAccess.LockState, mAccess.OpenState,\r
-             &SmramMapSize, SmramMap);\r
+  Status       = SmramAccessGetCapabilities (\r
+                   mAccess.LockState,\r
+                   mAccess.OpenState,\r
+                   &SmramMapSize,\r
+                   SmramMap\r
+                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   DEBUG_CODE_BEGIN ();\r
   {\r
-    UINTN Count;\r
-    UINTN Idx;\r
+    UINTN  Count;\r
+    UINTN  Idx;\r
 \r
     Count = SmramMapSize / sizeof SmramMap[0];\r
-    DEBUG ((DEBUG_VERBOSE, "%a: SMRAM map follows, %d entries\n", __FUNCTION__,\r
-      (INT32)Count));\r
-    DEBUG ((DEBUG_VERBOSE, "% 20a % 20a % 20a % 20a\n", "PhysicalStart(0x)",\r
-      "PhysicalSize(0x)", "CpuStart(0x)", "RegionState(0x)"));\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "%a: SMRAM map follows, %d entries\n",\r
+      __FUNCTION__,\r
+      (INT32)Count\r
+      ));\r
+    DEBUG ((\r
+      DEBUG_VERBOSE,\r
+      "% 20a % 20a % 20a % 20a\n",\r
+      "PhysicalStart(0x)",\r
+      "PhysicalSize(0x)",\r
+      "CpuStart(0x)",\r
+      "RegionState(0x)"\r
+      ));\r
     for (Idx = 0; Idx < Count; ++Idx) {\r
-      DEBUG ((DEBUG_VERBOSE, "% 20Lx % 20Lx % 20Lx % 20Lx\n",\r
-        SmramMap[Idx].PhysicalStart, SmramMap[Idx].PhysicalSize,\r
-        SmramMap[Idx].CpuStart, SmramMap[Idx].RegionState));\r
+      DEBUG ((\r
+        DEBUG_VERBOSE,\r
+        "% 20Lx % 20Lx % 20Lx % 20Lx\n",\r
+        SmramMap[Idx].PhysicalStart,\r
+        SmramMap[Idx].PhysicalSize,\r
+        SmramMap[Idx].CpuStart,\r
+        SmramMap[Idx].RegionState\r
+        ));\r
     }\r
   }\r
   DEBUG_CODE_END ();\r
 \r
-  GuidHob = BuildGuidHob (&gEfiAcpiVariableGuid,\r
-    sizeof SmramMap[DescIdxSmmS3ResumeState]);\r
+  GuidHob = BuildGuidHob (\r
+              &gEfiAcpiVariableGuid,\r
+              sizeof SmramMap[DescIdxSmmS3ResumeState]\r
+              );\r
   if (GuidHob == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  CopyMem (GuidHob, &SmramMap[DescIdxSmmS3ResumeState],\r
-    sizeof SmramMap[DescIdxSmmS3ResumeState]);\r
+  CopyMem (\r
+    GuidHob,\r
+    &SmramMap[DescIdxSmmS3ResumeState],\r
+    sizeof SmramMap[DescIdxSmmS3ResumeState]\r
+    );\r
 \r
   //\r
   // SmramAccessLock() depends on "mQ35SmramAtDefaultSmbase"; init the latter\r
index 0b07dc667b3fd885f2bba999ea0c9cd7ebcf54c1..d391ddc9aec111e2d0a35628c07214fe7f61eaec 100644 (file)
 //\r
 // The value of PcdQ35TsegMbytes is saved into this variable at module startup.\r
 //\r
-UINT16 mQ35TsegMbytes;\r
+UINT16  mQ35TsegMbytes;\r
 \r
 //\r
 // The value of PcdQ35SmramAtDefaultSmbase is saved into this variable at\r
 // module startup.\r
 //\r
-STATIC BOOLEAN mQ35SmramAtDefaultSmbase;\r
+STATIC BOOLEAN  mQ35SmramAtDefaultSmbase;\r
 \r
 /**\r
   Save PcdQ35TsegMbytes into mQ35TsegMbytes.\r
@@ -65,11 +65,11 @@ InitQ35SmramAtDefaultSmbase (
 **/\r
 VOID\r
 GetStates (\r
-  OUT BOOLEAN *LockState,\r
-  OUT BOOLEAN *OpenState\r
-)\r
+  OUT BOOLEAN  *LockState,\r
+  OUT BOOLEAN  *OpenState\r
+  )\r
 {\r
-  UINT8 SmramVal, EsmramcVal;\r
+  UINT8  SmramVal, EsmramcVal;\r
 \r
   SmramVal   = PciRead8 (DRAMC_REGISTER_Q35 (MCH_SMRAM));\r
   EsmramcVal = PciRead8 (DRAMC_REGISTER_Q35 (MCH_ESMRAMC));\r
@@ -91,27 +91,30 @@ GetStates (
 \r
 EFI_STATUS\r
 SmramAccessOpen (\r
-  OUT BOOLEAN *LockState,\r
-  OUT BOOLEAN *OpenState\r
+  OUT BOOLEAN  *LockState,\r
+  OUT BOOLEAN  *OpenState\r
   )\r
 {\r
   //\r
   // Open TSEG by clearing T_EN.\r
   //\r
-  PciAnd8 (DRAMC_REGISTER_Q35 (MCH_ESMRAMC),\r
-    (UINT8)((~(UINT32)MCH_ESMRAMC_T_EN) & 0xff));\r
+  PciAnd8 (\r
+    DRAMC_REGISTER_Q35 (MCH_ESMRAMC),\r
+    (UINT8)((~(UINT32)MCH_ESMRAMC_T_EN) & 0xff)\r
+    );\r
 \r
   GetStates (LockState, OpenState);\r
   if (!*OpenState) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
 EFI_STATUS\r
 SmramAccessClose (\r
-  OUT BOOLEAN *LockState,\r
-  OUT BOOLEAN *OpenState\r
+  OUT BOOLEAN  *LockState,\r
+  OUT BOOLEAN  *OpenState\r
   )\r
 {\r
   //\r
@@ -123,13 +126,14 @@ SmramAccessClose (
   if (*OpenState) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
 EFI_STATUS\r
 SmramAccessLock (\r
-  OUT    BOOLEAN *LockState,\r
-  IN OUT BOOLEAN *OpenState\r
+  OUT    BOOLEAN  *LockState,\r
+  IN OUT BOOLEAN  *OpenState\r
   )\r
 {\r
   if (*OpenState) {\r
@@ -140,35 +144,38 @@ SmramAccessLock (
   // Close & lock TSEG by setting T_EN and D_LCK.\r
   //\r
   PciOr8 (DRAMC_REGISTER_Q35 (MCH_ESMRAMC), MCH_ESMRAMC_T_EN);\r
-  PciOr8 (DRAMC_REGISTER_Q35 (MCH_SMRAM),   MCH_SMRAM_D_LCK);\r
+  PciOr8 (DRAMC_REGISTER_Q35 (MCH_SMRAM), MCH_SMRAM_D_LCK);\r
 \r
   //\r
   // Close & lock the SMRAM at the default SMBASE, if it exists.\r
   //\r
   if (mQ35SmramAtDefaultSmbase) {\r
-    PciWrite8 (DRAMC_REGISTER_Q35 (MCH_DEFAULT_SMBASE_CTL),\r
-      MCH_DEFAULT_SMBASE_LCK);\r
+    PciWrite8 (\r
+      DRAMC_REGISTER_Q35 (MCH_DEFAULT_SMBASE_CTL),\r
+      MCH_DEFAULT_SMBASE_LCK\r
+      );\r
   }\r
 \r
   GetStates (LockState, OpenState);\r
   if (*OpenState || !*LockState) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
 EFI_STATUS\r
 SmramAccessGetCapabilities (\r
-  IN BOOLEAN                  LockState,\r
-  IN BOOLEAN                  OpenState,\r
-  IN OUT UINTN                *SmramMapSize,\r
-  IN OUT EFI_SMRAM_DESCRIPTOR *SmramMap\r
+  IN BOOLEAN                   LockState,\r
+  IN BOOLEAN                   OpenState,\r
+  IN OUT UINTN                 *SmramMapSize,\r
+  IN OUT EFI_SMRAM_DESCRIPTOR  *SmramMap\r
   )\r
 {\r
-  UINTN  OriginalSize;\r
-  UINT32 TsegMemoryBaseMb, TsegMemoryBase;\r
-  UINT64 CommonRegionState;\r
-  UINT8  TsegSizeBits;\r
+  UINTN   OriginalSize;\r
+  UINT32  TsegMemoryBaseMb, TsegMemoryBase;\r
+  UINT64  CommonRegionState;\r
+  UINT8   TsegSizeBits;\r
 \r
   OriginalSize  = *SmramMapSize;\r
   *SmramMapSize = DescIdxCount * sizeof *SmramMap;\r
@@ -180,7 +187,7 @@ SmramAccessGetCapabilities (
   // Read the TSEG Memory Base register.\r
   //\r
   TsegMemoryBaseMb = PciRead32 (DRAMC_REGISTER_Q35 (MCH_TSEGMB));\r
-  TsegMemoryBase = (TsegMemoryBaseMb >> MCH_TSEGMB_MB_SHIFT) << 20;\r
+  TsegMemoryBase   = (TsegMemoryBaseMb >> MCH_TSEGMB_MB_SHIFT) << 20;\r
 \r
   //\r
   // Precompute the region state bits that will be set for all regions.\r
@@ -198,7 +205,7 @@ SmramAccessGetCapabilities (
   SmramMap[DescIdxSmmS3ResumeState].CpuStart      = TsegMemoryBase;\r
   SmramMap[DescIdxSmmS3ResumeState].PhysicalSize  =\r
     EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (sizeof (SMM_S3_RESUME_STATE)));\r
-  SmramMap[DescIdxSmmS3ResumeState].RegionState   =\r
+  SmramMap[DescIdxSmmS3ResumeState].RegionState =\r
     CommonRegionState | EFI_ALLOCATED;\r
 \r
   //\r
@@ -213,7 +220,7 @@ SmramAccessGetCapabilities (
   SmramMap[DescIdxMain].PhysicalStart =\r
     SmramMap[DescIdxSmmS3ResumeState].PhysicalStart +\r
     SmramMap[DescIdxSmmS3ResumeState].PhysicalSize;\r
-  SmramMap[DescIdxMain].CpuStart = SmramMap[DescIdxMain].PhysicalStart;\r
+  SmramMap[DescIdxMain].CpuStart     = SmramMap[DescIdxMain].PhysicalStart;\r
   SmramMap[DescIdxMain].PhysicalSize =\r
     (TsegSizeBits == MCH_ESMRAMC_TSEG_8MB ? SIZE_8MB :\r
      TsegSizeBits == MCH_ESMRAMC_TSEG_2MB ? SIZE_2MB :\r
index a4d8827adfe4fbd25e160b5523da510c337ce153..da5b7bbca1323f134e4c8ad4526ec960d9759d87 100644 (file)
@@ -28,7 +28,7 @@ typedef enum {
 //\r
 // The value of PcdQ35TsegMbytes is saved into this variable at module startup.\r
 //\r
-extern UINT16 mQ35TsegMbytes;\r
+extern UINT16  mQ35TsegMbytes;\r
 \r
 /**\r
   Save PcdQ35TsegMbytes into mQ35TsegMbytes.\r
@@ -62,8 +62,8 @@ InitQ35SmramAtDefaultSmbase (
 **/\r
 VOID\r
 GetStates (\r
-  OUT BOOLEAN *LockState,\r
-  OUT BOOLEAN *OpenState\r
+  OUT BOOLEAN  *LockState,\r
+  OUT BOOLEAN  *OpenState\r
   );\r
 \r
 //\r
@@ -79,26 +79,26 @@ GetStates (
 \r
 EFI_STATUS\r
 SmramAccessOpen (\r
-  OUT BOOLEAN *LockState,\r
-  OUT BOOLEAN *OpenState\r
+  OUT BOOLEAN  *LockState,\r
+  OUT BOOLEAN  *OpenState\r
   );\r
 \r
 EFI_STATUS\r
 SmramAccessClose (\r
-  OUT BOOLEAN *LockState,\r
-  OUT BOOLEAN *OpenState\r
+  OUT BOOLEAN  *LockState,\r
+  OUT BOOLEAN  *OpenState\r
   );\r
 \r
 EFI_STATUS\r
 SmramAccessLock (\r
-  OUT    BOOLEAN *LockState,\r
-  IN OUT BOOLEAN *OpenState\r
+  OUT    BOOLEAN  *LockState,\r
+  IN OUT BOOLEAN  *OpenState\r
   );\r
 \r
 EFI_STATUS\r
 SmramAccessGetCapabilities (\r
-  IN BOOLEAN                  LockState,\r
-  IN BOOLEAN                  OpenState,\r
-  IN OUT UINTN                *SmramMapSize,\r
-  IN OUT EFI_SMRAM_DESCRIPTOR *SmramMap\r
+  IN BOOLEAN                   LockState,\r
+  IN BOOLEAN                   OpenState,\r
+  IN OUT UINTN                 *SmramMapSize,\r
+  IN OUT EFI_SMRAM_DESCRIPTOR  *SmramMap\r
   );\r
index e7e74a80e1ae43188faa285ffc4c8d63b5ff7188..daeb7195aee7f92fa335441265d0c943f910f179 100644 (file)
 // The following bit value stands for "broadcast SMI" in the\r
 // "etc/smi/supported-features" and "etc/smi/requested-features" fw_cfg files.\r
 //\r
-#define ICH9_LPC_SMI_F_BROADCAST BIT0\r
+#define ICH9_LPC_SMI_F_BROADCAST  BIT0\r
 //\r
 // The following bit value stands for "enable CPU hotplug, and inject an SMI\r
 // with control value ICH9_APM_CNT_CPU_HOTPLUG upon hotplug", in the\r
 // "etc/smi/supported-features" and "etc/smi/requested-features" fw_cfg files.\r
 //\r
-#define ICH9_LPC_SMI_F_CPU_HOTPLUG BIT1\r
+#define ICH9_LPC_SMI_F_CPU_HOTPLUG  BIT1\r
 //\r
 // The following bit value stands for "enable CPU hot-unplug, and inject an SMI\r
 // with control value ICH9_APM_CNT_CPU_HOTPLUG upon hot-unplug", in the\r
 // "etc/smi/supported-features" and "etc/smi/requested-features" fw_cfg files.\r
 //\r
-#define ICH9_LPC_SMI_F_CPU_HOT_UNPLUG BIT2\r
+#define ICH9_LPC_SMI_F_CPU_HOT_UNPLUG  BIT2\r
 \r
 //\r
 // Provides a scratch buffer (allocated in EfiReservedMemoryType type memory)\r
@@ -41,8 +41,8 @@
 //\r
 #pragma pack (1)\r
 typedef union {\r
-  UINT64 Features;\r
-  UINT8  FeaturesOk;\r
+  UINT64    Features;\r
+  UINT8     FeaturesOk;\r
 } SCRATCH_BUFFER;\r
 #pragma pack ()\r
 \r
@@ -51,14 +51,14 @@ typedef union {
 // "etc/smi/features-ok" fw_cfg files from NegotiateSmiFeatures() to\r
 // AppendFwCfgBootScript().\r
 //\r
-STATIC FIRMWARE_CONFIG_ITEM mRequestedFeaturesItem;\r
-STATIC FIRMWARE_CONFIG_ITEM mFeaturesOkItem;\r
+STATIC FIRMWARE_CONFIG_ITEM  mRequestedFeaturesItem;\r
+STATIC FIRMWARE_CONFIG_ITEM  mFeaturesOkItem;\r
 \r
 //\r
 // Carries the negotiated SMI features from NegotiateSmiFeatures() to\r
 // AppendFwCfgBootScript().\r
 //\r
-STATIC UINT64 mSmiFeatures;\r
+STATIC UINT64  mSmiFeatures;\r
 \r
 /**\r
   Negotiate SMI features with QEMU.\r
@@ -76,11 +76,11 @@ NegotiateSmiFeatures (
   VOID\r
   )\r
 {\r
-  FIRMWARE_CONFIG_ITEM SupportedFeaturesItem;\r
-  UINTN                SupportedFeaturesSize;\r
-  UINTN                RequestedFeaturesSize;\r
-  UINTN                FeaturesOkSize;\r
-  UINT64               RequestedFeaturesMask;\r
+  FIRMWARE_CONFIG_ITEM  SupportedFeaturesItem;\r
+  UINTN                 SupportedFeaturesSize;\r
+  UINTN                 RequestedFeaturesSize;\r
+  UINTN                 FeaturesOkSize;\r
+  UINT64                RequestedFeaturesMask;\r
 \r
   //\r
   // Look up the fw_cfg files used for feature negotiation. The selector keys\r
@@ -88,14 +88,33 @@ NegotiateSmiFeatures (
   // statically. If the files are missing, then QEMU doesn't support SMI\r
   // feature negotiation.\r
   //\r
-  if (RETURN_ERROR (QemuFwCfgFindFile ("etc/smi/supported-features",\r
-                      &SupportedFeaturesItem, &SupportedFeaturesSize)) ||\r
-      RETURN_ERROR (QemuFwCfgFindFile ("etc/smi/requested-features",\r
-                      &mRequestedFeaturesItem, &RequestedFeaturesSize)) ||\r
-      RETURN_ERROR (QemuFwCfgFindFile ("etc/smi/features-ok",\r
-                      &mFeaturesOkItem, &FeaturesOkSize))) {\r
-    DEBUG ((DEBUG_INFO, "%a: SMI feature negotiation unavailable\n",\r
-      __FUNCTION__));\r
+  if (RETURN_ERROR (\r
+        QemuFwCfgFindFile (\r
+          "etc/smi/supported-features",\r
+          &SupportedFeaturesItem,\r
+          &SupportedFeaturesSize\r
+          )\r
+        ) ||\r
+      RETURN_ERROR (\r
+        QemuFwCfgFindFile (\r
+          "etc/smi/requested-features",\r
+          &mRequestedFeaturesItem,\r
+          &RequestedFeaturesSize\r
+          )\r
+        ) ||\r
+      RETURN_ERROR (\r
+        QemuFwCfgFindFile (\r
+          "etc/smi/features-ok",\r
+          &mFeaturesOkItem,\r
+          &FeaturesOkSize\r
+          )\r
+        ))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: SMI feature negotiation unavailable\n",\r
+      __FUNCTION__\r
+      ));\r
     return FALSE;\r
   }\r
 \r
@@ -103,11 +122,15 @@ NegotiateSmiFeatures (
   // If the files are present but their sizes disagree with us, that's a fatal\r
   // error (we can't trust the behavior of SMIs either way).\r
   //\r
-  if (SupportedFeaturesSize != sizeof mSmiFeatures ||\r
-      RequestedFeaturesSize != sizeof mSmiFeatures ||\r
-      FeaturesOkSize != sizeof (UINT8)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: size mismatch in feature negotiation\n",\r
-      __FUNCTION__));\r
+  if ((SupportedFeaturesSize != sizeof mSmiFeatures) ||\r
+      (RequestedFeaturesSize != sizeof mSmiFeatures) ||\r
+      (FeaturesOkSize != sizeof (UINT8)))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: size mismatch in feature negotiation\n",\r
+      __FUNCTION__\r
+      ));\r
     goto FatalError;\r
   }\r
 \r
@@ -129,6 +152,7 @@ NegotiateSmiFeatures (
     RequestedFeaturesMask |= ICH9_LPC_SMI_F_CPU_HOTPLUG;\r
     RequestedFeaturesMask |= ICH9_LPC_SMI_F_CPU_HOT_UNPLUG;\r
   }\r
+\r
   mSmiFeatures &= RequestedFeaturesMask;\r
   QemuFwCfgSelectItem (mRequestedFeaturesItem);\r
   QemuFwCfgWriteBytes (sizeof mSmiFeatures, &mSmiFeatures);\r
@@ -141,8 +165,12 @@ NegotiateSmiFeatures (
   //\r
   QemuFwCfgSelectItem (mFeaturesOkItem);\r
   if (QemuFwCfgRead8 () != 1) {\r
-    DEBUG ((DEBUG_ERROR, "%a: negotiation failed for feature bitmap 0x%Lx\n",\r
-      __FUNCTION__, mSmiFeatures));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: negotiation failed for feature bitmap 0x%Lx\n",\r
+      __FUNCTION__,\r
+      mSmiFeatures\r
+      ));\r
     goto FatalError;\r
   }\r
 \r
@@ -159,26 +187,37 @@ NegotiateSmiFeatures (
     // the original QEMU behavior (i.e., unicast SMI) used to differ.\r
     //\r
     if (RETURN_ERROR (PcdSet64S (PcdCpuSmmApSyncTimeout, 1000000)) ||\r
-        RETURN_ERROR (PcdSet8S (PcdCpuSmmSyncMode, 0x00))) {\r
-      DEBUG ((DEBUG_ERROR, "%a: PiSmmCpuDxeSmm PCD configuration failed\n",\r
-        __FUNCTION__));\r
+        RETURN_ERROR (PcdSet8S (PcdCpuSmmSyncMode, 0x00)))\r
+    {\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: PiSmmCpuDxeSmm PCD configuration failed\n",\r
+        __FUNCTION__\r
+        ));\r
       goto FatalError;\r
     }\r
+\r
     DEBUG ((DEBUG_INFO, "%a: using SMI broadcast\n", __FUNCTION__));\r
   }\r
 \r
   if ((mSmiFeatures & ICH9_LPC_SMI_F_CPU_HOTPLUG) == 0) {\r
     DEBUG ((DEBUG_INFO, "%a: CPU hotplug not negotiated\n", __FUNCTION__));\r
   } else {\r
-    DEBUG ((DEBUG_INFO, "%a: CPU hotplug with SMI negotiated\n",\r
-      __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: CPU hotplug with SMI negotiated\n",\r
+      __FUNCTION__\r
+      ));\r
   }\r
 \r
   if ((mSmiFeatures & ICH9_LPC_SMI_F_CPU_HOT_UNPLUG) == 0) {\r
     DEBUG ((DEBUG_INFO, "%a: CPU hot-unplug not negotiated\n", __FUNCTION__));\r
   } else {\r
-    DEBUG ((DEBUG_INFO, "%a: CPU hot-unplug with SMI negotiated\n",\r
-      __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: CPU hot-unplug with SMI negotiated\n",\r
+      __FUNCTION__\r
+      ));\r
   }\r
 \r
   //\r
@@ -203,12 +242,12 @@ STATIC
 VOID\r
 EFIAPI\r
 AppendFwCfgBootScript (\r
-  IN OUT VOID *Context               OPTIONAL,\r
-  IN OUT VOID *ExternalScratchBuffer\r
+  IN OUT VOID  *Context               OPTIONAL,\r
+  IN OUT VOID  *ExternalScratchBuffer\r
   )\r
 {\r
-  SCRATCH_BUFFER *ScratchBuffer;\r
-  RETURN_STATUS  Status;\r
+  SCRATCH_BUFFER  *ScratchBuffer;\r
+  RETURN_STATUS   Status;\r
 \r
   ScratchBuffer = ExternalScratchBuffer;\r
 \r
@@ -216,8 +255,10 @@ AppendFwCfgBootScript (
   // Write the negotiated feature bitmap into "etc/smi/requested-features".\r
   //\r
   ScratchBuffer->Features = mSmiFeatures;\r
-  Status = QemuFwCfgS3ScriptWriteBytes (mRequestedFeaturesItem,\r
-             sizeof ScratchBuffer->Features);\r
+  Status                  = QemuFwCfgS3ScriptWriteBytes (\r
+                              mRequestedFeaturesItem,\r
+                              sizeof ScratchBuffer->Features\r
+                              );\r
   if (RETURN_ERROR (Status)) {\r
     goto FatalError;\r
   }\r
@@ -226,8 +267,10 @@ AppendFwCfgBootScript (
   // Read back "etc/smi/features-ok". This invokes the feature validation &\r
   // lockdown. (The validation succeeded at first boot.)\r
   //\r
-  Status = QemuFwCfgS3ScriptReadBytes (mFeaturesOkItem,\r
-             sizeof ScratchBuffer->FeaturesOk);\r
+  Status = QemuFwCfgS3ScriptReadBytes (\r
+             mFeaturesOkItem,\r
+             sizeof ScratchBuffer->FeaturesOk\r
+             );\r
   if (RETURN_ERROR (Status)) {\r
     goto FatalError;\r
   }\r
@@ -236,14 +279,21 @@ AppendFwCfgBootScript (
   // If "etc/smi/features-ok" read as 1, we're good. Otherwise, hang the S3\r
   // resume process.\r
   //\r
-  Status = QemuFwCfgS3ScriptCheckValue (&ScratchBuffer->FeaturesOk,\r
-             sizeof ScratchBuffer->FeaturesOk, MAX_UINT8, 1);\r
+  Status = QemuFwCfgS3ScriptCheckValue (\r
+             &ScratchBuffer->FeaturesOk,\r
+             sizeof ScratchBuffer->FeaturesOk,\r
+             MAX_UINT8,\r
+             1\r
+             );\r
   if (RETURN_ERROR (Status)) {\r
     goto FatalError;\r
   }\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: SMI feature negotiation boot script saved\n",\r
-    __FUNCTION__));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: SMI feature negotiation boot script saved\n",\r
+    __FUNCTION__\r
+    ));\r
   return;\r
 \r
 FatalError:\r
@@ -251,7 +301,6 @@ FatalError:
   CpuDeadLoop ();\r
 }\r
 \r
-\r
 /**\r
   Append a boot script fragment that will re-select the previously negotiated\r
   SMI features during S3 resume.\r
@@ -261,15 +310,18 @@ SaveSmiFeatures (
   VOID\r
   )\r
 {\r
-  RETURN_STATUS Status;\r
+  RETURN_STATUS  Status;\r
 \r
   //\r
   // We are already running at TPL_CALLBACK, on the stack of\r
   // OnS3SaveStateInstalled(). But that's okay, we can easily queue more\r
   // notification functions while executing a notification function.\r
   //\r
-  Status = QemuFwCfgS3CallWhenBootScriptReady (AppendFwCfgBootScript, NULL,\r
-             sizeof (SCRATCH_BUFFER));\r
+  Status = QemuFwCfgS3CallWhenBootScriptReady (\r
+             AppendFwCfgBootScript,\r
+             NULL,\r
+             sizeof (SCRATCH_BUFFER)\r
+             );\r
   if (RETURN_ERROR (Status)) {\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
index be04baf7b28838ba5ae0b925b4e2f4794eebbf10..edbf8ac431e433deaee1b5e12768fa7ed47dbca6 100644 (file)
@@ -38,8 +38,8 @@ STATIC
 VOID\r
 EFIAPI\r
 OnS3SaveStateInstalled (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 //\r
@@ -48,19 +48,19 @@ OnS3SaveStateInstalled (
 // S3SaveState protocol installation callback, strictly before the runtime\r
 // phase.\r
 //\r
-STATIC UINTN mSmiEnable;\r
+STATIC UINTN  mSmiEnable;\r
 \r
 //\r
 // Captures whether SMI feature negotiation is supported. The variable is only\r
 // used to carry this information from the entry point function to the\r
 // S3SaveState protocol installation callback.\r
 //\r
-STATIC BOOLEAN mSmiFeatureNegotiation;\r
+STATIC BOOLEAN  mSmiFeatureNegotiation;\r
 \r
 //\r
 // Event signaled when an S3SaveState protocol interface is installed.\r
 //\r
-STATIC EFI_EVENT mS3SaveStateInstalled;\r
+STATIC EFI_EVENT  mS3SaveStateInstalled;\r
 \r
 /**\r
   Invokes SMI activation from either the preboot or runtime environment.\r
@@ -97,7 +97,7 @@ SmmControl2DxeTrigger (
   //\r
   // No support for queued or periodic activation.\r
   //\r
-  if (Periodic || ActivationInterval > 0) {\r
+  if (Periodic || (ActivationInterval > 0)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -161,7 +161,7 @@ SmmControl2DxeClear (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC EFI_SMM_CONTROL2_PROTOCOL mControl2 = {\r
+STATIC EFI_SMM_CONTROL2_PROTOCOL  mControl2 = {\r
   &SmmControl2DxeTrigger,\r
   &SmmControl2DxeClear,\r
   MAX_UINTN // MinimumTriggerPeriod -- we don't support periodic SMIs\r
@@ -173,13 +173,13 @@ STATIC EFI_SMM_CONTROL2_PROTOCOL mControl2 = {
 EFI_STATUS\r
 EFIAPI\r
 SmmControl2DxeEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  UINT32     PmBase;\r
-  UINT32     SmiEnableVal;\r
-  EFI_STATUS Status;\r
+  UINT32      PmBase;\r
+  UINT32      SmiEnableVal;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // This module should only be included if SMRAM support is required.\r
@@ -192,7 +192,7 @@ SmmControl2DxeEntryPoint (
   // ACPI PM IO space.)\r
   //\r
   PmBase = PciRead32 (POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE)) &\r
-    ICH9_PMBASE_MASK;\r
+           ICH9_PMBASE_MASK;\r
   mSmiEnable = PmBase + ICH9_PMBASE_OFS_SMI_EN;\r
 \r
   //\r
@@ -202,8 +202,11 @@ SmmControl2DxeEntryPoint (
   //\r
   SmiEnableVal = IoRead32 (mSmiEnable);\r
   if ((SmiEnableVal & ICH9_SMI_EN_APMC_EN) != 0) {\r
-    DEBUG ((DEBUG_ERROR, "%a: this Q35 implementation lacks SMI\n",\r
-      __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: this Q35 implementation lacks SMI\n",\r
+      __FUNCTION__\r
+      ));\r
     goto FatalError;\r
   }\r
 \r
@@ -217,8 +220,10 @@ SmmControl2DxeEntryPoint (
   //\r
   // Prevent software from undoing the above (until platform reset).\r
   //\r
-  PciOr16 (POWER_MGMT_REGISTER_Q35 (ICH9_GEN_PMCON_1),\r
-    ICH9_GEN_PMCON_1_SMI_LOCK);\r
+  PciOr16 (\r
+    POWER_MGMT_REGISTER_Q35 (ICH9_GEN_PMCON_1),\r
+    ICH9_GEN_PMCON_1_SMI_LOCK\r
+    );\r
 \r
   //\r
   // If we can clear GBL_SMI_EN now, that means QEMU's SMI support is not\r
@@ -226,8 +231,11 @@ SmmControl2DxeEntryPoint (
   //\r
   IoWrite32 (mSmiEnable, SmiEnableVal & ~(UINT32)ICH9_SMI_EN_GBL_SMI_EN);\r
   if (IoRead32 (mSmiEnable) != SmiEnableVal) {\r
-    DEBUG ((DEBUG_ERROR, "%a: failed to lock down GBL_SMI_EN\n",\r
-      __FUNCTION__));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: failed to lock down GBL_SMI_EN\n",\r
+      __FUNCTION__\r
+      ));\r
     goto FatalError;\r
   }\r
 \r
@@ -237,26 +245,37 @@ SmmControl2DxeEntryPoint (
   mSmiFeatureNegotiation = NegotiateSmiFeatures ();\r
 \r
   if (PcdGetBool (PcdAcpiS3Enable)) {\r
-    VOID *Registration;\r
+    VOID  *Registration;\r
 \r
     //\r
     // On S3 resume the above register settings have to be repeated. Register a\r
     // protocol notify callback that, when boot script saving becomes\r
     // available, saves operations equivalent to the above to the boot script.\r
     //\r
-    Status = gBS->CreateEvent (EVT_NOTIFY_SIGNAL, TPL_CALLBACK,\r
-                    OnS3SaveStateInstalled, NULL /* Context */,\r
-                    &mS3SaveStateInstalled);\r
+    Status = gBS->CreateEvent (\r
+                    EVT_NOTIFY_SIGNAL,\r
+                    TPL_CALLBACK,\r
+                    OnS3SaveStateInstalled,\r
+                    NULL /* Context */,\r
+                    &mS3SaveStateInstalled\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "%a: CreateEvent: %r\n", __FUNCTION__, Status));\r
       goto FatalError;\r
     }\r
 \r
-    Status = gBS->RegisterProtocolNotify (&gEfiS3SaveStateProtocolGuid,\r
-                    mS3SaveStateInstalled, &Registration);\r
+    Status = gBS->RegisterProtocolNotify (\r
+                    &gEfiS3SaveStateProtocolGuid,\r
+                    mS3SaveStateInstalled,\r
+                    &Registration\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "%a: RegisterProtocolNotify: %r\n", __FUNCTION__,\r
-        Status));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: RegisterProtocolNotify: %r\n",\r
+        __FUNCTION__,\r
+        Status\r
+        ));\r
       goto ReleaseEvent;\r
     }\r
 \r
@@ -274,12 +293,19 @@ SmmControl2DxeEntryPoint (
   // We have no pointers to convert to virtual addresses. The handle itself\r
   // doesn't matter, as protocol services are not accessible at runtime.\r
   //\r
-  Status = gBS->InstallMultipleProtocolInterfaces (&ImageHandle,\r
-                  &gEfiSmmControl2ProtocolGuid, &mControl2,\r
-                  NULL);\r
+  Status = gBS->InstallMultipleProtocolInterfaces (\r
+                  &ImageHandle,\r
+                  &gEfiSmmControl2ProtocolGuid,\r
+                  &mControl2,\r
+                  NULL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: InstallMultipleProtocolInterfaces: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: InstallMultipleProtocolInterfaces: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     goto ReleaseEvent;\r
   }\r
 \r
@@ -311,20 +337,23 @@ STATIC
 VOID\r
 EFIAPI\r
 OnS3SaveStateInstalled (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_S3_SAVE_STATE_PROTOCOL *S3SaveState;\r
-  UINT32                     SmiEnOrMask, SmiEnAndMask;\r
-  UINT64                     GenPmCon1Address;\r
-  UINT16                     GenPmCon1OrMask, GenPmCon1AndMask;\r
+  EFI_STATUS                  Status;\r
+  EFI_S3_SAVE_STATE_PROTOCOL  *S3SaveState;\r
+  UINT32                      SmiEnOrMask, SmiEnAndMask;\r
+  UINT64                      GenPmCon1Address;\r
+  UINT16                      GenPmCon1OrMask, GenPmCon1AndMask;\r
 \r
   ASSERT (Event == mS3SaveStateInstalled);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiS3SaveStateProtocolGuid,\r
-                  NULL /* Registration */, (VOID **)&S3SaveState);\r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiS3SaveStateProtocolGuid,\r
+                  NULL /* Registration */,\r
+                  (VOID **)&S3SaveState\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return;\r
   }\r
@@ -335,37 +364,45 @@ OnS3SaveStateInstalled (
   //\r
   SmiEnOrMask  = ICH9_SMI_EN_APMC_EN | ICH9_SMI_EN_GBL_SMI_EN;\r
   SmiEnAndMask = MAX_UINT32;\r
-  Status = S3SaveState->Write (\r
-                          S3SaveState,\r
-                          EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE,\r
-                          EfiBootScriptWidthUint32,\r
-                          (UINT64)mSmiEnable,\r
-                          &SmiEnOrMask,\r
-                          &SmiEnAndMask\r
-                          );\r
+  Status       = S3SaveState->Write (\r
+                                S3SaveState,\r
+                                EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE,\r
+                                EfiBootScriptWidthUint32,\r
+                                (UINT64)mSmiEnable,\r
+                                &SmiEnOrMask,\r
+                                &SmiEnAndMask\r
+                                );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
 \r
   GenPmCon1Address = POWER_MGMT_REGISTER_Q35_EFI_PCI_ADDRESS (\r
-                       ICH9_GEN_PMCON_1);\r
+                       ICH9_GEN_PMCON_1\r
+                       );\r
   GenPmCon1OrMask  = ICH9_GEN_PMCON_1_SMI_LOCK;\r
   GenPmCon1AndMask = MAX_UINT16;\r
-  Status = S3SaveState->Write (\r
-                          S3SaveState,\r
-                          EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE,\r
-                          EfiBootScriptWidthUint16,\r
-                          GenPmCon1Address,\r
-                          &GenPmCon1OrMask,\r
-                          &GenPmCon1AndMask\r
-                          );\r
+  Status           = S3SaveState->Write (\r
+                                    S3SaveState,\r
+                                    EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE,\r
+                                    EfiBootScriptWidthUint16,\r
+                                    GenPmCon1Address,\r
+                                    &GenPmCon1OrMask,\r
+                                    &GenPmCon1AndMask\r
+                                    );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
-      "%a: EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE: %r\n", __FUNCTION__,\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     ASSERT (FALSE);\r
     CpuDeadLoop ();\r
   }\r
index b3b9035eea1b233594e22054cfdd9e87a52ba3d2..96771b19359545aaeb8c0cb833bf47534e90a3a9 100644 (file)
@@ -11,7 +11,6 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
-\r
 #include <PiPei.h>\r
 \r
 #include <Guid/TpmInstance.h>\r
@@ -22,7 +21,7 @@
 \r
 #include "Tpm12Support.h"\r
 \r
-STATIC CONST EFI_PEI_PPI_DESCRIPTOR mTpmSelectedPpi = {\r
+STATIC CONST EFI_PEI_PPI_DESCRIPTOR  mTpmSelectedPpi = {\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEfiTpmDeviceSelectedGuid,\r
   NULL\r
@@ -47,15 +46,15 @@ Tcg2ConfigPeimEntryPoint (
   IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
-  UINTN                           Size;\r
-  EFI_STATUS                      Status;\r
+  UINTN       Size;\r
+  EFI_STATUS  Status;\r
 \r
   DEBUG ((DEBUG_INFO, "%a\n", __FUNCTION__));\r
 \r
   Status = InternalTpm12Detect ();\r
   if (!EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_INFO, "%a: TPM1.2 detected\n", __FUNCTION__));\r
-    Size = sizeof (gEfiTpmDeviceInstanceTpm12Guid);\r
+    Size   = sizeof (gEfiTpmDeviceInstanceTpm12Guid);\r
     Status = PcdSetPtrS (\r
                PcdTpmInstanceGuid,\r
                &Size,\r
@@ -66,7 +65,7 @@ Tcg2ConfigPeimEntryPoint (
     Status = Tpm2RequestUseTpm ();\r
     if (!EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_INFO, "%a: TPM2 detected\n", __FUNCTION__));\r
-      Size = sizeof (gEfiTpmDeviceInstanceTpm20DtpmGuid);\r
+      Size   = sizeof (gEfiTpmDeviceInstanceTpm20DtpmGuid);\r
       Status = PcdSetPtrS (\r
                  PcdTpmInstanceGuid,\r
                  &Size,\r
index 4f5a775c7a03b3c5f858ffd5dbfb8627a1038f7a..c88da5758b44ddccfc10b6ed5ab62cb7b60950a8 100644 (file)
@@ -14,8 +14,8 @@
 \r
 #pragma pack (1)\r
 typedef struct {\r
-  TPM_RSP_COMMAND_HDR   Hdr;\r
-  TPM_CURRENT_TICKS     CurrentTicks;\r
+  TPM_RSP_COMMAND_HDR    Hdr;\r
+  TPM_CURRENT_TICKS      CurrentTicks;\r
 } TPM_RSP_GET_TICKS;\r
 #pragma pack ()\r
 \r
@@ -44,8 +44,12 @@ TestTpm12 (
   Command.ordinal   = SwapBytes32 (TPM_ORD_GetTicks);\r
 \r
   Length = sizeof (Response);\r
-  Status = Tpm12SubmitCommand (sizeof (Command), (UINT8 *)&Command, &Length,\r
-             (UINT8 *)&Response);\r
+  Status = Tpm12SubmitCommand (\r
+             sizeof (Command),\r
+             (UINT8 *)&Command,\r
+             &Length,\r
+             (UINT8 *)&Response\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -68,7 +72,7 @@ InternalTpm12Detect (
   VOID\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = Tpm12RequestUseTpm ();\r
   if (EFI_ERROR (Status)) {\r
index 570c8467a673337b97d37ff0f14657fbd0fa0244..88bb9e8e042baff599f7814b68a0dab12e2d4135 100644 (file)
@@ -7,7 +7,6 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
-\r
 #include <PiPei.h>\r
 \r
 #include <Library/DebugLib.h>\r
@@ -36,8 +35,8 @@ TpmMmioSevDecryptPeimEntryPoint (
   IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
-  RETURN_STATUS                   DecryptStatus;\r
-  EFI_STATUS                      Status;\r
+  RETURN_STATUS  DecryptStatus;\r
+  EFI_STATUS     Status;\r
 \r
   DEBUG ((DEBUG_INFO, "%a\n", __FUNCTION__));\r
 \r
@@ -58,20 +57,24 @@ TpmMmioSevDecryptPeimEntryPoint (
   // termination in this scenario, mark the range unencrypted ahead of access.\r
   //\r
   if (MemEncryptSevEsIsEnabled ()) {\r
-    DEBUG ((DEBUG_INFO,\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
       "%a: mapping TPM MMIO address range unencrypted\n",\r
-      __FUNCTION__));\r
+      __FUNCTION__\r
+      ));\r
 \r
     DecryptStatus = MemEncryptSevClearMmioPageEncMask (\r
                       0,\r
                       FixedPcdGet64 (PcdTpmBaseAddress),\r
-                      EFI_SIZE_TO_PAGES ((UINTN) 0x5000)\r
+                      EFI_SIZE_TO_PAGES ((UINTN)0x5000)\r
                       );\r
 \r
     if (RETURN_ERROR (DecryptStatus)) {\r
-      DEBUG ((DEBUG_ERROR,\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
         "%a: failed to map TPM MMIO address range unencrypted\n",\r
-        __FUNCTION__));\r
+        __FUNCTION__\r
+        ));\r
       ASSERT_RETURN_ERROR (DecryptStatus);\r
     }\r
   }\r
index 4d8e5b58a936173b12f36c04e48a5a7cf7f1f432..970524f6d711470775373178034cd079b86865fa 100644 (file)
@@ -22,7 +22,6 @@
 \r
 #include "Virtio10.h"\r
 \r
-\r
 //\r
 // Utility functions\r
 //\r
 STATIC\r
 EFI_STATUS\r
 Virtio10Transfer (\r
-  IN     EFI_PCI_IO_PROTOCOL *PciIo,\r
-  IN     VIRTIO_1_0_CONFIG   *Config,\r
-  IN     BOOLEAN             Write,\r
-  IN     UINTN               FieldOffset,\r
-  IN     UINTN               FieldSize,\r
-  IN OUT VOID                *Buffer\r
+  IN     EFI_PCI_IO_PROTOCOL  *PciIo,\r
+  IN     VIRTIO_1_0_CONFIG    *Config,\r
+  IN     BOOLEAN              Write,\r
+  IN     UINTN                FieldOffset,\r
+  IN     UINTN                FieldSize,\r
+  IN OUT VOID                 *Buffer\r
   )\r
 {\r
-  UINTN                      Count;\r
-  EFI_PCI_IO_PROTOCOL_WIDTH  Width;\r
-  EFI_PCI_IO_PROTOCOL_ACCESS *BarType;\r
-  EFI_PCI_IO_PROTOCOL_IO_MEM Access;\r
+  UINTN                       Count;\r
+  EFI_PCI_IO_PROTOCOL_WIDTH   Width;\r
+  EFI_PCI_IO_PROTOCOL_ACCESS  *BarType;\r
+  EFI_PCI_IO_PROTOCOL_IO_MEM  Access;\r
 \r
   if (!Config->Exists ||\r
-      FieldSize > Config->Length ||\r
-      FieldOffset > Config->Length - FieldSize) {\r
+      (FieldSize > Config->Length) ||\r
+      (FieldOffset > Config->Length - FieldSize))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -97,9 +97,9 @@ Virtio10Transfer (
 \r
     case 8:\r
       Count = 2;\r
-      //\r
-      // fall through\r
-      //\r
+    //\r
+    // fall through\r
+    //\r
 \r
     case 4:\r
       Width = EfiPciIoWidthUint32;\r
@@ -110,13 +110,18 @@ Virtio10Transfer (
   }\r
 \r
   BarType = (Config->BarType == Virtio10BarTypeMem) ? &PciIo->Mem : &PciIo->Io;\r
-  Access = Write ? BarType->Write : BarType->Read;\r
-\r
-  return Access (PciIo, Width, Config->Bar, Config->Offset + FieldOffset,\r
-           Count, Buffer);\r
+  Access  = Write ? BarType->Write : BarType->Read;\r
+\r
+  return Access (\r
+           PciIo,\r
+           Width,\r
+           Config->Bar,\r
+           Config->Offset + FieldOffset,\r
+           Count,\r
+           Buffer\r
+           );\r
 }\r
 \r
-\r
 /**\r
   Determine if a PCI BAR is IO or MMIO.\r
 \r
@@ -140,13 +145,13 @@ Virtio10Transfer (
 STATIC\r
 EFI_STATUS\r
 GetBarType (\r
-  IN  EFI_PCI_IO_PROTOCOL *PciIo,\r
-  IN  UINT8               BarIndex,\r
-  OUT VIRTIO_1_0_BAR_TYPE *BarType\r
+  IN  EFI_PCI_IO_PROTOCOL  *PciIo,\r
+  IN  UINT8                BarIndex,\r
+  OUT VIRTIO_1_0_BAR_TYPE  *BarType\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  VOID       *Resources;\r
+  EFI_STATUS  Status;\r
+  VOID        *Resources;\r
 \r
   Status = PciIo->GetBarAttributes (PciIo, BarIndex, NULL, &Resources);\r
   if (EFI_ERROR (Status)) {\r
@@ -156,22 +161,22 @@ GetBarType (
   Status = EFI_UNSUPPORTED;\r
 \r
   if (*(UINT8 *)Resources == ACPI_QWORD_ADDRESS_SPACE_DESCRIPTOR) {\r
-    EFI_ACPI_QWORD_ADDRESS_SPACE_DESCRIPTOR *Descriptor;\r
+    EFI_ACPI_QWORD_ADDRESS_SPACE_DESCRIPTOR  *Descriptor;\r
 \r
     Descriptor = Resources;\r
     switch (Descriptor->ResType) {\r
-    case ACPI_ADDRESS_SPACE_TYPE_MEM:\r
-      *BarType = Virtio10BarTypeMem;\r
-      Status = EFI_SUCCESS;\r
-      break;\r
-\r
-    case ACPI_ADDRESS_SPACE_TYPE_IO:\r
-      *BarType = Virtio10BarTypeIo;\r
-      Status = EFI_SUCCESS;\r
-      break;\r
-\r
-    default:\r
-      break;\r
+      case ACPI_ADDRESS_SPACE_TYPE_MEM:\r
+        *BarType = Virtio10BarTypeMem;\r
+        Status   = EFI_SUCCESS;\r
+        break;\r
+\r
+      case ACPI_ADDRESS_SPACE_TYPE_IO:\r
+        *BarType = Virtio10BarTypeIo;\r
+        Status   = EFI_SUCCESS;\r
+        break;\r
+\r
+      default:\r
+        break;\r
     }\r
   }\r
 \r
@@ -179,7 +184,6 @@ GetBarType (
   return Status;\r
 }\r
 \r
-\r
 /*\r
   Traverse the PCI capabilities list of a virtio-1.0 device, and capture the\r
   locations of the interesting virtio-1.0 register blocks.\r
@@ -201,42 +205,55 @@ GetBarType (
 STATIC\r
 EFI_STATUS\r
 ParseCapabilities (\r
-  IN OUT VIRTIO_1_0_DEV *Device\r
+  IN OUT VIRTIO_1_0_DEV  *Device\r
   )\r
 {\r
-  EFI_STATUS   Status;\r
-  PCI_CAP_DEV  *PciDevice;\r
-  PCI_CAP_LIST *CapList;\r
-  UINT16       VendorInstance;\r
-  PCI_CAP      *VendorCap;\r
+  EFI_STATUS    Status;\r
+  PCI_CAP_DEV   *PciDevice;\r
+  PCI_CAP_LIST  *CapList;\r
+  UINT16        VendorInstance;\r
+  PCI_CAP       *VendorCap;\r
 \r
   Status = PciCapPciIoDeviceInit (Device->PciIo, &PciDevice);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   Status = PciCapListInit (PciDevice, &CapList);\r
   if (EFI_ERROR (Status)) {\r
     goto UninitPciDevice;\r
   }\r
 \r
   for (VendorInstance = 0;\r
-       !EFI_ERROR (PciCapListFindCap (CapList, PciCapNormal,\r
-                     EFI_PCI_CAPABILITY_ID_VENDOR, VendorInstance,\r
-                     &VendorCap));\r
-       VendorInstance++) {\r
-    UINT8             CapLen;\r
-    VIRTIO_PCI_CAP    VirtIoCap;\r
-    VIRTIO_1_0_CONFIG *ParsedConfig;\r
+       !EFI_ERROR (\r
+          PciCapListFindCap (\r
+            CapList,\r
+            PciCapNormal,\r
+            EFI_PCI_CAPABILITY_ID_VENDOR,\r
+            VendorInstance,\r
+            &VendorCap\r
+            )\r
+          );\r
+       VendorInstance++)\r
+  {\r
+    UINT8              CapLen;\r
+    VIRTIO_PCI_CAP     VirtIoCap;\r
+    VIRTIO_1_0_CONFIG  *ParsedConfig;\r
 \r
     //\r
     // Big enough to accommodate a VIRTIO_PCI_CAP structure?\r
     //\r
-    Status = PciCapRead (PciDevice, VendorCap,\r
-               OFFSET_OF (EFI_PCI_CAPABILITY_VENDOR_HDR, Length), &CapLen,\r
-               sizeof CapLen);\r
+    Status = PciCapRead (\r
+               PciDevice,\r
+               VendorCap,\r
+               OFFSET_OF (EFI_PCI_CAPABILITY_VENDOR_HDR, Length),\r
+               &CapLen,\r
+               sizeof CapLen\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       goto UninitCapList;\r
     }\r
+\r
     if (CapLen < sizeof VirtIoCap) {\r
       //\r
       // Too small, move to next.\r
@@ -253,20 +270,20 @@ ParseCapabilities (
     }\r
 \r
     switch (VirtIoCap.ConfigType) {\r
-    case VIRTIO_PCI_CAP_COMMON_CFG:\r
-      ParsedConfig = &Device->CommonConfig;\r
-      break;\r
-    case VIRTIO_PCI_CAP_NOTIFY_CFG:\r
-      ParsedConfig = &Device->NotifyConfig;\r
-      break;\r
-    case VIRTIO_PCI_CAP_DEVICE_CFG:\r
-      ParsedConfig = &Device->SpecificConfig;\r
-      break;\r
-    default:\r
-      //\r
-      // Capability is not interesting.\r
-      //\r
-      continue;\r
+      case VIRTIO_PCI_CAP_COMMON_CFG:\r
+        ParsedConfig = &Device->CommonConfig;\r
+        break;\r
+      case VIRTIO_PCI_CAP_NOTIFY_CFG:\r
+        ParsedConfig = &Device->NotifyConfig;\r
+        break;\r
+      case VIRTIO_PCI_CAP_DEVICE_CFG:\r
+        ParsedConfig = &Device->SpecificConfig;\r
+        break;\r
+      default:\r
+        //\r
+        // Capability is not interesting.\r
+        //\r
+        continue;\r
     }\r
 \r
     //\r
@@ -276,6 +293,7 @@ ParseCapabilities (
     if (EFI_ERROR (Status)) {\r
       goto UninitCapList;\r
     }\r
+\r
     ParsedConfig->Bar    = VirtIoCap.Bar;\r
     ParsedConfig->Offset = VirtIoCap.Offset;\r
     ParsedConfig->Length = VirtIoCap.Length;\r
@@ -292,9 +310,13 @@ ParseCapabilities (
         continue;\r
       }\r
 \r
-      Status = PciCapRead (PciDevice, VendorCap, sizeof VirtIoCap,\r
+      Status = PciCapRead (\r
+                 PciDevice,\r
+                 VendorCap,\r
+                 sizeof VirtIoCap,\r
                  &Device->NotifyOffsetMultiplier,\r
-                 sizeof Device->NotifyOffsetMultiplier);\r
+                 sizeof Device->NotifyOffsetMultiplier\r
+                 );\r
       if (EFI_ERROR (Status)) {\r
         goto UninitCapList;\r
       }\r
@@ -317,7 +339,6 @@ UninitPciDevice:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Accumulate the BAR type of a virtio-1.0 register block into a UINT64\r
   attribute map, such that the latter is suitable for enabling IO / MMIO\r
@@ -335,18 +356,17 @@ UninitPciDevice:
 STATIC\r
 VOID\r
 UpdateAttributes (\r
-  IN     VIRTIO_1_0_CONFIG *Config,\r
-  IN OUT UINT64            *Attributes\r
+  IN     VIRTIO_1_0_CONFIG  *Config,\r
+  IN OUT UINT64             *Attributes\r
   )\r
 {\r
   if (Config->Exists) {\r
     *Attributes |= (Config->BarType == Virtio10BarTypeMem) ?\r
-                     EFI_PCI_IO_ATTRIBUTE_MEMORY:\r
-                     EFI_PCI_IO_ATTRIBUTE_IO;\r
+                   EFI_PCI_IO_ATTRIBUTE_MEMORY :\r
+                   EFI_PCI_IO_ATTRIBUTE_IO;\r
   }\r
 }\r
 \r
-\r
 //\r
 // VIRTIO_DEVICE_PROTOCOL member functions\r
 //\r
@@ -355,25 +375,30 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 Virtio10GetDeviceFeatures (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
-  OUT UINT64                *DeviceFeatures\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  OUT UINT64                 *DeviceFeatures\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  UINT32         Selector;\r
-  UINT32         Features32[2];\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  UINT32          Selector;\r
+  UINT32          Features32[2];\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
   for (Selector = 0; Selector < 2; ++Selector) {\r
-    EFI_STATUS Status;\r
+    EFI_STATUS  Status;\r
 \r
     //\r
     // Select the low or high half of the features.\r
     //\r
-    Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
+    Status = Virtio10Transfer (\r
+               Dev->PciIo,\r
+               &Dev->CommonConfig,\r
+               TRUE,\r
                OFFSET_OF (VIRTIO_PCI_COMMON_CFG, DeviceFeatureSelect),\r
-               sizeof Selector, &Selector);\r
+               sizeof Selector,\r
+               &Selector\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -381,9 +406,14 @@ Virtio10GetDeviceFeatures (
     //\r
     // Fetch that half.\r
     //\r
-    Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, FALSE,\r
+    Status = Virtio10Transfer (\r
+               Dev->PciIo,\r
+               &Dev->CommonConfig,\r
+               FALSE,\r
                OFFSET_OF (VIRTIO_PCI_COMMON_CFG, DeviceFeature),\r
-               sizeof Features32[Selector], &Features32[Selector]);\r
+               sizeof Features32[Selector],\r
+               &Features32[Selector]\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -393,18 +423,17 @@ Virtio10GetDeviceFeatures (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10SetGuestFeatures (\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
-  IN UINT64                   Features\r
+  IN UINT64                  Features\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  UINT32         Selector;\r
-  UINT32         Features32[2];\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  UINT32          Selector;\r
+  UINT32          Features32[2];\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -412,14 +441,19 @@ Virtio10SetGuestFeatures (
   Features32[1] = (UINT32)RShiftU64 (Features, 32);\r
 \r
   for (Selector = 0; Selector < 2; ++Selector) {\r
-    EFI_STATUS Status;\r
+    EFI_STATUS  Status;\r
 \r
     //\r
     // Select the low or high half of the features.\r
     //\r
-    Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
+    Status = Virtio10Transfer (\r
+               Dev->PciIo,\r
+               &Dev->CommonConfig,\r
+               TRUE,\r
                OFFSET_OF (VIRTIO_PCI_COMMON_CFG, DriverFeatureSelect),\r
-               sizeof Selector, &Selector);\r
+               sizeof Selector,\r
+               &Selector\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -427,9 +461,14 @@ Virtio10SetGuestFeatures (
     //\r
     // Write that half.\r
     //\r
-    Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
+    Status = Virtio10Transfer (\r
+               Dev->PciIo,\r
+               &Dev->CommonConfig,\r
+               TRUE,\r
                OFFSET_OF (VIRTIO_PCI_COMMON_CFG, DriverFeature),\r
-               sizeof Features32[Selector], &Features32[Selector]);\r
+               sizeof Features32[Selector],\r
+               &Features32[Selector]\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -438,7 +477,6 @@ Virtio10SetGuestFeatures (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
@@ -448,80 +486,103 @@ Virtio10SetQueueAddress (
   IN UINT64                  RingBaseShift\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  EFI_STATUS     Status;\r
-  UINT64         Address;\r
-  UINT16         Enable;\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  EFI_STATUS      Status;\r
+  UINT64          Address;\r
+  UINT16          Enable;\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
-  Address = (UINTN)Ring->Desc;\r
+  Address  = (UINTN)Ring->Desc;\r
   Address += RingBaseShift;\r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
-             OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueDesc),\r
-             sizeof Address, &Address);\r
+  Status   = Virtio10Transfer (\r
+               Dev->PciIo,\r
+               &Dev->CommonConfig,\r
+               TRUE,\r
+               OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueDesc),\r
+               sizeof Address,\r
+               &Address\r
+               );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Address = (UINTN)Ring->Avail.Flags;\r
+  Address  = (UINTN)Ring->Avail.Flags;\r
   Address += RingBaseShift;\r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
-             OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueAvail),\r
-             sizeof Address, &Address);\r
+  Status   = Virtio10Transfer (\r
+               Dev->PciIo,\r
+               &Dev->CommonConfig,\r
+               TRUE,\r
+               OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueAvail),\r
+               sizeof Address,\r
+               &Address\r
+               );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Address = (UINTN)Ring->Used.Flags;\r
+  Address  = (UINTN)Ring->Used.Flags;\r
   Address += RingBaseShift;\r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
-             OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueUsed),\r
-             sizeof Address, &Address);\r
+  Status   = Virtio10Transfer (\r
+               Dev->PciIo,\r
+               &Dev->CommonConfig,\r
+               TRUE,\r
+               OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueUsed),\r
+               sizeof Address,\r
+               &Address\r
+               );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   Enable = 1;\r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->CommonConfig,\r
+             TRUE,\r
              OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueEnable),\r
-             sizeof Enable, &Enable);\r
+             sizeof Enable,\r
+             &Enable\r
+             );\r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10SetQueueSel (\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
-  IN UINT16                   Index\r
+  IN UINT16                  Index\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  EFI_STATUS     Status;\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  EFI_STATUS      Status;\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->CommonConfig,\r
+             TRUE,\r
              OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueSelect),\r
-             sizeof Index, &Index);\r
+             sizeof Index,\r
+             &Index\r
+             );\r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10SetQueueNotify (\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
-  IN UINT16                   Index\r
+  IN UINT16                  Index\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  EFI_STATUS     Status;\r
-  UINT16         SavedQueueSelect;\r
-  UINT16         NotifyOffset;\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  EFI_STATUS      Status;\r
+  UINT16          SavedQueueSelect;\r
+  UINT16          NotifyOffset;\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -531,9 +592,14 @@ Virtio10SetQueueNotify (
   //\r
   // So, start with saving the current queue selector.\r
   //\r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, FALSE,\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->CommonConfig,\r
+             FALSE,\r
              OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueSelect),\r
-             sizeof SavedQueueSelect, &SavedQueueSelect);\r
+             sizeof SavedQueueSelect,\r
+             &SavedQueueSelect\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -541,9 +607,14 @@ Virtio10SetQueueNotify (
   //\r
   // Select the requested queue.\r
   //\r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->CommonConfig,\r
+             TRUE,\r
              OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueSelect),\r
-             sizeof Index, &Index);\r
+             sizeof Index,\r
+             &Index\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -551,9 +622,14 @@ Virtio10SetQueueNotify (
   //\r
   // Read the QueueNotifyOff field.\r
   //\r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, FALSE,\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->CommonConfig,\r
+             FALSE,\r
              OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueNotifyOff),\r
-             sizeof NotifyOffset, &NotifyOffset);\r
+             sizeof NotifyOffset,\r
+             &NotifyOffset\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -561,9 +637,14 @@ Virtio10SetQueueNotify (
   //\r
   // Re-select the original queue.\r
   //\r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->CommonConfig,\r
+             TRUE,\r
              OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueSelect),\r
-             sizeof SavedQueueSelect, &SavedQueueSelect);\r
+             sizeof SavedQueueSelect,\r
+             &SavedQueueSelect\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -571,37 +652,39 @@ Virtio10SetQueueNotify (
   //\r
   // We can now kick the queue.\r
   //\r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->NotifyConfig, TRUE,\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->NotifyConfig,\r
+             TRUE,\r
              NotifyOffset * Dev->NotifyOffsetMultiplier,\r
-             sizeof Index, &Index);\r
+             sizeof Index,\r
+             &Index\r
+             );\r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10SetQueueAlign (\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
-  IN UINT32                   Alignment\r
+  IN UINT32                  Alignment\r
   )\r
 {\r
   return (Alignment == EFI_PAGE_SIZE) ? EFI_SUCCESS : EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10SetPageSize (\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
-  IN UINT32                   PageSize\r
+  IN UINT32                  PageSize\r
   )\r
 {\r
   return (PageSize == EFI_PAGE_SIZE) ? EFI_SUCCESS : EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
@@ -610,28 +693,32 @@ Virtio10GetQueueNumMax (
   OUT UINT16                  *QueueNumMax\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  EFI_STATUS     Status;\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  EFI_STATUS      Status;\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, FALSE,\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->CommonConfig,\r
+             FALSE,\r
              OFFSET_OF (VIRTIO_PCI_COMMON_CFG, QueueSize),\r
-             sizeof *QueueNumMax, QueueNumMax);\r
+             sizeof *QueueNumMax,\r
+             QueueNumMax\r
+             );\r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10SetQueueNum (\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
-  IN UINT16                   QueueSize\r
+  IN UINT16                  QueueSize\r
   )\r
 {\r
-  EFI_STATUS     Status;\r
-  UINT16         CurrentSize;\r
+  EFI_STATUS  Status;\r
+  UINT16      CurrentSize;\r
 \r
   //\r
   // This member function is required for VirtIo MMIO, and a no-op in\r
@@ -643,10 +730,10 @@ Virtio10SetQueueNum (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   return (CurrentSize == QueueSize) ? EFI_SUCCESS : EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
@@ -655,18 +742,22 @@ Virtio10GetDeviceStatus (
   OUT UINT8                   *DeviceStatus\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  EFI_STATUS     Status;\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  EFI_STATUS      Status;\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, FALSE,\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->CommonConfig,\r
+             FALSE,\r
              OFFSET_OF (VIRTIO_PCI_COMMON_CFG, DeviceStatus),\r
-             sizeof *DeviceStatus, DeviceStatus);\r
+             sizeof *DeviceStatus,\r
+             DeviceStatus\r
+             );\r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
@@ -675,52 +766,61 @@ Virtio10SetDeviceStatus (
   IN UINT8                   DeviceStatus\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  EFI_STATUS     Status;\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  EFI_STATUS      Status;\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->CommonConfig, TRUE,\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->CommonConfig,\r
+             TRUE,\r
              OFFSET_OF (VIRTIO_PCI_COMMON_CFG, DeviceStatus),\r
-             sizeof DeviceStatus, &DeviceStatus);\r
+             sizeof DeviceStatus,\r
+             &DeviceStatus\r
+             );\r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10WriteDevice (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
-  IN UINTN                  FieldOffset,\r
-  IN UINTN                  FieldSize,\r
-  IN UINT64                 Value\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN UINTN                   FieldOffset,\r
+  IN UINTN                   FieldSize,\r
+  IN UINT64                  Value\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  EFI_STATUS     Status;\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  EFI_STATUS      Status;\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->SpecificConfig, TRUE,\r
-             FieldOffset, FieldSize, &Value);\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->SpecificConfig,\r
+             TRUE,\r
+             FieldOffset,\r
+             FieldSize,\r
+             &Value\r
+             );\r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10ReadDevice (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *This,\r
-  IN  UINTN                  FieldOffset,\r
-  IN  UINTN                  FieldSize,\r
-  IN  UINTN                  BufferSize,\r
-  OUT VOID                   *Buffer\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   FieldOffset,\r
+  IN  UINTN                   FieldSize,\r
+  IN  UINTN                   BufferSize,\r
+  OUT VOID                    *Buffer\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  EFI_STATUS     Status;\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  EFI_STATUS      Status;\r
 \r
   if (FieldSize != BufferSize) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -728,8 +828,14 @@ Virtio10ReadDevice (
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
-  Status = Virtio10Transfer (Dev->PciIo, &Dev->SpecificConfig, FALSE,\r
-             FieldOffset, FieldSize, Buffer);\r
+  Status = Virtio10Transfer (\r
+             Dev->PciIo,\r
+             &Dev->SpecificConfig,\r
+             FALSE,\r
+             FieldOffset,\r
+             FieldSize,\r
+             Buffer\r
+             );\r
   return Status;\r
 }\r
 \r
@@ -742,8 +848,8 @@ Virtio10AllocateSharedPages (
   IN OUT VOID                    **HostAddress\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
-  EFI_STATUS     Status;\r
+  VIRTIO_1_0_DEV  *Dev;\r
+  EFI_STATUS      Status;\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -767,7 +873,7 @@ Virtio10FreeSharedPages (
   IN  VOID                    *HostAddress\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Dev;\r
+  VIRTIO_1_0_DEV  *Dev;\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -790,9 +896,9 @@ Virtio10MapSharedBuffer (
   OUT    VOID                    **Mapping\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  VIRTIO_1_0_DEV                *Dev;\r
-  EFI_PCI_IO_PROTOCOL_OPERATION PciIoOperation;\r
+  EFI_STATUS                     Status;\r
+  VIRTIO_1_0_DEV                 *Dev;\r
+  EFI_PCI_IO_PROTOCOL_OPERATION  PciIoOperation;\r
 \r
   Dev = VIRTIO_1_0_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -800,17 +906,17 @@ Virtio10MapSharedBuffer (
   // Map VIRTIO_MAP_OPERATION to EFI_PCI_IO_PROTOCOL_OPERATION\r
   //\r
   switch (Operation) {\r
-  case VirtioOperationBusMasterRead:\r
-    PciIoOperation = EfiPciIoOperationBusMasterRead;\r
-    break;\r
-  case VirtioOperationBusMasterWrite:\r
-    PciIoOperation = EfiPciIoOperationBusMasterWrite;\r
-    break;\r
-  case VirtioOperationBusMasterCommonBuffer:\r
-    PciIoOperation = EfiPciIoOperationBusMasterCommonBuffer;\r
-    break;\r
-  default:\r
-    return EFI_INVALID_PARAMETER;\r
+    case VirtioOperationBusMasterRead:\r
+      PciIoOperation = EfiPciIoOperationBusMasterRead;\r
+      break;\r
+    case VirtioOperationBusMasterWrite:\r
+      PciIoOperation = EfiPciIoOperationBusMasterWrite;\r
+      break;\r
+    case VirtioOperationBusMasterCommonBuffer:\r
+      PciIoOperation = EfiPciIoOperationBusMasterCommonBuffer;\r
+      break;\r
+    default:\r
+      return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Status = Dev->PciIo->Map (\r
@@ -845,9 +951,9 @@ Virtio10UnmapSharedBuffer (
   return Status;\r
 }\r
 \r
-STATIC CONST VIRTIO_DEVICE_PROTOCOL mVirtIoTemplate = {\r
-  VIRTIO_SPEC_REVISION (1, 0, 0),\r
-  0,                              // SubSystemDeviceId, filled in dynamically\r
+STATIC CONST VIRTIO_DEVICE_PROTOCOL  mVirtIoTemplate = {\r
+  VIRTIO_SPEC_REVISION (1,     0, 0),\r
+  0,                           // SubSystemDeviceId, filled in dynamically\r
   Virtio10GetDeviceFeatures,\r
   Virtio10SetGuestFeatures,\r
   Virtio10SetQueueAddress,\r
@@ -867,7 +973,6 @@ STATIC CONST VIRTIO_DEVICE_PROTOCOL mVirtIoTemplate = {
   Virtio10UnmapSharedBuffer\r
 };\r
 \r
-\r
 //\r
 // EFI_DRIVER_BINDING_PROTOCOL member functions\r
 //\r
@@ -876,24 +981,34 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 Virtio10BindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE00          Pci;\r
-\r
-  Status = gBS->OpenProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-                  (VOID **)&PciIo, This->DriverBindingHandle,\r
-                  DeviceHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
+\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  (VOID **)&PciIo,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0,\r
-                        sizeof Pci / sizeof (UINT32), &Pci);\r
+  Status = PciIo->Pci.Read (\r
+                        PciIo,\r
+                        EfiPciIoWidthUint32,\r
+                        0,\r
+                        sizeof Pci / sizeof (UINT32),\r
+                        &Pci\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseProtocol;\r
   }\r
@@ -903,12 +1018,13 @@ Virtio10BindingSupported (
   // Recognize non-transitional modern devices. Also, we'll have to parse the\r
   // PCI capability list, so make sure the CapabilityPtr field will be valid.\r
   //\r
-  if (Pci.Hdr.VendorId == VIRTIO_VENDOR_ID &&\r
-      Pci.Hdr.DeviceId >= 0x1040 &&\r
-      Pci.Hdr.DeviceId <= 0x107F &&\r
-      Pci.Hdr.RevisionID >= 0x01 &&\r
-      Pci.Device.SubsystemID >= 0x40 &&\r
-      (Pci.Hdr.Status & EFI_PCI_STATUS_CAPABILITY) != 0) {\r
+  if ((Pci.Hdr.VendorId == VIRTIO_VENDOR_ID) &&\r
+      (Pci.Hdr.DeviceId >= 0x1040) &&\r
+      (Pci.Hdr.DeviceId <= 0x107F) &&\r
+      (Pci.Hdr.RevisionID >= 0x01) &&\r
+      (Pci.Device.SubsystemID >= 0x40) &&\r
+      ((Pci.Hdr.Status & EFI_PCI_STATUS_CAPABILITY) != 0))\r
+  {\r
     //\r
     // The virtio-vga device is special. It can be driven both as a VGA device\r
     // with a linear framebuffer, and through its underlying, modern,\r
@@ -920,32 +1036,35 @@ Virtio10BindingSupported (
     // Both virtio-vga and virtio-gpu-pci have DeviceId 0x1050, but only the\r
     // former has device class PCI_CLASS_DISPLAY_VGA.\r
     //\r
-    if (Pci.Hdr.DeviceId != 0x1050 || !IS_PCI_VGA (&Pci)) {\r
+    if ((Pci.Hdr.DeviceId != 0x1050) || !IS_PCI_VGA (&Pci)) {\r
       Status = EFI_SUCCESS;\r
     }\r
   }\r
 \r
 CloseProtocol:\r
-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10BindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  VIRTIO_1_0_DEV *Device;\r
-  EFI_STATUS     Status;\r
-  PCI_TYPE00     Pci;\r
-  UINT64         SetAttributes;\r
+  VIRTIO_1_0_DEV  *Device;\r
+  EFI_STATUS      Status;\r
+  PCI_TYPE00      Pci;\r
+  UINT64          SetAttributes;\r
 \r
   Device = AllocateZeroPool (sizeof *Device);\r
   if (Device == NULL) {\r
@@ -955,15 +1074,25 @@ Virtio10BindingStart (
   Device->Signature = VIRTIO_1_0_SIGNATURE;\r
   CopyMem (&Device->VirtIo, &mVirtIoTemplate, sizeof mVirtIoTemplate);\r
 \r
-  Status = gBS->OpenProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-                  (VOID **)&Device->PciIo, This->DriverBindingHandle,\r
-                  DeviceHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  (VOID **)&Device->PciIo,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeDevice;\r
   }\r
 \r
-  Status = Device->PciIo->Pci.Read (Device->PciIo, EfiPciIoWidthUint32, 0,\r
-                                sizeof Pci / sizeof (UINT32), &Pci);\r
+  Status = Device->PciIo->Pci.Read (\r
+                                Device->PciIo,\r
+                                EfiPciIoWidthUint32,\r
+                                0,\r
+                                sizeof Pci / sizeof (UINT32),\r
+                                &Pci\r
+                                );\r
   if (EFI_ERROR (Status)) {\r
     goto ClosePciIo;\r
   }\r
@@ -975,9 +1104,12 @@ Virtio10BindingStart (
     goto ClosePciIo;\r
   }\r
 \r
-  Status = Device->PciIo->Attributes (Device->PciIo,\r
-                            EfiPciIoAttributeOperationGet, 0,\r
-                            &Device->OriginalPciAttributes);\r
+  Status = Device->PciIo->Attributes (\r
+                            Device->PciIo,\r
+                            EfiPciIoAttributeOperationGet,\r
+                            0,\r
+                            &Device->OriginalPciAttributes\r
+                            );\r
   if (EFI_ERROR (Status)) {\r
     goto ClosePciIo;\r
   }\r
@@ -987,16 +1119,22 @@ Virtio10BindingStart (
   UpdateAttributes (&Device->CommonConfig, &SetAttributes);\r
   UpdateAttributes (&Device->NotifyConfig, &SetAttributes);\r
   UpdateAttributes (&Device->SpecificConfig, &SetAttributes);\r
-  Status = Device->PciIo->Attributes (Device->PciIo,\r
-                            EfiPciIoAttributeOperationEnable, SetAttributes,\r
-                            NULL);\r
+  Status = Device->PciIo->Attributes (\r
+                            Device->PciIo,\r
+                            EfiPciIoAttributeOperationEnable,\r
+                            SetAttributes,\r
+                            NULL\r
+                            );\r
   if (EFI_ERROR (Status)) {\r
     goto ClosePciIo;\r
   }\r
 \r
-  Status = gBS->InstallProtocolInterface (&DeviceHandle,\r
-                  &gVirtioDeviceProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  &Device->VirtIo);\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &DeviceHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  EFI_NATIVE_INTERFACE,\r
+                  &Device->VirtIo\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto RestorePciAttributes;\r
   }\r
@@ -1004,12 +1142,20 @@ Virtio10BindingStart (
   return EFI_SUCCESS;\r
 \r
 RestorePciAttributes:\r
-  Device->PciIo->Attributes (Device->PciIo, EfiPciIoAttributeOperationSet,\r
-                   Device->OriginalPciAttributes, NULL);\r
+  Device->PciIo->Attributes (\r
+                   Device->PciIo,\r
+                   EfiPciIoAttributeOperationSet,\r
+                   Device->OriginalPciAttributes,\r
+                   NULL\r
+                   );\r
 \r
 ClosePciIo:\r
-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
 FreeDevice:\r
   FreePool (Device);\r
@@ -1017,47 +1163,61 @@ FreeDevice:
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10BindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  VIRTIO_DEVICE_PROTOCOL *VirtIo;\r
-  VIRTIO_1_0_DEV         *Device;\r
-\r
-  Status = gBS->OpenProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-                  (VOID **)&VirtIo, This->DriverBindingHandle,\r
-                  DeviceHandle, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+  EFI_STATUS              Status;\r
+  VIRTIO_DEVICE_PROTOCOL  *VirtIo;\r
+  VIRTIO_1_0_DEV          *Device;\r
+\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  (VOID **)&VirtIo,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle,\r
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   Device = VIRTIO_1_0_FROM_VIRTIO_DEVICE (VirtIo);\r
 \r
-  Status = gBS->UninstallProtocolInterface (DeviceHandle,\r
-                  &gVirtioDeviceProtocolGuid, &Device->VirtIo);\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  DeviceHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  &Device->VirtIo\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Device->PciIo->Attributes (Device->PciIo, EfiPciIoAttributeOperationSet,\r
-                   Device->OriginalPciAttributes, NULL);\r
-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  Device->PciIo->Attributes (\r
+                   Device->PciIo,\r
+                   EfiPciIoAttributeOperationSet,\r
+                   Device->OriginalPciAttributes,\r
+                   NULL\r
+                   );\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
   FreePool (Device);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-STATIC EFI_DRIVER_BINDING_PROTOCOL mDriverBinding = {\r
+STATIC EFI_DRIVER_BINDING_PROTOCOL  mDriverBinding = {\r
   &Virtio10BindingSupported,\r
   &Virtio10BindingStart,\r
   &Virtio10BindingStop,\r
@@ -1066,28 +1226,27 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL mDriverBinding = {
   NULL  // DriverBindingHandle, to be overwritten\r
 };\r
 \r
-\r
 //\r
 // EFI_COMPONENT_NAME_PROTOCOL and EFI_COMPONENT_NAME2_PROTOCOL\r
 // implementations\r
 //\r
 \r
 STATIC\r
-EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "eng;en", L"Virtio 1.0 PCI Driver" },\r
   { NULL,     NULL                     }\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL mComponentName;\r
+EFI_COMPONENT_NAME_PROTOCOL  mComponentName;\r
 \r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Virtio10GetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -1103,31 +1262,30 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 Virtio10GetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL mComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL  mComponentName = {\r
   &Virtio10GetDriverName,\r
   &Virtio10GetDeviceName,\r
   "eng"\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &Virtio10GetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &Virtio10GetDeviceName,\r
+EFI_COMPONENT_NAME2_PROTOCOL  mComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&Virtio10GetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&Virtio10GetDeviceName,\r
   "en"\r
 };\r
 \r
-\r
 //\r
 // Entry point of this driver\r
 //\r
@@ -1135,8 +1293,8 @@ EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {
 EFI_STATUS\r
 EFIAPI\r
 Virtio10EntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r
index 4258bbfcaa3e41741dbd608189e502efba648016..355f2a07857100596a51c55b61a8fff8bc1ca66b 100644 (file)
@@ -12,7 +12,7 @@
 #include <Protocol/PciIo.h>\r
 #include <Protocol/VirtioDevice.h>\r
 \r
-#define VIRTIO_1_0_SIGNATURE SIGNATURE_32 ('V', 'I', 'O', '1')\r
+#define VIRTIO_1_0_SIGNATURE  SIGNATURE_32 ('V', 'I', 'O', '1')\r
 \r
 //\r
 // Type of the PCI BAR that contains a VirtIo 1.0 config structure.\r
@@ -26,22 +26,22 @@ typedef enum {
 // The type below defines the access to a VirtIo 1.0 config structure.\r
 //\r
 typedef struct {\r
-  BOOLEAN             Exists;  // The device exposes this structure\r
-  VIRTIO_1_0_BAR_TYPE BarType;\r
-  UINT8               Bar;\r
-  UINT32              Offset;  // Offset into BAR where structure starts\r
-  UINT32              Length;  // Length of structure in BAR.\r
+  BOOLEAN                Exists; // The device exposes this structure\r
+  VIRTIO_1_0_BAR_TYPE    BarType;\r
+  UINT8                  Bar;\r
+  UINT32                 Offset; // Offset into BAR where structure starts\r
+  UINT32                 Length; // Length of structure in BAR.\r
 } VIRTIO_1_0_CONFIG;\r
 \r
 typedef struct {\r
-  UINT32                 Signature;\r
-  VIRTIO_DEVICE_PROTOCOL VirtIo;\r
-  EFI_PCI_IO_PROTOCOL    *PciIo;\r
-  UINT64                 OriginalPciAttributes;\r
-  VIRTIO_1_0_CONFIG      CommonConfig;           // Common settings\r
-  VIRTIO_1_0_CONFIG      NotifyConfig;           // Notifications\r
-  UINT32                 NotifyOffsetMultiplier;\r
-  VIRTIO_1_0_CONFIG      SpecificConfig;         // Device specific settings\r
+  UINT32                    Signature;\r
+  VIRTIO_DEVICE_PROTOCOL    VirtIo;\r
+  EFI_PCI_IO_PROTOCOL       *PciIo;\r
+  UINT64                    OriginalPciAttributes;\r
+  VIRTIO_1_0_CONFIG         CommonConfig;        // Common settings\r
+  VIRTIO_1_0_CONFIG         NotifyConfig;        // Notifications\r
+  UINT32                    NotifyOffsetMultiplier;\r
+  VIRTIO_1_0_CONFIG         SpecificConfig;      // Device specific settings\r
 } VIRTIO_1_0_DEV;\r
 \r
 #define VIRTIO_1_0_FROM_VIRTIO_DEVICE(Device) \\r
index 06b9859a6486df344877a7cf51eeb88749520f57..cc094cc4ddb8bf5774aea0d017a6c696e3807018 100644 (file)
@@ -63,7 +63,7 @@
                                                 (Value)                    \\r
                                                 ))\r
 \r
-#define VIRTIO_CFG_READ(Dev, Field, Pointer) ((Dev)->VirtIo->ReadDevice (  \\r
+#define VIRTIO_CFG_READ(Dev, Field, Pointer)  ((Dev)->VirtIo->ReadDevice ( \\r
                                                 (Dev)->VirtIo,             \\r
                                                 OFFSET_OF_VBLK (Field),    \\r
                                                 SIZE_OF_VBLK (Field),      \\r
@@ -71,7 +71,6 @@
                                                 (Pointer)                  \\r
                                                 ))\r
 \r
-\r
 //\r
 // UEFI Spec 2.3.1 + Errata C, 12.8 EFI Block I/O Protocol\r
 // Driver Writer's Guide for UEFI 2.3.1 v1.01,\r
@@ -80,8 +79,8 @@
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkReset (\r
-  IN EFI_BLOCK_IO_PROTOCOL *This,\r
-  IN BOOLEAN               ExtendedVerification\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN BOOLEAN                ExtendedVerification\r
   )\r
 {\r
   //\r
@@ -143,26 +142,28 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VerifyReadWriteRequest (\r
-  IN  EFI_BLOCK_IO_MEDIA *Media,\r
-  IN  EFI_LBA            Lba,\r
-  IN  UINTN              PositiveBufferSize,\r
-  IN  BOOLEAN            RequestIsWrite\r
+  IN  EFI_BLOCK_IO_MEDIA  *Media,\r
+  IN  EFI_LBA             Lba,\r
+  IN  UINTN               PositiveBufferSize,\r
+  IN  BOOLEAN             RequestIsWrite\r
   )\r
 {\r
-  UINTN BlockCount;\r
+  UINTN  BlockCount;\r
 \r
   ASSERT (PositiveBufferSize > 0);\r
 \r
-  if (PositiveBufferSize > SIZE_1GB ||\r
-      PositiveBufferSize % Media->BlockSize > 0) {\r
+  if ((PositiveBufferSize > SIZE_1GB) ||\r
+      (PositiveBufferSize % Media->BlockSize > 0))\r
+  {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
+\r
   BlockCount = PositiveBufferSize / Media->BlockSize;\r
 \r
   //\r
   // Avoid unsigned wraparound on either side in the second comparison.\r
   //\r
-  if (Lba > Media->LastBlock || BlockCount - 1 > Media->LastBlock - Lba) {\r
+  if ((Lba > Media->LastBlock) || (BlockCount - 1 > Media->LastBlock - Lba)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -173,9 +174,6 @@ VerifyReadWriteRequest (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-\r
-\r
 /**\r
 \r
   Format a read / write / flush request as three consecutive virtio\r
@@ -230,31 +228,30 @@ VerifyReadWriteRequest (
                                for a bus master operation.\r
 \r
 **/\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 SynchronousRequest (\r
-  IN              VBLK_DEV *Dev,\r
-  IN              EFI_LBA  Lba,\r
-  IN              UINTN    BufferSize,\r
-  IN OUT volatile VOID     *Buffer,\r
-  IN              BOOLEAN  RequestIsWrite\r
+  IN              VBLK_DEV  *Dev,\r
+  IN              EFI_LBA   Lba,\r
+  IN              UINTN     BufferSize,\r
+  IN OUT volatile VOID      *Buffer,\r
+  IN              BOOLEAN   RequestIsWrite\r
   )\r
 {\r
-  UINT32                  BlockSize;\r
-  volatile VIRTIO_BLK_REQ Request;\r
-  volatile UINT8          *HostStatus;\r
-  VOID                    *HostStatusBuffer;\r
-  DESC_INDICES            Indices;\r
-  VOID                    *RequestMapping;\r
-  VOID                    *StatusMapping;\r
-  VOID                    *BufferMapping;\r
-  EFI_PHYSICAL_ADDRESS    BufferDeviceAddress;\r
-  EFI_PHYSICAL_ADDRESS    HostStatusDeviceAddress;\r
-  EFI_PHYSICAL_ADDRESS    RequestDeviceAddress;\r
-  EFI_STATUS              Status;\r
-  EFI_STATUS              UnmapStatus;\r
+  UINT32                   BlockSize;\r
+  volatile VIRTIO_BLK_REQ  Request;\r
+  volatile UINT8           *HostStatus;\r
+  VOID                     *HostStatusBuffer;\r
+  DESC_INDICES             Indices;\r
+  VOID                     *RequestMapping;\r
+  VOID                     *StatusMapping;\r
+  VOID                     *BufferMapping;\r
+  EFI_PHYSICAL_ADDRESS     BufferDeviceAddress;\r
+  EFI_PHYSICAL_ADDRESS     HostStatusDeviceAddress;\r
+  EFI_PHYSICAL_ADDRESS     RequestDeviceAddress;\r
+  EFI_STATUS               Status;\r
+  EFI_STATUS               UnmapStatus;\r
 \r
   BlockSize = Dev->BlockIoMedia.BlockSize;\r
 \r
@@ -280,11 +277,11 @@ SynchronousRequest (
   // Prepare virtio-blk request header, setting zero size for flush.\r
   // IO Priority is homogeneously 0.\r
   //\r
-  Request.Type   = RequestIsWrite ?\r
-                   (BufferSize == 0 ? VIRTIO_BLK_T_FLUSH : VIRTIO_BLK_T_OUT) :\r
-                   VIRTIO_BLK_T_IN;\r
+  Request.Type = RequestIsWrite ?\r
+                 (BufferSize == 0 ? VIRTIO_BLK_T_FLUSH : VIRTIO_BLK_T_OUT) :\r
+                 VIRTIO_BLK_T_IN;\r
   Request.IoPrio = 0;\r
-  Request.Sector = MultU64x32(Lba, BlockSize / 512);\r
+  Request.Sector = MultU64x32 (Lba, BlockSize / 512);\r
 \r
   //\r
   // Host status is bi-directional (we preset with a value and expect the\r
@@ -309,7 +306,7 @@ SynchronousRequest (
   Status = VirtioMapAllBytesInSharedBuffer (\r
              Dev->VirtIo,\r
              VirtioOperationBusMasterRead,\r
-             (VOID *) &Request,\r
+             (VOID *)&Request,\r
              sizeof Request,\r
              &RequestDeviceAddress,\r
              &RequestMapping\r
@@ -328,7 +325,7 @@ SynchronousRequest (
                (RequestIsWrite ?\r
                 VirtioOperationBusMasterRead :\r
                 VirtioOperationBusMasterWrite),\r
-               (VOID *) Buffer,\r
+               (VOID *)Buffer,\r
                BufferSize,\r
                &BufferDeviceAddress,\r
                &BufferMapping\r
@@ -400,7 +397,7 @@ SynchronousRequest (
     VirtioAppendDesc (\r
       &Dev->Ring,\r
       BufferDeviceAddress,\r
-      (UINT32) BufferSize,\r
+      (UINT32)BufferSize,\r
       VRING_DESC_F_NEXT | (RequestIsWrite ? 0 : VRING_DESC_F_WRITE),\r
       &Indices\r
       );\r
@@ -420,9 +417,15 @@ SynchronousRequest (
   //\r
   // virtio-blk's only virtqueue is #0, called "requestq" (see Appendix D).\r
   //\r
-  if (VirtioFlush (Dev->VirtIo, 0, &Dev->Ring, &Indices,\r
-        NULL) == EFI_SUCCESS &&\r
-      *HostStatus == VIRTIO_BLK_S_OK) {\r
+  if ((VirtioFlush (\r
+         Dev->VirtIo,\r
+         0,\r
+         &Dev->Ring,\r
+         &Indices,\r
+         NULL\r
+         ) == EFI_SUCCESS) &&\r
+      (*HostStatus == VIRTIO_BLK_S_OK))\r
+  {\r
     Status = EFI_SUCCESS;\r
   } else {\r
     Status = EFI_DEVICE_ERROR;\r
@@ -454,7 +457,6 @@ FreeHostStatusBuffer:
   return Status;\r
 }\r
 \r
-\r
 /**\r
 \r
   ReadBlocks() operation for virtio-blk.\r
@@ -472,25 +474,24 @@ FreeHostStatusBuffer:
   successfully.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkReadBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL *This,\r
-  IN  UINT32                MediaId,\r
-  IN  EFI_LBA               Lba,\r
-  IN  UINTN                 BufferSize,\r
-  OUT VOID                  *Buffer\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  UINT32                 MediaId,\r
+  IN  EFI_LBA                Lba,\r
+  IN  UINTN                  BufferSize,\r
+  OUT VOID                   *Buffer\r
   )\r
 {\r
-  VBLK_DEV   *Dev;\r
-  EFI_STATUS Status;\r
+  VBLK_DEV    *Dev;\r
+  EFI_STATUS  Status;\r
 \r
   if (BufferSize == 0) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  Dev = VIRTIO_BLK_FROM_BLOCK_IO (This);\r
+  Dev    = VIRTIO_BLK_FROM_BLOCK_IO (This);\r
   Status = VerifyReadWriteRequest (\r
              &Dev->BlockIoMedia,\r
              Lba,\r
@@ -527,25 +528,24 @@ VirtioBlkReadBlocks (
   successfully.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkWriteBlocks (\r
-  IN EFI_BLOCK_IO_PROTOCOL *This,\r
-  IN UINT32                MediaId,\r
-  IN EFI_LBA               Lba,\r
-  IN UINTN                 BufferSize,\r
-  IN VOID                  *Buffer\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN UINT32                 MediaId,\r
+  IN EFI_LBA                Lba,\r
+  IN UINTN                  BufferSize,\r
+  IN VOID                   *Buffer\r
   )\r
 {\r
-  VBLK_DEV   *Dev;\r
-  EFI_STATUS Status;\r
+  VBLK_DEV    *Dev;\r
+  EFI_STATUS  Status;\r
 \r
   if (BufferSize == 0) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  Dev = VIRTIO_BLK_FROM_BLOCK_IO (This);\r
+  Dev    = VIRTIO_BLK_FROM_BLOCK_IO (This);\r
   Status = VerifyReadWriteRequest (\r
              &Dev->BlockIoMedia,\r
              Lba,\r
@@ -565,7 +565,6 @@ VirtioBlkWriteBlocks (
            );\r
 }\r
 \r
-\r
 /**\r
 \r
   FlushBlocks() operation for virtio-blk.\r
@@ -582,28 +581,26 @@ VirtioBlkWriteBlocks (
   Should they do nonetheless, we do nothing, successfully.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkFlushBlocks (\r
-  IN EFI_BLOCK_IO_PROTOCOL *This\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This\r
   )\r
 {\r
-  VBLK_DEV *Dev;\r
+  VBLK_DEV  *Dev;\r
 \r
   Dev = VIRTIO_BLK_FROM_BLOCK_IO (This);\r
   return Dev->BlockIoMedia.WriteCaching ?\r
-           SynchronousRequest (\r
-             Dev,\r
-             0,    // Lba\r
-             0,    // BufferSize\r
-             NULL, // Buffer\r
-             TRUE  // RequestIsWrite\r
-             ) :\r
-           EFI_SUCCESS;\r
+         SynchronousRequest (\r
+           Dev,\r
+           0,      // Lba\r
+           0,      // BufferSize\r
+           NULL,   // Buffer\r
+           TRUE    // RequestIsWrite\r
+           ) :\r
+         EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
 \r
   Device probe function for this driver.\r
@@ -640,17 +637,16 @@ VirtioBlkFlushBlocks (
                            the VirtIo protocol.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  VIRTIO_DEVICE_PROTOCOL *VirtIo;\r
+  EFI_STATUS              Status;\r
+  VIRTIO_DEVICE_PROTOCOL  *VirtIo;\r
 \r
   //\r
   // Attempt to open the device with the VirtIo set of interfaces. On success,\r
@@ -679,12 +675,15 @@ VirtioBlkDriverBindingSupported (
   // We needed VirtIo access only transitorily, to see whether we support the\r
   // device or not.\r
   //\r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
 \r
   Set up all BlockIo and virtio-blk aspects of this driver for the specified\r
@@ -704,47 +703,46 @@ VirtioBlkDriverBindingSupported (
                            VirtioRingMap().\r
 \r
 **/\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkInit (\r
-  IN OUT VBLK_DEV *Dev\r
+  IN OUT VBLK_DEV  *Dev\r
   )\r
 {\r
-  UINT8      NextDevStat;\r
-  EFI_STATUS Status;\r
-\r
-  UINT64     Features;\r
-  UINT64     NumSectors;\r
-  UINT32     BlockSize;\r
-  UINT8      PhysicalBlockExp;\r
-  UINT8      AlignmentOffset;\r
-  UINT32     OptIoSize;\r
-  UINT16     QueueSize;\r
-  UINT64     RingBaseShift;\r
+  UINT8       NextDevStat;\r
+  EFI_STATUS  Status;\r
+\r
+  UINT64  Features;\r
+  UINT64  NumSectors;\r
+  UINT32  BlockSize;\r
+  UINT8   PhysicalBlockExp;\r
+  UINT8   AlignmentOffset;\r
+  UINT32  OptIoSize;\r
+  UINT16  QueueSize;\r
+  UINT64  RingBaseShift;\r
 \r
   PhysicalBlockExp = 0;\r
-  AlignmentOffset = 0;\r
-  OptIoSize = 0;\r
+  AlignmentOffset  = 0;\r
+  OptIoSize        = 0;\r
 \r
   //\r
   // Execute virtio-0.9.5, 2.2.1 Device Initialization Sequence.\r
   //\r
   NextDevStat = 0;             // step 1 -- reset device\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status      = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
 \r
   NextDevStat |= VSTAT_ACK;    // step 2 -- acknowledge device presence\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
 \r
   NextDevStat |= VSTAT_DRIVER; // step 3 -- we know how to drive it\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
@@ -769,6 +767,7 @@ VirtioBlkInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   if (NumSectors == 0) {\r
     Status = EFI_UNSUPPORTED;\r
     goto Failed;\r
@@ -779,8 +778,10 @@ VirtioBlkInit (
     if (EFI_ERROR (Status)) {\r
       goto Failed;\r
     }\r
-    if (BlockSize == 0 || BlockSize % 512 != 0 ||\r
-        ModU64x32 (NumSectors, BlockSize / 512) != 0) {\r
+\r
+    if ((BlockSize == 0) || (BlockSize % 512 != 0) ||\r
+        (ModU64x32 (NumSectors, BlockSize / 512) != 0))\r
+    {\r
       //\r
       // We can only handle a logical block consisting of whole sectors,\r
       // and only a disk composed of whole logical blocks.\r
@@ -788,17 +789,20 @@ VirtioBlkInit (
       Status = EFI_UNSUPPORTED;\r
       goto Failed;\r
     }\r
-  }\r
-  else {\r
+  } else {\r
     BlockSize = 512;\r
   }\r
 \r
   if (Features & VIRTIO_BLK_F_TOPOLOGY) {\r
-    Status = VIRTIO_CFG_READ (Dev, Topology.PhysicalBlockExp,\r
-               &PhysicalBlockExp);\r
+    Status = VIRTIO_CFG_READ (\r
+               Dev,\r
+               Topology.PhysicalBlockExp,\r
+               &PhysicalBlockExp\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       goto Failed;\r
     }\r
+\r
     if (PhysicalBlockExp >= 32) {\r
       Status = EFI_UNSUPPORTED;\r
       goto Failed;\r
@@ -837,11 +841,14 @@ VirtioBlkInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   Status = Dev->VirtIo->GetQueueNumMax (Dev->VirtIo, &QueueSize);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
-  if (QueueSize < 3) { // SynchronousRequest() uses at most three descriptors\r
+\r
+  if (QueueSize < 3) {\r
+    // SynchronousRequest() uses at most three descriptors\r
     Status = EFI_UNSUPPORTED;\r
     goto Failed;\r
   }\r
@@ -890,13 +897,12 @@ VirtioBlkInit (
     goto UnmapQueue;\r
   }\r
 \r
-\r
   //\r
   // step 5 -- Report understood features.\r
   //\r
   if (Dev->VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) {\r
     Features &= ~(UINT64)(VIRTIO_F_VERSION_1 | VIRTIO_F_IOMMU_PLATFORM);\r
-    Status = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);\r
+    Status    = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);\r
     if (EFI_ERROR (Status)) {\r
       goto UnmapQueue;\r
     }\r
@@ -906,7 +912,7 @@ VirtioBlkInit (
   // step 6 -- initialization complete\r
   //\r
   NextDevStat |= VSTAT_DRIVER_OK;\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto UnmapQueue;\r
   }\r
@@ -925,30 +931,45 @@ VirtioBlkInit (
   Dev->BlockIoMedia.RemovableMedia   = FALSE;\r
   Dev->BlockIoMedia.MediaPresent     = TRUE;\r
   Dev->BlockIoMedia.LogicalPartition = FALSE;\r
-  Dev->BlockIoMedia.ReadOnly         = (BOOLEAN) ((Features & VIRTIO_BLK_F_RO) != 0);\r
-  Dev->BlockIoMedia.WriteCaching     = (BOOLEAN) ((Features & VIRTIO_BLK_F_FLUSH) != 0);\r
+  Dev->BlockIoMedia.ReadOnly         = (BOOLEAN)((Features & VIRTIO_BLK_F_RO) != 0);\r
+  Dev->BlockIoMedia.WriteCaching     = (BOOLEAN)((Features & VIRTIO_BLK_F_FLUSH) != 0);\r
   Dev->BlockIoMedia.BlockSize        = BlockSize;\r
   Dev->BlockIoMedia.IoAlign          = 0;\r
-  Dev->BlockIoMedia.LastBlock        = DivU64x32 (NumSectors,\r
-                                         BlockSize / 512) - 1;\r
-\r
-  DEBUG ((DEBUG_INFO, "%a: LbaSize=0x%x[B] NumBlocks=0x%Lx[Lba]\n",\r
-    __FUNCTION__, Dev->BlockIoMedia.BlockSize,\r
-    Dev->BlockIoMedia.LastBlock + 1));\r
+  Dev->BlockIoMedia.LastBlock        = DivU64x32 (\r
+                                         NumSectors,\r
+                                         BlockSize / 512\r
+                                         ) - 1;\r
+\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: LbaSize=0x%x[B] NumBlocks=0x%Lx[Lba]\n",\r
+    __FUNCTION__,\r
+    Dev->BlockIoMedia.BlockSize,\r
+    Dev->BlockIoMedia.LastBlock + 1\r
+    ));\r
 \r
   if (Features & VIRTIO_BLK_F_TOPOLOGY) {\r
     Dev->BlockIo.Revision = EFI_BLOCK_IO_PROTOCOL_REVISION3;\r
 \r
-    Dev->BlockIoMedia.LowestAlignedLba = AlignmentOffset;\r
-    Dev->BlockIoMedia.LogicalBlocksPerPhysicalBlock = 1u << PhysicalBlockExp;\r
+    Dev->BlockIoMedia.LowestAlignedLba                 = AlignmentOffset;\r
+    Dev->BlockIoMedia.LogicalBlocksPerPhysicalBlock    = 1u << PhysicalBlockExp;\r
     Dev->BlockIoMedia.OptimalTransferLengthGranularity = OptIoSize;\r
 \r
-    DEBUG ((DEBUG_INFO, "%a: FirstAligned=0x%Lx[Lba] PhysBlkSize=0x%x[Lba]\n",\r
-      __FUNCTION__, Dev->BlockIoMedia.LowestAlignedLba,\r
-      Dev->BlockIoMedia.LogicalBlocksPerPhysicalBlock));\r
-    DEBUG ((DEBUG_INFO, "%a: OptimalTransferLengthGranularity=0x%x[Lba]\n",\r
-      __FUNCTION__, Dev->BlockIoMedia.OptimalTransferLengthGranularity));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: FirstAligned=0x%Lx[Lba] PhysBlkSize=0x%x[Lba]\n",\r
+      __FUNCTION__,\r
+      Dev->BlockIoMedia.LowestAlignedLba,\r
+      Dev->BlockIoMedia.LogicalBlocksPerPhysicalBlock\r
+      ));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: OptimalTransferLengthGranularity=0x%x[Lba]\n",\r
+      __FUNCTION__,\r
+      Dev->BlockIoMedia.OptimalTransferLengthGranularity\r
+      ));\r
   }\r
+\r
   return EFI_SUCCESS;\r
 \r
 UnmapQueue:\r
@@ -968,7 +989,6 @@ Failed:
   return Status; // reached only via Failed above\r
 }\r
 \r
-\r
 /**\r
 \r
   Uninitialize the internals of a virtio-blk device that has been successfully\r
@@ -977,12 +997,11 @@ Failed:
   @param[in out]  Dev  The device to clean up.\r
 \r
 **/\r
-\r
 STATIC\r
 VOID\r
 EFIAPI\r
 VirtioBlkUninit (\r
-  IN OUT VBLK_DEV *Dev\r
+  IN OUT VBLK_DEV  *Dev\r
   )\r
 {\r
   //\r
@@ -995,11 +1014,10 @@ VirtioBlkUninit (
   Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, Dev->RingMap);\r
   VirtioRingUninit (Dev->VirtIo, &Dev->Ring);\r
 \r
-  SetMem (&Dev->BlockIo,      sizeof Dev->BlockIo,      0x00);\r
+  SetMem (&Dev->BlockIo, sizeof Dev->BlockIo, 0x00);\r
   SetMem (&Dev->BlockIoMedia, sizeof Dev->BlockIoMedia, 0x00);\r
 }\r
 \r
-\r
 /**\r
 \r
   Event notification function enqueued by ExitBootServices().\r
@@ -1009,16 +1027,15 @@ VirtioBlkUninit (
   @param[in] Context  Pointer to the VBLK_DEV structure.\r
 \r
 **/\r
-\r
 STATIC\r
 VOID\r
 EFIAPI\r
 VirtioBlkExitBoot (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  VBLK_DEV *Dev;\r
+  VBLK_DEV  *Dev;\r
 \r
   DEBUG ((DEBUG_VERBOSE, "%a: Context=0x%p\n", __FUNCTION__, Context));\r
   //\r
@@ -1060,26 +1077,30 @@ VirtioBlkExitBoot (
                                 or the InstallProtocolInterface() boot service.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  VBLK_DEV   *Dev;\r
-  EFI_STATUS Status;\r
+  VBLK_DEV    *Dev;\r
+  EFI_STATUS  Status;\r
 \r
-  Dev = (VBLK_DEV *) AllocateZeroPool (sizeof *Dev);\r
+  Dev = (VBLK_DEV *)AllocateZeroPool (sizeof *Dev);\r
   if (Dev == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->OpenProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-                  (VOID **)&Dev->VirtIo, This->DriverBindingHandle,\r
-                  DeviceHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  (VOID **)&Dev->VirtIo,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeVirtioBlk;\r
   }\r
@@ -1092,8 +1113,13 @@ VirtioBlkDriverBindingStart (
     goto CloseVirtIo;\r
   }\r
 \r
-  Status = gBS->CreateEvent (EVT_SIGNAL_EXIT_BOOT_SERVICES, TPL_CALLBACK,\r
-                  &VirtioBlkExitBoot, Dev, &Dev->ExitBoot);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+                  TPL_CALLBACK,\r
+                  &VirtioBlkExitBoot,\r
+                  Dev,\r
+                  &Dev->ExitBoot\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto UninitDev;\r
   }\r
@@ -1102,9 +1128,12 @@ VirtioBlkDriverBindingStart (
   // Setup complete, attempt to export the driver instance's BlockIo interface.\r
   //\r
   Dev->Signature = VBLK_SIG;\r
-  Status = gBS->InstallProtocolInterface (&DeviceHandle,\r
-                  &gEfiBlockIoProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  &Dev->BlockIo);\r
+  Status         = gBS->InstallProtocolInterface (\r
+                          &DeviceHandle,\r
+                          &gEfiBlockIoProtocolGuid,\r
+                          EFI_NATIVE_INTERFACE,\r
+                          &Dev->BlockIo\r
+                          );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseExitBoot;\r
   }\r
@@ -1118,8 +1147,12 @@ UninitDev:
   VirtioBlkUninit (Dev);\r
 \r
 CloseVirtIo:\r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
 FreeVirtioBlk:\r
   FreePool (Dev);\r
@@ -1127,7 +1160,6 @@ FreeVirtioBlk:
   return Status;\r
 }\r
 \r
-\r
 /**\r
 \r
   Stop driving a virtio-blk device and remove its BlockIo interface.\r
@@ -1150,19 +1182,18 @@ FreeVirtioBlk:
   @param[in] ChildHandleBuffer  Ignored (corresponding to NumberOfChildren).\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
-  VBLK_DEV              *Dev;\r
+  EFI_STATUS             Status;\r
+  EFI_BLOCK_IO_PROTOCOL  *BlockIo;\r
+  VBLK_DEV               *Dev;\r
 \r
   Status = gBS->OpenProtocol (\r
                   DeviceHandle,                  // candidate device\r
@@ -1181,8 +1212,11 @@ VirtioBlkDriverBindingStop (
   //\r
   // Handle Stop() requests for in-use driver instances gracefully.\r
   //\r
-  Status = gBS->UninstallProtocolInterface (DeviceHandle,\r
-                  &gEfiBlockIoProtocolGuid, &Dev->BlockIo);\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  DeviceHandle,\r
+                  &gEfiBlockIoProtocolGuid,\r
+                  &Dev->BlockIo\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1191,21 +1225,24 @@ VirtioBlkDriverBindingStop (
 \r
   VirtioBlkUninit (Dev);\r
 \r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
   FreePool (Dev);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 //\r
 // The static object that groups the Supported() (ie. probe), Start() and\r
 // Stop() functions of the driver together. Refer to UEFI Spec 2.3.1 + Errata\r
 // C, 10.1 EFI Driver Binding Protocol.\r
 //\r
-STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {\r
+STATIC EFI_DRIVER_BINDING_PROTOCOL  gDriverBinding = {\r
   &VirtioBlkDriverBindingSupported,\r
   &VirtioBlkDriverBindingStart,\r
   &VirtioBlkDriverBindingStop,\r
@@ -1215,7 +1252,6 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
   NULL  // DriverBindingHandle, ditto\r
 };\r
 \r
-\r
 //\r
 // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL and\r
 // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's name\r
@@ -1229,20 +1265,20 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
 //\r
 \r
 STATIC\r
-EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "eng;en", L"Virtio Block Driver" },\r
   { NULL,     NULL                   }\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName;\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -1257,39 +1293,38 @@ VirtioBlkGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName = {\r
   &VirtioBlkGetDriverName,\r
   &VirtioBlkGetDeviceName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME2_PROTOCOL gComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &VirtioBlkGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &VirtioBlkGetDeviceName,\r
+EFI_COMPONENT_NAME2_PROTOCOL  gComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&VirtioBlkGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&VirtioBlkGetDeviceName,\r
   "en" // SupportedLanguages, RFC 4646 language codes\r
 };\r
 \r
-\r
 //\r
 // Entry point of this driver.\r
 //\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r
@@ -1301,4 +1336,3 @@ VirtioBlkEntryPoint (
            &gComponentName2\r
            );\r
 }\r
-\r
index efbbe2162fcde33553b6b8ee8b78ed418c85ab27..54a96626ffe4d3ad1eee026d71656e0f25c4d202 100644 (file)
@@ -18,8 +18,7 @@
 \r
 #include <IndustryStandard/Virtio.h>\r
 \r
-\r
-#define VBLK_SIG SIGNATURE_32 ('V', 'B', 'L', 'K')\r
+#define VBLK_SIG  SIGNATURE_32 ('V', 'B', 'L', 'K')\r
 \r
 typedef struct {\r
   //\r
@@ -29,19 +28,18 @@ typedef struct {
   //\r
   //                     field                    init function       init dpth\r
   //                     ---------------------    ------------------  ---------\r
-  UINT32                 Signature;            // DriverBindingStart  0\r
-  VIRTIO_DEVICE_PROTOCOL *VirtIo;              // DriverBindingStart  0\r
-  EFI_EVENT              ExitBoot;             // DriverBindingStart  0\r
-  VRING                  Ring;                 // VirtioRingInit      2\r
-  EFI_BLOCK_IO_PROTOCOL  BlockIo;              // VirtioBlkInit       1\r
-  EFI_BLOCK_IO_MEDIA     BlockIoMedia;         // VirtioBlkInit       1\r
-  VOID                   *RingMap;             // VirtioRingMap       2\r
+  UINT32                    Signature;         // DriverBindingStart  0\r
+  VIRTIO_DEVICE_PROTOCOL    *VirtIo;           // DriverBindingStart  0\r
+  EFI_EVENT                 ExitBoot;          // DriverBindingStart  0\r
+  VRING                     Ring;              // VirtioRingInit      2\r
+  EFI_BLOCK_IO_PROTOCOL     BlockIo;           // VirtioBlkInit       1\r
+  EFI_BLOCK_IO_MEDIA        BlockIoMedia;      // VirtioBlkInit       1\r
+  VOID                      *RingMap;          // VirtioRingMap       2\r
 } VBLK_DEV;\r
 \r
 #define VIRTIO_BLK_FROM_BLOCK_IO(BlockIoPointer) \\r
         CR (BlockIoPointer, VBLK_DEV, BlockIo, VBLK_SIG)\r
 \r
-\r
 /**\r
 \r
   Device probe function for this driver.\r
@@ -81,12 +79,11 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   );\r
 \r
-\r
 /**\r
 \r
   After we've pronounced support for a specific device in\r
@@ -119,12 +116,11 @@ VirtioBlkDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   );\r
 \r
-\r
 /**\r
 \r
   Stop driving a virtio-blk device and remove its BlockIo interface.\r
@@ -151,13 +147,12 @@ VirtioBlkDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   );\r
 \r
-\r
 //\r
 // UEFI Spec 2.3.1 + Errata C, 12.8 EFI Block I/O Protocol\r
 // Driver Writer's Guide for UEFI 2.3.1 v1.01,\r
@@ -166,11 +161,10 @@ VirtioBlkDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkReset (\r
-  IN EFI_BLOCK_IO_PROTOCOL *This,\r
-  IN BOOLEAN               ExtendedVerification\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN BOOLEAN                ExtendedVerification\r
   );\r
 \r
-\r
 /**\r
 \r
   ReadBlocks() operation for virtio-blk.\r
@@ -192,14 +186,13 @@ VirtioBlkReset (
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkReadBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL *This,\r
-  IN  UINT32                MediaId,\r
-  IN  EFI_LBA               Lba,\r
-  IN  UINTN                 BufferSize,\r
-  OUT VOID                  *Buffer\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  UINT32                 MediaId,\r
+  IN  EFI_LBA                Lba,\r
+  IN  UINTN                  BufferSize,\r
+  OUT VOID                   *Buffer\r
   );\r
 \r
-\r
 /**\r
 \r
   WriteBlocks() operation for virtio-blk.\r
@@ -221,14 +214,13 @@ VirtioBlkReadBlocks (
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkWriteBlocks (\r
-  IN EFI_BLOCK_IO_PROTOCOL *This,\r
-  IN UINT32                MediaId,\r
-  IN EFI_LBA               Lba,\r
-  IN UINTN                 BufferSize,\r
-  IN VOID                  *Buffer\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN UINT32                 MediaId,\r
+  IN EFI_LBA                Lba,\r
+  IN UINTN                  BufferSize,\r
+  IN VOID                   *Buffer\r
   );\r
 \r
-\r
 /**\r
 \r
   FlushBlocks() operation for virtio-blk.\r
@@ -249,10 +241,9 @@ VirtioBlkWriteBlocks (
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkFlushBlocks (\r
-  IN EFI_BLOCK_IO_PROTOCOL *This\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This\r
   );\r
 \r
-\r
 //\r
 // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL and\r
 // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's name\r
@@ -268,19 +259,19 @@ VirtioBlkFlushBlocks (
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioBlkGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
 #endif // _VIRTIO_BLK_DXE_H_\r
index e273c9f362eb5fc92c7cde1ebfd3ceb29e6101fc..86eb9cf0ba51b72c72838fc7400a3d9cbb337720 100644 (file)
@@ -17,8 +17,8 @@
 //\r
 // UEFI Driver Model protocol instances.\r
 //\r
-STATIC EFI_DRIVER_BINDING_PROTOCOL  mDriverBinding;\r
-STATIC EFI_COMPONENT_NAME2_PROTOCOL mComponentName2;\r
+STATIC EFI_DRIVER_BINDING_PROTOCOL   mDriverBinding;\r
+STATIC EFI_COMPONENT_NAME2_PROTOCOL  mComponentName2;\r
 \r
 //\r
 // UEFI Driver Model protocol member functions.\r
@@ -26,18 +26,23 @@ STATIC EFI_COMPONENT_NAME2_PROTOCOL mComponentName2;
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  VIRTIO_DEVICE_PROTOCOL *Virtio;\r
-  EFI_STATUS             CloseStatus;\r
-\r
-  Status = gBS->OpenProtocol (ControllerHandle, &gVirtioDeviceProtocolGuid,\r
-                  (VOID **)&Virtio, This->DriverBindingHandle,\r
-                  ControllerHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  EFI_STATUS              Status;\r
+  VIRTIO_DEVICE_PROTOCOL  *Virtio;\r
+  EFI_STATUS              CloseStatus;\r
+\r
+  Status = gBS->OpenProtocol (\r
+                  ControllerHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  (VOID **)&Virtio,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -46,9 +51,12 @@ VirtioFsBindingSupported (
     Status = EFI_UNSUPPORTED;\r
   }\r
 \r
-  CloseStatus = gBS->CloseProtocol (ControllerHandle,\r
-                       &gVirtioDeviceProtocolGuid, This->DriverBindingHandle,\r
-                       ControllerHandle);\r
+  CloseStatus = gBS->CloseProtocol (\r
+                       ControllerHandle,\r
+                       &gVirtioDeviceProtocolGuid,\r
+                       This->DriverBindingHandle,\r
+                       ControllerHandle\r
+                       );\r
   ASSERT_EFI_ERROR (CloseStatus);\r
 \r
   return Status;\r
@@ -57,24 +65,30 @@ VirtioFsBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  VIRTIO_FS  *VirtioFs;\r
-  EFI_STATUS Status;\r
-  EFI_STATUS CloseStatus;\r
+  VIRTIO_FS   *VirtioFs;\r
+  EFI_STATUS  Status;\r
+  EFI_STATUS  CloseStatus;\r
 \r
   VirtioFs = AllocatePool (sizeof *VirtioFs);\r
   if (VirtioFs == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   VirtioFs->Signature = VIRTIO_FS_SIG;\r
 \r
-  Status = gBS->OpenProtocol (ControllerHandle, &gVirtioDeviceProtocolGuid,\r
-                  (VOID **)&VirtioFs->Virtio, This->DriverBindingHandle,\r
-                  ControllerHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  Status = gBS->OpenProtocol (\r
+                  ControllerHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  (VOID **)&VirtioFs->Virtio,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeVirtioFs;\r
   }\r
@@ -89,8 +103,13 @@ VirtioFsBindingStart (
     goto UninitVirtioFs;\r
   }\r
 \r
-  Status = gBS->CreateEvent (EVT_SIGNAL_EXIT_BOOT_SERVICES, TPL_CALLBACK,\r
-                  VirtioFsExitBoot, VirtioFs, &VirtioFs->ExitBoot);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+                  TPL_CALLBACK,\r
+                  VirtioFsExitBoot,\r
+                  VirtioFs,\r
+                  &VirtioFs->ExitBoot\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto UninitVirtioFs;\r
   }\r
@@ -99,9 +118,12 @@ VirtioFsBindingStart (
   VirtioFs->SimpleFs.Revision   = EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION;\r
   VirtioFs->SimpleFs.OpenVolume = VirtioFsOpenVolume;\r
 \r
-  Status = gBS->InstallProtocolInterface (&ControllerHandle,\r
-                  &gEfiSimpleFileSystemProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  &VirtioFs->SimpleFs);\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &ControllerHandle,\r
+                  &gEfiSimpleFileSystemProtocolGuid,\r
+                  EFI_NATIVE_INTERFACE,\r
+                  &VirtioFs->SimpleFs\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseExitBoot;\r
   }\r
@@ -116,9 +138,12 @@ UninitVirtioFs:
   VirtioFsUninit (VirtioFs);\r
 \r
 CloseVirtio:\r
-  CloseStatus = gBS->CloseProtocol (ControllerHandle,\r
-                       &gVirtioDeviceProtocolGuid, This->DriverBindingHandle,\r
-                       ControllerHandle);\r
+  CloseStatus = gBS->CloseProtocol (\r
+                       ControllerHandle,\r
+                       &gVirtioDeviceProtocolGuid,\r
+                       This->DriverBindingHandle,\r
+                       ControllerHandle\r
+                       );\r
   ASSERT_EFI_ERROR (CloseStatus);\r
 \r
 FreeVirtioFs:\r
@@ -130,20 +155,24 @@ FreeVirtioFs:
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *SimpleFs;\r
-  VIRTIO_FS                       *VirtioFs;\r
-\r
-  Status = gBS->OpenProtocol (ControllerHandle,\r
-                  &gEfiSimpleFileSystemProtocolGuid, (VOID **)&SimpleFs,\r
-                  This->DriverBindingHandle, ControllerHandle,\r
-                  EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+  EFI_STATUS                       Status;\r
+  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *SimpleFs;\r
+  VIRTIO_FS                        *VirtioFs;\r
+\r
+  Status = gBS->OpenProtocol (\r
+                  ControllerHandle,\r
+                  &gEfiSimpleFileSystemProtocolGuid,\r
+                  (VOID **)&SimpleFs,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -154,8 +183,11 @@ VirtioFsBindingStop (
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
-  Status = gBS->UninstallProtocolInterface (ControllerHandle,\r
-                  &gEfiSimpleFileSystemProtocolGuid, SimpleFs);\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  ControllerHandle,\r
+                  &gEfiSimpleFileSystemProtocolGuid,\r
+                  SimpleFs\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -165,8 +197,12 @@ VirtioFsBindingStop (
 \r
   VirtioFsUninit (VirtioFs);\r
 \r
-  Status = gBS->CloseProtocol (ControllerHandle, &gVirtioDeviceProtocolGuid,\r
-                  This->DriverBindingHandle, ControllerHandle);\r
+  Status = gBS->CloseProtocol (\r
+                  ControllerHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   FreePool (VirtioFs);\r
@@ -177,14 +213,15 @@ VirtioFsBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsGetDriverName (\r
-  IN  EFI_COMPONENT_NAME2_PROTOCOL *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
+  IN  EFI_COMPONENT_NAME2_PROTOCOL  *This,\r
+  IN  CHAR8                         *Language,\r
+  OUT CHAR16                        **DriverName\r
   )\r
 {\r
   if (AsciiStrCmp (Language, "en") != 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   *DriverName = L"Virtio Filesystem Driver";\r
   return EFI_SUCCESS;\r
 }\r
@@ -192,11 +229,11 @@ VirtioFsGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsGetControllerName (\r
-  IN  EFI_COMPONENT_NAME2_PROTOCOL *This,\r
-  IN  EFI_HANDLE                   ControllerHandle,\r
-  IN  EFI_HANDLE                   ChildHandle OPTIONAL,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **ControllerName\r
+  IN  EFI_COMPONENT_NAME2_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                    ControllerHandle,\r
+  IN  EFI_HANDLE                    ChildHandle OPTIONAL,\r
+  IN  CHAR8                         *Language,\r
+  OUT CHAR16                        **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -208,11 +245,11 @@ VirtioFsGetControllerName (
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   mDriverBinding.Supported           = VirtioFsBindingSupported;\r
   mDriverBinding.Start               = VirtioFsBindingStart;\r
@@ -225,8 +262,13 @@ VirtioFsEntryPoint (
   mComponentName2.GetControllerName  = VirtioFsGetControllerName;\r
   mComponentName2.SupportedLanguages = "en";\r
 \r
-  Status = gBS->InstallMultipleProtocolInterfaces (&ImageHandle,\r
-                  &gEfiDriverBindingProtocolGuid, &mDriverBinding,\r
-                  &gEfiComponentName2ProtocolGuid, &mComponentName2, NULL);\r
+  Status = gBS->InstallMultipleProtocolInterfaces (\r
+                  &ImageHandle,\r
+                  &gEfiDriverBindingProtocolGuid,\r
+                  &mDriverBinding,\r
+                  &gEfiComponentName2ProtocolGuid,\r
+                  &mComponentName2,\r
+                  NULL\r
+                  );\r
   return Status;\r
 }\r
index b689ad32910aa4c2eb7c66102f2ec737ac2f1443..ff5d6f3f5a88047616a02a49b0f25e4404937232 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseFlush (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    FuseHandle\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     FuseHandle\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_FUSE_FLUSH_REQUEST  FlushReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE       CommonResp;\r
-  VIRTIO_FS_IO_VECTOR           RespIoVec[1];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST RespSgList;\r
-  EFI_STATUS                    Status;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_FUSE_FLUSH_REQUEST   FlushReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
+  VIRTIO_FS_IO_VECTOR            RespIoVec[1];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
+  EFI_STATUS                     Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -75,8 +75,13 @@ VirtioFsFuseFlush (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpFlush, NodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpFlush,\r
+             NodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -102,10 +107,18 @@ VirtioFsFuseFlush (
   //\r
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (Status == EFI_DEVICE_ERROR) {\r
-    DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu "\r
-      "Errno=%d\n", __FUNCTION__, VirtioFs->Label, NodeId, FuseHandle,\r
-      CommonResp.Error));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu "\r
+      "Errno=%d\n",\r
+      __FUNCTION__,\r
+      VirtioFs->Label,\r
+      NodeId,\r
+      FuseHandle,\r
+      CommonResp.Error\r
+      ));\r
     Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
   }\r
+\r
   return Status;\r
 }\r
index fdee42cffbff7d5faaea780155a07aafb35e5594..0ed83f1e19d500538acfe548c42b33015e49fa8d 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseForget (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_FUSE_FORGET_REQUEST ForgetReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  EFI_STATUS                    Status;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_FUSE_FORGET_REQUEST  ForgetReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  EFI_STATUS                     Status;\r
 \r
   //\r
   // Set up the scatter-gather list (note: only request).\r
@@ -66,8 +66,13 @@ VirtioFsFuseForget (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpForget, NodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpForget,\r
+             NodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
index ea1463cd8073bde25e03166fb86e466b22896c0f..c537b064e60e85593671e085ae30f4fa37d91be5 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseFsyncFileOrDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    FuseHandle,\r
-  IN     BOOLEAN   IsDir\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     FuseHandle,\r
+  IN     BOOLEAN    IsDir\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_FUSE_FSYNC_REQUEST  FsyncReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE       CommonResp;\r
-  VIRTIO_FS_IO_VECTOR           RespIoVec[1];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST RespSgList;\r
-  EFI_STATUS                    Status;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_FUSE_FSYNC_REQUEST   FsyncReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
+  VIRTIO_FS_IO_VECTOR            RespIoVec[1];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
+  EFI_STATUS                     Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -112,10 +112,19 @@ VirtioFsFuseFsyncFileOrDir (
   //\r
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (Status == EFI_DEVICE_ERROR) {\r
-    DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu "\r
-      "IsDir=%d Errno=%d\n", __FUNCTION__, VirtioFs->Label, NodeId, FuseHandle,\r
-      IsDir, CommonResp.Error));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu "\r
+      "IsDir=%d Errno=%d\n",\r
+      __FUNCTION__,\r
+      VirtioFs->Label,\r
+      NodeId,\r
+      FuseHandle,\r
+      IsDir,\r
+      CommonResp.Error\r
+      ));\r
     Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
   }\r
+\r
   return Status;\r
 }\r
index 29d8ec8190e1fc4515db378ae168cc623f9797e5..1dc0349a55be97c89c9f0f106abf4a0ba8f7bf1e 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseGetAttr (\r
-  IN OUT VIRTIO_FS                          *VirtioFs,\r
-  IN     UINT64                             NodeId,\r
-     OUT VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE *FuseAttr\r
+  IN OUT VIRTIO_FS                        *VirtioFs,\r
+  IN     UINT64                           NodeId,\r
+  OUT VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  *FuseAttr\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST          CommonReq;\r
-  VIRTIO_FS_FUSE_GETATTR_REQUEST  GetAttrReq;\r
-  VIRTIO_FS_IO_VECTOR             ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST   ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE         CommonResp;\r
-  VIRTIO_FS_FUSE_GETATTR_RESPONSE GetAttrResp;\r
-  VIRTIO_FS_IO_VECTOR             RespIoVec[3];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST   RespSgList;\r
-  EFI_STATUS                      Status;\r
+  VIRTIO_FS_FUSE_REQUEST           CommonReq;\r
+  VIRTIO_FS_FUSE_GETATTR_REQUEST   GetAttrReq;\r
+  VIRTIO_FS_IO_VECTOR              ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST    ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE          CommonResp;\r
+  VIRTIO_FS_FUSE_GETATTR_RESPONSE  GetAttrResp;\r
+  VIRTIO_FS_IO_VECTOR              RespIoVec[3];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST    RespSgList;\r
+  EFI_STATUS                       Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -82,8 +82,13 @@ VirtioFsFuseGetAttr (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpGetAttr, NodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpGetAttr,\r
+             NodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -108,9 +113,16 @@ VirtioFsFuseGetAttr (
   //\r
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (Status == EFI_DEVICE_ERROR) {\r
-    DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu Errno=%d\n",\r
-      __FUNCTION__, VirtioFs->Label, NodeId, CommonResp.Error));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: Label=\"%s\" NodeId=%Lu Errno=%d\n",\r
+      __FUNCTION__,\r
+      VirtioFs->Label,\r
+      NodeId,\r
+      CommonResp.Error\r
+      ));\r
     Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
   }\r
+\r
   return Status;\r
 }\r
index 4318428049127a5da5e554498d319d3cca63fb13..d34fc05a50dd90309cd0842ad29377a43ac6f3c6 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseInitSession (\r
-  IN OUT VIRTIO_FS *VirtioFs\r
+  IN OUT VIRTIO_FS  *VirtioFs\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_FUSE_INIT_REQUEST   InitReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE       CommonResp;\r
-  VIRTIO_FS_FUSE_INIT_RESPONSE  InitResp;\r
-  VIRTIO_FS_IO_VECTOR           RespIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST RespSgList;\r
-  EFI_STATUS                    Status;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_FUSE_INIT_REQUEST    InitReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
+  VIRTIO_FS_FUSE_INIT_RESPONSE   InitResp;\r
+  VIRTIO_FS_IO_VECTOR            RespIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
+  EFI_STATUS                     Status;\r
 \r
   //\r
   // Initialize the FUSE request counter.\r
@@ -89,8 +89,13 @@ VirtioFsFuseInitSession (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpInit, 0);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpInit,\r
+             0\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -117,20 +122,27 @@ VirtioFsFuseInitSession (
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_DEVICE_ERROR) {\r
-      DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" Errno=%d\n", __FUNCTION__,\r
-        VirtioFs->Label, CommonResp.Error));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Label=\"%s\" Errno=%d\n",\r
+        __FUNCTION__,\r
+        VirtioFs->Label,\r
+        CommonResp.Error\r
+        ));\r
       Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
     }\r
+\r
     return Status;\r
   }\r
 \r
   //\r
   // Check FUSE interface version / feature compatibility.\r
   //\r
-  if (InitResp.Major < InitReq.Major ||\r
-      (InitResp.Major == InitReq.Major && InitResp.Minor < InitReq.Minor) ||\r
-      (InitResp.Flags & VIRTIO_FS_FUSE_INIT_REQ_F_DO_READDIRPLUS) == 0 ||\r
-      InitResp.MaxWrite < SIZE_4KB) {\r
+  if ((InitResp.Major < InitReq.Major) ||\r
+      ((InitResp.Major == InitReq.Major) && (InitResp.Minor < InitReq.Minor)) ||\r
+      ((InitResp.Flags & VIRTIO_FS_FUSE_INIT_REQ_F_DO_READDIRPLUS) == 0) ||\r
+      (InitResp.MaxWrite < SIZE_4KB))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
index 5c9a825e172529f42bf16b93f9e3e5294cc1cc24..f2bda8a547ff7b035eb80fae81ffac5dfb1ef502 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseLookup (\r
-  IN OUT VIRTIO_FS                          *VirtioFs,\r
-  IN     UINT64                             DirNodeId,\r
-  IN     CHAR8                              *Name,\r
-     OUT UINT64                             *NodeId,\r
-     OUT VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE *FuseAttr\r
+  IN OUT VIRTIO_FS                        *VirtioFs,\r
+  IN     UINT64                           DirNodeId,\r
+  IN     CHAR8                            *Name,\r
+  OUT UINT64                              *NodeId,\r
+  OUT VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  *FuseAttr\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE       CommonResp;\r
-  VIRTIO_FS_FUSE_NODE_RESPONSE  NodeResp;\r
-  VIRTIO_FS_IO_VECTOR           RespIoVec[3];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST RespSgList;\r
-  EFI_STATUS                    Status;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
+  VIRTIO_FS_FUSE_NODE_RESPONSE   NodeResp;\r
+  VIRTIO_FS_IO_VECTOR            RespIoVec[3];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
+  EFI_STATUS                     Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -98,8 +98,13 @@ VirtioFsFuseLookup (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpLookup, DirNodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpLookup,\r
+             DirNodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto Fail;\r
   }\r
@@ -132,8 +137,10 @@ VirtioFsFuseLookup (
       if (CommonResp.Error == VIRTIO_FS_FUSE_ERRNO_ENOENT) {\r
         return EFI_NOT_FOUND;\r
       }\r
+\r
       Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
     }\r
+\r
     goto Fail;\r
   }\r
 \r
index 541ff330cd1e0b5d60729a7c571dc462a94b87a7..409e09a41895e8b1ab44e5eae7c8fb9c4d433af4 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseMkDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    ParentNodeId,\r
-  IN     CHAR8     *Name,\r
-     OUT UINT64    *NodeId\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     ParentNodeId,\r
+  IN     CHAR8      *Name,\r
+  OUT UINT64        *NodeId\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST             CommonReq;\r
-  VIRTIO_FS_FUSE_MKDIR_REQUEST       MkDirReq;\r
-  VIRTIO_FS_IO_VECTOR                ReqIoVec[3];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST      ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE            CommonResp;\r
-  VIRTIO_FS_FUSE_NODE_RESPONSE       NodeResp;\r
-  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE AttrResp;\r
-  VIRTIO_FS_IO_VECTOR                RespIoVec[3];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST      RespSgList;\r
-  EFI_STATUS                         Status;\r
+  VIRTIO_FS_FUSE_REQUEST              CommonReq;\r
+  VIRTIO_FS_FUSE_MKDIR_REQUEST        MkDirReq;\r
+  VIRTIO_FS_IO_VECTOR                 ReqIoVec[3];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST       ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE             CommonResp;\r
+  VIRTIO_FS_FUSE_NODE_RESPONSE        NodeResp;\r
+  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  AttrResp;\r
+  VIRTIO_FS_IO_VECTOR                 RespIoVec[3];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST       RespSgList;\r
+  EFI_STATUS                          Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -90,8 +90,13 @@ VirtioFsFuseMkDir (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpMkDir, ParentNodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpMkDir,\r
+             ParentNodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -99,9 +104,9 @@ VirtioFsFuseMkDir (
   //\r
   // Populate the FUSE_MKDIR-specific fields.\r
   //\r
-  MkDirReq.Mode  = (VIRTIO_FS_FUSE_MODE_PERM_RWXU |\r
-                    VIRTIO_FS_FUSE_MODE_PERM_RWXG |\r
-                    VIRTIO_FS_FUSE_MODE_PERM_RWXO);\r
+  MkDirReq.Mode = (VIRTIO_FS_FUSE_MODE_PERM_RWXU |\r
+                   VIRTIO_FS_FUSE_MODE_PERM_RWXG |\r
+                   VIRTIO_FS_FUSE_MODE_PERM_RWXO);\r
   MkDirReq.Umask = 0;\r
 \r
   //\r
@@ -118,11 +123,19 @@ VirtioFsFuseMkDir (
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_DEVICE_ERROR) {\r
-      DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" ParentNodeId=%Lu Name=\"%a\" "\r
-        "Errno=%d\n", __FUNCTION__, VirtioFs->Label, ParentNodeId, Name,\r
-        CommonResp.Error));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Label=\"%s\" ParentNodeId=%Lu Name=\"%a\" "\r
+        "Errno=%d\n",\r
+        __FUNCTION__,\r
+        VirtioFs->Label,\r
+        ParentNodeId,\r
+        Name,\r
+        CommonResp.Error\r
+        ));\r
       Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
     }\r
+\r
     return Status;\r
   }\r
 \r
index b731580729b630b0b980db663b3e41e519ba8d23..64015bb6cc7f6a2b6494f2f88bdbf8e078c33246 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseOpen (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     BOOLEAN   ReadWrite,\r
-     OUT UINT64    *FuseHandle\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     BOOLEAN    ReadWrite,\r
+  OUT UINT64        *FuseHandle\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_FUSE_OPEN_REQUEST   OpenReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE       CommonResp;\r
-  VIRTIO_FS_FUSE_OPEN_RESPONSE  OpenResp;\r
-  VIRTIO_FS_IO_VECTOR           RespIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST RespSgList;\r
-  EFI_STATUS                    Status;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_FUSE_OPEN_REQUEST    OpenReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
+  VIRTIO_FS_FUSE_OPEN_RESPONSE   OpenResp;\r
+  VIRTIO_FS_IO_VECTOR            RespIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
+  EFI_STATUS                     Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -82,8 +82,13 @@ VirtioFsFuseOpen (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpOpen, NodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpOpen,\r
+             NodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -91,9 +96,9 @@ VirtioFsFuseOpen (
   //\r
   // Populate the FUSE_OPEN-specific fields.\r
   //\r
-  OpenReq.Flags  = (ReadWrite ?\r
-                    VIRTIO_FS_FUSE_OPEN_REQ_F_RDWR :\r
-                    VIRTIO_FS_FUSE_OPEN_REQ_F_RDONLY);\r
+  OpenReq.Flags = (ReadWrite ?\r
+                   VIRTIO_FS_FUSE_OPEN_REQ_F_RDWR :\r
+                   VIRTIO_FS_FUSE_OPEN_REQ_F_RDONLY);\r
   OpenReq.Unused = 0;\r
 \r
   //\r
@@ -110,11 +115,19 @@ VirtioFsFuseOpen (
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_DEVICE_ERROR) {\r
-      DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu ReadWrite=%d "\r
-        "Errno=%d\n", __FUNCTION__, VirtioFs->Label, NodeId, ReadWrite,\r
-        CommonResp.Error));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Label=\"%s\" NodeId=%Lu ReadWrite=%d "\r
+        "Errno=%d\n",\r
+        __FUNCTION__,\r
+        VirtioFs->Label,\r
+        NodeId,\r
+        ReadWrite,\r
+        CommonResp.Error\r
+        ));\r
       Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
     }\r
+\r
     return Status;\r
   }\r
 \r
index eef522693c3f1a1bcc41184c7aade9356b8534ab..e49c046b9d47f693894b59bf59185d336011969e 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseOpenDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-     OUT UINT64    *FuseHandle\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  OUT UINT64        *FuseHandle\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_FUSE_OPEN_REQUEST   OpenReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE       CommonResp;\r
-  VIRTIO_FS_FUSE_OPEN_RESPONSE  OpenResp;\r
-  VIRTIO_FS_IO_VECTOR           RespIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST RespSgList;\r
-  EFI_STATUS                    Status;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_FUSE_OPEN_REQUEST    OpenReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
+  VIRTIO_FS_FUSE_OPEN_RESPONSE   OpenResp;\r
+  VIRTIO_FS_IO_VECTOR            RespIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
+  EFI_STATUS                     Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -79,8 +79,13 @@ VirtioFsFuseOpenDir (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpOpenDir, NodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpOpenDir,\r
+             NodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -105,10 +110,17 @@ VirtioFsFuseOpenDir (
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_DEVICE_ERROR) {\r
-      DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu Errno=%d\n",\r
-        __FUNCTION__, VirtioFs->Label, NodeId, CommonResp.Error));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Label=\"%s\" NodeId=%Lu Errno=%d\n",\r
+        __FUNCTION__,\r
+        VirtioFs->Label,\r
+        NodeId,\r
+        CommonResp.Error\r
+        ));\r
       Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
     }\r
+\r
     return Status;\r
   }\r
 \r
index 60ab002bcd998f62a95e27796c65d32f31a035cb..4d9846ab3b0599ecdddef6ea838931d9f0412407 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseOpenOrCreate (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    ParentNodeId,\r
-  IN     CHAR8     *Name,\r
-     OUT UINT64    *NodeId,\r
-     OUT UINT64    *FuseHandle\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     ParentNodeId,\r
+  IN     CHAR8      *Name,\r
+  OUT UINT64        *NodeId,\r
+  OUT UINT64        *FuseHandle\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST             CommonReq;\r
-  VIRTIO_FS_FUSE_CREATE_REQUEST      CreateReq;\r
-  VIRTIO_FS_IO_VECTOR                ReqIoVec[3];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST      ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE            CommonResp;\r
-  VIRTIO_FS_FUSE_NODE_RESPONSE       NodeResp;\r
-  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE AttrResp;\r
-  VIRTIO_FS_FUSE_OPEN_RESPONSE       OpenResp;\r
-  VIRTIO_FS_IO_VECTOR                RespIoVec[4];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST      RespSgList;\r
-  EFI_STATUS                         Status;\r
+  VIRTIO_FS_FUSE_REQUEST              CommonReq;\r
+  VIRTIO_FS_FUSE_CREATE_REQUEST       CreateReq;\r
+  VIRTIO_FS_IO_VECTOR                 ReqIoVec[3];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST       ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE             CommonResp;\r
+  VIRTIO_FS_FUSE_NODE_RESPONSE        NodeResp;\r
+  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  AttrResp;\r
+  VIRTIO_FS_FUSE_OPEN_RESPONSE        OpenResp;\r
+  VIRTIO_FS_IO_VECTOR                 RespIoVec[4];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST       RespSgList;\r
+  EFI_STATUS                          Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -99,8 +99,13 @@ VirtioFsFuseOpenOrCreate (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpCreate, ParentNodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpCreate,\r
+             ParentNodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -113,13 +118,13 @@ VirtioFsFuseOpenOrCreate (
   // the only OpenMode of EFI_FILE_PROTOCOL.Open() that enables filesystem\r
   // object creation -- that is, Create/Read/Write.\r
   //\r
-  CreateReq.Flags   = VIRTIO_FS_FUSE_OPEN_REQ_F_RDWR;\r
-  CreateReq.Mode    = (VIRTIO_FS_FUSE_MODE_PERM_RUSR |\r
-                       VIRTIO_FS_FUSE_MODE_PERM_WUSR |\r
-                       VIRTIO_FS_FUSE_MODE_PERM_RGRP |\r
-                       VIRTIO_FS_FUSE_MODE_PERM_WGRP |\r
-                       VIRTIO_FS_FUSE_MODE_PERM_ROTH |\r
-                       VIRTIO_FS_FUSE_MODE_PERM_WOTH);\r
+  CreateReq.Flags = VIRTIO_FS_FUSE_OPEN_REQ_F_RDWR;\r
+  CreateReq.Mode  = (VIRTIO_FS_FUSE_MODE_PERM_RUSR |\r
+                     VIRTIO_FS_FUSE_MODE_PERM_WUSR |\r
+                     VIRTIO_FS_FUSE_MODE_PERM_RGRP |\r
+                     VIRTIO_FS_FUSE_MODE_PERM_WGRP |\r
+                     VIRTIO_FS_FUSE_MODE_PERM_ROTH |\r
+                     VIRTIO_FS_FUSE_MODE_PERM_WOTH);\r
   CreateReq.Umask   = 0;\r
   CreateReq.Padding = 0;\r
 \r
@@ -137,11 +142,19 @@ VirtioFsFuseOpenOrCreate (
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_DEVICE_ERROR) {\r
-      DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" ParentNodeId=%Lu Name=\"%a\" "\r
-        "Errno=%d\n", __FUNCTION__, VirtioFs->Label, ParentNodeId, Name,\r
-        CommonResp.Error));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Label=\"%s\" ParentNodeId=%Lu Name=\"%a\" "\r
+        "Errno=%d\n",\r
+        __FUNCTION__,\r
+        VirtioFs->Label,\r
+        ParentNodeId,\r
+        Name,\r
+        CommonResp.Error\r
+        ));\r
       Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
     }\r
+\r
     return Status;\r
   }\r
 \r
index 1611e298b90da03aab7d00312cf7b4730cf13f2e..013dac7e52f3a795b0be38cb83a5a55f61b83492 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseReadFileOrDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    FuseHandle,\r
-  IN     BOOLEAN   IsDir,\r
-  IN     UINT64    Offset,\r
-  IN OUT UINT32    *Size,\r
-     OUT VOID      *Data\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     FuseHandle,\r
+  IN     BOOLEAN    IsDir,\r
+  IN     UINT64     Offset,\r
+  IN OUT UINT32     *Size,\r
+  OUT VOID          *Data\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_FUSE_READ_REQUEST   ReadReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE       CommonResp;\r
-  VIRTIO_FS_IO_VECTOR           RespIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST RespSgList;\r
-  EFI_STATUS                    Status;\r
-  UINTN                         TailBufferFill;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_FUSE_READ_REQUEST    ReadReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
+  VIRTIO_FS_IO_VECTOR            RespIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
+  EFI_STATUS                     Status;\r
+  UINTN                          TailBufferFill;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -167,16 +167,30 @@ VirtioFsFuseReadFileOrDir (
   //\r
   // Verify the response. Note that TailBufferFill is variable.\r
   //\r
-  Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique,\r
-             &TailBufferFill);\r
+  Status = VirtioFsFuseCheckResponse (\r
+             &RespSgList,\r
+             CommonReq.Unique,\r
+             &TailBufferFill\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_DEVICE_ERROR) {\r
-      DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu "\r
-        "IsDir=%d Offset=0x%Lx Size=0x%x Data@%p Errno=%d\n", __FUNCTION__,\r
-        VirtioFs->Label, NodeId, FuseHandle, IsDir, Offset, *Size, Data,\r
-        CommonResp.Error));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu "\r
+        "IsDir=%d Offset=0x%Lx Size=0x%x Data@%p Errno=%d\n",\r
+        __FUNCTION__,\r
+        VirtioFs->Label,\r
+        NodeId,\r
+        FuseHandle,\r
+        IsDir,\r
+        Offset,\r
+        *Size,\r
+        Data,\r
+        CommonResp.Error\r
+        ));\r
       Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
     }\r
+\r
     return Status;\r
   }\r
 \r
index dd45c7864fc8e91fddde3a2902f6931f8fbf4904..c8363158f5e7163bb1f62e5debe105318bce296c 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseReleaseFileOrDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    FuseHandle,\r
-  IN     BOOLEAN   IsDir\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     FuseHandle,\r
+  IN     BOOLEAN    IsDir\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
-  VIRTIO_FS_FUSE_RELEASE_REQUEST ReleaseReq;\r
-  VIRTIO_FS_IO_VECTOR            ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
-  VIRTIO_FS_IO_VECTOR            RespIoVec[1];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
-  EFI_STATUS                     Status;\r
+  VIRTIO_FS_FUSE_REQUEST          CommonReq;\r
+  VIRTIO_FS_FUSE_RELEASE_REQUEST  ReleaseReq;\r
+  VIRTIO_FS_IO_VECTOR             ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST   ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE         CommonResp;\r
+  VIRTIO_FS_IO_VECTOR             RespIoVec[1];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST   RespSgList;\r
+  EFI_STATUS                      Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -112,10 +112,19 @@ VirtioFsFuseReleaseFileOrDir (
   //\r
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (Status == EFI_DEVICE_ERROR) {\r
-    DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu "\r
-      "IsDir=%d Errno=%d\n", __FUNCTION__, VirtioFs->Label, NodeId, FuseHandle,\r
-      IsDir, CommonResp.Error));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu "\r
+      "IsDir=%d Errno=%d\n",\r
+      __FUNCTION__,\r
+      VirtioFs->Label,\r
+      NodeId,\r
+      FuseHandle,\r
+      IsDir,\r
+      CommonResp.Error\r
+      ));\r
     Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
   }\r
+\r
   return Status;\r
 }\r
index fc9b27ccf6d4c13571c817eb9df884bf7d06b303..a3a105050600ab2d0b5ad3c2d607c5cb1678fd0d 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseRename (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    OldParentNodeId,\r
-  IN     CHAR8     *OldName,\r
-  IN     UINT64    NewParentNodeId,\r
-  IN     CHAR8     *NewName\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     OldParentNodeId,\r
+  IN     CHAR8      *OldName,\r
+  IN     UINT64     NewParentNodeId,\r
+  IN     CHAR8      *NewName\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
-  VIRTIO_FS_FUSE_RENAME2_REQUEST Rename2Req;\r
-  VIRTIO_FS_IO_VECTOR            ReqIoVec[4];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
-  VIRTIO_FS_IO_VECTOR            RespIoVec[1];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
-  EFI_STATUS                     Status;\r
+  VIRTIO_FS_FUSE_REQUEST          CommonReq;\r
+  VIRTIO_FS_FUSE_RENAME2_REQUEST  Rename2Req;\r
+  VIRTIO_FS_IO_VECTOR             ReqIoVec[4];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST   ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE         CommonResp;\r
+  VIRTIO_FS_IO_VECTOR             RespIoVec[1];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST   RespSgList;\r
+  EFI_STATUS                      Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -95,8 +95,13 @@ VirtioFsFuseRename (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpRename2, OldParentNodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpRename2,\r
+             OldParentNodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -121,11 +126,20 @@ VirtioFsFuseRename (
   //\r
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (Status == EFI_DEVICE_ERROR) {\r
-    DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" OldParentNodeId=%Lu OldName=\"%a\" "\r
-      "NewParentNodeId=%Lu NewName=\"%a\" Errno=%d\n", __FUNCTION__,\r
-      VirtioFs->Label, OldParentNodeId, OldName, NewParentNodeId, NewName,\r
-      CommonResp.Error));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: Label=\"%s\" OldParentNodeId=%Lu OldName=\"%a\" "\r
+      "NewParentNodeId=%Lu NewName=\"%a\" Errno=%d\n",\r
+      __FUNCTION__,\r
+      VirtioFs->Label,\r
+      OldParentNodeId,\r
+      OldName,\r
+      NewParentNodeId,\r
+      NewName,\r
+      CommonResp.Error\r
+      ));\r
     Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
   }\r
+\r
   return Status;\r
 }\r
index dcd014172022f823c994bdde81f7071aa55fad26..9d0ea93fd9570e07b54643868ebdb7336947c8f9 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseSetAttr (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    *Size      OPTIONAL,\r
-  IN     UINT64    *Atime     OPTIONAL,\r
-  IN     UINT64    *Mtime     OPTIONAL,\r
-  IN     UINT32    *Mode      OPTIONAL\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     *Size      OPTIONAL,\r
+  IN     UINT64     *Atime     OPTIONAL,\r
+  IN     UINT64     *Mtime     OPTIONAL,\r
+  IN     UINT32     *Mode      OPTIONAL\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST             CommonReq;\r
-  VIRTIO_FS_FUSE_SETATTR_REQUEST     AttrReq;\r
-  VIRTIO_FS_IO_VECTOR                ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST      ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE            CommonResp;\r
-  VIRTIO_FS_FUSE_GETATTR_RESPONSE    GetAttrResp;\r
-  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE AttrResp;\r
-  VIRTIO_FS_IO_VECTOR                RespIoVec[3];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST      RespSgList;\r
-  EFI_STATUS                         Status;\r
+  VIRTIO_FS_FUSE_REQUEST              CommonReq;\r
+  VIRTIO_FS_FUSE_SETATTR_REQUEST      AttrReq;\r
+  VIRTIO_FS_IO_VECTOR                 ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST       ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE             CommonResp;\r
+  VIRTIO_FS_FUSE_GETATTR_RESPONSE     GetAttrResp;\r
+  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  AttrResp;\r
+  VIRTIO_FS_IO_VECTOR                 RespIoVec[3];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST       RespSgList;\r
+  EFI_STATUS                          Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -101,8 +101,13 @@ VirtioFsFuseSetAttr (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpSetAttr, NodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpSetAttr,\r
+             NodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -130,12 +135,15 @@ VirtioFsFuseSetAttr (
   if (Size != NULL) {\r
     AttrReq.Valid |= VIRTIO_FS_FUSE_SETATTR_REQ_F_SIZE;\r
   }\r
+\r
   if (Atime != NULL) {\r
     AttrReq.Valid |= VIRTIO_FS_FUSE_SETATTR_REQ_F_ATIME;\r
   }\r
+\r
   if (Mtime != NULL) {\r
     AttrReq.Valid |= VIRTIO_FS_FUSE_SETATTR_REQ_F_MTIME;\r
   }\r
+\r
   if (Mode != NULL) {\r
     AttrReq.Valid |= VIRTIO_FS_FUSE_SETATTR_REQ_F_MODE;\r
   }\r
@@ -153,22 +161,32 @@ VirtioFsFuseSetAttr (
   //\r
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (Status == EFI_DEVICE_ERROR) {\r
-    DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu", __FUNCTION__,\r
-      VirtioFs->Label, NodeId));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: Label=\"%s\" NodeId=%Lu",\r
+      __FUNCTION__,\r
+      VirtioFs->Label,\r
+      NodeId\r
+      ));\r
     if (Size != NULL) {\r
       DEBUG ((DEBUG_ERROR, " Size=0x%Lx", *Size));\r
     }\r
+\r
     if (Atime != NULL) {\r
       DEBUG ((DEBUG_ERROR, " Atime=%Lu", *Atime));\r
     }\r
+\r
     if (Mtime != NULL) {\r
       DEBUG ((DEBUG_ERROR, " Mtime=%Lu", *Mtime));\r
     }\r
+\r
     if (Mode != NULL) {\r
       DEBUG ((DEBUG_ERROR, " Mode=0x%x", *Mode)); // no support for octal :/\r
     }\r
-    DEBUG ((DEBUG_ERROR, " Errno=%d\n",  CommonResp.Error));\r
+\r
+    DEBUG ((DEBUG_ERROR, " Errno=%d\n", CommonResp.Error));\r
     Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
   }\r
+\r
   return Status;\r
 }\r
index e794f8977a48e2e00ef4a17438f36824030359fe..d93a62080e470d23e9bdc8555f3c26a726016b94 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseStatFs (\r
-  IN OUT VIRTIO_FS                      *VirtioFs,\r
-  IN     UINT64                         NodeId,\r
-     OUT VIRTIO_FS_FUSE_STATFS_RESPONSE *FilesysAttr\r
-     )\r
+  IN OUT VIRTIO_FS                    *VirtioFs,\r
+  IN     UINT64                       NodeId,\r
+  OUT VIRTIO_FS_FUSE_STATFS_RESPONSE  *FilesysAttr\r
+  )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[1];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE       CommonResp;\r
-  VIRTIO_FS_IO_VECTOR           RespIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST RespSgList;\r
-  EFI_STATUS                    Status;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[1];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
+  VIRTIO_FS_IO_VECTOR            RespIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
+  EFI_STATUS                     Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -75,8 +75,13 @@ VirtioFsFuseStatFs (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpStatFs, NodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpStatFs,\r
+             NodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -94,9 +99,16 @@ VirtioFsFuseStatFs (
   //\r
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (Status == EFI_DEVICE_ERROR) {\r
-    DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu Errno=%d\n",\r
-      __FUNCTION__, VirtioFs->Label, NodeId, CommonResp.Error));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: Label=\"%s\" NodeId=%Lu Errno=%d\n",\r
+      __FUNCTION__,\r
+      VirtioFs->Label,\r
+      NodeId,\r
+      CommonResp.Error\r
+      ));\r
     Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
   }\r
+\r
   return Status;\r
 }\r
index 8f84edbe94313183629c1e5afb1d09d6f620d884..14cbdec5f5b26b6f33899ae74939c1b5e5a3a923 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseRemoveFileOrDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    ParentNodeId,\r
-  IN     CHAR8     *Name,\r
-  IN     BOOLEAN   IsDir\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     ParentNodeId,\r
+  IN     CHAR8      *Name,\r
+  IN     BOOLEAN    IsDir\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE       CommonResp;\r
-  VIRTIO_FS_IO_VECTOR           RespIoVec[1];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST RespSgList;\r
-  EFI_STATUS                    Status;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
+  VIRTIO_FS_IO_VECTOR            RespIoVec[1];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
+  EFI_STATUS                     Status;\r
 \r
   //\r
   // Set up the scatter-gather lists.\r
@@ -105,10 +105,19 @@ VirtioFsFuseRemoveFileOrDir (
   //\r
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (Status == EFI_DEVICE_ERROR) {\r
-    DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" ParentNodeId=%Lu Name=\"%a\" "\r
-      "IsDir=%d Errno=%d\n", __FUNCTION__, VirtioFs->Label, ParentNodeId, Name,\r
-      IsDir, CommonResp.Error));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: Label=\"%s\" ParentNodeId=%Lu Name=\"%a\" "\r
+      "IsDir=%d Errno=%d\n",\r
+      __FUNCTION__,\r
+      VirtioFs->Label,\r
+      ParentNodeId,\r
+      Name,\r
+      IsDir,\r
+      CommonResp.Error\r
+      ));\r
     Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
   }\r
+\r
   return Status;\r
 }\r
index cc552bd667ba400cf61eda4b71a0d470b1c7c26a..fe65c0bdbe41bcce00ee4594f146a187e52856f0 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioFsFuseWrite (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    FuseHandle,\r
-  IN     UINT64    Offset,\r
-  IN OUT UINT32    *Size,\r
-  IN     VOID      *Data\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     FuseHandle,\r
+  IN     UINT64     Offset,\r
+  IN OUT UINT32     *Size,\r
+  IN     VOID       *Data\r
   )\r
 {\r
-  VIRTIO_FS_FUSE_REQUEST        CommonReq;\r
-  VIRTIO_FS_FUSE_WRITE_REQUEST  WriteReq;\r
-  VIRTIO_FS_IO_VECTOR           ReqIoVec[3];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST ReqSgList;\r
-  VIRTIO_FS_FUSE_RESPONSE       CommonResp;\r
-  VIRTIO_FS_FUSE_WRITE_RESPONSE WriteResp;\r
-  VIRTIO_FS_IO_VECTOR           RespIoVec[2];\r
-  VIRTIO_FS_SCATTER_GATHER_LIST RespSgList;\r
-  EFI_STATUS                    Status;\r
+  VIRTIO_FS_FUSE_REQUEST         CommonReq;\r
+  VIRTIO_FS_FUSE_WRITE_REQUEST   WriteReq;\r
+  VIRTIO_FS_IO_VECTOR            ReqIoVec[3];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  ReqSgList;\r
+  VIRTIO_FS_FUSE_RESPONSE        CommonResp;\r
+  VIRTIO_FS_FUSE_WRITE_RESPONSE  WriteResp;\r
+  VIRTIO_FS_IO_VECTOR            RespIoVec[2];\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  RespSgList;\r
+  EFI_STATUS                     Status;\r
 \r
   //\r
   // Honor the write buffer size limit of the Virtio Filesystem device.\r
@@ -107,8 +107,13 @@ VirtioFsFuseWrite (
   //\r
   // Populate the common request header.\r
   //\r
-  Status = VirtioFsFuseNewRequest (VirtioFs, &CommonReq, ReqSgList.TotalSize,\r
-             VirtioFsFuseOpWrite, NodeId);\r
+  Status = VirtioFsFuseNewRequest (\r
+             VirtioFs,\r
+             &CommonReq,\r
+             ReqSgList.TotalSize,\r
+             VirtioFsFuseOpWrite,\r
+             NodeId\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -138,12 +143,22 @@ VirtioFsFuseWrite (
   Status = VirtioFsFuseCheckResponse (&RespSgList, CommonReq.Unique, NULL);\r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_DEVICE_ERROR) {\r
-      DEBUG ((DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu "\r
-        "Offset=0x%Lx Size=0x%x Data@%p Errno=%d\n", __FUNCTION__,\r
-        VirtioFs->Label, NodeId, FuseHandle, Offset, *Size, Data,\r
-        CommonResp.Error));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu "\r
+        "Offset=0x%Lx Size=0x%x Data@%p Errno=%d\n",\r
+        __FUNCTION__,\r
+        VirtioFs->Label,\r
+        NodeId,\r
+        FuseHandle,\r
+        Offset,\r
+        *Size,\r
+        Data,\r
+        CommonResp.Error\r
+        ));\r
       Status = VirtioFsErrnoToEfiStatus (CommonResp.Error);\r
     }\r
+\r
     return Status;\r
   }\r
 \r
index b81c04e0a4e81df5d72f99d164c8f49d6784e15d..f32fb1d48a3e01755bae976bfd591e14449525b2 100644 (file)
 STATIC\r
 EFI_STATUS\r
 VirtioFsReadConfig (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *Virtio,\r
-  OUT VIRTIO_FS_CONFIG       *Config\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *Virtio,\r
+  OUT VIRTIO_FS_CONFIG        *Config\r
   )\r
 {\r
-  UINTN      Idx;\r
-  EFI_STATUS Status;\r
+  UINTN       Idx;\r
+  EFI_STATUS  Status;\r
 \r
   for (Idx = 0; Idx < VIRTIO_FS_TAG_BYTES; Idx++) {\r
     Status = Virtio->ReadDevice (\r
@@ -78,15 +78,15 @@ VirtioFsReadConfig (
 **/\r
 EFI_STATUS\r
 VirtioFsInit (\r
-  IN OUT VIRTIO_FS *VirtioFs\r
+  IN OUT VIRTIO_FS  *VirtioFs\r
   )\r
 {\r
-  UINT8            NextDevStat;\r
-  EFI_STATUS       Status;\r
-  UINT64           Features;\r
-  VIRTIO_FS_CONFIG Config;\r
-  UINTN            Idx;\r
-  UINT64           RingBaseShift;\r
+  UINT8             NextDevStat;\r
+  EFI_STATUS        Status;\r
+  UINT64            Features;\r
+  VIRTIO_FS_CONFIG  Config;\r
+  UINTN             Idx;\r
+  UINT64            RingBaseShift;\r
 \r
   //\r
   // Execute virtio-v1.1-cs01-87fa6b5d8155, 3.1.1 Driver Requirements: Device\r
@@ -95,7 +95,7 @@ VirtioFsInit (
   // 1. Reset the device.\r
   //\r
   NextDevStat = 0;\r
-  Status = VirtioFs->Virtio->SetDeviceStatus (VirtioFs->Virtio, NextDevStat);\r
+  Status      = VirtioFs->Virtio->SetDeviceStatus (VirtioFs->Virtio, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
@@ -104,7 +104,7 @@ VirtioFsInit (
   // 2. Set the ACKNOWLEDGE status bit [...]\r
   //\r
   NextDevStat |= VSTAT_ACK;\r
-  Status = VirtioFs->Virtio->SetDeviceStatus (VirtioFs->Virtio, NextDevStat);\r
+  Status       = VirtioFs->Virtio->SetDeviceStatus (VirtioFs->Virtio, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
@@ -113,7 +113,7 @@ VirtioFsInit (
   // 3. Set the DRIVER status bit [...]\r
   //\r
   NextDevStat |= VSTAT_DRIVER;\r
-  Status = VirtioFs->Virtio->SetDeviceStatus (VirtioFs->Virtio, NextDevStat);\r
+  Status       = VirtioFs->Virtio->SetDeviceStatus (VirtioFs->Virtio, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
@@ -125,10 +125,12 @@ VirtioFsInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   if ((Features & VIRTIO_F_VERSION_1) == 0) {\r
     Status = EFI_UNSUPPORTED;\r
     goto Failed;\r
   }\r
+\r
   //\r
   // No device-specific feature bits have been defined in file "virtio-fs.tex"\r
   // of the virtio spec at <https://github.com/oasis-tcs/virtio-spec.git>, as\r
@@ -163,12 +165,14 @@ VirtioFsInit (
   // original label.\r
   //\r
   for (Idx = 0; Idx < VIRTIO_FS_TAG_BYTES && Config.Tag[Idx] != '\0'; Idx++) {\r
-    if (Config.Tag[Idx] < 0x20 || Config.Tag[Idx] > 0x7E) {\r
+    if ((Config.Tag[Idx] < 0x20) || (Config.Tag[Idx] > 0x7E)) {\r
       Status = EFI_UNSUPPORTED;\r
       goto Failed;\r
     }\r
+\r
     VirtioFs->Label[Idx] = Config.Tag[Idx];\r
   }\r
+\r
   VirtioFs->Label[Idx] = L'\0';\r
 \r
   //\r
@@ -184,16 +188,22 @@ VirtioFsInit (
   // queue at once. We'll need two descriptors per request, as a minimum --\r
   // request header, response header.\r
   //\r
-  Status = VirtioFs->Virtio->SetQueueSel (VirtioFs->Virtio,\r
-                               VIRTIO_FS_REQUEST_QUEUE);\r
+  Status = VirtioFs->Virtio->SetQueueSel (\r
+                               VirtioFs->Virtio,\r
+                               VIRTIO_FS_REQUEST_QUEUE\r
+                               );\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
-  Status = VirtioFs->Virtio->GetQueueNumMax (VirtioFs->Virtio,\r
-                               &VirtioFs->QueueSize);\r
+\r
+  Status = VirtioFs->Virtio->GetQueueNumMax (\r
+                               VirtioFs->Virtio,\r
+                               &VirtioFs->QueueSize\r
+                               );\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   if (VirtioFs->QueueSize < 2) {\r
     Status = EFI_UNSUPPORTED;\r
     goto Failed;\r
@@ -202,20 +212,30 @@ VirtioFsInit (
   //\r
   // 7.d. [...] population of virtqueues [...]\r
   //\r
-  Status = VirtioRingInit (VirtioFs->Virtio, VirtioFs->QueueSize,\r
-             &VirtioFs->Ring);\r
+  Status = VirtioRingInit (\r
+             VirtioFs->Virtio,\r
+             VirtioFs->QueueSize,\r
+             &VirtioFs->Ring\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
 \r
-  Status = VirtioRingMap (VirtioFs->Virtio, &VirtioFs->Ring, &RingBaseShift,\r
-             &VirtioFs->RingMap);\r
+  Status = VirtioRingMap (\r
+             VirtioFs->Virtio,\r
+             &VirtioFs->Ring,\r
+             &RingBaseShift,\r
+             &VirtioFs->RingMap\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto ReleaseQueue;\r
   }\r
 \r
-  Status = VirtioFs->Virtio->SetQueueAddress (VirtioFs->Virtio,\r
-                               &VirtioFs->Ring, RingBaseShift);\r
+  Status = VirtioFs->Virtio->SetQueueAddress (\r
+                               VirtioFs->Virtio,\r
+                               &VirtioFs->Ring,\r
+                               RingBaseShift\r
+                               );\r
   if (EFI_ERROR (Status)) {\r
     goto UnmapQueue;\r
   }\r
@@ -224,7 +244,7 @@ VirtioFsInit (
   // 8. Set the DRIVER_OK status bit.\r
   //\r
   NextDevStat |= VSTAT_DRIVER_OK;\r
-  Status = VirtioFs->Virtio->SetDeviceStatus (VirtioFs->Virtio, NextDevStat);\r
+  Status       = VirtioFs->Virtio->SetDeviceStatus (VirtioFs->Virtio, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto UnmapQueue;\r
   }\r
@@ -262,7 +282,7 @@ Failed:
 **/\r
 VOID\r
 VirtioFsUninit (\r
-  IN OUT VIRTIO_FS *VirtioFs\r
+  IN OUT VIRTIO_FS  *VirtioFs\r
   )\r
 {\r
   //\r
@@ -290,15 +310,20 @@ VirtioFsUninit (
 VOID\r
 EFIAPI\r
 VirtioFsExitBoot (\r
-  IN EFI_EVENT ExitBootEvent,\r
-  IN VOID      *VirtioFsAsVoid\r
+  IN EFI_EVENT  ExitBootEvent,\r
+  IN VOID       *VirtioFsAsVoid\r
   )\r
 {\r
-  VIRTIO_FS *VirtioFs;\r
+  VIRTIO_FS  *VirtioFs;\r
 \r
   VirtioFs = VirtioFsAsVoid;\r
-  DEBUG ((DEBUG_VERBOSE, "%a: VirtioFs=0x%p Label=\"%s\"\n", __FUNCTION__,\r
-    VirtioFsAsVoid, VirtioFs->Label));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: VirtioFs=0x%p Label=\"%s\"\n",\r
+    __FUNCTION__,\r
+    VirtioFsAsVoid,\r
+    VirtioFs->Label\r
+    ));\r
   VirtioFs->Virtio->SetDeviceStatus (VirtioFs->Virtio, 0);\r
 }\r
 \r
@@ -371,14 +396,14 @@ VirtioFsExitBoot (
 **/\r
 EFI_STATUS\r
 VirtioFsSgListsValidate (\r
-  IN     VIRTIO_FS                     *VirtioFs,\r
-  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST *RequestSgList,\r
-  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST *ResponseSgList OPTIONAL\r
+  IN     VIRTIO_FS                      *VirtioFs,\r
+  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST  *RequestSgList,\r
+  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST  *ResponseSgList OPTIONAL\r
   )\r
 {\r
-  VIRTIO_FS_SCATTER_GATHER_LIST *SgListParam[2];\r
-  UINT16                        DescriptorsNeeded;\r
-  UINTN                         ListId;\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  *SgListParam[2];\r
+  UINT16                         DescriptorsNeeded;\r
+  UINTN                          ListId;\r
 \r
   if (RequestSgList == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -389,42 +414,47 @@ VirtioFsSgListsValidate (
 \r
   DescriptorsNeeded = 0;\r
   for (ListId = 0; ListId < ARRAY_SIZE (SgListParam); ListId++) {\r
-    VIRTIO_FS_SCATTER_GATHER_LIST *SgList;\r
-    UINT32                        SgListTotalSize;\r
-    UINTN                         IoVecIdx;\r
+    VIRTIO_FS_SCATTER_GATHER_LIST  *SgList;\r
+    UINT32                         SgListTotalSize;\r
+    UINTN                          IoVecIdx;\r
 \r
     SgList = SgListParam[ListId];\r
     if (SgList == NULL) {\r
       continue;\r
     }\r
+\r
     //\r
     // Sanity-check SgList -- it must provide at least one IO Vector.\r
     //\r
-    if (SgList->IoVec == NULL || SgList->NumVec == 0) {\r
+    if ((SgList->IoVec == NULL) || (SgList->NumVec == 0)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     //\r
     // Make sure that, for each IO Vector in this SgList, a virtio descriptor\r
     // can be added to the virtio queue, after the other descriptors added\r
     // previously.\r
     //\r
-    if (SgList->NumVec > (UINTN)(MAX_UINT16 - DescriptorsNeeded) ||\r
-        DescriptorsNeeded + SgList->NumVec > VirtioFs->QueueSize) {\r
+    if ((SgList->NumVec > (UINTN)(MAX_UINT16 - DescriptorsNeeded)) ||\r
+        (DescriptorsNeeded + SgList->NumVec > VirtioFs->QueueSize))\r
+    {\r
       return EFI_UNSUPPORTED;\r
     }\r
+\r
     DescriptorsNeeded += (UINT16)SgList->NumVec;\r
 \r
     SgListTotalSize = 0;\r
     for (IoVecIdx = 0; IoVecIdx < SgList->NumVec; IoVecIdx++) {\r
-      VIRTIO_FS_IO_VECTOR *IoVec;\r
+      VIRTIO_FS_IO_VECTOR  *IoVec;\r
 \r
       IoVec = &SgList->IoVec[IoVecIdx];\r
       //\r
       // Sanity-check this IoVec -- it must describe a non-empty buffer.\r
       //\r
-      if (IoVec->Buffer == NULL || IoVec->Size == 0) {\r
+      if ((IoVec->Buffer == NULL) || (IoVec->Size == 0)) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
+\r
       //\r
       // Make sure the cumulative size of all IO Vectors in this SgList remains\r
       // expressible as a UINT32.\r
@@ -432,6 +462,7 @@ VirtioFsSgListsValidate (
       if (IoVec->Size > MAX_UINT32 - SgListTotalSize) {\r
         return EFI_UNSUPPORTED;\r
       }\r
+\r
       SgListTotalSize += (UINT32)IoVec->Size;\r
 \r
       //\r
@@ -505,22 +536,22 @@ VirtioFsSgListsValidate (
 **/\r
 EFI_STATUS\r
 VirtioFsSgListsSubmit (\r
-  IN OUT VIRTIO_FS                     *VirtioFs,\r
-  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST *RequestSgList,\r
-  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST *ResponseSgList OPTIONAL\r
+  IN OUT VIRTIO_FS                      *VirtioFs,\r
+  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST  *RequestSgList,\r
+  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST  *ResponseSgList OPTIONAL\r
   )\r
 {\r
-  VIRTIO_FS_SCATTER_GATHER_LIST *SgListParam[2];\r
-  VIRTIO_MAP_OPERATION          SgListVirtioMapOp[ARRAY_SIZE (SgListParam)];\r
-  UINT16                        SgListDescriptorFlag[ARRAY_SIZE (SgListParam)];\r
-  UINTN                         ListId;\r
-  VIRTIO_FS_SCATTER_GATHER_LIST *SgList;\r
-  UINTN                         IoVecIdx;\r
-  VIRTIO_FS_IO_VECTOR           *IoVec;\r
-  EFI_STATUS                    Status;\r
-  DESC_INDICES                  Indices;\r
-  UINT32                        TotalBytesWrittenByDevice;\r
-  UINT32                        BytesPermittedForWrite;\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  *SgListParam[2];\r
+  VIRTIO_MAP_OPERATION           SgListVirtioMapOp[ARRAY_SIZE (SgListParam)];\r
+  UINT16                         SgListDescriptorFlag[ARRAY_SIZE (SgListParam)];\r
+  UINTN                          ListId;\r
+  VIRTIO_FS_SCATTER_GATHER_LIST  *SgList;\r
+  UINTN                          IoVecIdx;\r
+  VIRTIO_FS_IO_VECTOR            *IoVec;\r
+  EFI_STATUS                     Status;\r
+  DESC_INDICES                   Indices;\r
+  UINT32                         TotalBytesWrittenByDevice;\r
+  UINT32                         BytesPermittedForWrite;\r
 \r
   SgListParam[0]          = RequestSgList;\r
   SgListVirtioMapOp[0]    = VirtioOperationBusMasterRead;\r
@@ -538,6 +569,7 @@ VirtioFsSgListsSubmit (
     if (SgList == NULL) {\r
       continue;\r
     }\r
+\r
     for (IoVecIdx = 0; IoVecIdx < SgList->NumVec; IoVecIdx++) {\r
       IoVec = &SgList->IoVec[IoVecIdx];\r
       //\r
@@ -554,6 +586,7 @@ VirtioFsSgListsSubmit (
       if (EFI_ERROR (Status)) {\r
         goto Unmap;\r
       }\r
+\r
       IoVec->Mapped = TRUE;\r
     }\r
   }\r
@@ -567,18 +600,21 @@ VirtioFsSgListsSubmit (
     if (SgList == NULL) {\r
       continue;\r
     }\r
+\r
     for (IoVecIdx = 0; IoVecIdx < SgList->NumVec; IoVecIdx++) {\r
-      UINT16 NextFlag;\r
+      UINT16  NextFlag;\r
 \r
       IoVec = &SgList->IoVec[IoVecIdx];\r
       //\r
       // Set VRING_DESC_F_NEXT on all except the very last descriptor.\r
       //\r
       NextFlag = VRING_DESC_F_NEXT;\r
-      if (ListId == ARRAY_SIZE (SgListParam) - 1 &&\r
-          IoVecIdx == SgList->NumVec - 1) {\r
+      if ((ListId == ARRAY_SIZE (SgListParam) - 1) &&\r
+          (IoVecIdx == SgList->NumVec - 1))\r
+      {\r
         NextFlag = 0;\r
       }\r
+\r
       VirtioAppendDesc (\r
         &VirtioFs->Ring,\r
         IoVec->MappedAddress,\r
@@ -592,8 +628,13 @@ VirtioFsSgListsSubmit (
   //\r
   // Submit the descriptor chain.\r
   //\r
-  Status = VirtioFlush (VirtioFs->Virtio, VIRTIO_FS_REQUEST_QUEUE,\r
-             &VirtioFs->Ring, &Indices, &TotalBytesWrittenByDevice);\r
+  Status = VirtioFlush (\r
+             VirtioFs->Virtio,\r
+             VIRTIO_FS_REQUEST_QUEUE,\r
+             &VirtioFs->Ring,\r
+             &Indices,\r
+             &TotalBytesWrittenByDevice\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto Unmap;\r
   }\r
@@ -607,6 +648,7 @@ VirtioFsSgListsSubmit (
   } else {\r
     BytesPermittedForWrite = ResponseSgList->TotalSize;\r
   }\r
+\r
   if (TotalBytesWrittenByDevice > BytesPermittedForWrite) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto Unmap;\r
@@ -620,6 +662,7 @@ VirtioFsSgListsSubmit (
     if (SgList == NULL) {\r
       continue;\r
     }\r
+\r
     for (IoVecIdx = 0; IoVecIdx < SgList->NumVec; IoVecIdx++) {\r
       IoVec = &SgList->IoVec[IoVecIdx];\r
       if (SgListVirtioMapOp[ListId] == VirtioOperationBusMasterRead) {\r
@@ -636,8 +679,10 @@ VirtioFsSgListsSubmit (
         // across all device-writeable descriptors, in the order they were\r
         // chained on the ring.\r
         //\r
-        IoVec->Transferred = MIN ((UINTN)TotalBytesWrittenByDevice,\r
-                               IoVec->Size);\r
+        IoVec->Transferred = MIN (\r
+                               (UINTN)TotalBytesWrittenByDevice,\r
+                               IoVec->Size\r
+                               );\r
         TotalBytesWrittenByDevice -= (UINT32)IoVec->Transferred;\r
       }\r
     }\r
@@ -664,9 +709,10 @@ Unmap:
     if (SgList == NULL) {\r
       continue;\r
     }\r
+\r
     IoVecIdx = SgList->NumVec;\r
     while (IoVecIdx > 0) {\r
-      EFI_STATUS UnmapStatus;\r
+      EFI_STATUS  UnmapStatus;\r
 \r
       --IoVecIdx;\r
       IoVec = &SgList->IoVec[IoVecIdx];\r
@@ -676,8 +722,11 @@ Unmap:
       if (!IoVec->Mapped) {\r
         continue;\r
       }\r
-      UnmapStatus = VirtioFs->Virtio->UnmapSharedBuffer (VirtioFs->Virtio,\r
-                                        IoVec->Mapping);\r
+\r
+      UnmapStatus = VirtioFs->Virtio->UnmapSharedBuffer (\r
+                                        VirtioFs->Virtio,\r
+                                        IoVec->Mapping\r
+                                        );\r
       //\r
       // Re-set the following fields to the values they initially got from\r
       // VirtioFsSgListsValidate() -- the above unmapping attempt is considered\r
@@ -740,7 +789,7 @@ Unmap:
 EFI_STATUS\r
 VirtioFsFuseNewRequest (\r
   IN OUT VIRTIO_FS              *VirtioFs,\r
-     OUT VIRTIO_FS_FUSE_REQUEST *Request,\r
+  OUT VIRTIO_FS_FUSE_REQUEST    *Request,\r
   IN     UINT32                 RequestSize,\r
   IN     VIRTIO_FS_FUSE_OPCODE  Opcode,\r
   IN     UINT64                 NodeId\r
@@ -822,15 +871,15 @@ VirtioFsFuseNewRequest (
 **/\r
 EFI_STATUS\r
 VirtioFsFuseCheckResponse (\r
-  IN  VIRTIO_FS_SCATTER_GATHER_LIST *ResponseSgList,\r
-  IN  UINT64                        RequestId,\r
-  OUT UINTN                         *TailBufferFill\r
+  IN  VIRTIO_FS_SCATTER_GATHER_LIST  *ResponseSgList,\r
+  IN  UINT64                         RequestId,\r
+  OUT UINTN                          *TailBufferFill\r
   )\r
 {\r
-  UINTN                   NumFixedSizeVec;\r
-  VIRTIO_FS_FUSE_RESPONSE *CommonResp;\r
-  UINT32                  TotalTransferred;\r
-  UINTN                   Idx;\r
+  UINTN                    NumFixedSizeVec;\r
+  VIRTIO_FS_FUSE_RESPONSE  *CommonResp;\r
+  UINT32                   TotalTransferred;\r
+  UINTN                    Idx;\r
 \r
   //\r
   // Ensured by VirtioFsSgListsValidate().\r
@@ -851,6 +900,7 @@ VirtioFsFuseCheckResponse (
     if (ResponseSgList->NumVec == 1) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     NumFixedSizeVec = ResponseSgList->NumVec - 1;\r
   }\r
 \r
@@ -861,6 +911,7 @@ VirtioFsFuseCheckResponse (
   if (ResponseSgList->IoVec[0].Size != sizeof *CommonResp) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   if (ResponseSgList->IoVec[0].Transferred != ResponseSgList->IoVec[0].Size) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
@@ -869,7 +920,7 @@ VirtioFsFuseCheckResponse (
   // FUSE must report the same number of bytes, written by the Virtio\r
   // Filesystem device, as the virtio transport does.\r
   //\r
-  CommonResp = ResponseSgList->IoVec[0].Buffer;\r
+  CommonResp       = ResponseSgList->IoVec[0].Buffer;\r
   TotalTransferred = 0;\r
   for (Idx = 0; Idx < ResponseSgList->NumVec; Idx++) {\r
     //\r
@@ -878,6 +929,7 @@ VirtioFsFuseCheckResponse (
     //\r
     TotalTransferred += (UINT32)ResponseSgList->IoVec[Idx].Transferred;\r
   }\r
+\r
   if (CommonResp->Len != TotalTransferred) {\r
     return EFI_PROTOCOL_ERROR;\r
   }\r
@@ -905,7 +957,8 @@ VirtioFsFuseCheckResponse (
   ASSERT (NumFixedSizeVec >= 1);\r
   for (Idx = 1; Idx < NumFixedSizeVec; Idx++) {\r
     if (ResponseSgList->IoVec[Idx].Transferred !=\r
-        ResponseSgList->IoVec[Idx].Size) {\r
+        ResponseSgList->IoVec[Idx].Size)\r
+    {\r
       return EFI_PROTOCOL_ERROR;\r
     }\r
   }\r
@@ -936,185 +989,185 @@ VirtioFsFuseCheckResponse (
 **/\r
 EFI_STATUS\r
 VirtioFsErrnoToEfiStatus (\r
-  IN INT32 Errno\r
+  IN INT32  Errno\r
   )\r
 {\r
   switch (Errno) {\r
-  case   -1: // EPERM               Operation not permitted\r
-    return EFI_SECURITY_VIOLATION;\r
-\r
-  case   -2: // ENOENT              No such file or directory\r
-  case   -3: // ESRCH               No such process\r
-  case   -6: // ENXIO               No such device or address\r
-  case  -10: // ECHILD              No child processes\r
-  case  -19: // ENODEV              No such device\r
-  case  -49: // EUNATCH             Protocol driver not attached\r
-  case  -65: // ENOPKG              Package not installed\r
-  case  -79: // ELIBACC             Can not access a needed shared library\r
-  case -126: // ENOKEY              Required key not available\r
-    return EFI_NOT_FOUND;\r
-\r
-  case   -4: // EINTR               Interrupted system call\r
-  case  -11: // EAGAIN, EWOULDBLOCK Resource temporarily unavailable\r
-  case  -16: // EBUSY               Device or resource busy\r
-  case  -26: // ETXTBSY             Text file busy\r
-  case  -35: // EDEADLK, EDEADLOCK  Resource deadlock avoided\r
-  case  -39: // ENOTEMPTY           Directory not empty\r
-  case  -42: // ENOMSG              No message of desired type\r
-  case  -61: // ENODATA             No data available\r
-  case  -85: // ERESTART            Interrupted system call should be restarted\r
-    return EFI_NOT_READY;\r
-\r
-  case   -5: // EIO                 Input/output error\r
-  case  -45: // EL2NSYNC            Level 2 not synchronized\r
-  case  -46: // EL3HLT              Level 3 halted\r
-  case  -47: // EL3RST              Level 3 reset\r
-  case  -51: // EL2HLT              Level 2 halted\r
-  case -121: // EREMOTEIO           Remote I/O error\r
-  case -133: // EHWPOISON           Memory page has hardware error\r
-    return EFI_DEVICE_ERROR;\r
-\r
-  case   -7: // E2BIG               Argument list too long\r
-  case  -36: // ENAMETOOLONG        File name too long\r
-  case  -90: // EMSGSIZE            Message too long\r
-    return EFI_BAD_BUFFER_SIZE;\r
-\r
-  case   -8: // ENOEXEC             Exec format error\r
-  case  -15: // ENOTBLK             Block device required\r
-  case  -18: // EXDEV               Invalid cross-device link\r
-  case  -20: // ENOTDIR             Not a directory\r
-  case  -21: // EISDIR              Is a directory\r
-  case  -25: // ENOTTY              Inappropriate ioctl for device\r
-  case  -27: // EFBIG               File too large\r
-  case  -29: // ESPIPE              Illegal seek\r
-  case  -38: // ENOSYS              Function not implemented\r
-  case  -59: // EBFONT              Bad font file format\r
-  case  -60: // ENOSTR              Device not a stream\r
-  case  -83: // ELIBEXEC            Cannot exec a shared library directly\r
-  case  -88: // ENOTSOCK            Socket operation on non-socket\r
-  case  -91: // EPROTOTYPE          Protocol wrong type for socket\r
-  case  -92: // ENOPROTOOPT         Protocol not available\r
-  case  -93: // EPROTONOSUPPORT     Protocol not supported\r
-  case  -94: // ESOCKTNOSUPPORT     Socket type not supported\r
-  case  -95: // ENOTSUP, EOPNOTSUPP Operation not supported\r
-  case  -96: // EPFNOSUPPORT        Protocol family not supported\r
-  case  -97: // EAFNOSUPPORT        Address family not supported by protocol\r
-  case  -99: // EADDRNOTAVAIL       Cannot assign requested address\r
-  case -118: // ENOTNAM             Not a XENIX named type file\r
-  case -120: // EISNAM              Is a named type file\r
-  case -124: // EMEDIUMTYPE         Wrong medium type\r
-    return EFI_UNSUPPORTED;\r
-\r
-  case   -9: // EBADF               Bad file descriptor\r
-  case  -14: // EFAULT              Bad address\r
-  case  -44: // ECHRNG              Channel number out of range\r
-  case  -48: // ELNRNG              Link number out of range\r
-  case  -53: // EBADR               Invalid request descriptor\r
-  case  -56: // EBADRQC             Invalid request code\r
-  case  -57: // EBADSLT             Invalid slot\r
-  case  -76: // ENOTUNIQ            Name not unique on network\r
-  case  -84: // EILSEQ        Invalid or incomplete multibyte or wide character\r
-    return EFI_NO_MAPPING;\r
-\r
-  case  -12: // ENOMEM              Cannot allocate memory\r
-  case  -23: // ENFILE              Too many open files in system\r
-  case  -24: // EMFILE              Too many open files\r
-  case  -31: // EMLINK              Too many links\r
-  case  -37: // ENOLCK              No locks available\r
-  case  -40: // ELOOP               Too many levels of symbolic links\r
-  case  -50: // ENOCSI              No CSI structure available\r
-  case  -55: // ENOANO              No anode\r
-  case  -63: // ENOSR               Out of streams resources\r
-  case  -82: // ELIBMAX         Attempting to link in too many shared libraries\r
-  case  -87: // EUSERS              Too many users\r
-  case -105: // ENOBUFS             No buffer space available\r
-  case -109: // ETOOMANYREFS        Too many references: cannot splice\r
-  case -119: // ENAVAIL             No XENIX semaphores available\r
-  case -122: // EDQUOT              Disk quota exceeded\r
-    return EFI_OUT_OF_RESOURCES;\r
+    case   -1:// EPERM               Operation not permitted\r
+      return EFI_SECURITY_VIOLATION;\r
+\r
+    case   -2: // ENOENT              No such file or directory\r
+    case   -3: // ESRCH               No such process\r
+    case   -6: // ENXIO               No such device or address\r
+    case  -10: // ECHILD              No child processes\r
+    case  -19: // ENODEV              No such device\r
+    case  -49: // EUNATCH             Protocol driver not attached\r
+    case  -65: // ENOPKG              Package not installed\r
+    case  -79: // ELIBACC             Can not access a needed shared library\r
+    case -126: // ENOKEY              Required key not available\r
+      return EFI_NOT_FOUND;\r
+\r
+    case   -4: // EINTR               Interrupted system call\r
+    case  -11: // EAGAIN, EWOULDBLOCK Resource temporarily unavailable\r
+    case  -16: // EBUSY               Device or resource busy\r
+    case  -26: // ETXTBSY             Text file busy\r
+    case  -35: // EDEADLK, EDEADLOCK  Resource deadlock avoided\r
+    case  -39: // ENOTEMPTY           Directory not empty\r
+    case  -42: // ENOMSG              No message of desired type\r
+    case  -61: // ENODATA             No data available\r
+    case  -85: // ERESTART            Interrupted system call should be restarted\r
+      return EFI_NOT_READY;\r
+\r
+    case   -5: // EIO                 Input/output error\r
+    case  -45: // EL2NSYNC            Level 2 not synchronized\r
+    case  -46: // EL3HLT              Level 3 halted\r
+    case  -47: // EL3RST              Level 3 reset\r
+    case  -51: // EL2HLT              Level 2 halted\r
+    case -121: // EREMOTEIO           Remote I/O error\r
+    case -133: // EHWPOISON           Memory page has hardware error\r
+      return EFI_DEVICE_ERROR;\r
+\r
+    case   -7: // E2BIG               Argument list too long\r
+    case  -36: // ENAMETOOLONG        File name too long\r
+    case  -90: // EMSGSIZE            Message too long\r
+      return EFI_BAD_BUFFER_SIZE;\r
+\r
+    case   -8: // ENOEXEC             Exec format error\r
+    case  -15: // ENOTBLK             Block device required\r
+    case  -18: // EXDEV               Invalid cross-device link\r
+    case  -20: // ENOTDIR             Not a directory\r
+    case  -21: // EISDIR              Is a directory\r
+    case  -25: // ENOTTY              Inappropriate ioctl for device\r
+    case  -27: // EFBIG               File too large\r
+    case  -29: // ESPIPE              Illegal seek\r
+    case  -38: // ENOSYS              Function not implemented\r
+    case  -59: // EBFONT              Bad font file format\r
+    case  -60: // ENOSTR              Device not a stream\r
+    case  -83: // ELIBEXEC            Cannot exec a shared library directly\r
+    case  -88: // ENOTSOCK            Socket operation on non-socket\r
+    case  -91: // EPROTOTYPE          Protocol wrong type for socket\r
+    case  -92: // ENOPROTOOPT         Protocol not available\r
+    case  -93: // EPROTONOSUPPORT     Protocol not supported\r
+    case  -94: // ESOCKTNOSUPPORT     Socket type not supported\r
+    case  -95: // ENOTSUP, EOPNOTSUPP Operation not supported\r
+    case  -96: // EPFNOSUPPORT        Protocol family not supported\r
+    case  -97: // EAFNOSUPPORT        Address family not supported by protocol\r
+    case  -99: // EADDRNOTAVAIL       Cannot assign requested address\r
+    case -118: // ENOTNAM             Not a XENIX named type file\r
+    case -120: // EISNAM              Is a named type file\r
+    case -124: // EMEDIUMTYPE         Wrong medium type\r
+      return EFI_UNSUPPORTED;\r
 \r
-  case  -13: // EACCES              Permission denied\r
-    return EFI_ACCESS_DENIED;\r
+    case   -9: // EBADF               Bad file descriptor\r
+    case  -14: // EFAULT              Bad address\r
+    case  -44: // ECHRNG              Channel number out of range\r
+    case  -48: // ELNRNG              Link number out of range\r
+    case  -53: // EBADR               Invalid request descriptor\r
+    case  -56: // EBADRQC             Invalid request code\r
+    case  -57: // EBADSLT             Invalid slot\r
+    case  -76: // ENOTUNIQ            Name not unique on network\r
+    case  -84: // EILSEQ        Invalid or incomplete multibyte or wide character\r
+      return EFI_NO_MAPPING;\r
+\r
+    case  -12: // ENOMEM              Cannot allocate memory\r
+    case  -23: // ENFILE              Too many open files in system\r
+    case  -24: // EMFILE              Too many open files\r
+    case  -31: // EMLINK              Too many links\r
+    case  -37: // ENOLCK              No locks available\r
+    case  -40: // ELOOP               Too many levels of symbolic links\r
+    case  -50: // ENOCSI              No CSI structure available\r
+    case  -55: // ENOANO              No anode\r
+    case  -63: // ENOSR               Out of streams resources\r
+    case  -82: // ELIBMAX         Attempting to link in too many shared libraries\r
+    case  -87: // EUSERS              Too many users\r
+    case -105: // ENOBUFS             No buffer space available\r
+    case -109: // ETOOMANYREFS        Too many references: cannot splice\r
+    case -119: // ENAVAIL             No XENIX semaphores available\r
+    case -122: // EDQUOT              Disk quota exceeded\r
+      return EFI_OUT_OF_RESOURCES;\r
 \r
-  case  -17: // EEXIST              File exists\r
-  case  -98: // EADDRINUSE          Address already in use\r
-  case -106: // EISCONN             Transport endpoint is already connected\r
-  case -114: // EALREADY            Operation already in progress\r
-  case -115: // EINPROGRESS         Operation now in progress\r
-    return EFI_ALREADY_STARTED;\r
+    case  -13:// EACCES              Permission denied\r
+      return EFI_ACCESS_DENIED;\r
 \r
-  case  -22: // EINVAL              Invalid argument\r
-  case  -33: // EDOM                Numerical argument out of domain\r
-    return EFI_INVALID_PARAMETER;\r
+    case  -17: // EEXIST              File exists\r
+    case  -98: // EADDRINUSE          Address already in use\r
+    case -106: // EISCONN             Transport endpoint is already connected\r
+    case -114: // EALREADY            Operation already in progress\r
+    case -115: // EINPROGRESS         Operation now in progress\r
+      return EFI_ALREADY_STARTED;\r
 \r
-  case  -28: // ENOSPC              No space left on device\r
-  case  -54: // EXFULL              Exchange full\r
-    return EFI_VOLUME_FULL;\r
-\r
-  case  -30: // EROFS               Read-only file system\r
-    return EFI_WRITE_PROTECTED;\r
-\r
-  case  -32: // EPIPE               Broken pipe\r
-  case  -43: // EIDRM               Identifier removed\r
-  case  -67: // ENOLINK             Link has been severed\r
-  case  -68: // EADV                Advertise error\r
-  case  -69: // ESRMNT              Srmount error\r
-  case  -70: // ECOMM               Communication error on send\r
-  case  -73: // EDOTDOT             RFS specific error\r
-  case  -78: // EREMCHG             Remote address changed\r
-  case  -86: // ESTRPIPE            Streams pipe error\r
-  case -102: // ENETRESET           Network dropped connection on reset\r
-  case -103: // ECONNABORTED        Software caused connection abort\r
-  case -104: // ECONNRESET          Connection reset by peer\r
-  case -116: // ESTALE              Stale file handle\r
-  case -125: // ECANCELED           Operation canceled\r
-  case -128: // EKEYREVOKED         Key has been revoked\r
-  case -129: // EKEYREJECTED        Key was rejected by service\r
-  case -130: // EOWNERDEAD          Owner died\r
-  case -131: // ENOTRECOVERABLE     State not recoverable\r
-    return EFI_ABORTED;\r
-\r
-  case  -34: // ERANGE              Numerical result out of range\r
-  case  -75: // EOVERFLOW           Value too large for defined data type\r
-    return EFI_BUFFER_TOO_SMALL;\r
+    case  -22: // EINVAL              Invalid argument\r
+    case  -33: // EDOM                Numerical argument out of domain\r
+      return EFI_INVALID_PARAMETER;\r
 \r
-  case  -52: // EBADE               Invalid exchange\r
-  case -108: // ESHUTDOWN         Cannot send after transport endpoint shutdown\r
-  case -111: // ECONNREFUSED        Connection refused\r
-    return EFI_END_OF_FILE;\r
-\r
-  case  -62: // ETIME               Timer expired\r
-  case -110: // ETIMEDOUT           Connection timed out\r
-  case -127: // EKEYEXPIRED         Key has expired\r
-    return EFI_TIMEOUT;\r
-\r
-  case  -64: // ENONET              Machine is not on the network\r
-  case  -66: // EREMOTE             Object is remote\r
-  case  -72: // EMULTIHOP           Multihop attempted\r
-  case -100: // ENETDOWN            Network is down\r
-  case -101: // ENETUNREACH         Network is unreachable\r
-  case -112: // EHOSTDOWN           Host is down\r
-  case -113: // EHOSTUNREACH        No route to host\r
-  case -123: // ENOMEDIUM           No medium found\r
-  case -132: // ERFKILL             Operation not possible due to RF-kill\r
-    return EFI_NO_MEDIA;\r
-\r
-  case  -71: // EPROTO              Protocol error\r
-    return EFI_PROTOCOL_ERROR;\r
+    case  -28: // ENOSPC              No space left on device\r
+    case  -54: // EXFULL              Exchange full\r
+      return EFI_VOLUME_FULL;\r
+\r
+    case  -30:// EROFS               Read-only file system\r
+      return EFI_WRITE_PROTECTED;\r
+\r
+    case  -32: // EPIPE               Broken pipe\r
+    case  -43: // EIDRM               Identifier removed\r
+    case  -67: // ENOLINK             Link has been severed\r
+    case  -68: // EADV                Advertise error\r
+    case  -69: // ESRMNT              Srmount error\r
+    case  -70: // ECOMM               Communication error on send\r
+    case  -73: // EDOTDOT             RFS specific error\r
+    case  -78: // EREMCHG             Remote address changed\r
+    case  -86: // ESTRPIPE            Streams pipe error\r
+    case -102: // ENETRESET           Network dropped connection on reset\r
+    case -103: // ECONNABORTED        Software caused connection abort\r
+    case -104: // ECONNRESET          Connection reset by peer\r
+    case -116: // ESTALE              Stale file handle\r
+    case -125: // ECANCELED           Operation canceled\r
+    case -128: // EKEYREVOKED         Key has been revoked\r
+    case -129: // EKEYREJECTED        Key was rejected by service\r
+    case -130: // EOWNERDEAD          Owner died\r
+    case -131: // ENOTRECOVERABLE     State not recoverable\r
+      return EFI_ABORTED;\r
+\r
+    case  -34: // ERANGE              Numerical result out of range\r
+    case  -75: // EOVERFLOW           Value too large for defined data type\r
+      return EFI_BUFFER_TOO_SMALL;\r
+\r
+    case  -52: // EBADE               Invalid exchange\r
+    case -108: // ESHUTDOWN         Cannot send after transport endpoint shutdown\r
+    case -111: // ECONNREFUSED        Connection refused\r
+      return EFI_END_OF_FILE;\r
+\r
+    case  -62: // ETIME               Timer expired\r
+    case -110: // ETIMEDOUT           Connection timed out\r
+    case -127: // EKEYEXPIRED         Key has expired\r
+      return EFI_TIMEOUT;\r
+\r
+    case  -64: // ENONET              Machine is not on the network\r
+    case  -66: // EREMOTE             Object is remote\r
+    case  -72: // EMULTIHOP           Multihop attempted\r
+    case -100: // ENETDOWN            Network is down\r
+    case -101: // ENETUNREACH         Network is unreachable\r
+    case -112: // EHOSTDOWN           Host is down\r
+    case -113: // EHOSTUNREACH        No route to host\r
+    case -123: // ENOMEDIUM           No medium found\r
+    case -132: // ERFKILL             Operation not possible due to RF-kill\r
+      return EFI_NO_MEDIA;\r
+\r
+    case  -71:// EPROTO              Protocol error\r
+      return EFI_PROTOCOL_ERROR;\r
 \r
-  case  -74: // EBADMSG             Bad message\r
-  case  -77: // EBADFD              File descriptor in bad state\r
-  case  -80: // ELIBBAD             Accessing a corrupted shared library\r
-  case  -81: // ELIBSCN             .lib section in a.out corrupted\r
-  case -117: // EUCLEAN             Structure needs cleaning\r
-    return EFI_VOLUME_CORRUPTED;\r
+    case  -74: // EBADMSG             Bad message\r
+    case  -77: // EBADFD              File descriptor in bad state\r
+    case  -80: // ELIBBAD             Accessing a corrupted shared library\r
+    case  -81: // ELIBSCN             .lib section in a.out corrupted\r
+    case -117: // EUCLEAN             Structure needs cleaning\r
+      return EFI_VOLUME_CORRUPTED;\r
 \r
-  case  -89: // EDESTADDRREQ        Destination address required\r
-  case -107: // ENOTCONN            Transport endpoint is not connected\r
-    return EFI_NOT_STARTED;\r
+    case  -89: // EDESTADDRREQ        Destination address required\r
+    case -107: // ENOTCONN            Transport endpoint is not connected\r
+      return EFI_NOT_STARTED;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
   return EFI_DEVICE_ERROR;\r
@@ -1151,8 +1204,8 @@ typedef enum {
 STATIC\r
 VOID\r
 ParserStripSlash (\r
-  IN     CHAR8 *Buffer,\r
-  IN OUT UINTN *Position\r
+  IN     CHAR8  *Buffer,\r
+  IN OUT UINTN  *Position\r
   )\r
 {\r
   ASSERT (*Position >= 1);\r
@@ -1160,6 +1213,7 @@ ParserStripSlash (
   if (*Position == 1) {\r
     return;\r
   }\r
+\r
   (*Position)--;\r
 }\r
 \r
@@ -1182,10 +1236,10 @@ ParserStripSlash (
 STATIC\r
 VOID\r
 ParserCopy (\r
-     OUT CHAR8 *Buffer,\r
-  IN OUT UINTN *Position,\r
-  IN     UINTN Size,\r
-  IN     CHAR8 Char8\r
+  OUT CHAR8     *Buffer,\r
+  IN OUT UINTN  *Position,\r
+  IN     UINTN  Size,\r
+  IN     CHAR8  Char8\r
   )\r
 {\r
   ASSERT (*Position < Size);\r
@@ -1209,8 +1263,8 @@ ParserCopy (
 STATIC\r
 VOID\r
 ParserRewindDot (\r
-  IN     CHAR8 *Buffer,\r
-  IN OUT UINTN *Position\r
+  IN     CHAR8  *Buffer,\r
+  IN OUT UINTN  *Position\r
   )\r
 {\r
   ASSERT (*Position >= 2);\r
@@ -1252,9 +1306,9 @@ ParserRewindDot (
 STATIC\r
 VOID\r
 ParserRewindDotDot (\r
-  IN     CHAR8   *Buffer,\r
-  IN OUT UINTN   *Position,\r
-     OUT BOOLEAN *RootEscape\r
+  IN     CHAR8  *Buffer,\r
+  IN OUT UINTN  *Position,\r
+  OUT BOOLEAN   *RootEscape\r
 \r
   )\r
 {\r
@@ -1283,6 +1337,7 @@ ParserRewindDotDot (
     ASSERT (*Position > 0);\r
     (*Position)--;\r
   } while (Buffer[*Position] != '/');\r
+\r
   (*Position)++;\r
 }\r
 \r
@@ -1349,19 +1404,19 @@ EFI_STATUS
 VirtioFsAppendPath (\r
   IN     CHAR8   *LhsPath8,\r
   IN     CHAR16  *RhsPath16,\r
-     OUT CHAR8   **ResultPath8,\r
-     OUT BOOLEAN *RootEscape\r
+  OUT CHAR8      **ResultPath8,\r
+  OUT BOOLEAN    *RootEscape\r
   )\r
 {\r
-  UINTN        RhsLen;\r
-  CHAR8        *RhsPath8;\r
-  UINTN        Idx;\r
-  EFI_STATUS   Status;\r
-  UINTN        SizeToSanitize;\r
-  CHAR8        *BufferToSanitize;\r
-  CHAR8        *SanitizedBuffer;\r
-  PARSER_STATE State;\r
-  UINTN        SanitizedPosition;\r
+  UINTN         RhsLen;\r
+  CHAR8         *RhsPath8;\r
+  UINTN         Idx;\r
+  EFI_STATUS    Status;\r
+  UINTN         SizeToSanitize;\r
+  CHAR8         *BufferToSanitize;\r
+  CHAR8         *SanitizedBuffer;\r
+  PARSER_STATE  State;\r
+  UINTN         SanitizedPosition;\r
 \r
   //\r
   // Appending an empty pathname is not allowed.\r
@@ -1370,6 +1425,7 @@ VirtioFsAppendPath (
   if (RhsLen == 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // Enforce length restriction on RhsPath16.\r
   //\r
@@ -1388,14 +1444,18 @@ VirtioFsAppendPath (
   if (RhsPath8 == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   for (Idx = 0; RhsPath16[Idx] != L'\0'; Idx++) {\r
-    if (RhsPath16[Idx] < 0x20 || RhsPath16[Idx] > 0x7E ||\r
-        RhsPath16[Idx] == L'/') {\r
+    if ((RhsPath16[Idx] < 0x20) || (RhsPath16[Idx] > 0x7E) ||\r
+        (RhsPath16[Idx] == L'/'))\r
+    {\r
       Status = EFI_UNSUPPORTED;\r
       goto FreeRhsPath8;\r
     }\r
+\r
     RhsPath8[Idx] = (CHAR8)((RhsPath16[Idx] == L'\\') ? L'/' : RhsPath16[Idx]);\r
   }\r
+\r
   RhsPath8[Idx++] = '\0';\r
 \r
   //\r
@@ -1412,22 +1472,23 @@ VirtioFsAppendPath (
     // If the right hand side path is absolute, then it is not appended to the\r
     // left hand side path -- it *replaces* the left hand side path.\r
     //\r
-    SizeToSanitize = RhsLen + 1;\r
+    SizeToSanitize   = RhsLen + 1;\r
     BufferToSanitize = RhsPath8;\r
   } else {\r
     //\r
     // If the right hand side path is relative, then it is appended (naively)\r
     // to the left hand side.\r
     //\r
-    UINTN LhsLen;\r
+    UINTN  LhsLen;\r
 \r
-    LhsLen = AsciiStrLen (LhsPath8);\r
-    SizeToSanitize = LhsLen + 1 + RhsLen + 1;\r
+    LhsLen           = AsciiStrLen (LhsPath8);\r
+    SizeToSanitize   = LhsLen + 1 + RhsLen + 1;\r
     BufferToSanitize = AllocatePool (SizeToSanitize);\r
     if (BufferToSanitize == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto FreeRhsPath8;\r
     }\r
+\r
     CopyMem (BufferToSanitize, LhsPath8, LhsLen);\r
     BufferToSanitize[LhsLen] = '/';\r
     CopyMem (BufferToSanitize + LhsLen + 1, RhsPath8, RhsLen + 1);\r
@@ -1451,113 +1512,117 @@ VirtioFsAppendPath (
   State             = ParserInit;\r
   SanitizedPosition = 0;\r
   do {\r
-    CHAR8 Chr8;\r
+    CHAR8  Chr8;\r
 \r
     ASSERT (Idx < SizeToSanitize);\r
     Chr8 = BufferToSanitize[Idx++];\r
 \r
     switch (State) {\r
-    case ParserInit: // just starting\r
-      ASSERT (Chr8 == '/');\r
-      ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-      State = ParserSlash;\r
-      break;\r
-\r
-    case ParserSlash: // slash(es) seen\r
-      switch (Chr8) {\r
-      case '\0':\r
-        ParserStripSlash (SanitizedBuffer, &SanitizedPosition);\r
+      case ParserInit: // just starting\r
+        ASSERT (Chr8 == '/');\r
         ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-        State = ParserEnd;\r
-        break;\r
-      case '/':\r
-        //\r
-        // skip & stay in same state\r
-        //\r
-        break;\r
-      case '.':\r
-        ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-        State = ParserDot;\r
-        break;\r
-      default:\r
-        ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-        State = ParserNormal;\r
-        break;\r
-      }\r
-      break;\r
-\r
-    case ParserDot: // one dot seen since last slash\r
-      switch (Chr8) {\r
-      case '\0':\r
-        ParserRewindDot (SanitizedBuffer, &SanitizedPosition);\r
-        ParserStripSlash (SanitizedBuffer, &SanitizedPosition);\r
-        ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-        State = ParserEnd;\r
-        break;\r
-      case '/':\r
-        ParserRewindDot (SanitizedBuffer, &SanitizedPosition);\r
         State = ParserSlash;\r
         break;\r
-      case '.':\r
-        ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-        State = ParserDotDot;\r
-        break;\r
-      default:\r
-        ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-        State = ParserNormal;\r
-        break;\r
-      }\r
-      break;\r
 \r
-    case ParserDotDot: // two dots seen since last slash\r
-      switch (Chr8) {\r
-      case '\0':\r
-        ParserRewindDotDot (SanitizedBuffer, &SanitizedPosition, RootEscape);\r
-        ParserStripSlash (SanitizedBuffer, &SanitizedPosition);\r
-        ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-        State = ParserEnd;\r
-        break;\r
-      case '/':\r
-        ParserRewindDotDot (SanitizedBuffer, &SanitizedPosition, RootEscape);\r
-        State = ParserSlash;\r
+      case ParserSlash: // slash(es) seen\r
+        switch (Chr8) {\r
+          case '\0':\r
+            ParserStripSlash (SanitizedBuffer, &SanitizedPosition);\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            State = ParserEnd;\r
+            break;\r
+          case '/':\r
+            //\r
+            // skip & stay in same state\r
+            //\r
+            break;\r
+          case '.':\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            State = ParserDot;\r
+            break;\r
+          default:\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            State = ParserNormal;\r
+            break;\r
+        }\r
+\r
         break;\r
-      case '.':\r
-        //\r
-        // fall through\r
-        //\r
-      default:\r
-        ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-        State = ParserNormal;\r
+\r
+      case ParserDot: // one dot seen since last slash\r
+        switch (Chr8) {\r
+          case '\0':\r
+            ParserRewindDot (SanitizedBuffer, &SanitizedPosition);\r
+            ParserStripSlash (SanitizedBuffer, &SanitizedPosition);\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            State = ParserEnd;\r
+            break;\r
+          case '/':\r
+            ParserRewindDot (SanitizedBuffer, &SanitizedPosition);\r
+            State = ParserSlash;\r
+            break;\r
+          case '.':\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            State = ParserDotDot;\r
+            break;\r
+          default:\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            State = ParserNormal;\r
+            break;\r
+        }\r
+\r
         break;\r
-      }\r
-      break;\r
 \r
-    case ParserNormal: // a different sequence seen\r
-      switch (Chr8) {\r
-      case '\0':\r
-        ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-        State = ParserEnd;\r
+      case ParserDotDot: // two dots seen since last slash\r
+        switch (Chr8) {\r
+          case '\0':\r
+            ParserRewindDotDot (SanitizedBuffer, &SanitizedPosition, RootEscape);\r
+            ParserStripSlash (SanitizedBuffer, &SanitizedPosition);\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            State = ParserEnd;\r
+            break;\r
+          case '/':\r
+            ParserRewindDotDot (SanitizedBuffer, &SanitizedPosition, RootEscape);\r
+            State = ParserSlash;\r
+            break;\r
+          case '.':\r
+          //\r
+          // fall through\r
+          //\r
+          default:\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            State = ParserNormal;\r
+            break;\r
+        }\r
+\r
         break;\r
-      case '/':\r
-        ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
-        State = ParserSlash;\r
+\r
+      case ParserNormal: // a different sequence seen\r
+        switch (Chr8) {\r
+          case '\0':\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            State = ParserEnd;\r
+            break;\r
+          case '/':\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            State = ParserSlash;\r
+            break;\r
+          case '.':\r
+          //\r
+          // fall through\r
+          //\r
+          default:\r
+            //\r
+            // copy and stay in same state\r
+            //\r
+            ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+            break;\r
+        }\r
+\r
         break;\r
-      case '.':\r
-        //\r
-        // fall through\r
-        //\r
+\r
       default:\r
-        //\r
-        // copy and stay in same state\r
-        //\r
-        ParserCopy (SanitizedBuffer, &SanitizedPosition, SizeToSanitize, Chr8);\r
+        ASSERT (FALSE);\r
         break;\r
-      }\r
-      break;\r
-\r
-    default:\r
-      ASSERT (FALSE);\r
-      break;\r
     }\r
   } while (State != ParserEnd);\r
 \r
@@ -1634,16 +1699,16 @@ FreeRhsPath8:
 **/\r
 EFI_STATUS\r
 VirtioFsLookupMostSpecificParentDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN OUT CHAR8     *Path,\r
-     OUT UINT64    *DirNodeId,\r
-     OUT CHAR8     **LastComponent\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN OUT CHAR8      *Path,\r
+  OUT UINT64        *DirNodeId,\r
+  OUT CHAR8         **LastComponent\r
   )\r
 {\r
-  UINT64     ParentDirNodeId;\r
-  CHAR8      *Slash;\r
-  EFI_STATUS Status;\r
-  UINT64     NextDirNodeId;\r
+  UINT64      ParentDirNodeId;\r
+  CHAR8       *Slash;\r
+  EFI_STATUS  Status;\r
+  UINT64      NextDirNodeId;\r
 \r
   if (AsciiStrCmp (Path, "/") == 0) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1651,10 +1716,10 @@ VirtioFsLookupMostSpecificParentDir (
 \r
   ParentDirNodeId = VIRTIO_FS_FUSE_ROOT_DIR_NODE_ID;\r
   Slash           = Path;\r
-  for (;;) {\r
-    CHAR8                              *NextSlash;\r
-    VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE FuseAttr;\r
-    EFI_FILE_INFO                      FileInfo;\r
+  for ( ; ;) {\r
+    CHAR8                               *NextSlash;\r
+    VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  FuseAttr;\r
+    EFI_FILE_INFO                       FileInfo;\r
 \r
     //\r
     // Find the slash (if any) that terminates the next pathname component.\r
@@ -1670,8 +1735,13 @@ VirtioFsLookupMostSpecificParentDir (
     // up.\r
     //\r
     *NextSlash = '\0';\r
-    Status = VirtioFsFuseLookup (VirtioFs, ParentDirNodeId, Slash + 1,\r
-               &NextDirNodeId, &FuseAttr);\r
+    Status     = VirtioFsFuseLookup (\r
+                   VirtioFs,\r
+                   ParentDirNodeId,\r
+                   Slash + 1,\r
+                   &NextDirNodeId,\r
+                   &FuseAttr\r
+                   );\r
     *NextSlash = '/';\r
 \r
     //\r
@@ -1696,6 +1766,7 @@ VirtioFsLookupMostSpecificParentDir (
     if (EFI_ERROR (Status)) {\r
       goto ForgetNextDirNodeId;\r
     }\r
+\r
     if ((FileInfo.Attribute & EFI_FILE_DIRECTORY) == 0) {\r
       Status = EFI_ACCESS_DENIED;\r
       goto ForgetNextDirNodeId;\r
@@ -1751,14 +1822,14 @@ ForgetNextDirNodeId:
 EFI_STATUS\r
 VirtioFsGetBasename (\r
   IN     CHAR8  *Path,\r
-     OUT CHAR16 *Basename     OPTIONAL,\r
+  OUT CHAR16    *Basename     OPTIONAL,\r
   IN OUT UINTN  *BasenameSize\r
   )\r
 {\r
-  UINTN AllocSize;\r
-  UINTN LastComponent;\r
-  UINTN Idx;\r
-  UINTN PathSize;\r
+  UINTN  AllocSize;\r
+  UINTN  LastComponent;\r
+  UINTN  Idx;\r
+  UINTN  PathSize;\r
 \r
   AllocSize = *BasenameSize;\r
 \r
@@ -1768,6 +1839,7 @@ VirtioFsGetBasename (
       LastComponent = Idx;\r
     }\r
   }\r
+\r
   PathSize = Idx + 1;\r
   ASSERT (LastComponent < MAX_UINTN);\r
   LastComponent++;\r
@@ -1780,6 +1852,7 @@ VirtioFsGetBasename (
   for (Idx = LastComponent; Idx < PathSize; Idx++) {\r
     Basename[Idx - LastComponent] = Path[Idx];\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -1845,8 +1918,8 @@ EFI_STATUS
 VirtioFsComposeRenameDestination (\r
   IN     CHAR8   *LhsPath8,\r
   IN     CHAR16  *RhsPath16,\r
-     OUT CHAR8   **ResultPath8,\r
-     OUT BOOLEAN *RootEscape\r
+  OUT CHAR8      **ResultPath8,\r
+  OUT BOOLEAN    *RootEscape\r
   )\r
 {\r
   //\r
@@ -1854,13 +1927,13 @@ VirtioFsComposeRenameDestination (
   // excluding terminating NULs. Sizes are expressed as byte counts, including\r
   // the bytes taken up by terminating NULs.\r
   //\r
-  UINTN      RhsLen;\r
-  UINTN      LhsBasename16Size;\r
-  EFI_STATUS Status;\r
-  UINTN      LhsBasenameLen;\r
-  UINTN      DestSuffix16Size;\r
-  CHAR16     *DestSuffix16;\r
-  CHAR8      *DestPrefix8;\r
+  UINTN       RhsLen;\r
+  UINTN       LhsBasename16Size;\r
+  EFI_STATUS  Status;\r
+  UINTN       LhsBasenameLen;\r
+  UINTN       DestSuffix16Size;\r
+  CHAR16      *DestSuffix16;\r
+  CHAR8       *DestPrefix8;\r
 \r
   //\r
   // An empty destination operand for the rename/move operation is not allowed.\r
@@ -1869,6 +1942,7 @@ VirtioFsComposeRenameDestination (
   if (RhsLen == 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // Enforce length restriction on RhsPath16.\r
   //\r
@@ -1880,7 +1954,7 @@ VirtioFsComposeRenameDestination (
   // Determine the length of the basename of LhsPath8.\r
   //\r
   LhsBasename16Size = 0;\r
-  Status = VirtioFsGetBasename (LhsPath8, NULL, &LhsBasename16Size);\r
+  Status            = VirtioFsGetBasename (LhsPath8, NULL, &LhsBasename16Size);\r
   ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
   ASSERT (LhsBasename16Size >= sizeof (CHAR16));\r
   ASSERT (LhsBasename16Size % sizeof (CHAR16) == 0);\r
@@ -1900,20 +1974,24 @@ VirtioFsComposeRenameDestination (
     // Append the basename of LhsPath8 as a CHAR16 string to RhsPath16.\r
     //\r
     DestSuffix16Size = RhsLen * sizeof (CHAR16) + LhsBasename16Size;\r
-    DestSuffix16 = AllocatePool (DestSuffix16Size);\r
+    DestSuffix16     = AllocatePool (DestSuffix16Size);\r
     if (DestSuffix16 == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     CopyMem (DestSuffix16, RhsPath16, RhsLen * sizeof (CHAR16));\r
-    Status = VirtioFsGetBasename (LhsPath8, DestSuffix16 + RhsLen,\r
-               &LhsBasename16Size);\r
+    Status = VirtioFsGetBasename (\r
+               LhsPath8,\r
+               DestSuffix16 + RhsLen,\r
+               &LhsBasename16Size\r
+               );\r
     ASSERT_EFI_ERROR (Status);\r
   } else {\r
     //\r
     // Just create a copy of RhsPath16.\r
     //\r
     DestSuffix16Size = (RhsLen + 1) * sizeof (CHAR16);\r
-    DestSuffix16 = AllocateCopyPool (DestSuffix16Size, RhsPath16);\r
+    DestSuffix16     = AllocateCopyPool (DestSuffix16Size, RhsPath16);\r
     if (DestSuffix16 == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
@@ -1935,8 +2013,8 @@ VirtioFsComposeRenameDestination (
       goto FreeDestSuffix16;\r
     }\r
   } else {\r
-    UINTN LhsLen;\r
-    UINTN DestPrefixLen;\r
+    UINTN  LhsLen;\r
+    UINTN  DestPrefixLen;\r
 \r
     //\r
     // Strip the basename of LhsPath8.\r
@@ -1951,11 +2029,13 @@ VirtioFsComposeRenameDestination (
     if (DestPrefixLen > 1) {\r
       DestPrefixLen--;\r
     }\r
+\r
     DestPrefix8 = AllocatePool (DestPrefixLen + 1);\r
     if (DestPrefix8 == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto FreeDestSuffix16;\r
     }\r
+\r
     CopyMem (DestPrefix8, LhsPath8, DestPrefixLen);\r
     DestPrefix8[DestPrefixLen] = '\0';\r
   }\r
@@ -1964,8 +2044,12 @@ VirtioFsComposeRenameDestination (
   // Now combine DestPrefix8 and DestSuffix16 into the final canonical\r
   // pathname.\r
   //\r
-  Status = VirtioFsAppendPath (DestPrefix8, DestSuffix16, ResultPath8,\r
-             RootEscape);\r
+  Status = VirtioFsAppendPath (\r
+             DestPrefix8,\r
+             DestSuffix16,\r
+             ResultPath8,\r
+             RootEscape\r
+             );\r
 \r
   FreePool (DestPrefix8);\r
   //\r
@@ -2004,13 +2088,13 @@ FreeDestSuffix16:
 **/\r
 EFI_STATUS\r
 VirtioFsFuseAttrToEfiFileInfo (\r
-  IN     VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE *FuseAttr,\r
-     OUT EFI_FILE_INFO                      *FileInfo\r
+  IN     VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  *FuseAttr,\r
+  OUT EFI_FILE_INFO                          *FileInfo\r
   )\r
 {\r
-  UINT64   EpochTime[3];\r
-  EFI_TIME *ConvertedTime[ARRAY_SIZE (EpochTime)];\r
-  UINTN    Idx;\r
+  UINT64    EpochTime[3];\r
+  EFI_TIME  *ConvertedTime[ARRAY_SIZE (EpochTime)];\r
+  UINTN     Idx;\r
 \r
   FileInfo->FileSize = FuseAttr->Size;\r
 \r
@@ -2020,6 +2104,7 @@ VirtioFsFuseAttrToEfiFileInfo (
   if (FuseAttr->Blocks >= BIT55) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   FileInfo->PhysicalSize = LShiftU64 (FuseAttr->Blocks, 9);\r
 \r
   //\r
@@ -2041,6 +2126,7 @@ VirtioFsFuseAttrToEfiFileInfo (
     if (EpochTime[Idx] > MAX_UINTN) {\r
       return EFI_UNSUPPORTED;\r
     }\r
+\r
     //\r
     // Set the following fields in the converted time: Year, Month, Day, Hour,\r
     // Minute, Second, Nanosecond.\r
@@ -2063,32 +2149,34 @@ VirtioFsFuseAttrToEfiFileInfo (
   // Set the attributes.\r
   //\r
   switch (FuseAttr->Mode & VIRTIO_FS_FUSE_MODE_TYPE_MASK) {\r
-  case VIRTIO_FS_FUSE_MODE_TYPE_DIR:\r
-    FileInfo->Attribute = EFI_FILE_DIRECTORY;\r
-    break;\r
-  case VIRTIO_FS_FUSE_MODE_TYPE_REG:\r
-    FileInfo->Attribute = 0;\r
-    break;\r
-  default:\r
-    //\r
-    // Other file types are not supported.\r
-    //\r
-    return EFI_UNSUPPORTED;\r
+    case VIRTIO_FS_FUSE_MODE_TYPE_DIR:\r
+      FileInfo->Attribute = EFI_FILE_DIRECTORY;\r
+      break;\r
+    case VIRTIO_FS_FUSE_MODE_TYPE_REG:\r
+      FileInfo->Attribute = 0;\r
+      break;\r
+    default:\r
+      //\r
+      // Other file types are not supported.\r
+      //\r
+      return EFI_UNSUPPORTED;\r
   }\r
+\r
   //\r
   // Report the regular file or directory as read-only if all classes lack\r
   // write permission.\r
   //\r
   if ((FuseAttr->Mode & (VIRTIO_FS_FUSE_MODE_PERM_WUSR |\r
                          VIRTIO_FS_FUSE_MODE_PERM_WGRP |\r
-                         VIRTIO_FS_FUSE_MODE_PERM_WOTH)) == 0) {\r
+                         VIRTIO_FS_FUSE_MODE_PERM_WOTH)) == 0)\r
+  {\r
     FileInfo->Attribute |= EFI_FILE_READ_ONLY;\r
   }\r
 \r
   //\r
   // A hard link count greater than 1 is not supported for regular files.\r
   //\r
-  if ((FileInfo->Attribute & EFI_FILE_DIRECTORY) == 0 && FuseAttr->Nlink > 1) {\r
+  if (((FileInfo->Attribute & EFI_FILE_DIRECTORY) == 0) && (FuseAttr->Nlink > 1)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -2129,19 +2217,20 @@ VirtioFsFuseAttrToEfiFileInfo (
 **/\r
 EFI_STATUS\r
 VirtioFsFuseDirentPlusToEfiFileInfo (\r
-  IN     VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE *FuseDirent,\r
-  IN OUT EFI_FILE_INFO                      *FileInfo\r
+  IN     VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE  *FuseDirent,\r
+  IN OUT EFI_FILE_INFO                       *FileInfo\r
   )\r
 {\r
-  UINTN  DirentSize;\r
-  UINTN  FileInfoSize;\r
-  UINT8  *DirentName;\r
-  UINT32 Idx;\r
+  UINTN   DirentSize;\r
+  UINTN   FileInfoSize;\r
+  UINT8   *DirentName;\r
+  UINT32  Idx;\r
 \r
   DirentSize = VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE_SIZE (FuseDirent->Namelen);\r
   if (DirentSize == 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // We're now safe from overflow in the calculation below.\r
   //\r
@@ -2156,15 +2245,18 @@ VirtioFsFuseDirentPlusToEfiFileInfo (
   //\r
   DirentName = (UINT8 *)(FuseDirent + 1);\r
   for (Idx = 0; Idx < FuseDirent->Namelen; Idx++) {\r
-    UINT8 NameByte;\r
+    UINT8  NameByte;\r
 \r
     NameByte = DirentName[Idx];\r
-    if (NameByte < 0x20 || NameByte > 0x7E ||\r
-        NameByte == '/' || NameByte == '\\') {\r
+    if ((NameByte < 0x20) || (NameByte > 0x7E) ||\r
+        (NameByte == '/') || (NameByte == '\\'))\r
+    {\r
       return EFI_UNSUPPORTED;\r
     }\r
+\r
     FileInfo->FileName[Idx] = (CHAR16)NameByte;\r
   }\r
+\r
   FileInfo->FileName[Idx++] = L'\0';\r
   //\r
   // Set the (possibly reduced) size.\r
@@ -2196,22 +2288,23 @@ VirtioFsFuseDirentPlusToEfiFileInfo (
 **/\r
 VOID\r
 VirtioFsGetFuseSizeUpdate (\r
-  IN     EFI_FILE_INFO *Info,\r
-  IN     EFI_FILE_INFO *NewInfo,\r
-     OUT BOOLEAN       *Update,\r
-     OUT UINT64        *Size\r
+  IN     EFI_FILE_INFO  *Info,\r
+  IN     EFI_FILE_INFO  *NewInfo,\r
+  OUT BOOLEAN           *Update,\r
+  OUT UINT64            *Size\r
   )\r
 {\r
-  BOOLEAN IsDirectory;\r
+  BOOLEAN  IsDirectory;\r
 \r
   IsDirectory = (BOOLEAN)((Info->Attribute & EFI_FILE_DIRECTORY) != 0);\r
 \r
-  if (IsDirectory || Info->FileSize == NewInfo->FileSize) {\r
+  if (IsDirectory || (Info->FileSize == NewInfo->FileSize)) {\r
     *Update = FALSE;\r
     return;\r
   }\r
+\r
   *Update = TRUE;\r
-  *Size = NewInfo->FileSize;\r
+  *Size   = NewInfo->FileSize;\r
 }\r
 \r
 /**\r
@@ -2260,20 +2353,20 @@ VirtioFsGetFuseSizeUpdate (
 **/\r
 EFI_STATUS\r
 VirtioFsGetFuseTimeUpdates (\r
-  IN     EFI_FILE_INFO *Info,\r
-  IN     EFI_FILE_INFO *NewInfo,\r
-     OUT BOOLEAN       *UpdateAtime,\r
-     OUT BOOLEAN       *UpdateMtime,\r
-     OUT UINT64        *Atime,\r
-     OUT UINT64        *Mtime\r
+  IN     EFI_FILE_INFO  *Info,\r
+  IN     EFI_FILE_INFO  *NewInfo,\r
+  OUT BOOLEAN           *UpdateAtime,\r
+  OUT BOOLEAN           *UpdateMtime,\r
+  OUT UINT64            *Atime,\r
+  OUT UINT64            *Mtime\r
   )\r
 {\r
-  EFI_TIME              *Time[3];\r
-  EFI_TIME              *NewTime[ARRAY_SIZE (Time)];\r
-  UINTN                 Idx;\r
-  STATIC CONST EFI_TIME ZeroTime = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };\r
-  BOOLEAN               Change[ARRAY_SIZE (Time)];\r
-  UINT64                Seconds[ARRAY_SIZE (Time)];\r
+  EFI_TIME               *Time[3];\r
+  EFI_TIME               *NewTime[ARRAY_SIZE (Time)];\r
+  UINTN                  Idx;\r
+  STATIC CONST EFI_TIME  ZeroTime = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };\r
+  BOOLEAN                Change[ARRAY_SIZE (Time)];\r
+  UINT64                 Seconds[ARRAY_SIZE (Time)];\r
 \r
   Time[0]    = &Info->CreateTime;\r
   Time[1]    = &Info->LastAccessTime;\r
@@ -2288,14 +2381,16 @@ VirtioFsGetFuseTimeUpdates (
   // changed, calculate the seconds since the Epoch.\r
   //\r
   for (Idx = 0; Idx < ARRAY_SIZE (Time); Idx++) {\r
-    if (CompareMem (NewTime[Idx], &ZeroTime, sizeof (EFI_TIME)) == 0 ||\r
-        CompareMem (NewTime[Idx], Time[Idx], sizeof (EFI_TIME)) == 0) {\r
+    if ((CompareMem (NewTime[Idx], &ZeroTime, sizeof (EFI_TIME)) == 0) ||\r
+        (CompareMem (NewTime[Idx], Time[Idx], sizeof (EFI_TIME)) == 0))\r
+    {\r
       Change[Idx] = FALSE;\r
     } else {\r
       if (!IsTimeValid (NewTime[Idx])) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
-      Change[Idx] = TRUE;\r
+\r
+      Change[Idx]  = TRUE;\r
       Seconds[Idx] = EfiTimeToEpoch (NewTime[Idx]);\r
     }\r
   }\r
@@ -2307,7 +2402,7 @@ VirtioFsGetFuseTimeUpdates (
   // last modification time. If changes are requested for both, but to\r
   // different timestamps, we reject the request.\r
   //\r
-  if (Change[0] && Change[2] && Seconds[0] != Seconds[2]) {\r
+  if (Change[0] && Change[2] && (Seconds[0] != Seconds[2])) {\r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
@@ -2316,15 +2411,17 @@ VirtioFsGetFuseTimeUpdates (
 \r
   if (Change[0]) {\r
     *UpdateMtime = TRUE;\r
-    *Mtime = Seconds[0];\r
+    *Mtime       = Seconds[0];\r
   }\r
+\r
   if (Change[1]) {\r
     *UpdateAtime = TRUE;\r
-    *Atime = Seconds[1];\r
+    *Atime       = Seconds[1];\r
   }\r
+\r
   if (Change[2]) {\r
     *UpdateMtime = TRUE;\r
-    *Mtime = Seconds[2];\r
+    *Mtime       = Seconds[2];\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -2360,16 +2457,16 @@ VirtioFsGetFuseTimeUpdates (
 **/\r
 EFI_STATUS\r
 VirtioFsGetFuseModeUpdate (\r
-  IN     EFI_FILE_INFO *Info,\r
-  IN     EFI_FILE_INFO *NewInfo,\r
-     OUT BOOLEAN       *Update,\r
-     OUT UINT32        *Mode\r
-     )\r
+  IN     EFI_FILE_INFO  *Info,\r
+  IN     EFI_FILE_INFO  *NewInfo,\r
+  OUT BOOLEAN           *Update,\r
+  OUT UINT32            *Mode\r
+  )\r
 {\r
-  UINT64  Toggle;\r
-  BOOLEAN IsDirectory;\r
-  BOOLEAN IsWriteable;\r
-  BOOLEAN WillBeWriteable;\r
+  UINT64   Toggle;\r
+  BOOLEAN  IsDirectory;\r
+  BOOLEAN  IsWriteable;\r
+  BOOLEAN  WillBeWriteable;\r
 \r
   Toggle = Info->Attribute ^ NewInfo->Attribute;\r
   if ((Toggle & ~EFI_FILE_VALID_ATTR) != 0) {\r
@@ -2378,6 +2475,7 @@ VirtioFsGetFuseModeUpdate (
     //\r
     return EFI_ACCESS_DENIED;\r
   }\r
+\r
   if ((Toggle & EFI_FILE_DIRECTORY) != 0) {\r
     //\r
     // EFI_FILE_DIRECTORY cannot be toggled.\r
@@ -2421,6 +2519,7 @@ VirtioFsGetFuseModeUpdate (
                VIRTIO_FS_FUSE_MODE_PERM_ROTH);\r
     }\r
   }\r
+\r
   *Update = TRUE;\r
   return EFI_SUCCESS;\r
 }\r
index 4c1cf52112cea2afefd23f0a30228e01d5e61dc9..0cae2126b773b110eaf3ea3fc49635554f621d10 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileClose (\r
-  IN EFI_FILE_PROTOCOL *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 {\r
-  VIRTIO_FS_FILE *VirtioFsFile;\r
-  VIRTIO_FS      *VirtioFs;\r
+  VIRTIO_FS_FILE  *VirtioFsFile;\r
+  VIRTIO_FS       *VirtioFs;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   VirtioFs     = VirtioFsFile->OwnerFs;\r
@@ -34,16 +34,27 @@ VirtioFsSimpleFileClose (
   //\r
   if (VirtioFsFile->IsOpenForWriting) {\r
     if (!VirtioFsFile->IsDirectory) {\r
-      VirtioFsFuseFlush (VirtioFs, VirtioFsFile->NodeId,\r
-        VirtioFsFile->FuseHandle);\r
+      VirtioFsFuseFlush (\r
+        VirtioFs,\r
+        VirtioFsFile->NodeId,\r
+        VirtioFsFile->FuseHandle\r
+        );\r
     }\r
 \r
-    VirtioFsFuseFsyncFileOrDir (VirtioFs, VirtioFsFile->NodeId,\r
-      VirtioFsFile->FuseHandle, VirtioFsFile->IsDirectory);\r
+    VirtioFsFuseFsyncFileOrDir (\r
+      VirtioFs,\r
+      VirtioFsFile->NodeId,\r
+      VirtioFsFile->FuseHandle,\r
+      VirtioFsFile->IsDirectory\r
+      );\r
   }\r
 \r
-  VirtioFsFuseReleaseFileOrDir (VirtioFs, VirtioFsFile->NodeId,\r
-    VirtioFsFile->FuseHandle, VirtioFsFile->IsDirectory);\r
+  VirtioFsFuseReleaseFileOrDir (\r
+    VirtioFs,\r
+    VirtioFsFile->NodeId,\r
+    VirtioFsFile->FuseHandle,\r
+    VirtioFsFile->IsDirectory\r
+    );\r
 \r
   //\r
   // VirtioFsFile->FuseHandle is gone at this point, but VirtioFsFile->NodeId\r
@@ -63,6 +74,7 @@ VirtioFsSimpleFileClose (
   if (VirtioFsFile->FileInfoArray != NULL) {\r
     FreePool (VirtioFsFile->FileInfoArray);\r
   }\r
+\r
   FreePool (VirtioFsFile);\r
   return EFI_SUCCESS;\r
 }\r
index 76a868b3c24df182281a34780fb7df3fa4fc68bc..e745c4e25210b8fd3e489edb0e11d38d8e1066e9 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileDelete (\r
-  IN EFI_FILE_PROTOCOL *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 {\r
-  VIRTIO_FS_FILE *VirtioFsFile;\r
-  VIRTIO_FS      *VirtioFs;\r
-  EFI_STATUS     Status;\r
+  VIRTIO_FS_FILE  *VirtioFsFile;\r
+  VIRTIO_FS       *VirtioFs;\r
+  EFI_STATUS      Status;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   VirtioFs     = VirtioFsFile->OwnerFs;\r
@@ -38,8 +38,12 @@ VirtioFsSimpleFileDelete (
   //\r
   // If any action fails below, we still try the others.\r
   //\r
-  VirtioFsFuseReleaseFileOrDir (VirtioFs, VirtioFsFile->NodeId,\r
-    VirtioFsFile->FuseHandle, VirtioFsFile->IsDirectory);\r
+  VirtioFsFuseReleaseFileOrDir (\r
+    VirtioFs,\r
+    VirtioFsFile->NodeId,\r
+    VirtioFsFile->FuseHandle,\r
+    VirtioFsFile->IsDirectory\r
+    );\r
 \r
   //\r
   // VirtioFsFile->FuseHandle is gone at this point, but VirtioFsFile->NodeId\r
@@ -47,8 +51,8 @@ VirtioFsSimpleFileDelete (
   // of this operation determines the return status of the function.\r
   //\r
   if (VirtioFsFile->IsOpenForWriting) {\r
-    UINT64 ParentNodeId;\r
-    CHAR8  *LastComponent;\r
+    UINT64  ParentNodeId;\r
+    CHAR8   *LastComponent;\r
 \r
     //\r
     // Split our canonical pathname into most specific parent directory\r
@@ -78,6 +82,7 @@ VirtioFsSimpleFileDelete (
         VirtioFsFuseForget (VirtioFs, ParentNodeId);\r
       }\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       //\r
       // Map any failure to the spec-mandated warning code.\r
@@ -105,6 +110,7 @@ VirtioFsSimpleFileDelete (
   if (VirtioFsFile->FileInfoArray != NULL) {\r
     FreePool (VirtioFsFile->FileInfoArray);\r
   }\r
+\r
   FreePool (VirtioFsFile);\r
   return Status;\r
 }\r
index ba4a611e5a2129b0cafa1084c2f0bb31c860b7dc..d7d04b94e5ab0d8eb2fb1e8e175a34f09c9fa2ff 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileFlush (\r
-  IN EFI_FILE_PROTOCOL *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   )\r
 {\r
-  VIRTIO_FS_FILE *VirtioFsFile;\r
-  VIRTIO_FS      *VirtioFs;\r
-  EFI_STATUS     Status;\r
+  VIRTIO_FS_FILE  *VirtioFsFile;\r
+  VIRTIO_FS       *VirtioFs;\r
+  EFI_STATUS      Status;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   VirtioFs     = VirtioFsFile->OwnerFs;\r
@@ -29,14 +29,21 @@ VirtioFsSimpleFileFlush (
   // FUSE_FLUSH is for regular files only.\r
   //\r
   if (!VirtioFsFile->IsDirectory) {\r
-    Status = VirtioFsFuseFlush (VirtioFs, VirtioFsFile->NodeId,\r
-               VirtioFsFile->FuseHandle);\r
+    Status = VirtioFsFuseFlush (\r
+               VirtioFs,\r
+               VirtioFsFile->NodeId,\r
+               VirtioFsFile->FuseHandle\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
   }\r
 \r
-  Status = VirtioFsFuseFsyncFileOrDir (VirtioFs, VirtioFsFile->NodeId,\r
-             VirtioFsFile->FuseHandle, VirtioFsFile->IsDirectory);\r
+  Status = VirtioFsFuseFsyncFileOrDir (\r
+             VirtioFs,\r
+             VirtioFsFile->NodeId,\r
+             VirtioFsFile->FuseHandle,\r
+             VirtioFsFile->IsDirectory\r
+             );\r
   return Status;\r
 }\r
index c8be1d502202d8a449956a70288b80ac8e537afc..d4dc642c4de7b28970fcd6568ff6d4d72bba1066 100644 (file)
 STATIC\r
 EFI_STATUS\r
 GetFileInfo (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-  IN OUT UINTN             *BufferSize,\r
-     OUT VOID              *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT VOID                  *Buffer\r
   )\r
 {\r
-  VIRTIO_FS_FILE                     *VirtioFsFile;\r
-  VIRTIO_FS                          *VirtioFs;\r
-  UINTN                              AllocSize;\r
-  UINTN                              BasenameSize;\r
-  EFI_STATUS                         Status;\r
-  EFI_FILE_INFO                      *FileInfo;\r
-  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE FuseAttr;\r
+  VIRTIO_FS_FILE                      *VirtioFsFile;\r
+  VIRTIO_FS                           *VirtioFs;\r
+  UINTN                               AllocSize;\r
+  UINTN                               BasenameSize;\r
+  EFI_STATUS                          Status;\r
+  EFI_FILE_INFO                       *FileInfo;\r
+  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  FuseAttr;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   VirtioFs     = VirtioFsFile->OwnerFs;\r
@@ -41,8 +41,11 @@ GetFileInfo (
   // Calculate the needed size.\r
   //\r
   BasenameSize = 0;\r
-  Status = VirtioFsGetBasename (VirtioFsFile->CanonicalPathname, NULL,\r
-             &BasenameSize);\r
+  Status       = VirtioFsGetBasename (\r
+                   VirtioFsFile->CanonicalPathname,\r
+                   NULL,\r
+                   &BasenameSize\r
+                   );\r
   ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
   *BufferSize = OFFSET_OF (EFI_FILE_INFO, FileName) + BasenameSize;\r
 \r
@@ -53,10 +56,13 @@ GetFileInfo (
   //\r
   // Set the structure size, and store the basename.\r
   //\r
-  FileInfo = Buffer;\r
+  FileInfo       = Buffer;\r
   FileInfo->Size = *BufferSize;\r
-  Status = VirtioFsGetBasename (VirtioFsFile->CanonicalPathname,\r
-             FileInfo->FileName, &BasenameSize);\r
+  Status         = VirtioFsGetBasename (\r
+                     VirtioFsFile->CanonicalPathname,\r
+                     FileInfo->FileName,\r
+                     &BasenameSize\r
+                     );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -66,6 +72,7 @@ GetFileInfo (
   if (!EFI_ERROR (Status)) {\r
     Status = VirtioFsFuseAttrToEfiFileInfo (&FuseAttr, FileInfo);\r
   }\r
+\r
   return (Status == EFI_BUFFER_TOO_SMALL) ? EFI_DEVICE_ERROR : Status;\r
 }\r
 \r
@@ -75,19 +82,19 @@ GetFileInfo (
 STATIC\r
 EFI_STATUS\r
 GetFileSystemInfo (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-  IN OUT UINTN             *BufferSize,\r
-     OUT VOID              *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT VOID                  *Buffer\r
   )\r
 {\r
-  VIRTIO_FS_FILE                 *VirtioFsFile;\r
-  VIRTIO_FS                      *VirtioFs;\r
-  UINTN                          AllocSize;\r
-  UINTN                          LabelSize;\r
-  EFI_STATUS                     Status;\r
-  VIRTIO_FS_FUSE_STATFS_RESPONSE FilesysAttr;\r
-  UINT64                         MaxBlocks;\r
-  EFI_FILE_SYSTEM_INFO           *FilesysInfo;\r
+  VIRTIO_FS_FILE                  *VirtioFsFile;\r
+  VIRTIO_FS                       *VirtioFs;\r
+  UINTN                           AllocSize;\r
+  UINTN                           LabelSize;\r
+  EFI_STATUS                      Status;\r
+  VIRTIO_FS_FUSE_STATFS_RESPONSE  FilesysAttr;\r
+  UINT64                          MaxBlocks;\r
+  EFI_FILE_SYSTEM_INFO            *FilesysInfo;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   VirtioFs     = VirtioFsFile->OwnerFs;\r
@@ -97,7 +104,7 @@ GetFileSystemInfo (
   //\r
   // Calculate the needed size.\r
   //\r
-  LabelSize = StrSize (VirtioFs->Label);\r
+  LabelSize   = StrSize (VirtioFs->Label);\r
   *BufferSize = OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel) + LabelSize;\r
 \r
   if (*BufferSize > AllocSize) {\r
@@ -111,18 +118,22 @@ GetFileSystemInfo (
   if (EFI_ERROR (Status)) {\r
     return (Status == EFI_BUFFER_TOO_SMALL) ? EFI_DEVICE_ERROR : Status;\r
   }\r
+\r
   //\r
   // Sanity checks...\r
   //\r
   if (FilesysAttr.Frsize != FilesysAttr.Bsize) {\r
     return EFI_UNSUPPORTED;\r
   }\r
-  if (FilesysAttr.Frsize == 0 || FilesysAttr.Blocks == 0 ||\r
-      FilesysAttr.Bavail > FilesysAttr.Blocks) {\r
+\r
+  if ((FilesysAttr.Frsize == 0) || (FilesysAttr.Blocks == 0) ||\r
+      (FilesysAttr.Bavail > FilesysAttr.Blocks))\r
+  {\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   MaxBlocks = DivU64x32 (MAX_UINT64, FilesysAttr.Frsize);\r
-  if (FilesysAttr.Blocks > MaxBlocks || FilesysAttr.Bavail > MaxBlocks) {\r
+  if ((FilesysAttr.Blocks > MaxBlocks) || (FilesysAttr.Bavail > MaxBlocks)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -132,11 +143,15 @@ GetFileSystemInfo (
   FilesysInfo             = Buffer;\r
   FilesysInfo->Size       = *BufferSize;\r
   FilesysInfo->ReadOnly   = FALSE;\r
-  FilesysInfo->VolumeSize = MultU64x32 (FilesysAttr.Blocks,\r
-                              FilesysAttr.Frsize);\r
-  FilesysInfo->FreeSpace  = MultU64x32 (FilesysAttr.Bavail,\r
-                              FilesysAttr.Frsize);\r
-  FilesysInfo->BlockSize  = FilesysAttr.Frsize;\r
+  FilesysInfo->VolumeSize = MultU64x32 (\r
+                              FilesysAttr.Blocks,\r
+                              FilesysAttr.Frsize\r
+                              );\r
+  FilesysInfo->FreeSpace = MultU64x32 (\r
+                             FilesysAttr.Bavail,\r
+                             FilesysAttr.Frsize\r
+                             );\r
+  FilesysInfo->BlockSize = FilesysAttr.Frsize;\r
   CopyMem (FilesysInfo->VolumeLabel, VirtioFs->Label, LabelSize);\r
 \r
   return EFI_SUCCESS;\r
@@ -148,16 +163,16 @@ GetFileSystemInfo (
 STATIC\r
 EFI_STATUS\r
 GetFileSystemVolumeLabelInfo (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-  IN OUT UINTN             *BufferSize,\r
-     OUT VOID              *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT VOID                  *Buffer\r
   )\r
 {\r
-  VIRTIO_FS_FILE               *VirtioFsFile;\r
-  VIRTIO_FS                    *VirtioFs;\r
-  UINTN                        AllocSize;\r
-  UINTN                        LabelSize;\r
-  EFI_FILE_SYSTEM_VOLUME_LABEL *FilesysVolumeLabel;\r
+  VIRTIO_FS_FILE                *VirtioFsFile;\r
+  VIRTIO_FS                     *VirtioFs;\r
+  UINTN                         AllocSize;\r
+  UINTN                         LabelSize;\r
+  EFI_FILE_SYSTEM_VOLUME_LABEL  *FilesysVolumeLabel;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   VirtioFs     = VirtioFsFile->OwnerFs;\r
@@ -167,7 +182,7 @@ GetFileSystemVolumeLabelInfo (
   //\r
   // Calculate the needed size.\r
   //\r
-  LabelSize = StrSize (VirtioFs->Label);\r
+  LabelSize   = StrSize (VirtioFs->Label);\r
   *BufferSize = (OFFSET_OF (EFI_FILE_SYSTEM_VOLUME_LABEL, VolumeLabel) +\r
                  LabelSize);\r
 \r
@@ -187,10 +202,10 @@ GetFileSystemVolumeLabelInfo (
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileGetInfo (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-  IN     EFI_GUID          *InformationType,\r
-  IN OUT UINTN             *BufferSize,\r
-     OUT VOID              *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN     EFI_GUID           *InformationType,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT VOID                  *Buffer\r
   )\r
 {\r
   if (CompareGuid (InformationType, &gEfiFileInfoGuid)) {\r
index 53212621e97045354146f64f74aeba5892707ded..6c30dcec5723dd47788eab60faa99e223944e492 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileGetPosition (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-     OUT UINT64            *Position\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  OUT UINT64                *Position\r
   )\r
 {\r
-  VIRTIO_FS_FILE *VirtioFsFile;\r
+  VIRTIO_FS_FILE  *VirtioFsFile;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   if (VirtioFsFile->IsDirectory) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   *Position = VirtioFsFile->FilePosition;\r
   return EFI_SUCCESS;\r
 }\r
index 9e46e8ab83852dfc41ac1b17757eb57b12da3daf..d479f76f5bc34a56175ea399a6aaa41b14044d1e 100644 (file)
 STATIC\r
 EFI_STATUS\r
 OpenRootDirectory (\r
-  IN OUT VIRTIO_FS         *VirtioFs,\r
-     OUT EFI_FILE_PROTOCOL **NewHandle,\r
-  IN     BOOLEAN           OpenForWriting\r
+  IN OUT VIRTIO_FS       *VirtioFs,\r
+  OUT EFI_FILE_PROTOCOL  **NewHandle,\r
+  IN     BOOLEAN         OpenForWriting\r
   )\r
 {\r
-  EFI_STATUS     Status;\r
-  VIRTIO_FS_FILE *NewVirtioFsFile;\r
+  EFI_STATUS      Status;\r
+  VIRTIO_FS_FILE  *NewVirtioFsFile;\r
 \r
   //\r
   // VirtioFsOpenVolume() opens the root directory for read-only access. If the\r
@@ -54,18 +54,23 @@ OpenRootDirectory (
   // permission first.\r
   //\r
   if (OpenForWriting) {\r
-    VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE FuseAttr;\r
-    EFI_FILE_INFO                      FileInfo;\r
-\r
-    Status = VirtioFsFuseGetAttr (VirtioFs, VIRTIO_FS_FUSE_ROOT_DIR_NODE_ID,\r
-               &FuseAttr);\r
+    VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  FuseAttr;\r
+    EFI_FILE_INFO                       FileInfo;\r
+\r
+    Status = VirtioFsFuseGetAttr (\r
+               VirtioFs,\r
+               VIRTIO_FS_FUSE_ROOT_DIR_NODE_ID,\r
+               &FuseAttr\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     Status = VirtioFsFuseAttrToEfiFileInfo (&FuseAttr, &FileInfo);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     if ((FileInfo.Attribute & EFI_FILE_READ_ONLY) != 0) {\r
       return EFI_ACCESS_DENIED;\r
     }\r
@@ -76,7 +81,7 @@ OpenRootDirectory (
     return Status;\r
   }\r
 \r
-  NewVirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (*NewHandle);\r
+  NewVirtioFsFile                   = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (*NewHandle);\r
   NewVirtioFsFile->IsOpenForWriting = OpenForWriting;\r
   return EFI_SUCCESS;\r
 }\r
@@ -132,33 +137,39 @@ OpenRootDirectory (
 STATIC\r
 EFI_STATUS\r
 OpenExistentFileOrDirectory (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    DirNodeId,\r
-  IN     CHAR8     *Name,\r
-  IN     BOOLEAN   OpenForWriting,\r
-     OUT UINT64    *NodeId,\r
-     OUT UINT64    *FuseHandle,\r
-     OUT BOOLEAN   *NodeIsDirectory\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     DirNodeId,\r
+  IN     CHAR8      *Name,\r
+  IN     BOOLEAN    OpenForWriting,\r
+  OUT UINT64        *NodeId,\r
+  OUT UINT64        *FuseHandle,\r
+  OUT BOOLEAN       *NodeIsDirectory\r
   )\r
 {\r
-  EFI_STATUS                         Status;\r
-  UINT64                             ResolvedNodeId;\r
-  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE FuseAttr;\r
-  EFI_FILE_INFO                      FileInfo;\r
-  BOOLEAN                            IsDirectory;\r
-  UINT64                             NewFuseHandle;\r
-\r
-  Status = VirtioFsFuseLookup (VirtioFs, DirNodeId, Name, &ResolvedNodeId,\r
-             &FuseAttr);\r
+  EFI_STATUS                          Status;\r
+  UINT64                              ResolvedNodeId;\r
+  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  FuseAttr;\r
+  EFI_FILE_INFO                       FileInfo;\r
+  BOOLEAN                             IsDirectory;\r
+  UINT64                              NewFuseHandle;\r
+\r
+  Status = VirtioFsFuseLookup (\r
+             VirtioFs,\r
+             DirNodeId,\r
+             Name,\r
+             &ResolvedNodeId,\r
+             &FuseAttr\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   Status = VirtioFsFuseAttrToEfiFileInfo (&FuseAttr, &FileInfo);\r
   if (EFI_ERROR (Status)) {\r
     goto ForgetResolvedNodeId;\r
   }\r
 \r
-  if (OpenForWriting && (FileInfo.Attribute & EFI_FILE_READ_ONLY) != 0) {\r
+  if (OpenForWriting && ((FileInfo.Attribute & EFI_FILE_READ_ONLY) != 0)) {\r
     Status = EFI_ACCESS_DENIED;\r
     goto ForgetResolvedNodeId;\r
   }\r
@@ -173,9 +184,14 @@ OpenExistentFileOrDirectory (
     //\r
     Status = VirtioFsFuseOpenDir (VirtioFs, ResolvedNodeId, &NewFuseHandle);\r
   } else {\r
-    Status = VirtioFsFuseOpen (VirtioFs, ResolvedNodeId, OpenForWriting,\r
-               &NewFuseHandle);\r
+    Status = VirtioFsFuseOpen (\r
+               VirtioFs,\r
+               ResolvedNodeId,\r
+               OpenForWriting,\r
+               &NewFuseHandle\r
+               );\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     goto ForgetResolvedNodeId;\r
   }\r
@@ -216,16 +232,16 @@ ForgetResolvedNodeId:
 STATIC\r
 EFI_STATUS\r
 CreateDirectory (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    DirNodeId,\r
-  IN     CHAR8     *Name,\r
-     OUT UINT64    *NodeId,\r
-     OUT UINT64    *FuseHandle\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     DirNodeId,\r
+  IN     CHAR8      *Name,\r
+  OUT UINT64        *NodeId,\r
+  OUT UINT64        *FuseHandle\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT64     NewChildDirNodeId;\r
-  UINT64     NewFuseHandle;\r
+  EFI_STATUS  Status;\r
+  UINT64      NewChildDirNodeId;\r
+  UINT64      NewFuseHandle;\r
 \r
   Status = VirtioFsFuseMkDir (VirtioFs, DirNodeId, Name, &NewChildDirNodeId);\r
   if (EFI_ERROR (Status)) {\r
@@ -273,41 +289,46 @@ RemoveNewChildDir:
 STATIC\r
 EFI_STATUS\r
 CreateRegularFile (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    DirNodeId,\r
-  IN     CHAR8     *Name,\r
-     OUT UINT64    *NodeId,\r
-     OUT UINT64    *FuseHandle\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     DirNodeId,\r
+  IN     CHAR8      *Name,\r
+  OUT UINT64        *NodeId,\r
+  OUT UINT64        *FuseHandle\r
   )\r
 {\r
-  return VirtioFsFuseOpenOrCreate (VirtioFs, DirNodeId, Name, NodeId,\r
-           FuseHandle);\r
+  return VirtioFsFuseOpenOrCreate (\r
+           VirtioFs,\r
+           DirNodeId,\r
+           Name,\r
+           NodeId,\r
+           FuseHandle\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileOpen (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-     OUT EFI_FILE_PROTOCOL **NewHandle,\r
-  IN     CHAR16            *FileName,\r
-  IN     UINT64            OpenMode,\r
-  IN     UINT64            Attributes\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  OUT EFI_FILE_PROTOCOL     **NewHandle,\r
+  IN     CHAR16             *FileName,\r
+  IN     UINT64             OpenMode,\r
+  IN     UINT64             Attributes\r
   )\r
 {\r
-  VIRTIO_FS_FILE *VirtioFsFile;\r
-  VIRTIO_FS      *VirtioFs;\r
-  BOOLEAN        OpenForWriting;\r
-  BOOLEAN        PermitCreation;\r
-  BOOLEAN        CreateDirectoryIfCreating;\r
-  VIRTIO_FS_FILE *NewVirtioFsFile;\r
-  EFI_STATUS     Status;\r
-  CHAR8          *NewCanonicalPath;\r
-  BOOLEAN        RootEscape;\r
-  UINT64         DirNodeId;\r
-  CHAR8          *LastComponent;\r
-  UINT64         NewNodeId;\r
-  UINT64         NewFuseHandle;\r
-  BOOLEAN        NewNodeIsDirectory;\r
+  VIRTIO_FS_FILE  *VirtioFsFile;\r
+  VIRTIO_FS       *VirtioFs;\r
+  BOOLEAN         OpenForWriting;\r
+  BOOLEAN         PermitCreation;\r
+  BOOLEAN         CreateDirectoryIfCreating;\r
+  VIRTIO_FS_FILE  *NewVirtioFsFile;\r
+  EFI_STATUS      Status;\r
+  CHAR8           *NewCanonicalPath;\r
+  BOOLEAN         RootEscape;\r
+  UINT64          DirNodeId;\r
+  CHAR8           *LastComponent;\r
+  UINT64          NewNodeId;\r
+  UINT64          NewFuseHandle;\r
+  BOOLEAN         NewNodeIsDirectory;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   VirtioFs     = VirtioFsFile->OwnerFs;\r
@@ -316,20 +337,20 @@ VirtioFsSimpleFileOpen (
   // Validate OpenMode.\r
   //\r
   switch (OpenMode) {\r
-  case EFI_FILE_MODE_READ:\r
-    OpenForWriting = FALSE;\r
-    PermitCreation = FALSE;\r
-    break;\r
-  case EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE:\r
-    OpenForWriting = TRUE;\r
-    PermitCreation = FALSE;\r
-    break;\r
-  case EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE:\r
-    OpenForWriting = TRUE;\r
-    PermitCreation = TRUE;\r
-    break;\r
-  default:\r
-    return EFI_INVALID_PARAMETER;\r
+    case EFI_FILE_MODE_READ:\r
+      OpenForWriting = FALSE;\r
+      PermitCreation = FALSE;\r
+      break;\r
+    case EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE:\r
+      OpenForWriting = TRUE;\r
+      PermitCreation = FALSE;\r
+      break;\r
+    case EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE:\r
+      OpenForWriting = TRUE;\r
+      PermitCreation = TRUE;\r
+      break;\r
+    default:\r
+      return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
@@ -366,6 +387,7 @@ VirtioFsSimpleFileOpen (
         ));\r
       return EFI_INVALID_PARAMETER;\r
     }\r
+\r
     CreateDirectoryIfCreating = (BOOLEAN)((Attributes &\r
                                            EFI_FILE_DIRECTORY) != 0);\r
   }\r
@@ -401,11 +423,16 @@ VirtioFsSimpleFileOpen (
   // Create the canonical pathname at which the desired file is expected to\r
   // exist.\r
   //\r
-  Status = VirtioFsAppendPath (VirtioFsFile->CanonicalPathname, FileName,\r
-             &NewCanonicalPath, &RootEscape);\r
+  Status = VirtioFsAppendPath (\r
+             VirtioFsFile->CanonicalPathname,\r
+             FileName,\r
+             &NewCanonicalPath,\r
+             &RootEscape\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeNewVirtioFsFile;\r
   }\r
+\r
   if (RootEscape) {\r
     Status = EFI_ACCESS_DENIED;\r
     goto FreeNewCanonicalPath;\r
@@ -426,8 +453,12 @@ VirtioFsSimpleFileOpen (
   // (given by DirNodeId) and last pathname component (i.e., immediate child\r
   // within that parent directory).\r
   //\r
-  Status = VirtioFsLookupMostSpecificParentDir (VirtioFs, NewCanonicalPath,\r
-             &DirNodeId, &LastComponent);\r
+  Status = VirtioFsLookupMostSpecificParentDir (\r
+             VirtioFs,\r
+             NewCanonicalPath,\r
+             &DirNodeId,\r
+             &LastComponent\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeNewCanonicalPath;\r
   }\r
@@ -441,22 +472,40 @@ VirtioFsSimpleFileOpen (
   // Try to open LastComponent directly under DirNodeId, as an existent regular\r
   // file or directory.\r
   //\r
-  Status = OpenExistentFileOrDirectory (VirtioFs, DirNodeId, LastComponent,\r
-             OpenForWriting, &NewNodeId, &NewFuseHandle, &NewNodeIsDirectory);\r
+  Status = OpenExistentFileOrDirectory (\r
+             VirtioFs,\r
+             DirNodeId,\r
+             LastComponent,\r
+             OpenForWriting,\r
+             &NewNodeId,\r
+             &NewFuseHandle,\r
+             &NewNodeIsDirectory\r
+             );\r
   //\r
   // If LastComponent could not be found under DirNodeId, but the request\r
   // allows us to create a new entry, attempt creating the requested regular\r
   // file or directory.\r
   //\r
-  if (Status == EFI_NOT_FOUND && PermitCreation) {\r
+  if ((Status == EFI_NOT_FOUND) && PermitCreation) {\r
     ASSERT (OpenForWriting);\r
     if (CreateDirectoryIfCreating) {\r
-      Status = CreateDirectory (VirtioFs, DirNodeId, LastComponent, &NewNodeId,\r
-                 &NewFuseHandle);\r
+      Status = CreateDirectory (\r
+                 VirtioFs,\r
+                 DirNodeId,\r
+                 LastComponent,\r
+                 &NewNodeId,\r
+                 &NewFuseHandle\r
+                 );\r
     } else {\r
-      Status = CreateRegularFile (VirtioFs, DirNodeId, LastComponent,\r
-                 &NewNodeId, &NewFuseHandle);\r
+      Status = CreateRegularFile (\r
+                 VirtioFs,\r
+                 DirNodeId,\r
+                 LastComponent,\r
+                 &NewNodeId,\r
+                 &NewFuseHandle\r
+                 );\r
     }\r
+\r
     NewNodeIsDirectory = CreateDirectoryIfCreating;\r
   }\r
 \r
index 058e7a41ab03ab6f0af1aede068c57462a2f5c38..d08b8e0a1d44c35c7e36a322d5ffca7660b191cf 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsOpenVolume (\r
-  IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
-  OUT EFI_FILE_PROTOCOL               **Root\r
+  IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *This,\r
+  OUT EFI_FILE_PROTOCOL                **Root\r
   )\r
 {\r
-  VIRTIO_FS      *VirtioFs;\r
-  VIRTIO_FS_FILE *VirtioFsFile;\r
-  EFI_STATUS     Status;\r
-  CHAR8          *CanonicalPathname;\r
-  UINT64         RootDirHandle;\r
+  VIRTIO_FS       *VirtioFs;\r
+  VIRTIO_FS_FILE  *VirtioFsFile;\r
+  EFI_STATUS      Status;\r
+  CHAR8           *CanonicalPathname;\r
+  UINT64          RootDirHandle;\r
 \r
   VirtioFs = VIRTIO_FS_FROM_SIMPLE_FS (This);\r
 \r
@@ -47,8 +47,11 @@ VirtioFsOpenVolume (
   //\r
   // Open the root directory.\r
   //\r
-  Status = VirtioFsFuseOpenDir (VirtioFs, VIRTIO_FS_FUSE_ROOT_DIR_NODE_ID,\r
-             &RootDirHandle);\r
+  Status = VirtioFsFuseOpenDir (\r
+             VirtioFs,\r
+             VIRTIO_FS_FUSE_ROOT_DIR_NODE_ID,\r
+             &RootDirHandle\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeCanonicalPathname;\r
   }\r
index d6368342a139d7f5f55ba1297fb215fa4538380f..9940bd99fef495ae2bb1bc7135d688203a7c6abb 100644 (file)
 STATIC\r
 EFI_STATUS\r
 PopulateFileInfo (\r
-  IN     VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE *Dirent,\r
-  IN     UINTN                              SingleFileInfoSize,\r
-     OUT EFI_FILE_INFO                      *FileInfo\r
+  IN     VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE  *Dirent,\r
+  IN     UINTN                               SingleFileInfoSize,\r
+  OUT EFI_FILE_INFO                          *FileInfo\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Convert the name, set the actual size.\r
   //\r
   FileInfo->Size = SingleFileInfoSize;\r
-  Status = VirtioFsFuseDirentPlusToEfiFileInfo (Dirent, FileInfo);\r
+  Status         = VirtioFsFuseDirentPlusToEfiFileInfo (Dirent, FileInfo);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Populate the scalar fields.\r
   //\r
@@ -65,19 +66,19 @@ PopulateFileInfo (
 STATIC\r
 EFI_STATUS\r
 RefillFileInfoCache (\r
-  IN OUT VIRTIO_FS_FILE *VirtioFsFile\r
+  IN OUT VIRTIO_FS_FILE  *VirtioFsFile\r
   )\r
 {\r
-  VIRTIO_FS                      *VirtioFs;\r
-  EFI_STATUS                     Status;\r
-  VIRTIO_FS_FUSE_STATFS_RESPONSE FilesysAttr;\r
-  UINT32                         DirentBufSize;\r
-  UINT8                          *DirentBuf;\r
-  UINTN                          SingleFileInfoSize;\r
-  UINT8                          *FileInfoArray;\r
-  UINT64                         DirStreamCookie;\r
-  UINT64                         CacheEndsAtCookie;\r
-  UINTN                          NumFileInfo;\r
+  VIRTIO_FS                       *VirtioFs;\r
+  EFI_STATUS                      Status;\r
+  VIRTIO_FS_FUSE_STATFS_RESPONSE  FilesysAttr;\r
+  UINT32                          DirentBufSize;\r
+  UINT8                           *DirentBuf;\r
+  UINTN                           SingleFileInfoSize;\r
+  UINT8                           *FileInfoArray;\r
+  UINT64                          DirStreamCookie;\r
+  UINT64                          CacheEndsAtCookie;\r
+  UINTN                           NumFileInfo;\r
 \r
   //\r
   // Allocate a DirentBuf that can receive at least\r
@@ -87,17 +88,20 @@ RefillFileInfoCache (
   // check.\r
   //\r
   VirtioFs = VirtioFsFile->OwnerFs;\r
-  Status = VirtioFsFuseStatFs (VirtioFs, VirtioFsFile->NodeId, &FilesysAttr);\r
+  Status   = VirtioFsFuseStatFs (VirtioFs, VirtioFsFile->NodeId, &FilesysAttr);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   DirentBufSize = (UINT32)VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE_SIZE (\r
-                            FilesysAttr.Namelen);\r
+                            FilesysAttr.Namelen\r
+                            );\r
   if (DirentBufSize == 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   DirentBufSize *= VIRTIO_FS_FILE_MAX_FILE_INFO;\r
-  DirentBuf = AllocatePool (DirentBufSize);\r
+  DirentBuf      = AllocatePool (DirentBufSize);\r
   if (DirentBuf == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -128,8 +132,8 @@ RefillFileInfoCache (
   CacheEndsAtCookie = VirtioFsFile->FilePosition;\r
   NumFileInfo       = 0;\r
   do {\r
-    UINT32 Remaining;\r
-    UINT32 Consumed;\r
+    UINT32  Remaining;\r
+    UINT32  Consumed;\r
 \r
     //\r
     // Fetch a chunk of the directory stream. The chunk may hold more entries\r
@@ -138,15 +142,15 @@ RefillFileInfoCache (
     // supported under UEFI (sockets, FIFOs, filenames with backslashes, etc).\r
     //\r
     Remaining = DirentBufSize;\r
-    Status = VirtioFsFuseReadFileOrDir (\r
-               VirtioFs,\r
-               VirtioFsFile->NodeId,\r
-               VirtioFsFile->FuseHandle,\r
-               TRUE,                     // IsDir\r
-               DirStreamCookie,          // Offset\r
-               &Remaining,               // Size\r
-               DirentBuf                 // Data\r
-               );\r
+    Status    = VirtioFsFuseReadFileOrDir (\r
+                  VirtioFs,\r
+                  VirtioFsFile->NodeId,\r
+                  VirtioFsFile->FuseHandle,\r
+                  TRUE,                  // IsDir\r
+                  DirStreamCookie,       // Offset\r
+                  &Remaining,            // Size\r
+                  DirentBuf              // Data\r
+                  );\r
     if (EFI_ERROR (Status)) {\r
       goto FreeFileInfoArray;\r
     }\r
@@ -165,12 +169,13 @@ RefillFileInfoCache (
     //\r
     Consumed = 0;\r
     while (Remaining >= sizeof (VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE)) {\r
-      VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE *Dirent;\r
-      UINT32                             DirentSize;\r
+      VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE  *Dirent;\r
+      UINT32                              DirentSize;\r
 \r
-      Dirent = (VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE *)(DirentBuf + Consumed);\r
+      Dirent     = (VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE *)(DirentBuf + Consumed);\r
       DirentSize = (UINT32)VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE_SIZE (\r
-                             Dirent->Namelen);\r
+                             Dirent->Namelen\r
+                             );\r
       if (DirentSize == 0) {\r
         //\r
         // This means one of two things: (a) Dirent->Namelen is zero, or (b)\r
@@ -182,6 +187,7 @@ RefillFileInfoCache (
         Status = EFI_PROTOCOL_ERROR;\r
         goto FreeFileInfoArray;\r
       }\r
+\r
       if (DirentSize > Remaining) {\r
         //\r
         // Dirent->Namelen suggests that the filename byte array (plus any\r
@@ -191,6 +197,7 @@ RefillFileInfoCache (
         Status = EFI_PROTOCOL_ERROR;\r
         goto FreeFileInfoArray;\r
       }\r
+\r
       if (Dirent->Namelen > FilesysAttr.Namelen) {\r
         //\r
         // This is possible without tripping the truncation check above, due to\r
@@ -207,7 +214,7 @@ RefillFileInfoCache (
       // Dirent to EFI_FILE_INFO.\r
       //\r
       if (NumFileInfo < VIRTIO_FS_FILE_MAX_FILE_INFO) {\r
-        EFI_FILE_INFO *FileInfo;\r
+        EFI_FILE_INFO  *FileInfo;\r
 \r
         FileInfo = (EFI_FILE_INFO *)(FileInfoArray +\r
                                      (NumFileInfo * SingleFileInfoSize));\r
@@ -224,6 +231,7 @@ RefillFileInfoCache (
           //\r
           CacheEndsAtCookie = Dirent->CookieForNextEntry;\r
         }\r
+\r
         //\r
         // If Dirent wasn't transformable to an EFI_FILE_INFO, we'll just skip\r
         // it.\r
@@ -244,8 +252,8 @@ RefillFileInfoCache (
       // Advance to the next entry in DirentBuf.\r
       //\r
       DirStreamCookie = Dirent->CookieForNextEntry;\r
-      Consumed += DirentSize;\r
-      Remaining -= DirentSize;\r
+      Consumed       += DirentSize;\r
+      Remaining      -= DirentSize;\r
     }\r
 \r
     if (Remaining > 0) {\r
@@ -257,6 +265,7 @@ RefillFileInfoCache (
       Status = EFI_PROTOCOL_ERROR;\r
       goto FreeFileInfoArray;\r
     }\r
+\r
     //\r
     // Fetch another DirentBuf from the directory stream, unless we've filled\r
     // the EFI_FILE_INFO cache.\r
@@ -269,6 +278,7 @@ RefillFileInfoCache (
   if (VirtioFsFile->FileInfoArray != NULL) {\r
     FreePool (VirtioFsFile->FileInfoArray);\r
   }\r
+\r
   VirtioFsFile->FileInfoArray      = FileInfoArray;\r
   VirtioFsFile->SingleFileInfoSize = SingleFileInfoSize;\r
   VirtioFsFile->NumFileInfo        = NumFileInfo;\r
@@ -293,30 +303,32 @@ FreeDirentBuf:
 STATIC\r
 EFI_STATUS\r
 ReadFileInfoCache (\r
-  IN OUT VIRTIO_FS_FILE *VirtioFsFile,\r
-  IN OUT UINTN          *BufferSize,\r
-     OUT VOID           *Buffer\r
+  IN OUT VIRTIO_FS_FILE  *VirtioFsFile,\r
+  IN OUT UINTN           *BufferSize,\r
+  OUT VOID               *Buffer\r
   )\r
 {\r
-  EFI_FILE_INFO *FileInfo;\r
-  UINTN         CallerAllocated;\r
+  EFI_FILE_INFO  *FileInfo;\r
+  UINTN          CallerAllocated;\r
 \r
   //\r
   // Refill the cache if needed. If the refill doesn't produce any new\r
   // EFI_FILE_INFO, report End of Directory, by setting (*BufferSize) to 0.\r
   //\r
   if (VirtioFsFile->NextFileInfo == VirtioFsFile->NumFileInfo) {\r
-    EFI_STATUS Status;\r
+    EFI_STATUS  Status;\r
 \r
     Status = RefillFileInfoCache (VirtioFsFile);\r
     if (EFI_ERROR (Status)) {\r
       return (Status == EFI_BUFFER_TOO_SMALL) ? EFI_DEVICE_ERROR : Status;\r
     }\r
+\r
     if (VirtioFsFile->NumFileInfo == 0) {\r
       *BufferSize = 0;\r
       return EFI_SUCCESS;\r
     }\r
   }\r
+\r
   FileInfo = (EFI_FILE_INFO *)(VirtioFsFile->FileInfoArray +\r
                                (VirtioFsFile->NextFileInfo *\r
                                 VirtioFsFile->SingleFileInfoSize));\r
@@ -337,10 +349,11 @@ ReadFileInfoCache (
   // VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE_SIZE().)\r
   //\r
   CallerAllocated = *BufferSize;\r
-  *BufferSize = (UINTN)FileInfo->Size;\r
+  *BufferSize     = (UINTN)FileInfo->Size;\r
   if (CallerAllocated < *BufferSize) {\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
+\r
   //\r
   // Output FileInfo, and remove it from the cache.\r
   //\r
@@ -355,23 +368,23 @@ ReadFileInfoCache (
 STATIC\r
 EFI_STATUS\r
 ReadRegularFile (\r
-  IN OUT VIRTIO_FS_FILE *VirtioFsFile,\r
-  IN OUT UINTN          *BufferSize,\r
-     OUT VOID           *Buffer\r
+  IN OUT VIRTIO_FS_FILE  *VirtioFsFile,\r
+  IN OUT UINTN           *BufferSize,\r
+  OUT VOID               *Buffer\r
   )\r
 {\r
-  VIRTIO_FS                          *VirtioFs;\r
-  EFI_STATUS                         Status;\r
-  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE FuseAttr;\r
-  UINTN                              Transferred;\r
-  UINTN                              Left;\r
+  VIRTIO_FS                           *VirtioFs;\r
+  EFI_STATUS                          Status;\r
+  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  FuseAttr;\r
+  UINTN                               Transferred;\r
+  UINTN                               Left;\r
 \r
   VirtioFs = VirtioFsFile->OwnerFs;\r
   //\r
   // The UEFI spec forbids reads that start beyond the end of the file.\r
   //\r
   Status = VirtioFsFuseGetAttr (VirtioFs, VirtioFsFile->NodeId, &FuseAttr);\r
-  if (EFI_ERROR (Status) || VirtioFsFile->FilePosition > FuseAttr.Size) {\r
+  if (EFI_ERROR (Status) || (VirtioFsFile->FilePosition > FuseAttr.Size)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -379,29 +392,30 @@ ReadRegularFile (
   Transferred = 0;\r
   Left        = *BufferSize;\r
   while (Left > 0) {\r
-    UINT32 ReadSize;\r
+    UINT32  ReadSize;\r
 \r
     //\r
     // FUSE_READ cannot express a >=4GB buffer size.\r
     //\r
     ReadSize = (UINT32)MIN ((UINTN)MAX_UINT32, Left);\r
-    Status = VirtioFsFuseReadFileOrDir (\r
-               VirtioFs,\r
-               VirtioFsFile->NodeId,\r
-               VirtioFsFile->FuseHandle,\r
-               FALSE,                                    // IsDir\r
-               VirtioFsFile->FilePosition + Transferred,\r
-               &ReadSize,\r
-               (UINT8 *)Buffer + Transferred\r
-               );\r
-    if (EFI_ERROR (Status) || ReadSize == 0) {\r
+    Status   = VirtioFsFuseReadFileOrDir (\r
+                 VirtioFs,\r
+                 VirtioFsFile->NodeId,\r
+                 VirtioFsFile->FuseHandle,\r
+                 FALSE,                                  // IsDir\r
+                 VirtioFsFile->FilePosition + Transferred,\r
+                 &ReadSize,\r
+                 (UINT8 *)Buffer + Transferred\r
+                 );\r
+    if (EFI_ERROR (Status) || (ReadSize == 0)) {\r
       break;\r
     }\r
+\r
     Transferred += ReadSize;\r
     Left        -= ReadSize;\r
   }\r
 \r
-  *BufferSize = Transferred;\r
+  *BufferSize                 = Transferred;\r
   VirtioFsFile->FilePosition += Transferred;\r
   //\r
   // If we managed to read some data, return success. If zero bytes were\r
@@ -415,13 +429,13 @@ ReadRegularFile (
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileRead (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-  IN OUT UINTN             *BufferSize,\r
-     OUT VOID              *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT VOID                  *Buffer\r
   )\r
 {\r
-  VIRTIO_FS_FILE *VirtioFsFile;\r
-  EFI_STATUS     Status;\r
+  VIRTIO_FS_FILE  *VirtioFsFile;\r
+  EFI_STATUS      Status;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
 \r
@@ -430,5 +444,6 @@ VirtioFsSimpleFileRead (
   } else {\r
     Status = ReadRegularFile (VirtioFsFile, BufferSize, Buffer);\r
   }\r
+\r
   return Status;\r
 }\r
index e7cc3d5dc3990fb0e182e631ba251655d5f1486a..b5f1a58341b0256da4fa3ef2c6421408e2550cee 100644 (file)
 STATIC\r
 EFI_STATUS\r
 ValidateInfoStructure (\r
-  IN UINTN   SizeByProtocolCaller,\r
-  IN UINTN   MinimumStructSize,\r
-  IN BOOLEAN IsSizeByInfoPresent,\r
-  IN VOID    *Buffer\r
+  IN UINTN    SizeByProtocolCaller,\r
+  IN UINTN    MinimumStructSize,\r
+  IN BOOLEAN  IsSizeByInfoPresent,\r
+  IN VOID     *Buffer\r
   )\r
 {\r
-  UINTN  NameFieldByteOffset;\r
-  UINTN  NameFieldBytes;\r
-  UINTN  NameFieldChar16s;\r
-  CHAR16 *NameField;\r
+  UINTN   NameFieldByteOffset;\r
+  UINTN   NameFieldBytes;\r
+  UINTN   NameFieldChar16s;\r
+  CHAR16  *NameField;\r
 \r
   //\r
   // Make sure the internal function asking for validation passes in sane\r
@@ -92,7 +92,7 @@ ValidateInfoStructure (
   // agrees with the protocol caller-provided size.\r
   //\r
   if (IsSizeByInfoPresent) {\r
-    UINT64 *SizeByInfo;\r
+    UINT64  *SizeByInfo;\r
 \r
     SizeByInfo = Buffer;\r
     if (*SizeByInfo != SizeByProtocolCaller) {\r
@@ -172,19 +172,18 @@ ValidateInfoStructure (
 STATIC\r
 EFI_STATUS\r
 Rename (\r
-  IN OUT VIRTIO_FS_FILE *VirtioFsFile,\r
-  IN     CHAR16         *NewFileName\r
+  IN OUT VIRTIO_FS_FILE  *VirtioFsFile,\r
+  IN     CHAR16          *NewFileName\r
   )\r
 {\r
-\r
-  VIRTIO_FS  *VirtioFs;\r
-  EFI_STATUS Status;\r
-  CHAR8      *Destination;\r
-  BOOLEAN    RootEscape;\r
-  UINT64     OldParentDirNodeId;\r
-  CHAR8      *OldLastComponent;\r
-  UINT64     NewParentDirNodeId;\r
-  CHAR8      *NewLastComponent;\r
+  VIRTIO_FS   *VirtioFs;\r
+  EFI_STATUS  Status;\r
+  CHAR8       *Destination;\r
+  BOOLEAN     RootEscape;\r
+  UINT64      OldParentDirNodeId;\r
+  CHAR8       *OldLastComponent;\r
+  UINT64      NewParentDirNodeId;\r
+  CHAR8       *NewLastComponent;\r
 \r
   VirtioFs = VirtioFsFile->OwnerFs;\r
 \r
@@ -198,21 +197,28 @@ Rename (
       //\r
       return EFI_SUCCESS;\r
     }\r
+\r
     return EFI_ACCESS_DENIED;\r
   }\r
 \r
   //\r
   // Compose the canonical pathname for the destination.\r
   //\r
-  Status = VirtioFsComposeRenameDestination (VirtioFsFile->CanonicalPathname,\r
-             NewFileName, &Destination, &RootEscape);\r
+  Status = VirtioFsComposeRenameDestination (\r
+             VirtioFsFile->CanonicalPathname,\r
+             NewFileName,\r
+             &Destination,\r
+             &RootEscape\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   if (RootEscape) {\r
     Status = EFI_NOT_FOUND;\r
     goto FreeDestination;\r
   }\r
+\r
   //\r
   // If the rename would leave VirtioFsFile->CanonicalPathname unchanged, then\r
   // EFI_FILE_PROTOCOL.SetInfo() isn't asking for a rename actually.\r
@@ -221,24 +227,29 @@ Rename (
     Status = EFI_SUCCESS;\r
     goto FreeDestination;\r
   }\r
+\r
   //\r
   // Check if the rename would break the canonical pathnames of other\r
   // VIRTIO_FS_FILE instances of the same VIRTIO_FS.\r
   //\r
   if (VirtioFsFile->IsDirectory) {\r
-    UINTN      PathLen;\r
-    LIST_ENTRY *OpenFilesEntry;\r
+    UINTN       PathLen;\r
+    LIST_ENTRY  *OpenFilesEntry;\r
 \r
     PathLen = AsciiStrLen (VirtioFsFile->CanonicalPathname);\r
     BASE_LIST_FOR_EACH (OpenFilesEntry, &VirtioFs->OpenFiles) {\r
-      VIRTIO_FS_FILE *OtherFile;\r
+      VIRTIO_FS_FILE  *OtherFile;\r
 \r
       OtherFile = VIRTIO_FS_FILE_FROM_OPEN_FILES_ENTRY (OpenFilesEntry);\r
-      if (OtherFile != VirtioFsFile &&\r
-          AsciiStrnCmp (VirtioFsFile->CanonicalPathname,\r
-            OtherFile->CanonicalPathname, PathLen) == 0 &&\r
-          (OtherFile->CanonicalPathname[PathLen] == '\0' ||\r
-           OtherFile->CanonicalPathname[PathLen] == '/')) {\r
+      if ((OtherFile != VirtioFsFile) &&\r
+          (AsciiStrnCmp (\r
+             VirtioFsFile->CanonicalPathname,\r
+             OtherFile->CanonicalPathname,\r
+             PathLen\r
+             ) == 0) &&\r
+          ((OtherFile->CanonicalPathname[PathLen] == '\0') ||\r
+           (OtherFile->CanonicalPathname[PathLen] == '/')))\r
+      {\r
         //\r
         // OtherFile refers to the same directory as VirtioFsFile, or is a\r
         // (possibly indirect) child of the directory referred to by\r
@@ -249,6 +260,7 @@ Rename (
       }\r
     }\r
   }\r
+\r
   //\r
   // From this point on, the file needs to be open for writing.\r
   //\r
@@ -256,26 +268,41 @@ Rename (
     Status = EFI_ACCESS_DENIED;\r
     goto FreeDestination;\r
   }\r
+\r
   //\r
   // Split both source and destination canonical pathnames into (most specific\r
   // parent directory, last component) pairs.\r
   //\r
-  Status = VirtioFsLookupMostSpecificParentDir (VirtioFs,\r
-             VirtioFsFile->CanonicalPathname, &OldParentDirNodeId,\r
-             &OldLastComponent);\r
+  Status = VirtioFsLookupMostSpecificParentDir (\r
+             VirtioFs,\r
+             VirtioFsFile->CanonicalPathname,\r
+             &OldParentDirNodeId,\r
+             &OldLastComponent\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeDestination;\r
   }\r
-  Status = VirtioFsLookupMostSpecificParentDir (VirtioFs, Destination,\r
-             &NewParentDirNodeId, &NewLastComponent);\r
+\r
+  Status = VirtioFsLookupMostSpecificParentDir (\r
+             VirtioFs,\r
+             Destination,\r
+             &NewParentDirNodeId,\r
+             &NewLastComponent\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto ForgetOldParentDirNodeId;\r
   }\r
+\r
   //\r
   // Perform the rename. If the destination path exists, the rename will fail.\r
   //\r
-  Status = VirtioFsFuseRename (VirtioFs, OldParentDirNodeId, OldLastComponent,\r
-             NewParentDirNodeId, NewLastComponent);\r
+  Status = VirtioFsFuseRename (\r
+             VirtioFs,\r
+             OldParentDirNodeId,\r
+             OldLastComponent,\r
+             NewParentDirNodeId,\r
+             NewLastComponent\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto ForgetNewParentDirNodeId;\r
   }\r
@@ -285,8 +312,8 @@ Rename (
   //\r
   FreePool (VirtioFsFile->CanonicalPathname);\r
   VirtioFsFile->CanonicalPathname = Destination;\r
-  Destination = NULL;\r
-  Status = EFI_SUCCESS;\r
+  Destination                     = NULL;\r
+  Status                          = EFI_SUCCESS;\r
 \r
   //\r
   // Fall through.\r
@@ -305,6 +332,7 @@ FreeDestination:
   if (Destination != NULL) {\r
     FreePool (Destination);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -332,22 +360,22 @@ FreeDestination:
 STATIC\r
 EFI_STATUS\r
 UpdateAttributes (\r
-  IN OUT VIRTIO_FS_FILE *VirtioFsFile,\r
-  IN     EFI_FILE_INFO  *NewFileInfo\r
+  IN OUT VIRTIO_FS_FILE  *VirtioFsFile,\r
+  IN     EFI_FILE_INFO   *NewFileInfo\r
   )\r
 {\r
-  VIRTIO_FS                          *VirtioFs;\r
-  EFI_STATUS                         Status;\r
-  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE FuseAttr;\r
-  EFI_FILE_INFO                      FileInfo;\r
-  BOOLEAN                            UpdateFileSize;\r
-  UINT64                             FileSize;\r
-  BOOLEAN                            UpdateAtime;\r
-  BOOLEAN                            UpdateMtime;\r
-  UINT64                             Atime;\r
-  UINT64                             Mtime;\r
-  BOOLEAN                            UpdateMode;\r
-  UINT32                             Mode;\r
+  VIRTIO_FS                           *VirtioFs;\r
+  EFI_STATUS                          Status;\r
+  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  FuseAttr;\r
+  EFI_FILE_INFO                       FileInfo;\r
+  BOOLEAN                             UpdateFileSize;\r
+  UINT64                              FileSize;\r
+  BOOLEAN                             UpdateAtime;\r
+  BOOLEAN                             UpdateMtime;\r
+  UINT64                              Atime;\r
+  UINT64                              Mtime;\r
+  BOOLEAN                             UpdateMode;\r
+  UINT32                              Mode;\r
 \r
   VirtioFs = VirtioFsFile->OwnerFs;\r
 \r
@@ -359,28 +387,44 @@ UpdateAttributes (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   Status = VirtioFsFuseAttrToEfiFileInfo (&FuseAttr, &FileInfo);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Collect the updates.\r
   //\r
   if (VirtioFsFile->IsDirectory) {\r
     UpdateFileSize = FALSE;\r
   } else {\r
-    VirtioFsGetFuseSizeUpdate (&FileInfo, NewFileInfo, &UpdateFileSize,\r
-      &FileSize);\r
-  }\r
-\r
-  Status = VirtioFsGetFuseTimeUpdates (&FileInfo, NewFileInfo, &UpdateAtime,\r
-             &UpdateMtime, &Atime, &Mtime);\r
+    VirtioFsGetFuseSizeUpdate (\r
+      &FileInfo,\r
+      NewFileInfo,\r
+      &UpdateFileSize,\r
+      &FileSize\r
+      );\r
+  }\r
+\r
+  Status = VirtioFsGetFuseTimeUpdates (\r
+             &FileInfo,\r
+             NewFileInfo,\r
+             &UpdateAtime,\r
+             &UpdateMtime,\r
+             &Atime,\r
+             &Mtime\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = VirtioFsGetFuseModeUpdate (&FileInfo, NewFileInfo, &UpdateMode,\r
-             &Mode);\r
+  Status = VirtioFsGetFuseModeUpdate (\r
+             &FileInfo,\r
+             NewFileInfo,\r
+             &UpdateMode,\r
+             &Mode\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -391,14 +435,17 @@ UpdateAttributes (
   if (!UpdateFileSize && !UpdateAtime && !UpdateMtime && !UpdateMode) {\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // If the file is not open for writing, then only Mode may be updated (for\r
   // toggling EFI_FILE_READ_ONLY).\r
   //\r
   if (!VirtioFsFile->IsOpenForWriting &&\r
-      (UpdateFileSize || UpdateAtime || UpdateMtime)) {\r
+      (UpdateFileSize || UpdateAtime || UpdateMtime))\r
+  {\r
     return EFI_ACCESS_DENIED;\r
   }\r
+\r
   //\r
   // Send the FUSE_SETATTR request now.\r
   //\r
@@ -419,14 +466,14 @@ UpdateAttributes (
 STATIC\r
 EFI_STATUS\r
 SetFileInfo (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN UINTN             BufferSize,\r
-  IN VOID              *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINTN              BufferSize,\r
+  IN VOID               *Buffer\r
   )\r
 {\r
-  VIRTIO_FS_FILE *VirtioFsFile;\r
-  EFI_STATUS     Status;\r
-  EFI_FILE_INFO  *FileInfo;\r
+  VIRTIO_FS_FILE  *VirtioFsFile;\r
+  EFI_STATUS      Status;\r
+  EFI_FILE_INFO   *FileInfo;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
 \r
@@ -435,14 +482,17 @@ SetFileInfo (
   //\r
   Status = ValidateInfoStructure (\r
              BufferSize,                    // SizeByProtocolCaller\r
-             OFFSET_OF (EFI_FILE_INFO,\r
-               FileName) + sizeof (CHAR16), // MinimumStructSize\r
+             OFFSET_OF (\r
+               EFI_FILE_INFO,\r
+               FileName\r
+               ) + sizeof (CHAR16),         // MinimumStructSize\r
              TRUE,                          // IsSizeByInfoPresent\r
              Buffer\r
              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   FileInfo = Buffer;\r
 \r
   //\r
@@ -452,6 +502,7 @@ SetFileInfo (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Update any attributes requested.\r
   //\r
@@ -470,15 +521,15 @@ SetFileInfo (
 STATIC\r
 EFI_STATUS\r
 SetFileSystemInfo (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN UINTN             BufferSize,\r
-  IN VOID              *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINTN              BufferSize,\r
+  IN VOID               *Buffer\r
   )\r
 {\r
-  VIRTIO_FS_FILE       *VirtioFsFile;\r
-  VIRTIO_FS            *VirtioFs;\r
-  EFI_STATUS           Status;\r
-  EFI_FILE_SYSTEM_INFO *FileSystemInfo;\r
+  VIRTIO_FS_FILE        *VirtioFsFile;\r
+  VIRTIO_FS             *VirtioFs;\r
+  EFI_STATUS            Status;\r
+  EFI_FILE_SYSTEM_INFO  *FileSystemInfo;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   VirtioFs     = VirtioFsFile->OwnerFs;\r
@@ -488,14 +539,17 @@ SetFileSystemInfo (
   //\r
   Status = ValidateInfoStructure (\r
              BufferSize,                       // SizeByProtocolCaller\r
-             OFFSET_OF (EFI_FILE_SYSTEM_INFO,\r
-               VolumeLabel) + sizeof (CHAR16), // MinimumStructSize\r
+             OFFSET_OF (\r
+               EFI_FILE_SYSTEM_INFO,\r
+               VolumeLabel\r
+               ) + sizeof (CHAR16),            // MinimumStructSize\r
              TRUE,                             // IsSizeByInfoPresent\r
              Buffer\r
              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   FileSystemInfo = Buffer;\r
 \r
   //\r
@@ -509,6 +563,7 @@ SetFileSystemInfo (
   if (StrCmp (FileSystemInfo->VolumeLabel, VirtioFs->Label) == 0) {\r
     return EFI_SUCCESS;\r
   }\r
+\r
   return EFI_WRITE_PROTECTED;\r
 }\r
 \r
@@ -518,15 +573,15 @@ SetFileSystemInfo (
 STATIC\r
 EFI_STATUS\r
 SetFileSystemVolumeLabelInfo (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN UINTN             BufferSize,\r
-  IN VOID              *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINTN              BufferSize,\r
+  IN VOID               *Buffer\r
   )\r
 {\r
-  VIRTIO_FS_FILE               *VirtioFsFile;\r
-  VIRTIO_FS                    *VirtioFs;\r
-  EFI_STATUS                   Status;\r
-  EFI_FILE_SYSTEM_VOLUME_LABEL *FileSystemVolumeLabel;\r
+  VIRTIO_FS_FILE                *VirtioFsFile;\r
+  VIRTIO_FS                     *VirtioFs;\r
+  EFI_STATUS                    Status;\r
+  EFI_FILE_SYSTEM_VOLUME_LABEL  *FileSystemVolumeLabel;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   VirtioFs     = VirtioFsFile->OwnerFs;\r
@@ -536,14 +591,17 @@ SetFileSystemVolumeLabelInfo (
   //\r
   Status = ValidateInfoStructure (\r
              BufferSize,                              // SizeByProtocolCaller\r
-             OFFSET_OF (EFI_FILE_SYSTEM_VOLUME_LABEL,\r
-               VolumeLabel) + sizeof (CHAR16),        // MinimumStructSize\r
+             OFFSET_OF (\r
+               EFI_FILE_SYSTEM_VOLUME_LABEL,\r
+               VolumeLabel\r
+               ) + sizeof (CHAR16),                   // MinimumStructSize\r
              FALSE,                                   // IsSizeByInfoPresent\r
              Buffer\r
              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   FileSystemVolumeLabel = Buffer;\r
 \r
   //\r
@@ -554,16 +612,17 @@ SetFileSystemVolumeLabelInfo (
   if (StrCmp (FileSystemVolumeLabel->VolumeLabel, VirtioFs->Label) == 0) {\r
     return EFI_SUCCESS;\r
   }\r
+\r
   return EFI_WRITE_PROTECTED;\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileSetInfo (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN EFI_GUID          *InformationType,\r
-  IN UINTN             BufferSize,\r
-  IN VOID              *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN EFI_GUID           *InformationType,\r
+  IN UINTN              BufferSize,\r
+  IN VOID               *Buffer\r
   )\r
 {\r
   if (CompareGuid (InformationType, &gEfiFileInfoGuid)) {\r
index a548012d9c09cc2d04d898c47aefc4a4350ee775..dd05081396d6ddc178ab6ba5c108eaef54e291b4 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileSetPosition (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN UINT64            Position\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINT64             Position\r
   )\r
 {\r
-  VIRTIO_FS_FILE                     *VirtioFsFile;\r
-  VIRTIO_FS                          *VirtioFs;\r
-  EFI_STATUS                         Status;\r
-  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE FuseAttr;\r
+  VIRTIO_FS_FILE                      *VirtioFsFile;\r
+  VIRTIO_FS                           *VirtioFs;\r
+  EFI_STATUS                          Status;\r
+  VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  FuseAttr;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
 \r
@@ -32,11 +32,13 @@ VirtioFsSimpleFileSetPosition (
     if (Position != 0) {\r
       return EFI_UNSUPPORTED;\r
     }\r
+\r
     VirtioFsFile->FilePosition = 0;\r
     if (VirtioFsFile->FileInfoArray != NULL) {\r
       FreePool (VirtioFsFile->FileInfoArray);\r
       VirtioFsFile->FileInfoArray = NULL;\r
     }\r
+\r
     VirtioFsFile->SingleFileInfoSize = 0;\r
     VirtioFsFile->NumFileInfo        = 0;\r
     VirtioFsFile->NextFileInfo       = 0;\r
@@ -58,10 +60,11 @@ VirtioFsSimpleFileSetPosition (
   // Caller is requesting a seek to EOF.\r
   //\r
   VirtioFs = VirtioFsFile->OwnerFs;\r
-  Status = VirtioFsFuseGetAttr (VirtioFs, VirtioFsFile->NodeId, &FuseAttr);\r
+  Status   = VirtioFsFuseGetAttr (VirtioFs, VirtioFsFile->NodeId, &FuseAttr);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   VirtioFsFile->FilePosition = FuseAttr.Size;\r
   return EFI_SUCCESS;\r
 }\r
index 8ae317c88e43c184af87c7baf883040f1b02bf1d..7f4ff8c5bbf341901264e41eab707fbe0e2cd3c0 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileWrite (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-  IN OUT UINTN             *BufferSize,\r
-  IN     VOID              *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  IN     VOID               *Buffer\r
   )\r
 {\r
-  VIRTIO_FS_FILE *VirtioFsFile;\r
-  VIRTIO_FS      *VirtioFs;\r
-  EFI_STATUS     Status;\r
-  UINTN          Transferred;\r
-  UINTN          Left;\r
+  VIRTIO_FS_FILE  *VirtioFsFile;\r
+  VIRTIO_FS       *VirtioFs;\r
+  EFI_STATUS      Status;\r
+  UINTN           Transferred;\r
+  UINTN           Left;\r
 \r
   VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);\r
   VirtioFs     = VirtioFsFile->OwnerFs;\r
@@ -28,6 +28,7 @@ VirtioFsSimpleFileWrite (
   if (VirtioFsFile->IsDirectory) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   if (!VirtioFsFile->IsOpenForWriting) {\r
     return EFI_ACCESS_DENIED;\r
   }\r
@@ -36,34 +37,36 @@ VirtioFsSimpleFileWrite (
   Transferred = 0;\r
   Left        = *BufferSize;\r
   while (Left > 0) {\r
-    UINT32 WriteSize;\r
+    UINT32  WriteSize;\r
 \r
     //\r
     // Honor the write buffer size limit.\r
     //\r
     WriteSize = (UINT32)MIN ((UINTN)VirtioFs->MaxWrite, Left);\r
-    Status = VirtioFsFuseWrite (\r
-               VirtioFs,\r
-               VirtioFsFile->NodeId,\r
-               VirtioFsFile->FuseHandle,\r
-               VirtioFsFile->FilePosition + Transferred,\r
-               &WriteSize,\r
-               (UINT8 *)Buffer + Transferred\r
-               );\r
-    if (!EFI_ERROR (Status) && WriteSize == 0) {\r
+    Status    = VirtioFsFuseWrite (\r
+                  VirtioFs,\r
+                  VirtioFsFile->NodeId,\r
+                  VirtioFsFile->FuseHandle,\r
+                  VirtioFsFile->FilePosition + Transferred,\r
+                  &WriteSize,\r
+                  (UINT8 *)Buffer + Transferred\r
+                  );\r
+    if (!EFI_ERROR (Status) && (WriteSize == 0)) {\r
       //\r
       // Progress should have been made.\r
       //\r
       Status = EFI_DEVICE_ERROR;\r
     }\r
+\r
     if (EFI_ERROR (Status)) {\r
       break;\r
     }\r
+\r
     Transferred += WriteSize;\r
     Left        -= WriteSize;\r
   }\r
 \r
-  *BufferSize = Transferred;\r
+  *BufferSize                 = Transferred;\r
   VirtioFsFile->FilePosition += Transferred;\r
   //\r
   // According to the UEFI spec,\r
index 3c3eb1ac93385332d6fabc97b024096a6935d2fe..0bbf5b789508050feae4e9d5df6b6778b8879637 100644 (file)
@@ -18,7 +18,7 @@
 #include <Protocol/VirtioDevice.h>     // VIRTIO_DEVICE_PROTOCOL\r
 #include <Uefi/UefiBaseType.h>         // EFI_EVENT\r
 \r
-#define VIRTIO_FS_SIG SIGNATURE_64 ('V', 'I', 'R', 'T', 'I', 'O', 'F', 'S')\r
+#define VIRTIO_FS_SIG  SIGNATURE_64 ('V', 'I', 'R', 'T', 'I', 'O', 'F', 'S')\r
 \r
 #define VIRTIO_FS_FILE_SIG \\r
   SIGNATURE_64 ('V', 'I', 'O', 'F', 'S', 'F', 'I', 'L')\r
 // pathnames, separate limits could be used; a common limit is used purely for\r
 // simplicity.\r
 //\r
-#define VIRTIO_FS_MAX_PATHNAME_LENGTH ((UINTN)65535)\r
+#define VIRTIO_FS_MAX_PATHNAME_LENGTH  ((UINTN)65535)\r
 \r
 //\r
 // Maximum value for VIRTIO_FS_FILE.NumFileInfo.\r
 //\r
-#define VIRTIO_FS_FILE_MAX_FILE_INFO 256\r
+#define VIRTIO_FS_FILE_MAX_FILE_INFO  256\r
 \r
 //\r
 // Filesystem label encoded in UCS-2, transformed from the UTF-8 representation\r
@@ -71,17 +71,17 @@ typedef struct {
   //\r
   //                              field         init function       init depth\r
   //                              -----------   ------------------  ----------\r
-  UINT64                          Signature; // DriverBindingStart  0\r
-  VIRTIO_DEVICE_PROTOCOL          *Virtio;   // DriverBindingStart  0\r
-  VIRTIO_FS_LABEL                 Label;     // VirtioFsInit        1\r
-  UINT16                          QueueSize; // VirtioFsInit        1\r
-  VRING                           Ring;      // VirtioRingInit      2\r
-  VOID                            *RingMap;  // VirtioRingMap       2\r
-  UINT64                          RequestId; // FuseInitSession     1\r
-  UINT32                          MaxWrite;  // FuseInitSession     1\r
-  EFI_EVENT                       ExitBoot;  // DriverBindingStart  0\r
-  LIST_ENTRY                      OpenFiles; // DriverBindingStart  0\r
-  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL SimpleFs;  // DriverBindingStart  0\r
+  UINT64                             Signature; // DriverBindingStart  0\r
+  VIRTIO_DEVICE_PROTOCOL             *Virtio;   // DriverBindingStart  0\r
+  VIRTIO_FS_LABEL                    Label;     // VirtioFsInit        1\r
+  UINT16                             QueueSize; // VirtioFsInit        1\r
+  VRING                              Ring;      // VirtioRingInit      2\r
+  VOID                               *RingMap;  // VirtioRingMap       2\r
+  UINT64                             RequestId; // FuseInitSession     1\r
+  UINT32                             MaxWrite;  // FuseInitSession     1\r
+  EFI_EVENT                          ExitBoot;  // DriverBindingStart  0\r
+  LIST_ENTRY                         OpenFiles; // DriverBindingStart  0\r
+  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL    SimpleFs;  // DriverBindingStart  0\r
 } VIRTIO_FS;\r
 \r
 #define VIRTIO_FS_FROM_SIMPLE_FS(SimpleFsReference) \\r
@@ -95,8 +95,8 @@ typedef struct {
   //\r
   // The following fields originate from the owner of the buffer.\r
   //\r
-  VOID  *Buffer;\r
-  UINTN Size;\r
+  VOID     *Buffer;\r
+  UINTN    Size;\r
   //\r
   // All of the fields below, until the end of the structure, are\r
   // zero-initialized when the structure is initially validated.\r
@@ -105,16 +105,16 @@ typedef struct {
   // for VirtioOperationBusMasterRead or VirtioOperationBusMasterWrite. They\r
   // are again updated when the buffer is unmapped.\r
   //\r
-  BOOLEAN              Mapped;\r
-  EFI_PHYSICAL_ADDRESS MappedAddress;\r
-  VOID                 *Mapping;\r
+  BOOLEAN                 Mapped;\r
+  EFI_PHYSICAL_ADDRESS    MappedAddress;\r
+  VOID                    *Mapping;\r
   //\r
   // Transferred is updated after VirtioFlush() returns successfully:\r
   // - for VirtioOperationBusMasterRead, Transferred is set to Size;\r
   // - for VirtioOperationBusMasterWrite, Transferred is calculated from the\r
   //   UsedLen output parameter of VirtioFlush().\r
   //\r
-  UINTN Transferred;\r
+  UINTN                   Transferred;\r
 } VIRTIO_FS_IO_VECTOR;\r
 \r
 //\r
@@ -124,13 +124,13 @@ typedef struct {
   //\r
   // The following fields originate from the owner of the buffers.\r
   //\r
-  VIRTIO_FS_IO_VECTOR *IoVec;\r
-  UINTN               NumVec;\r
+  VIRTIO_FS_IO_VECTOR    *IoVec;\r
+  UINTN                  NumVec;\r
   //\r
   // TotalSize is calculated when the scatter-gather list is initially\r
   // validated.\r
   //\r
-  UINT32 TotalSize;\r
+  UINT32                 TotalSize;\r
 } VIRTIO_FS_SCATTER_GATHER_LIST;\r
 \r
 //\r
@@ -138,14 +138,14 @@ typedef struct {
 // FUSE file reference.\r
 //\r
 typedef struct {\r
-  UINT64            Signature;\r
-  EFI_FILE_PROTOCOL SimpleFile;\r
-  BOOLEAN           IsDirectory;\r
-  BOOLEAN           IsOpenForWriting;\r
-  VIRTIO_FS         *OwnerFs;\r
-  LIST_ENTRY        OpenFilesEntry;\r
-  CHAR8             *CanonicalPathname;\r
-  UINT64            FilePosition;\r
+  UINT64               Signature;\r
+  EFI_FILE_PROTOCOL    SimpleFile;\r
+  BOOLEAN              IsDirectory;\r
+  BOOLEAN              IsOpenForWriting;\r
+  VIRTIO_FS            *OwnerFs;\r
+  LIST_ENTRY           OpenFilesEntry;\r
+  CHAR8                *CanonicalPathname;\r
+  UINT64               FilePosition;\r
   //\r
   // In the FUSE wire protocol, every request except FUSE_INIT refers to a\r
   // file, namely by the "VIRTIO_FS_FUSE_REQUEST.NodeId" field; that is, by the\r
@@ -158,8 +158,8 @@ typedef struct {
   // function must send a FUSE request that needs the file handle *in addition*\r
   // to the inode number, FuseHandle will be at our disposal at once.\r
   //\r
-  UINT64 NodeId;\r
-  UINT64 FuseHandle;\r
+  UINT64    NodeId;\r
+  UINT64    FuseHandle;\r
   //\r
   // EFI_FILE_INFO objects cached for an in-flight directory read.\r
   //\r
@@ -170,10 +170,10 @@ typedef struct {
   // EFI_FILE_INFOs immediately. EFI_FILE_PROTOCOL.Read() invocations (on\r
   // directories) will be served from this EFI_FILE_INFO cache.\r
   //\r
-  UINT8 *FileInfoArray;\r
-  UINTN SingleFileInfoSize;\r
-  UINTN NumFileInfo;\r
-  UINTN NextFileInfo;\r
+  UINT8    *FileInfoArray;\r
+  UINTN    SingleFileInfoSize;\r
+  UINTN    NumFileInfo;\r
+  UINTN    NextFileInfo;\r
 } VIRTIO_FS_FILE;\r
 \r
 #define VIRTIO_FS_FILE_FROM_SIMPLE_FILE(SimpleFileReference) \\r
@@ -189,39 +189,39 @@ typedef struct {
 \r
 EFI_STATUS\r
 VirtioFsInit (\r
-  IN OUT VIRTIO_FS *VirtioFs\r
+  IN OUT VIRTIO_FS  *VirtioFs\r
   );\r
 \r
 VOID\r
 VirtioFsUninit (\r
-  IN OUT VIRTIO_FS *VirtioFs\r
+  IN OUT VIRTIO_FS  *VirtioFs\r
   );\r
 \r
 VOID\r
 EFIAPI\r
 VirtioFsExitBoot (\r
-  IN EFI_EVENT ExitBootEvent,\r
-  IN VOID      *VirtioFsAsVoid\r
+  IN EFI_EVENT  ExitBootEvent,\r
+  IN VOID       *VirtioFsAsVoid\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsSgListsValidate (\r
-  IN     VIRTIO_FS                     *VirtioFs,\r
-  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST *RequestSgList,\r
-  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST *ResponseSgList OPTIONAL\r
+  IN     VIRTIO_FS                      *VirtioFs,\r
+  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST  *RequestSgList,\r
+  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST  *ResponseSgList OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsSgListsSubmit (\r
-  IN OUT VIRTIO_FS                     *VirtioFs,\r
-  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST *RequestSgList,\r
-  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST *ResponseSgList OPTIONAL\r
+  IN OUT VIRTIO_FS                      *VirtioFs,\r
+  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST  *RequestSgList,\r
+  IN OUT VIRTIO_FS_SCATTER_GATHER_LIST  *ResponseSgList OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseNewRequest (\r
   IN OUT VIRTIO_FS              *VirtioFs,\r
-     OUT VIRTIO_FS_FUSE_REQUEST *Request,\r
+  OUT VIRTIO_FS_FUSE_REQUEST    *Request,\r
   IN     UINT32                 RequestSize,\r
   IN     VIRTIO_FS_FUSE_OPCODE  Opcode,\r
   IN     UINT64                 NodeId\r
@@ -229,36 +229,36 @@ VirtioFsFuseNewRequest (
 \r
 EFI_STATUS\r
 VirtioFsFuseCheckResponse (\r
-  IN  VIRTIO_FS_SCATTER_GATHER_LIST *ResponseSgList,\r
-  IN  UINT64                        RequestId,\r
-  OUT UINTN                         *TailBufferFill\r
+  IN  VIRTIO_FS_SCATTER_GATHER_LIST  *ResponseSgList,\r
+  IN  UINT64                         RequestId,\r
+  OUT UINTN                          *TailBufferFill\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsErrnoToEfiStatus (\r
-  IN INT32 Errno\r
+  IN INT32  Errno\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsAppendPath (\r
   IN     CHAR8   *LhsPath8,\r
   IN     CHAR16  *RhsPath16,\r
-     OUT CHAR8   **ResultPath8,\r
-     OUT BOOLEAN *RootEscape\r
+  OUT CHAR8      **ResultPath8,\r
+  OUT BOOLEAN    *RootEscape\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsLookupMostSpecificParentDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN OUT CHAR8     *Path,\r
-     OUT UINT64    *DirNodeId,\r
-     OUT CHAR8     **LastComponent\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN OUT CHAR8      *Path,\r
+  OUT UINT64        *DirNodeId,\r
+  OUT CHAR8         **LastComponent\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsGetBasename (\r
   IN     CHAR8  *Path,\r
-     OUT CHAR16 *Basename     OPTIONAL,\r
+  OUT CHAR16    *Basename     OPTIONAL,\r
   IN OUT UINTN  *BasenameSize\r
   );\r
 \r
@@ -266,47 +266,47 @@ EFI_STATUS
 VirtioFsComposeRenameDestination (\r
   IN     CHAR8   *LhsPath8,\r
   IN     CHAR16  *RhsPath16,\r
-     OUT CHAR8   **ResultPath8,\r
-     OUT BOOLEAN *RootEscape\r
+  OUT CHAR8      **ResultPath8,\r
+  OUT BOOLEAN    *RootEscape\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseAttrToEfiFileInfo (\r
-  IN     VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE *FuseAttr,\r
-     OUT EFI_FILE_INFO                      *FileInfo\r
+  IN     VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  *FuseAttr,\r
+  OUT EFI_FILE_INFO                          *FileInfo\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseDirentPlusToEfiFileInfo (\r
-  IN     VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE *FuseDirent,\r
-  IN OUT EFI_FILE_INFO                      *FileInfo\r
+  IN     VIRTIO_FS_FUSE_DIRENTPLUS_RESPONSE  *FuseDirent,\r
+  IN OUT EFI_FILE_INFO                       *FileInfo\r
   );\r
 \r
 VOID\r
 VirtioFsGetFuseSizeUpdate (\r
-  IN     EFI_FILE_INFO *Info,\r
-  IN     EFI_FILE_INFO *NewInfo,\r
-     OUT BOOLEAN       *Update,\r
-     OUT UINT64        *Size\r
+  IN     EFI_FILE_INFO  *Info,\r
+  IN     EFI_FILE_INFO  *NewInfo,\r
+  OUT BOOLEAN           *Update,\r
+  OUT UINT64            *Size\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsGetFuseTimeUpdates (\r
-  IN     EFI_FILE_INFO *Info,\r
-  IN     EFI_FILE_INFO *NewInfo,\r
-     OUT BOOLEAN       *UpdateAtime,\r
-     OUT BOOLEAN       *UpdateMtime,\r
-     OUT UINT64        *Atime,\r
-     OUT UINT64        *Mtime\r
+  IN     EFI_FILE_INFO  *Info,\r
+  IN     EFI_FILE_INFO  *NewInfo,\r
+  OUT BOOLEAN           *UpdateAtime,\r
+  OUT BOOLEAN           *UpdateMtime,\r
+  OUT UINT64            *Atime,\r
+  OUT UINT64            *Mtime\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsGetFuseModeUpdate (\r
-  IN     EFI_FILE_INFO *Info,\r
-  IN     EFI_FILE_INFO *NewInfo,\r
-     OUT BOOLEAN       *Update,\r
-     OUT UINT32        *Mode\r
-     );\r
+  IN     EFI_FILE_INFO  *Info,\r
+  IN     EFI_FILE_INFO  *NewInfo,\r
+  OUT BOOLEAN           *Update,\r
+  OUT UINT32            *Mode\r
+  );\r
 \r
 //\r
 // Wrapper functions for FUSE commands (primitives).\r
@@ -314,139 +314,139 @@ VirtioFsGetFuseModeUpdate (
 \r
 EFI_STATUS\r
 VirtioFsFuseLookup (\r
-  IN OUT VIRTIO_FS                          *VirtioFs,\r
-  IN     UINT64                             DirNodeId,\r
-  IN     CHAR8                              *Name,\r
-     OUT UINT64                             *NodeId,\r
-     OUT VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE *FuseAttr\r
+  IN OUT VIRTIO_FS                        *VirtioFs,\r
+  IN     UINT64                           DirNodeId,\r
+  IN     CHAR8                            *Name,\r
+  OUT UINT64                              *NodeId,\r
+  OUT VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  *FuseAttr\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseForget (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseGetAttr (\r
-  IN OUT VIRTIO_FS                          *VirtioFs,\r
-  IN     UINT64                             NodeId,\r
-     OUT VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE *FuseAttr\r
+  IN OUT VIRTIO_FS                        *VirtioFs,\r
+  IN     UINT64                           NodeId,\r
+  OUT VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE  *FuseAttr\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseSetAttr (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    *Size      OPTIONAL,\r
-  IN     UINT64    *Atime     OPTIONAL,\r
-  IN     UINT64    *Mtime     OPTIONAL,\r
-  IN     UINT32    *Mode      OPTIONAL\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     *Size      OPTIONAL,\r
+  IN     UINT64     *Atime     OPTIONAL,\r
+  IN     UINT64     *Mtime     OPTIONAL,\r
+  IN     UINT32     *Mode      OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseMkDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    ParentNodeId,\r
-  IN     CHAR8     *Name,\r
-     OUT UINT64    *NodeId\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     ParentNodeId,\r
+  IN     CHAR8      *Name,\r
+  OUT UINT64        *NodeId\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseRemoveFileOrDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    ParentNodeId,\r
-  IN     CHAR8     *Name,\r
-  IN     BOOLEAN   IsDir\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     ParentNodeId,\r
+  IN     CHAR8      *Name,\r
+  IN     BOOLEAN    IsDir\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseOpen (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     BOOLEAN   ReadWrite,\r
-     OUT UINT64    *FuseHandle\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     BOOLEAN    ReadWrite,\r
+  OUT UINT64        *FuseHandle\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseReadFileOrDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    FuseHandle,\r
-  IN     BOOLEAN   IsDir,\r
-  IN     UINT64    Offset,\r
-  IN OUT UINT32    *Size,\r
-     OUT VOID      *Data\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     FuseHandle,\r
+  IN     BOOLEAN    IsDir,\r
+  IN     UINT64     Offset,\r
+  IN OUT UINT32     *Size,\r
+  OUT VOID          *Data\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseWrite (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    FuseHandle,\r
-  IN     UINT64    Offset,\r
-  IN OUT UINT32    *Size,\r
-  IN     VOID      *Data\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     FuseHandle,\r
+  IN     UINT64     Offset,\r
+  IN OUT UINT32     *Size,\r
+  IN     VOID       *Data\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseStatFs (\r
-  IN OUT VIRTIO_FS                      *VirtioFs,\r
-  IN     UINT64                         NodeId,\r
-     OUT VIRTIO_FS_FUSE_STATFS_RESPONSE *FilesysAttr\r
-     );\r
+  IN OUT VIRTIO_FS                    *VirtioFs,\r
+  IN     UINT64                       NodeId,\r
+  OUT VIRTIO_FS_FUSE_STATFS_RESPONSE  *FilesysAttr\r
+  );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseReleaseFileOrDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    FuseHandle,\r
-  IN     BOOLEAN   IsDir\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     FuseHandle,\r
+  IN     BOOLEAN    IsDir\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseFsyncFileOrDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    FuseHandle,\r
-  IN     BOOLEAN   IsDir\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     FuseHandle,\r
+  IN     BOOLEAN    IsDir\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseFlush (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-  IN     UINT64    FuseHandle\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  IN     UINT64     FuseHandle\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseInitSession (\r
-  IN OUT VIRTIO_FS *VirtioFs\r
+  IN OUT VIRTIO_FS  *VirtioFs\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseOpenDir (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    NodeId,\r
-     OUT UINT64    *FuseHandle\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     NodeId,\r
+  OUT UINT64        *FuseHandle\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseOpenOrCreate (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    ParentNodeId,\r
-  IN     CHAR8     *Name,\r
-     OUT UINT64    *NodeId,\r
-     OUT UINT64    *FuseHandle\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     ParentNodeId,\r
+  IN     CHAR8      *Name,\r
+  OUT UINT64        *NodeId,\r
+  OUT UINT64        *FuseHandle\r
   );\r
 \r
 EFI_STATUS\r
 VirtioFsFuseRename (\r
-  IN OUT VIRTIO_FS *VirtioFs,\r
-  IN     UINT64    OldParentNodeId,\r
-  IN     CHAR8     *OldName,\r
-  IN     UINT64    NewParentNodeId,\r
-  IN     CHAR8     *NewName\r
+  IN OUT VIRTIO_FS  *VirtioFs,\r
+  IN     UINT64     OldParentNodeId,\r
+  IN     CHAR8      *OldName,\r
+  IN     UINT64     NewParentNodeId,\r
+  IN     CHAR8      *NewName\r
   );\r
 \r
 //\r
@@ -457,8 +457,8 @@ VirtioFsFuseRename (
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsOpenVolume (\r
-  IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,\r
-  OUT EFI_FILE_PROTOCOL               **Root\r
+  IN  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *This,\r
+  OUT EFI_FILE_PROTOCOL                **Root\r
   );\r
 \r
 //\r
@@ -468,77 +468,77 @@ VirtioFsOpenVolume (
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileClose (\r
-  IN EFI_FILE_PROTOCOL *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileDelete (\r
-  IN EFI_FILE_PROTOCOL *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileFlush (\r
-  IN EFI_FILE_PROTOCOL *This\r
+  IN EFI_FILE_PROTOCOL  *This\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileGetInfo (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-  IN     EFI_GUID          *InformationType,\r
-  IN OUT UINTN             *BufferSize,\r
-     OUT VOID              *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN     EFI_GUID           *InformationType,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT VOID                  *Buffer\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileGetPosition (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-     OUT UINT64            *Position\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  OUT UINT64                *Position\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileOpen (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-     OUT EFI_FILE_PROTOCOL **NewHandle,\r
-  IN     CHAR16            *FileName,\r
-  IN     UINT64            OpenMode,\r
-  IN     UINT64            Attributes\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  OUT EFI_FILE_PROTOCOL     **NewHandle,\r
+  IN     CHAR16             *FileName,\r
+  IN     UINT64             OpenMode,\r
+  IN     UINT64             Attributes\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileRead (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-  IN OUT UINTN             *BufferSize,\r
-     OUT VOID              *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  OUT VOID                  *Buffer\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileSetInfo (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN EFI_GUID          *InformationType,\r
-  IN UINTN             BufferSize,\r
-  IN VOID              *Buffer\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN EFI_GUID           *InformationType,\r
+  IN UINTN              BufferSize,\r
+  IN VOID               *Buffer\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileSetPosition (\r
-  IN EFI_FILE_PROTOCOL *This,\r
-  IN UINT64            Position\r
+  IN EFI_FILE_PROTOCOL  *This,\r
+  IN UINT64             Position\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioFsSimpleFileWrite (\r
-  IN     EFI_FILE_PROTOCOL *This,\r
-  IN OUT UINTN             *BufferSize,\r
-  IN     VOID              *Buffer\r
+  IN     EFI_FILE_PROTOCOL  *This,\r
+  IN OUT UINTN              *BufferSize,\r
+  IN     VOID               *Buffer\r
   );\r
 \r
 #endif // VIRTIO_FS_DXE_H_\r
index 1645100a05d539e84018bb2403a1e82d3a8cb210..873a71656700acf4f725f507ba5d5cb76759f626 100644 (file)
 **/\r
 EFI_STATUS\r
 VirtioGpuInit (\r
-  IN OUT VGPU_DEV *VgpuDev\r
+  IN OUT VGPU_DEV  *VgpuDev\r
   )\r
 {\r
-  UINT8      NextDevStat;\r
-  EFI_STATUS Status;\r
-  UINT64     Features;\r
-  UINT16     QueueSize;\r
-  UINT64     RingBaseShift;\r
+  UINT8       NextDevStat;\r
+  EFI_STATUS  Status;\r
+  UINT64      Features;\r
+  UINT16      QueueSize;\r
+  UINT64      RingBaseShift;\r
 \r
   //\r
   // Execute virtio-v1.0-cs04, 3.1.1 Driver Requirements: Device\r
@@ -47,7 +47,7 @@ VirtioGpuInit (
   // 1. Reset the device.\r
   //\r
   NextDevStat = 0;\r
-  Status = VgpuDev->VirtIo->SetDeviceStatus (VgpuDev->VirtIo, NextDevStat);\r
+  Status      = VgpuDev->VirtIo->SetDeviceStatus (VgpuDev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
@@ -56,7 +56,7 @@ VirtioGpuInit (
   // 2. Set the ACKNOWLEDGE status bit [...]\r
   //\r
   NextDevStat |= VSTAT_ACK;\r
-  Status = VgpuDev->VirtIo->SetDeviceStatus (VgpuDev->VirtIo, NextDevStat);\r
+  Status       = VgpuDev->VirtIo->SetDeviceStatus (VgpuDev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
@@ -65,7 +65,7 @@ VirtioGpuInit (
   // 3. Set the DRIVER status bit [...]\r
   //\r
   NextDevStat |= VSTAT_DRIVER;\r
-  Status = VgpuDev->VirtIo->SetDeviceStatus (VgpuDev->VirtIo, NextDevStat);\r
+  Status       = VgpuDev->VirtIo->SetDeviceStatus (VgpuDev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
@@ -77,10 +77,12 @@ VirtioGpuInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   if ((Features & VIRTIO_F_VERSION_1) == 0) {\r
     Status = EFI_UNSUPPORTED;\r
     goto Failed;\r
   }\r
+\r
   //\r
   // We only want the most basic 2D features.\r
   //\r
@@ -101,11 +103,14 @@ VirtioGpuInit (
   // 7. Perform device-specific setup, including discovery of virtqueues for\r
   // the device [...]\r
   //\r
-  Status = VgpuDev->VirtIo->SetQueueSel (VgpuDev->VirtIo,\r
-                              VIRTIO_GPU_CONTROL_QUEUE);\r
+  Status = VgpuDev->VirtIo->SetQueueSel (\r
+                              VgpuDev->VirtIo,\r
+                              VIRTIO_GPU_CONTROL_QUEUE\r
+                              );\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   Status = VgpuDev->VirtIo->GetQueueNumMax (VgpuDev->VirtIo, &QueueSize);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
@@ -127,6 +132,7 @@ VirtioGpuInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   //\r
   // If anything fails from here on, we have to release the ring.\r
   //\r
@@ -139,6 +145,7 @@ VirtioGpuInit (
   if (EFI_ERROR (Status)) {\r
     goto ReleaseQueue;\r
   }\r
+\r
   //\r
   // If anything fails from here on, we have to unmap the ring.\r
   //\r
@@ -155,7 +162,7 @@ VirtioGpuInit (
   // 8. Set the DRIVER_OK status bit.\r
   //\r
   NextDevStat |= VSTAT_DRIVER_OK;\r
-  Status = VgpuDev->VirtIo->SetDeviceStatus (VgpuDev->VirtIo, NextDevStat);\r
+  Status       = VgpuDev->VirtIo->SetDeviceStatus (VgpuDev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto UnmapQueue;\r
   }\r
@@ -193,7 +200,7 @@ Failed:
 **/\r
 VOID\r
 VirtioGpuUninit (\r
-  IN OUT VGPU_DEV *VgpuDev\r
+  IN OUT VGPU_DEV  *VgpuDev\r
   )\r
 {\r
   //\r
@@ -235,15 +242,15 @@ VirtioGpuUninit (
 **/\r
 EFI_STATUS\r
 VirtioGpuAllocateZeroAndMapBackingStore (\r
-  IN  VGPU_DEV             *VgpuDev,\r
-  IN  UINTN                NumberOfPages,\r
-  OUT VOID                 **HostAddress,\r
-  OUT EFI_PHYSICAL_ADDRESS *DeviceAddress,\r
-  OUT VOID                 **Mapping\r
+  IN  VGPU_DEV              *VgpuDev,\r
+  IN  UINTN                 NumberOfPages,\r
+  OUT VOID                  **HostAddress,\r
+  OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress,\r
+  OUT VOID                  **Mapping\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  VOID       *NewHostAddress;\r
+  EFI_STATUS  Status;\r
+  VOID        *NewHostAddress;\r
 \r
   Status = VgpuDev->VirtIo->AllocateSharedPages (\r
                               VgpuDev->VirtIo,\r
@@ -308,10 +315,10 @@ FreeSharedPages:
 **/\r
 VOID\r
 VirtioGpuUnmapAndFreeBackingStore (\r
-  IN VGPU_DEV *VgpuDev,\r
-  IN UINTN    NumberOfPages,\r
-  IN VOID     *HostAddress,\r
-  IN VOID     *Mapping\r
+  IN VGPU_DEV  *VgpuDev,\r
+  IN UINTN     NumberOfPages,\r
+  IN VOID      *HostAddress,\r
+  IN VOID      *Mapping\r
   )\r
 {\r
   VgpuDev->VirtIo->UnmapSharedBuffer (\r
@@ -341,11 +348,11 @@ VirtioGpuUnmapAndFreeBackingStore (
 VOID\r
 EFIAPI\r
 VirtioGpuExitBoot (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  VGPU_DEV *VgpuDev;\r
+  VGPU_DEV  *VgpuDev;\r
 \r
   DEBUG ((DEBUG_VERBOSE, "%a: Context=0x%p\n", __FUNCTION__, Context));\r
   VgpuDev = Context;\r
@@ -398,26 +405,26 @@ VirtioGpuExitBoot (
 STATIC\r
 EFI_STATUS\r
 VirtioGpuSendCommand (\r
-  IN OUT VGPU_DEV                           *VgpuDev,\r
-  IN     VIRTIO_GPU_CONTROL_TYPE            RequestType,\r
-  IN     BOOLEAN                            Fence,\r
-  IN OUT volatile VIRTIO_GPU_CONTROL_HEADER *Header,\r
-  IN     UINTN                              RequestSize\r
+  IN OUT VGPU_DEV                            *VgpuDev,\r
+  IN     VIRTIO_GPU_CONTROL_TYPE             RequestType,\r
+  IN     BOOLEAN                             Fence,\r
+  IN OUT volatile VIRTIO_GPU_CONTROL_HEADER  *Header,\r
+  IN     UINTN                               RequestSize\r
   )\r
 {\r
-  DESC_INDICES                       Indices;\r
-  volatile VIRTIO_GPU_CONTROL_HEADER Response;\r
-  EFI_STATUS                         Status;\r
-  UINT32                             ResponseSize;\r
-  EFI_PHYSICAL_ADDRESS               RequestDeviceAddress;\r
-  VOID                               *RequestMap;\r
-  EFI_PHYSICAL_ADDRESS               ResponseDeviceAddress;\r
-  VOID                               *ResponseMap;\r
+  DESC_INDICES                        Indices;\r
+  volatile VIRTIO_GPU_CONTROL_HEADER  Response;\r
+  EFI_STATUS                          Status;\r
+  UINT32                              ResponseSize;\r
+  EFI_PHYSICAL_ADDRESS                RequestDeviceAddress;\r
+  VOID                                *RequestMap;\r
+  EFI_PHYSICAL_ADDRESS                ResponseDeviceAddress;\r
+  VOID                                *ResponseMap;\r
 \r
   //\r
   // Initialize Header.\r
   //\r
-  Header->Type      = RequestType;\r
+  Header->Type = RequestType;\r
   if (Fence) {\r
     Header->Flags   = VIRTIO_GPU_FLAG_FENCE;\r
     Header->FenceId = VgpuDev->FenceId++;\r
@@ -425,8 +432,9 @@ VirtioGpuSendCommand (
     Header->Flags   = 0;\r
     Header->FenceId = 0;\r
   }\r
-  Header->CtxId     = 0;\r
-  Header->Padding   = 0;\r
+\r
+  Header->CtxId   = 0;\r
+  Header->Padding = 0;\r
 \r
   ASSERT (RequestSize >= sizeof *Header);\r
   ASSERT (RequestSize <= MAX_UINT32);\r
@@ -445,6 +453,7 @@ VirtioGpuSendCommand (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   Status = VirtioMapAllBytesInSharedBuffer (\r
              VgpuDev->VirtIo,\r
              VirtioOperationBusMasterWrite,\r
@@ -479,8 +488,13 @@ VirtioGpuSendCommand (
   //\r
   // Send the command.\r
   //\r
-  Status = VirtioFlush (VgpuDev->VirtIo, VIRTIO_GPU_CONTROL_QUEUE,\r
-             &VgpuDev->Ring, &Indices, &ResponseSize);\r
+  Status = VirtioFlush (\r
+             VgpuDev->VirtIo,\r
+             VIRTIO_GPU_CONTROL_QUEUE,\r
+             &VgpuDev->Ring,\r
+             &Indices,\r
+             &ResponseSize\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto UnmapResponse;\r
   }\r
@@ -489,8 +503,12 @@ VirtioGpuSendCommand (
   // Verify response size.\r
   //\r
   if (ResponseSize != sizeof Response) {\r
-    DEBUG ((DEBUG_ERROR, "%a: malformed response to Request=0x%x\n",\r
-      __FUNCTION__, (UINT32)RequestType));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: malformed response to Request=0x%x\n",\r
+      __FUNCTION__,\r
+      (UINT32)RequestType\r
+      ));\r
     Status = EFI_PROTOCOL_ERROR;\r
     goto UnmapResponse;\r
   }\r
@@ -504,6 +522,7 @@ VirtioGpuSendCommand (
   if (EFI_ERROR (Status)) {\r
     goto UnmapRequest;\r
   }\r
+\r
   Status = VgpuDev->VirtIo->UnmapSharedBuffer (VgpuDev->VirtIo, RequestMap);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -516,8 +535,13 @@ VirtioGpuSendCommand (
     return EFI_SUCCESS;\r
   }\r
 \r
-  DEBUG ((DEBUG_ERROR, "%a: Request=0x%x Response=0x%x\n", __FUNCTION__,\r
-    (UINT32)RequestType, Response.Type));\r
+  DEBUG ((\r
+    DEBUG_ERROR,\r
+    "%a: Request=0x%x Response=0x%x\n",\r
+    __FUNCTION__,\r
+    (UINT32)RequestType,\r
+    Response.Type\r
+    ));\r
   return EFI_DEVICE_ERROR;\r
 \r
 UnmapResponse:\r
@@ -557,14 +581,14 @@ UnmapRequest:
 **/\r
 EFI_STATUS\r
 VirtioGpuResourceCreate2d (\r
-  IN OUT VGPU_DEV           *VgpuDev,\r
-  IN     UINT32             ResourceId,\r
-  IN     VIRTIO_GPU_FORMATS Format,\r
-  IN     UINT32             Width,\r
-  IN     UINT32             Height\r
+  IN OUT VGPU_DEV            *VgpuDev,\r
+  IN     UINT32              ResourceId,\r
+  IN     VIRTIO_GPU_FORMATS  Format,\r
+  IN     UINT32              Width,\r
+  IN     UINT32              Height\r
   )\r
 {\r
-  volatile VIRTIO_GPU_RESOURCE_CREATE_2D Request;\r
+  volatile VIRTIO_GPU_RESOURCE_CREATE_2D  Request;\r
 \r
   if (ResourceId == 0) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -586,11 +610,11 @@ VirtioGpuResourceCreate2d (
 \r
 EFI_STATUS\r
 VirtioGpuResourceUnref (\r
-  IN OUT VGPU_DEV *VgpuDev,\r
-  IN     UINT32   ResourceId\r
+  IN OUT VGPU_DEV  *VgpuDev,\r
+  IN     UINT32    ResourceId\r
   )\r
 {\r
-  volatile VIRTIO_GPU_RESOURCE_UNREF Request;\r
+  volatile VIRTIO_GPU_RESOURCE_UNREF  Request;\r
 \r
   if (ResourceId == 0) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -610,13 +634,13 @@ VirtioGpuResourceUnref (
 \r
 EFI_STATUS\r
 VirtioGpuResourceAttachBacking (\r
-  IN OUT VGPU_DEV             *VgpuDev,\r
-  IN     UINT32               ResourceId,\r
-  IN     EFI_PHYSICAL_ADDRESS BackingStoreDeviceAddress,\r
-  IN     UINTN                NumberOfPages\r
+  IN OUT VGPU_DEV              *VgpuDev,\r
+  IN     UINT32                ResourceId,\r
+  IN     EFI_PHYSICAL_ADDRESS  BackingStoreDeviceAddress,\r
+  IN     UINTN                 NumberOfPages\r
   )\r
 {\r
-  volatile VIRTIO_GPU_RESOURCE_ATTACH_BACKING Request;\r
+  volatile VIRTIO_GPU_RESOURCE_ATTACH_BACKING  Request;\r
 \r
   if (ResourceId == 0) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -639,11 +663,11 @@ VirtioGpuResourceAttachBacking (
 \r
 EFI_STATUS\r
 VirtioGpuResourceDetachBacking (\r
-  IN OUT VGPU_DEV *VgpuDev,\r
-  IN     UINT32   ResourceId\r
+  IN OUT VGPU_DEV  *VgpuDev,\r
+  IN     UINT32    ResourceId\r
   )\r
 {\r
-  volatile VIRTIO_GPU_RESOURCE_DETACH_BACKING Request;\r
+  volatile VIRTIO_GPU_RESOURCE_DETACH_BACKING  Request;\r
 \r
   if (ResourceId == 0) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -669,16 +693,16 @@ VirtioGpuResourceDetachBacking (
 \r
 EFI_STATUS\r
 VirtioGpuSetScanout (\r
-  IN OUT VGPU_DEV *VgpuDev,\r
-  IN     UINT32   X,\r
-  IN     UINT32   Y,\r
-  IN     UINT32   Width,\r
-  IN     UINT32   Height,\r
-  IN     UINT32   ScanoutId,\r
-  IN     UINT32   ResourceId\r
+  IN OUT VGPU_DEV  *VgpuDev,\r
+  IN     UINT32    X,\r
+  IN     UINT32    Y,\r
+  IN     UINT32    Width,\r
+  IN     UINT32    Height,\r
+  IN     UINT32    ScanoutId,\r
+  IN     UINT32    ResourceId\r
   )\r
 {\r
-  volatile VIRTIO_GPU_SET_SCANOUT Request;\r
+  volatile VIRTIO_GPU_SET_SCANOUT  Request;\r
 \r
   //\r
   // Unlike for most other commands, ResourceId=0 is valid; it\r
@@ -702,16 +726,16 @@ VirtioGpuSetScanout (
 \r
 EFI_STATUS\r
 VirtioGpuTransferToHost2d (\r
-  IN OUT VGPU_DEV *VgpuDev,\r
-  IN     UINT32   X,\r
-  IN     UINT32   Y,\r
-  IN     UINT32   Width,\r
-  IN     UINT32   Height,\r
-  IN     UINT64   Offset,\r
-  IN     UINT32   ResourceId\r
+  IN OUT VGPU_DEV  *VgpuDev,\r
+  IN     UINT32    X,\r
+  IN     UINT32    Y,\r
+  IN     UINT32    Width,\r
+  IN     UINT32    Height,\r
+  IN     UINT64    Offset,\r
+  IN     UINT32    ResourceId\r
   )\r
 {\r
-  volatile VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D Request;\r
+  volatile VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D  Request;\r
 \r
   if (ResourceId == 0) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -736,15 +760,15 @@ VirtioGpuTransferToHost2d (
 \r
 EFI_STATUS\r
 VirtioGpuResourceFlush (\r
-  IN OUT VGPU_DEV *VgpuDev,\r
-  IN     UINT32   X,\r
-  IN     UINT32   Y,\r
-  IN     UINT32   Width,\r
-  IN     UINT32   Height,\r
-  IN     UINT32   ResourceId\r
+  IN OUT VGPU_DEV  *VgpuDev,\r
+  IN     UINT32    X,\r
+  IN     UINT32    Y,\r
+  IN     UINT32    Width,\r
+  IN     UINT32    Height,\r
+  IN     UINT32    ResourceId\r
   )\r
 {\r
-  volatile VIRTIO_GPU_RESOURCE_FLUSH Request;\r
+  volatile VIRTIO_GPU_RESOURCE_FLUSH  Request;\r
 \r
   if (ResourceId == 0) {\r
     return EFI_INVALID_PARAMETER;\r
index 666d577547322ebd825ab119d0c95c1171c17729..21bf2babc8efd129d78acd824b9f4a33fbe7f67e 100644 (file)
 // in the ACPI 3.0b spec, or more recently, to Table B-379, section "B.3.2\r
 // _DOD" in the ACPI 6.0 spec.\r
 //\r
-STATIC CONST ACPI_ADR_DEVICE_PATH mAcpiAdr = {\r
+STATIC CONST ACPI_ADR_DEVICE_PATH  mAcpiAdr = {\r
   {                                         // Header\r
     ACPI_DEVICE_PATH,                       //   Type\r
     ACPI_ADR_DP,                            //   SubType\r
     { sizeof mAcpiAdr, 0 },                 //   Length\r
   },\r
-  ACPI_DISPLAY_ADR (                        // ADR\r
+  ACPI_DISPLAY_ADR (\r
+    // ADR\r
     1,                                      //   DeviceIdScheme: use the ACPI\r
                                             //     bit-field definitions\r
     0,                                      //   HeadId\r
@@ -51,7 +52,7 @@ STATIC CONST ACPI_ADR_DEVICE_PATH mAcpiAdr = {
 //\r
 // Component Name 2 Protocol implementation.\r
 //\r
-STATIC CONST EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+STATIC CONST EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "en", L"Virtio GPU Driver" },\r
   { NULL, NULL                 }\r
 };\r
@@ -60,51 +61,72 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioGpuGetDriverName (\r
-  IN  EFI_COMPONENT_NAME2_PROTOCOL *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
+  IN  EFI_COMPONENT_NAME2_PROTOCOL  *This,\r
+  IN  CHAR8                         *Language,\r
+  OUT CHAR16                        **DriverName\r
   )\r
 {\r
-  return LookupUnicodeString2 (Language, This->SupportedLanguages,\r
-           mDriverNameTable, DriverName, FALSE /* Iso639Language */);\r
+  return LookupUnicodeString2 (\r
+           Language,\r
+           This->SupportedLanguages,\r
+           mDriverNameTable,\r
+           DriverName,\r
+           FALSE                               /* Iso639Language */\r
+           );\r
 }\r
 \r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioGpuGetControllerName (\r
-  IN  EFI_COMPONENT_NAME2_PROTOCOL *This,\r
-  IN  EFI_HANDLE                   ControllerHandle,\r
-  IN  EFI_HANDLE                   ChildHandle       OPTIONAL,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **ControllerName\r
+  IN  EFI_COMPONENT_NAME2_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                    ControllerHandle,\r
+  IN  EFI_HANDLE                    ChildHandle       OPTIONAL,\r
+  IN  CHAR8                         *Language,\r
+  OUT CHAR16                        **ControllerName\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  VGPU_DEV   *VgpuDev;\r
+  EFI_STATUS  Status;\r
+  VGPU_DEV    *VgpuDev;\r
 \r
   //\r
   // Look up the VGPU_DEV "protocol interface" on ControllerHandle.\r
   //\r
-  Status = gBS->OpenProtocol (ControllerHandle, &gEfiCallerIdGuid,\r
-                  (VOID **)&VgpuDev, gImageHandle, ControllerHandle,\r
-                  EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+  Status = gBS->OpenProtocol (\r
+                  ControllerHandle,\r
+                  &gEfiCallerIdGuid,\r
+                  (VOID **)&VgpuDev,\r
+                  gImageHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Sanity check: if we found gEfiCallerIdGuid on ControllerHandle, then we\r
   // keep its Virtio Device Protocol interface open BY_DRIVER.\r
   //\r
-  ASSERT_EFI_ERROR (EfiTestManagedDevice (ControllerHandle, gImageHandle,\r
-                      &gVirtioDeviceProtocolGuid));\r
+  ASSERT_EFI_ERROR (\r
+    EfiTestManagedDevice (\r
+      ControllerHandle,\r
+      gImageHandle,\r
+      &gVirtioDeviceProtocolGuid\r
+      )\r
+    );\r
 \r
   if (ChildHandle == NULL) {\r
     //\r
     // The caller is querying the name of the VGPU_DEV controller.\r
     //\r
-    return LookupUnicodeString2 (Language, This->SupportedLanguages,\r
-             VgpuDev->BusName, ControllerName, FALSE /* Iso639Language */);\r
+    return LookupUnicodeString2 (\r
+             Language,\r
+             This->SupportedLanguages,\r
+             VgpuDev->BusName,\r
+             ControllerName,\r
+             FALSE                                   /* Iso639Language */\r
+             );\r
   }\r
 \r
   //\r
@@ -113,22 +135,32 @@ VirtioGpuGetControllerName (
   // condition below covers the case when we haven't produced the GOP child\r
   // controller yet, or we've destroyed it since.)\r
   //\r
-  if (VgpuDev->Child == NULL || ChildHandle != VgpuDev->Child->GopHandle) {\r
+  if ((VgpuDev->Child == NULL) || (ChildHandle != VgpuDev->Child->GopHandle)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   //\r
   // Sanity check: our GOP child controller keeps the VGPU_DEV controller's\r
   // Virtio Device Protocol interface open BY_CHILD_CONTROLLER.\r
   //\r
-  ASSERT_EFI_ERROR (EfiTestChildHandle (ControllerHandle, ChildHandle,\r
-                      &gVirtioDeviceProtocolGuid));\r
-\r
-  return LookupUnicodeString2 (Language, This->SupportedLanguages,\r
-           VgpuDev->Child->GopName, ControllerName,\r
-           FALSE /* Iso639Language */);\r
+  ASSERT_EFI_ERROR (\r
+    EfiTestChildHandle (\r
+      ControllerHandle,\r
+      ChildHandle,\r
+      &gVirtioDeviceProtocolGuid\r
+      )\r
+    );\r
+\r
+  return LookupUnicodeString2 (\r
+           Language,\r
+           This->SupportedLanguages,\r
+           VgpuDev->Child->GopName,\r
+           ControllerName,\r
+           FALSE /* Iso639Language */\r
+           );\r
 }\r
 \r
-STATIC CONST EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {\r
+STATIC CONST EFI_COMPONENT_NAME2_PROTOCOL  mComponentName2 = {\r
   VirtioGpuGetDriverName,\r
   VirtioGpuGetControllerName,\r
   "en"                       // SupportedLanguages (RFC 4646)\r
@@ -137,6 +169,7 @@ STATIC CONST EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {
 //\r
 // Helper functions for the Driver Binding Protocol Implementation.\r
 //\r
+\r
 /**\r
   Format the VGPU_DEV controller name, to be looked up and returned by\r
   VirtioGpuGetControllerName().\r
@@ -170,32 +203,55 @@ STATIC CONST EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {
 STATIC\r
 EFI_STATUS\r
 FormatVgpuDevName (\r
-  IN  EFI_HANDLE               ControllerHandle,\r
-  IN  EFI_HANDLE               AgentHandle,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
-  OUT CHAR16                   **ControllerName\r
+  IN  EFI_HANDLE                ControllerHandle,\r
+  IN  EFI_HANDLE                AgentHandle,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
+  OUT CHAR16                    **ControllerName\r
   )\r
 {\r
-  EFI_HANDLE          PciIoHandle;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  UINTN               Segment, Bus, Device, Function;\r
-  STATIC CONST CHAR16 ControllerNameStem[] = L"Virtio GPU Device";\r
-  UINTN               ControllerNameSize;\r
-\r
-  if (EFI_ERROR (gBS->LocateDevicePath (&gEfiPciIoProtocolGuid, &DevicePath,\r
-                        &PciIoHandle)) ||\r
-      EFI_ERROR (gBS->OpenProtocol (PciIoHandle, &gEfiPciIoProtocolGuid,\r
-                        (VOID **)&PciIo, AgentHandle, ControllerHandle,\r
-                        EFI_OPEN_PROTOCOL_GET_PROTOCOL)) ||\r
-      EFI_ERROR (PciIo->GetLocation (PciIo, &Segment, &Bus, &Device,\r
-                          &Function))) {\r
+  EFI_HANDLE           PciIoHandle;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  UINTN                Segment, Bus, Device, Function;\r
+  STATIC CONST CHAR16  ControllerNameStem[] = L"Virtio GPU Device";\r
+  UINTN                ControllerNameSize;\r
+\r
+  if (EFI_ERROR (\r
+        gBS->LocateDevicePath (\r
+               &gEfiPciIoProtocolGuid,\r
+               &DevicePath,\r
+               &PciIoHandle\r
+               )\r
+        ) ||\r
+      EFI_ERROR (\r
+        gBS->OpenProtocol (\r
+               PciIoHandle,\r
+               &gEfiPciIoProtocolGuid,\r
+               (VOID **)&PciIo,\r
+               AgentHandle,\r
+               ControllerHandle,\r
+               EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+               )\r
+        ) ||\r
+      EFI_ERROR (\r
+        PciIo->GetLocation (\r
+                 PciIo,\r
+                 &Segment,\r
+                 &Bus,\r
+                 &Device,\r
+                 &Function\r
+                 )\r
+        ))\r
+  {\r
     //\r
     // Failed to retrieve location info, return verbatim copy of static string.\r
     //\r
-    *ControllerName = AllocateCopyPool (sizeof ControllerNameStem,\r
-                        ControllerNameStem);\r
+    *ControllerName = AllocateCopyPool (\r
+                        sizeof ControllerNameStem,\r
+                        ControllerNameStem\r
+                        );\r
     return (*ControllerName == NULL) ? EFI_OUT_OF_RESOURCES : EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // Location info available, format ControllerName dynamically.\r
   //\r
@@ -210,9 +266,16 @@ FormatVgpuDevName (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  UnicodeSPrintAsciiFormat (*ControllerName, ControllerNameSize,\r
-    "%s %04x:%02x:%02x.%x", ControllerNameStem, (UINT32)Segment, (UINT32)Bus,\r
-    (UINT32)Device, (UINT32)Function);\r
+  UnicodeSPrintAsciiFormat (\r
+    *ControllerName,\r
+    ControllerNameSize,\r
+    "%s %04x:%02x:%02x.%x",\r
+    ControllerNameStem,\r
+    (UINT32)Segment,\r
+    (UINT32)Bus,\r
+    (UINT32)Device,\r
+    (UINT32)Function\r
+    );\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -254,20 +317,20 @@ FormatVgpuDevName (
 STATIC\r
 EFI_STATUS\r
 InitVgpuGop (\r
-  IN OUT VGPU_DEV                 *ParentBus,\r
-  IN     EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath,\r
-  IN     EFI_HANDLE               ParentBusController,\r
-  IN     EFI_HANDLE               DriverBindingHandle\r
+  IN OUT VGPU_DEV                  *ParentBus,\r
+  IN     EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath,\r
+  IN     EFI_HANDLE                ParentBusController,\r
+  IN     EFI_HANDLE                DriverBindingHandle\r
   )\r
 {\r
-  VGPU_GOP            *VgpuGop;\r
-  EFI_STATUS          Status;\r
-  CHAR16              *ParentBusName;\r
-  STATIC CONST CHAR16 NameSuffix[] = L" Head #0";\r
-  UINTN               NameSize;\r
-  CHAR16              *Name;\r
-  EFI_TPL             OldTpl;\r
-  VOID                *ParentVirtIo;\r
+  VGPU_GOP             *VgpuGop;\r
+  EFI_STATUS           Status;\r
+  CHAR16               *ParentBusName;\r
+  STATIC CONST CHAR16  NameSuffix[] = L" Head #0";\r
+  UINTN                NameSize;\r
+  CHAR16               *Name;\r
+  EFI_TPL              OldTpl;\r
+  VOID                 *ParentVirtIo;\r
 \r
   VgpuGop = AllocateZeroPool (sizeof *VgpuGop);\r
   if (VgpuGop == NULL) {\r
@@ -282,18 +345,29 @@ InitVgpuGop (
   // VirtioGpuGetControllerName() to look up. We simply append NameSuffix to\r
   // ParentBus->BusName.\r
   //\r
-  Status = LookupUnicodeString2 ("en", mComponentName2.SupportedLanguages,\r
-             ParentBus->BusName, &ParentBusName, FALSE /* Iso639Language */);\r
+  Status = LookupUnicodeString2 (\r
+             "en",\r
+             mComponentName2.SupportedLanguages,\r
+             ParentBus->BusName,\r
+             &ParentBusName,\r
+             FALSE                                     /* Iso639Language */\r
+             );\r
   ASSERT_EFI_ERROR (Status);\r
   NameSize = StrSize (ParentBusName) - sizeof (CHAR16) + sizeof NameSuffix;\r
-  Name = AllocatePool (NameSize);\r
+  Name     = AllocatePool (NameSize);\r
   if (Name == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeVgpuGop;\r
   }\r
+\r
   UnicodeSPrintAsciiFormat (Name, NameSize, "%s%s", ParentBusName, NameSuffix);\r
-  Status = AddUnicodeString2 ("en", mComponentName2.SupportedLanguages,\r
-             &VgpuGop->GopName, Name, FALSE /* Iso639Language */);\r
+  Status = AddUnicodeString2 (\r
+             "en",\r
+             mComponentName2.SupportedLanguages,\r
+             &VgpuGop->GopName,\r
+             Name,\r
+             FALSE                          /* Iso639Language */\r
+             );\r
   FreePool (Name);\r
   if (EFI_ERROR (Status)) {\r
     goto FreeVgpuGop;\r
@@ -302,8 +376,10 @@ InitVgpuGop (
   //\r
   // Create the child device path.\r
   //\r
-  VgpuGop->GopDevicePath = AppendDevicePathNode (ParentDevicePath,\r
-                             &mAcpiAdr.Header);\r
+  VgpuGop->GopDevicePath = AppendDevicePathNode (\r
+                             ParentDevicePath,\r
+                             &mAcpiAdr.Header\r
+                             );\r
   if (VgpuGop->GopDevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeVgpuGopName;\r
@@ -317,9 +393,12 @@ InitVgpuGop (
   //\r
   // Create the child handle with the child device path.\r
   //\r
-  Status = gBS->InstallProtocolInterface (&VgpuGop->GopHandle,\r
-                  &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  VgpuGop->GopDevicePath);\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &VgpuGop->GopHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  EFI_NATIVE_INTERFACE,\r
+                  VgpuGop->GopDevicePath\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeDevicePath;\r
   }\r
@@ -328,12 +407,18 @@ InitVgpuGop (
   // The child handle must present a reference to the parent handle's Virtio\r
   // Device Protocol interface.\r
   //\r
-  Status = gBS->OpenProtocol (ParentBusController, &gVirtioDeviceProtocolGuid,\r
-                  &ParentVirtIo, DriverBindingHandle, VgpuGop->GopHandle,\r
-                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER);\r
+  Status = gBS->OpenProtocol (\r
+                  ParentBusController,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  &ParentVirtIo,\r
+                  DriverBindingHandle,\r
+                  VgpuGop->GopHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto UninstallDevicePath;\r
   }\r
+\r
   ASSERT (ParentVirtIo == ParentBus->VirtIo);\r
 \r
   //\r
@@ -351,9 +436,12 @@ InitVgpuGop (
   //\r
   // Install the Graphics Output Protocol on the child handle.\r
   //\r
-  Status = gBS->InstallProtocolInterface (&VgpuGop->GopHandle,\r
-                  &gEfiGraphicsOutputProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  &VgpuGop->Gop);\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &VgpuGop->GopHandle,\r
+                  &gEfiGraphicsOutputProtocolGuid,\r
+                  EFI_NATIVE_INTERFACE,\r
+                  &VgpuGop->Gop\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto UninitGop;\r
   }\r
@@ -369,12 +457,19 @@ UninitGop:
   ReleaseGopResources (VgpuGop, TRUE /* DisableHead */);\r
 \r
 CloseVirtIoByChild:\r
-  gBS->CloseProtocol (ParentBusController, &gVirtioDeviceProtocolGuid,\r
-    DriverBindingHandle, VgpuGop->GopHandle);\r
+  gBS->CloseProtocol (\r
+         ParentBusController,\r
+         &gVirtioDeviceProtocolGuid,\r
+         DriverBindingHandle,\r
+         VgpuGop->GopHandle\r
+         );\r
 \r
 UninstallDevicePath:\r
-  gBS->UninstallProtocolInterface (VgpuGop->GopHandle,\r
-         &gEfiDevicePathProtocolGuid, VgpuGop->GopDevicePath);\r
+  gBS->UninstallProtocolInterface (\r
+         VgpuGop->GopHandle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         VgpuGop->GopDevicePath\r
+         );\r
 \r
 FreeDevicePath:\r
   gBS->RestoreTPL (OldTpl);\r
@@ -412,17 +507,20 @@ FreeVgpuGop:
 STATIC\r
 VOID\r
 UninitVgpuGop (\r
-  IN OUT VGPU_DEV   *ParentBus,\r
-  IN     EFI_HANDLE ParentBusController,\r
-  IN     EFI_HANDLE DriverBindingHandle\r
+  IN OUT VGPU_DEV    *ParentBus,\r
+  IN     EFI_HANDLE  ParentBusController,\r
+  IN     EFI_HANDLE  DriverBindingHandle\r
   )\r
 {\r
-  VGPU_GOP   *VgpuGop;\r
-  EFI_STATUS Status;\r
+  VGPU_GOP    *VgpuGop;\r
+  EFI_STATUS  Status;\r
 \r
   VgpuGop = ParentBus->Child;\r
-  Status = gBS->UninstallProtocolInterface (VgpuGop->GopHandle,\r
-                  &gEfiGraphicsOutputProtocolGuid, &VgpuGop->Gop);\r
+  Status  = gBS->UninstallProtocolInterface (\r
+                   VgpuGop->GopHandle,\r
+                   &gEfiGraphicsOutputProtocolGuid,\r
+                   &VgpuGop->Gop\r
+                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -430,12 +528,19 @@ UninitVgpuGop (
   //\r
   ReleaseGopResources (VgpuGop, TRUE /* DisableHead */);\r
 \r
-  Status = gBS->CloseProtocol (ParentBusController, &gVirtioDeviceProtocolGuid,\r
-                  DriverBindingHandle, VgpuGop->GopHandle);\r
+  Status = gBS->CloseProtocol (\r
+                  ParentBusController,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  DriverBindingHandle,\r
+                  VgpuGop->GopHandle\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->UninstallProtocolInterface (VgpuGop->GopHandle,\r
-                  &gEfiDevicePathProtocolGuid, VgpuGop->GopDevicePath);\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  VgpuGop->GopHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  VgpuGop->GopDevicePath\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   FreePool (VgpuGop->GopDevicePath);\r
@@ -452,13 +557,13 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioGpuDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  VIRTIO_DEVICE_PROTOCOL *VirtIo;\r
+  EFI_STATUS              Status;\r
+  VIRTIO_DEVICE_PROTOCOL  *VirtIo;\r
 \r
   //\r
   // - If RemainingDevicePath is NULL: the caller is interested in creating all\r
@@ -469,19 +574,25 @@ VirtioGpuDriverBindingSupported (
   //   specified in RemainingDevicePath. In this case we have to see if the\r
   //   requested device path is supportable.\r
   //\r
-  if (RemainingDevicePath != NULL &&\r
+  if ((RemainingDevicePath != NULL) &&\r
       !IsDevicePathEnd (RemainingDevicePath) &&\r
-      (DevicePathNodeLength (RemainingDevicePath) != sizeof mAcpiAdr ||\r
-       CompareMem (RemainingDevicePath, &mAcpiAdr, sizeof mAcpiAdr) != 0)) {\r
+      ((DevicePathNodeLength (RemainingDevicePath) != sizeof mAcpiAdr) ||\r
+       (CompareMem (RemainingDevicePath, &mAcpiAdr, sizeof mAcpiAdr) != 0)))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   //\r
   // Open the Virtio Device Protocol interface on the controller, BY_DRIVER.\r
   //\r
-  Status = gBS->OpenProtocol (ControllerHandle, &gVirtioDeviceProtocolGuid,\r
-                  (VOID **)&VirtIo, This->DriverBindingHandle,\r
-                  ControllerHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  Status = gBS->OpenProtocol (\r
+                  ControllerHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  (VOID **)&VirtIo,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // If this fails, then by default we cannot support ControllerHandle. There\r
@@ -491,17 +602,23 @@ VirtioGpuDriverBindingSupported (
     // allowed.\r
     //\r
     if (Status == EFI_ALREADY_STARTED) {\r
-      EFI_STATUS Status2;\r
-      VGPU_DEV   *VgpuDev;\r
-\r
-      Status2 = gBS->OpenProtocol (ControllerHandle, &gEfiCallerIdGuid,\r
-                       (VOID **)&VgpuDev, This->DriverBindingHandle,\r
-                       ControllerHandle, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+      EFI_STATUS  Status2;\r
+      VGPU_DEV    *VgpuDev;\r
+\r
+      Status2 = gBS->OpenProtocol (\r
+                       ControllerHandle,\r
+                       &gEfiCallerIdGuid,\r
+                       (VOID **)&VgpuDev,\r
+                       This->DriverBindingHandle,\r
+                       ControllerHandle,\r
+                       EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                       );\r
       ASSERT_EFI_ERROR (Status2);\r
 \r
-      if (VgpuDev->Child == NULL &&\r
-          (RemainingDevicePath == NULL ||\r
-           !IsDevicePathEnd (RemainingDevicePath))) {\r
+      if ((VgpuDev->Child == NULL) &&\r
+          ((RemainingDevicePath == NULL) ||\r
+           !IsDevicePathEnd (RemainingDevicePath)))\r
+      {\r
         Status = EFI_SUCCESS;\r
       }\r
     }\r
@@ -512,8 +629,9 @@ VirtioGpuDriverBindingSupported (
   //\r
   // First BY_DRIVER open; check the VirtIo revision and subsystem.\r
   //\r
-  if (VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0) ||\r
-      VirtIo->SubSystemDeviceId != VIRTIO_SUBSYSTEM_GPU_DEVICE) {\r
+  if ((VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) ||\r
+      (VirtIo->SubSystemDeviceId != VIRTIO_SUBSYSTEM_GPU_DEVICE))\r
+  {\r
     Status = EFI_UNSUPPORTED;\r
     goto CloseVirtIo;\r
   }\r
@@ -522,13 +640,22 @@ VirtioGpuDriverBindingSupported (
   // We'll need the device path of the VirtIo device both for formatting\r
   // VGPU_DEV.BusName and for populating VGPU_GOP.GopDevicePath.\r
   //\r
-  Status = gBS->OpenProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid,\r
-                  NULL, This->DriverBindingHandle, ControllerHandle,\r
-                  EFI_OPEN_PROTOCOL_TEST_PROTOCOL);\r
+  Status = gBS->OpenProtocol (\r
+                  ControllerHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  NULL,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
+                  );\r
 \r
 CloseVirtIo:\r
-  gBS->CloseProtocol (ControllerHandle, &gVirtioDeviceProtocolGuid,\r
-    This->DriverBindingHandle, ControllerHandle);\r
+  gBS->CloseProtocol (\r
+         ControllerHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
 \r
   return Status;\r
 }\r
@@ -537,16 +664,16 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioGpuDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  VIRTIO_DEVICE_PROTOCOL   *VirtIo;\r
-  BOOLEAN                  VirtIoBoundJustNow;\r
-  VGPU_DEV                 *VgpuDev;\r
-  EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+  EFI_STATUS                Status;\r
+  VIRTIO_DEVICE_PROTOCOL    *VirtIo;\r
+  BOOLEAN                   VirtIoBoundJustNow;\r
+  VGPU_DEV                  *VgpuDev;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r
   //\r
   // Open the Virtio Device Protocol.\r
@@ -556,9 +683,14 @@ VirtioGpuDriverBindingStart (
   // binding the VirtIo controller on this call (with or without creating child\r
   // controllers), or else we're *only* creating child controllers.\r
   //\r
-  Status = gBS->OpenProtocol (ControllerHandle, &gVirtioDeviceProtocolGuid,\r
-                  (VOID **)&VirtIo, This->DriverBindingHandle,\r
-                  ControllerHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  Status = gBS->OpenProtocol (\r
+                  ControllerHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  (VOID **)&VirtIo,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // The assertions below are based on the success of\r
@@ -568,14 +700,20 @@ VirtioGpuDriverBindingStart (
     //\r
     ASSERT (Status == EFI_ALREADY_STARTED);\r
 \r
-    Status = gBS->OpenProtocol (ControllerHandle, &gEfiCallerIdGuid,\r
-                    (VOID **)&VgpuDev, This->DriverBindingHandle,\r
-                    ControllerHandle, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+    Status = gBS->OpenProtocol (\r
+                    ControllerHandle,\r
+                    &gEfiCallerIdGuid,\r
+                    (VOID **)&VgpuDev,\r
+                    This->DriverBindingHandle,\r
+                    ControllerHandle,\r
+                    EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     ASSERT (VgpuDev->Child == NULL);\r
     ASSERT (\r
-      RemainingDevicePath == NULL || !IsDevicePathEnd (RemainingDevicePath));\r
+      RemainingDevicePath == NULL || !IsDevicePathEnd (RemainingDevicePath)\r
+      );\r
 \r
     VirtIoBoundJustNow = FALSE;\r
   } else {\r
@@ -589,6 +727,7 @@ VirtioGpuDriverBindingStart (
       Status = EFI_OUT_OF_RESOURCES;\r
       goto CloseVirtIo;\r
     }\r
+\r
     VgpuDev->VirtIo = VirtIo;\r
   }\r
 \r
@@ -596,9 +735,14 @@ VirtioGpuDriverBindingStart (
   // Grab the VirtIo controller's device path. This is necessary regardless of\r
   // VirtIoBoundJustNow.\r
   //\r
-  Status = gBS->OpenProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid,\r
-                  (VOID **)&DevicePath, This->DriverBindingHandle,\r
-                  ControllerHandle, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+  Status = gBS->OpenProtocol (\r
+                  ControllerHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  (VOID **)&DevicePath,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeVgpuDev;\r
   }\r
@@ -608,19 +752,29 @@ VirtioGpuDriverBindingStart (
   // if we aren't *only* creating child handles).\r
   //\r
   if (VirtIoBoundJustNow) {\r
-    CHAR16 *VgpuDevName;\r
+    CHAR16  *VgpuDevName;\r
 \r
     //\r
     // Format a human-readable controller name for VGPU_DEV, and stash it for\r
     // VirtioGpuGetControllerName() to look up.\r
     //\r
-    Status = FormatVgpuDevName (ControllerHandle, This->DriverBindingHandle,\r
-               DevicePath, &VgpuDevName);\r
+    Status = FormatVgpuDevName (\r
+               ControllerHandle,\r
+               This->DriverBindingHandle,\r
+               DevicePath,\r
+               &VgpuDevName\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       goto FreeVgpuDev;\r
     }\r
-    Status = AddUnicodeString2 ("en", mComponentName2.SupportedLanguages,\r
-               &VgpuDev->BusName, VgpuDevName, FALSE /* Iso639Language */);\r
+\r
+    Status = AddUnicodeString2 (\r
+               "en",\r
+               mComponentName2.SupportedLanguages,\r
+               &VgpuDev->BusName,\r
+               VgpuDevName,\r
+               FALSE                                 /* Iso639Language */\r
+               );\r
     FreePool (VgpuDevName);\r
     if (EFI_ERROR (Status)) {\r
       goto FreeVgpuDev;\r
@@ -631,9 +785,13 @@ VirtioGpuDriverBindingStart (
       goto FreeVgpuDevBusName;\r
     }\r
 \r
-    Status = gBS->CreateEvent (EVT_SIGNAL_EXIT_BOOT_SERVICES, TPL_CALLBACK,\r
-                    VirtioGpuExitBoot, VgpuDev /* NotifyContext */,\r
-                    &VgpuDev->ExitBoot);\r
+    Status = gBS->CreateEvent (\r
+                    EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+                    TPL_CALLBACK,\r
+                    VirtioGpuExitBoot,\r
+                    VgpuDev /* NotifyContext */,\r
+                    &VgpuDev->ExitBoot\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       goto UninitGpu;\r
     }\r
@@ -641,18 +799,26 @@ VirtioGpuDriverBindingStart (
     //\r
     // Install the VGPU_DEV "protocol interface" on ControllerHandle.\r
     //\r
-    Status = gBS->InstallProtocolInterface (&ControllerHandle,\r
-                    &gEfiCallerIdGuid, EFI_NATIVE_INTERFACE, VgpuDev);\r
+    Status = gBS->InstallProtocolInterface (\r
+                    &ControllerHandle,\r
+                    &gEfiCallerIdGuid,\r
+                    EFI_NATIVE_INTERFACE,\r
+                    VgpuDev\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       goto CloseExitBoot;\r
     }\r
 \r
-    if (RemainingDevicePath != NULL && IsDevicePathEnd (RemainingDevicePath)) {\r
+    if ((RemainingDevicePath != NULL) && IsDevicePathEnd (RemainingDevicePath)) {\r
       //\r
       // No child handle should be produced; we're done.\r
       //\r
-      DEBUG ((DEBUG_INFO, "%a: bound VirtIo=%p without producing GOP\n",\r
-        __FUNCTION__, (VOID *)VgpuDev->VirtIo));\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "%a: bound VirtIo=%p without producing GOP\n",\r
+        __FUNCTION__,\r
+        (VOID *)VgpuDev->VirtIo\r
+        ));\r
       return EFI_SUCCESS;\r
     }\r
   }\r
@@ -663,10 +829,15 @@ VirtioGpuDriverBindingStart (
   //\r
   ASSERT (VgpuDev->Child == NULL);\r
   ASSERT (\r
-    RemainingDevicePath == NULL || !IsDevicePathEnd (RemainingDevicePath));\r
-\r
-  Status = InitVgpuGop (VgpuDev, DevicePath, ControllerHandle,\r
-             This->DriverBindingHandle);\r
+    RemainingDevicePath == NULL || !IsDevicePathEnd (RemainingDevicePath)\r
+    );\r
+\r
+  Status = InitVgpuGop (\r
+             VgpuDev,\r
+             DevicePath,\r
+             ControllerHandle,\r
+             This->DriverBindingHandle\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto UninstallVgpuDev;\r
   }\r
@@ -674,15 +845,22 @@ VirtioGpuDriverBindingStart (
   //\r
   // We're done.\r
   //\r
-  DEBUG ((DEBUG_INFO, "%a: produced GOP %a VirtIo=%p\n", __FUNCTION__,\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: produced GOP %a VirtIo=%p\n",\r
+    __FUNCTION__,\r
     VirtIoBoundJustNow ? "while binding" : "for pre-bound",\r
-    (VOID *)VgpuDev->VirtIo));\r
+    (VOID *)VgpuDev->VirtIo\r
+    ));\r
   return EFI_SUCCESS;\r
 \r
 UninstallVgpuDev:\r
   if (VirtIoBoundJustNow) {\r
-    gBS->UninstallProtocolInterface (ControllerHandle, &gEfiCallerIdGuid,\r
-           VgpuDev);\r
+    gBS->UninstallProtocolInterface (\r
+           ControllerHandle,\r
+           &gEfiCallerIdGuid,\r
+           VgpuDev\r
+           );\r
   }\r
 \r
 CloseExitBoot:\r
@@ -707,8 +885,12 @@ FreeVgpuDev:
 \r
 CloseVirtIo:\r
   if (VirtIoBoundJustNow) {\r
-    gBS->CloseProtocol (ControllerHandle, &gVirtioDeviceProtocolGuid,\r
-      This->DriverBindingHandle, ControllerHandle);\r
+    gBS->CloseProtocol (\r
+           ControllerHandle,\r
+           &gVirtioDeviceProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           ControllerHandle\r
+           );\r
   }\r
 \r
   return Status;\r
@@ -718,101 +900,134 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioGpuDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  ControllerHandle,\r
-  IN  UINTN                       NumberOfChildren,\r
-  IN  EFI_HANDLE                  *ChildHandleBuffer OPTIONAL\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  VGPU_DEV   *VgpuDev;\r
+  EFI_STATUS  Status;\r
+  VGPU_DEV    *VgpuDev;\r
 \r
   //\r
   // Look up the VGPU_DEV "protocol interface" on ControllerHandle.\r
   //\r
-  Status = gBS->OpenProtocol (ControllerHandle, &gEfiCallerIdGuid,\r
-                  (VOID **)&VgpuDev, This->DriverBindingHandle,\r
-                  ControllerHandle, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+  Status = gBS->OpenProtocol (\r
+                  ControllerHandle,\r
+                  &gEfiCallerIdGuid,\r
+                  (VOID **)&VgpuDev,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Sanity check: if we found gEfiCallerIdGuid on ControllerHandle, then we\r
   // keep its Virtio Device Protocol interface open BY_DRIVER.\r
   //\r
-  ASSERT_EFI_ERROR (EfiTestManagedDevice (ControllerHandle,\r
-                      This->DriverBindingHandle, &gVirtioDeviceProtocolGuid));\r
+  ASSERT_EFI_ERROR (\r
+    EfiTestManagedDevice (\r
+      ControllerHandle,\r
+      This->DriverBindingHandle,\r
+      &gVirtioDeviceProtocolGuid\r
+      )\r
+    );\r
 \r
   switch (NumberOfChildren) {\r
-  case 0:\r
-    //\r
-    // The caller wants us to unbind the VirtIo controller.\r
-    //\r
-    if (VgpuDev->Child != NULL) {\r
+    case 0:\r
       //\r
-      // We still have the GOP child.\r
+      // The caller wants us to unbind the VirtIo controller.\r
       //\r
-      Status = EFI_DEVICE_ERROR;\r
-      break;\r
-    }\r
-\r
-    DEBUG ((DEBUG_INFO, "%a: unbinding GOP-less VirtIo=%p\n", __FUNCTION__,\r
-      (VOID *)VgpuDev->VirtIo));\r
-\r
-    Status = gBS->UninstallProtocolInterface (ControllerHandle,\r
-                    &gEfiCallerIdGuid, VgpuDev);\r
-    ASSERT_EFI_ERROR (Status);\r
+      if (VgpuDev->Child != NULL) {\r
+        //\r
+        // We still have the GOP child.\r
+        //\r
+        Status = EFI_DEVICE_ERROR;\r
+        break;\r
+      }\r
 \r
-    Status = gBS->CloseEvent (VgpuDev->ExitBoot);\r
-    ASSERT_EFI_ERROR (Status);\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "%a: unbinding GOP-less VirtIo=%p\n",\r
+        __FUNCTION__,\r
+        (VOID *)VgpuDev->VirtIo\r
+        ));\r
+\r
+      Status = gBS->UninstallProtocolInterface (\r
+                      ControllerHandle,\r
+                      &gEfiCallerIdGuid,\r
+                      VgpuDev\r
+                      );\r
+      ASSERT_EFI_ERROR (Status);\r
+\r
+      Status = gBS->CloseEvent (VgpuDev->ExitBoot);\r
+      ASSERT_EFI_ERROR (Status);\r
+\r
+      VirtioGpuUninit (VgpuDev);\r
+      FreeUnicodeStringTable (VgpuDev->BusName);\r
+      FreePool (VgpuDev);\r
+\r
+      Status = gBS->CloseProtocol (\r
+                      ControllerHandle,\r
+                      &gVirtioDeviceProtocolGuid,\r
+                      This->DriverBindingHandle,\r
+                      ControllerHandle\r
+                      );\r
+      ASSERT_EFI_ERROR (Status);\r
+      break;\r
 \r
-    VirtioGpuUninit (VgpuDev);\r
-    FreeUnicodeStringTable (VgpuDev->BusName);\r
-    FreePool (VgpuDev);\r
+    case 1:\r
+      //\r
+      // The caller wants us to destroy our child GOP controller.\r
+      //\r
+      if ((VgpuDev->Child == NULL) ||\r
+          (ChildHandleBuffer[0] != VgpuDev->Child->GopHandle))\r
+      {\r
+        //\r
+        // We have no child controller at the moment, or it differs from the one\r
+        // the caller wants us to destroy. I.e., we don't own the child\r
+        // controller passed in.\r
+        //\r
+        Status = EFI_DEVICE_ERROR;\r
+        break;\r
+      }\r
 \r
-    Status = gBS->CloseProtocol (ControllerHandle, &gVirtioDeviceProtocolGuid,\r
-                    This->DriverBindingHandle, ControllerHandle);\r
-    ASSERT_EFI_ERROR (Status);\r
-    break;\r
+      //\r
+      // Sanity check: our GOP child controller keeps the VGPU_DEV controller's\r
+      // Virtio Device Protocol interface open BY_CHILD_CONTROLLER.\r
+      //\r
+      ASSERT_EFI_ERROR (\r
+        EfiTestChildHandle (\r
+          ControllerHandle,\r
+          VgpuDev->Child->GopHandle,\r
+          &gVirtioDeviceProtocolGuid\r
+          )\r
+        );\r
+\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "%a: destroying GOP under VirtIo=%p\n",\r
+        __FUNCTION__,\r
+        (VOID *)VgpuDev->VirtIo\r
+        ));\r
+      UninitVgpuGop (VgpuDev, ControllerHandle, This->DriverBindingHandle);\r
+      break;\r
 \r
-  case 1:\r
-    //\r
-    // The caller wants us to destroy our child GOP controller.\r
-    //\r
-    if (VgpuDev->Child == NULL ||\r
-        ChildHandleBuffer[0] != VgpuDev->Child->GopHandle) {\r
+    default:\r
       //\r
-      // We have no child controller at the moment, or it differs from the one\r
-      // the caller wants us to destroy. I.e., we don't own the child\r
-      // controller passed in.\r
+      // Impossible, we never produced more than one child.\r
       //\r
       Status = EFI_DEVICE_ERROR;\r
       break;\r
-    }\r
-    //\r
-    // Sanity check: our GOP child controller keeps the VGPU_DEV controller's\r
-    // Virtio Device Protocol interface open BY_CHILD_CONTROLLER.\r
-    //\r
-    ASSERT_EFI_ERROR (EfiTestChildHandle (ControllerHandle,\r
-                        VgpuDev->Child->GopHandle,\r
-                        &gVirtioDeviceProtocolGuid));\r
-\r
-    DEBUG ((DEBUG_INFO, "%a: destroying GOP under VirtIo=%p\n", __FUNCTION__,\r
-      (VOID *)VgpuDev->VirtIo));\r
-    UninitVgpuGop (VgpuDev, ControllerHandle, This->DriverBindingHandle);\r
-    break;\r
-\r
-  default:\r
-    //\r
-    // Impossible, we never produced more than one child.\r
-    //\r
-    Status = EFI_DEVICE_ERROR;\r
-    break;\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-STATIC EFI_DRIVER_BINDING_PROTOCOL mDriverBinding = {\r
+STATIC EFI_DRIVER_BINDING_PROTOCOL  mDriverBinding = {\r
   VirtioGpuDriverBindingSupported,\r
   VirtioGpuDriverBindingStart,\r
   VirtioGpuDriverBindingStop,\r
@@ -827,11 +1042,16 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL mDriverBinding = {
 EFI_STATUS\r
 EFIAPI\r
 VirtioGpuEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  return EfiLibInstallDriverBindingComponentName2 (ImageHandle, SystemTable,\r
-           &mDriverBinding, ImageHandle, NULL /* ComponentName */,\r
-           &mComponentName2);\r
+  return EfiLibInstallDriverBindingComponentName2 (\r
+           ImageHandle,\r
+           SystemTable,\r
+           &mDriverBinding,\r
+           ImageHandle,\r
+           NULL /* ComponentName */,\r
+           &mComponentName2\r
+           );\r
 }\r
index 3f0570eaad0ece1342c934357169851d04b1c4bf..2c15d542e3b1e0c7aedd2564918b1576d39e9522 100644 (file)
 **/\r
 VOID\r
 ReleaseGopResources (\r
-  IN OUT VGPU_GOP *VgpuGop,\r
-  IN     BOOLEAN  DisableHead\r
+  IN OUT VGPU_GOP  *VgpuGop,\r
+  IN     BOOLEAN   DisableHead\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   ASSERT (VgpuGop->ResourceId != 0);\r
   ASSERT (VgpuGop->BackingStore != NULL);\r
@@ -58,7 +58,10 @@ ReleaseGopResources (
     //\r
     Status = VirtioGpuSetScanout (\r
                VgpuGop->ParentBus, // VgpuDev\r
-               0, 0, 0, 0,         // X, Y, Width, Height\r
+               0,\r
+               0,\r
+               0,\r
+               0,                  // X, Y, Width, Height\r
                0,                  // ScanoutId\r
                0                   // ResourceId\r
                );\r
@@ -116,8 +119,8 @@ ReleaseGopResources (
     VgpuGop->BackingStore,   // HostAddress\r
     VgpuGop->BackingStoreMap // Mapping\r
     );\r
-  VgpuGop->BackingStore  = NULL;\r
-  VgpuGop->NumberOfPages = 0;\r
+  VgpuGop->BackingStore    = NULL;\r
+  VgpuGop->NumberOfPages   = 0;\r
   VgpuGop->BackingStoreMap = NULL;\r
 \r
   //\r
@@ -131,6 +134,7 @@ ReleaseGopResources (
   if (EFI_ERROR (Status)) {\r
     CpuDeadLoop ();\r
   }\r
+\r
   VgpuGop->ResourceId = 0;\r
 }\r
 \r
@@ -138,31 +142,31 @@ ReleaseGopResources (
 // The resolutions supported by this driver.\r
 //\r
 typedef struct {\r
-  UINT32 Width;\r
-  UINT32 Height;\r
+  UINT32    Width;\r
+  UINT32    Height;\r
 } GOP_RESOLUTION;\r
 \r
-STATIC CONST GOP_RESOLUTION mGopResolutions[] = {\r
-  {  640,  480 },\r
-  {  800,  480 },\r
-  {  800,  600 },\r
-  {  832,  624 },\r
-  {  960,  640 },\r
-  { 1024,  600 },\r
-  { 1024,  768 },\r
-  { 1152,  864 },\r
-  { 1152,  870 },\r
-  { 1280,  720 },\r
-  { 1280,  760 },\r
-  { 1280,  768 },\r
-  { 1280,  800 },\r
-  { 1280,  960 },\r
+STATIC CONST GOP_RESOLUTION  mGopResolutions[] = {\r
+  { 640,  480  },\r
+  { 800,  480  },\r
+  { 800,  600  },\r
+  { 832,  624  },\r
+  { 960,  640  },\r
+  { 1024, 600  },\r
+  { 1024, 768  },\r
+  { 1152, 864  },\r
+  { 1152, 870  },\r
+  { 1280, 720  },\r
+  { 1280, 760  },\r
+  { 1280, 768  },\r
+  { 1280, 800  },\r
+  { 1280, 960  },\r
   { 1280, 1024 },\r
-  { 1360,  768 },\r
-  { 1366,  768 },\r
+  { 1360, 768  },\r
+  { 1366, 768  },\r
   { 1400, 1050 },\r
-  { 1440,  900 },\r
-  { 1600,  900 },\r
+  { 1440, 900  },\r
+  { 1600, 900  },\r
   { 1600, 1200 },\r
   { 1680, 1050 },\r
   { 1920, 1080 },\r
@@ -195,13 +199,13 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 GopQueryMode (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL         *This,\r
-  IN  UINT32                               ModeNumber,\r
-  OUT UINTN                                *SizeOfInfo,\r
-  OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION **Info\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL          *This,\r
+  IN  UINT32                                ModeNumber,\r
+  OUT UINTN                                 *SizeOfInfo,\r
+  OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  **Info\r
   )\r
 {\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *GopModeInfo;\r
+  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *GopModeInfo;\r
 \r
   if (ModeNumber >= ARRAY_SIZE (mGopResolutions)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -218,7 +222,7 @@ GopQueryMode (
   GopModeInfo->PixelsPerScanLine    = mGopResolutions[ModeNumber].Width;\r
 \r
   *SizeOfInfo = sizeof *GopModeInfo;\r
-  *Info = GopModeInfo;\r
+  *Info       = GopModeInfo;\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -226,20 +230,20 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 GopSetMode (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL *This,\r
-  IN  UINT32                       ModeNumber\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL  *This,\r
+  IN  UINT32                        ModeNumber\r
   )\r
 {\r
-  VGPU_GOP             *VgpuGop;\r
-  UINT32               NewResourceId;\r
-  UINTN                NewNumberOfBytes;\r
-  UINTN                NewNumberOfPages;\r
-  VOID                 *NewBackingStore;\r
-  EFI_PHYSICAL_ADDRESS NewBackingStoreDeviceAddress;\r
-  VOID                 *NewBackingStoreMap;\r
+  VGPU_GOP              *VgpuGop;\r
+  UINT32                NewResourceId;\r
+  UINTN                 NewNumberOfBytes;\r
+  UINTN                 NewNumberOfPages;\r
+  VOID                  *NewBackingStore;\r
+  EFI_PHYSICAL_ADDRESS  NewBackingStoreDeviceAddress;\r
+  VOID                  *NewBackingStoreMap;\r
 \r
-  EFI_STATUS Status;\r
-  EFI_STATUS Status2;\r
+  EFI_STATUS  Status;\r
+  EFI_STATUS  Status2;\r
 \r
   if (ModeNumber >= ARRAY_SIZE (mGopResolutions)) {\r
     return EFI_UNSUPPORTED;\r
@@ -260,9 +264,9 @@ GopSetMode (
     //\r
     VgpuGop->Gop.Mode = &VgpuGop->GopMode;\r
 \r
-    VgpuGop->GopMode.MaxMode         = (UINT32)(ARRAY_SIZE (mGopResolutions));\r
-    VgpuGop->GopMode.Info            = &VgpuGop->GopModeInfo;\r
-    VgpuGop->GopMode.SizeOfInfo      = sizeof VgpuGop->GopModeInfo;\r
+    VgpuGop->GopMode.MaxMode    = (UINT32)(ARRAY_SIZE (mGopResolutions));\r
+    VgpuGop->GopMode.Info       = &VgpuGop->GopModeInfo;\r
+    VgpuGop->GopMode.SizeOfInfo = sizeof VgpuGop->GopModeInfo;\r
 \r
     VgpuGop->GopModeInfo.PixelFormat = PixelBltOnly;\r
 \r
@@ -302,13 +306,13 @@ GopSetMode (
   NewNumberOfBytes = mGopResolutions[ModeNumber].Width *\r
                      mGopResolutions[ModeNumber].Height * sizeof (UINT32);\r
   NewNumberOfPages = EFI_SIZE_TO_PAGES (NewNumberOfBytes);\r
-  Status = VirtioGpuAllocateZeroAndMapBackingStore (\r
-             VgpuGop->ParentBus,            // VgpuDev\r
-             NewNumberOfPages,              // NumberOfPages\r
-             &NewBackingStore,              // HostAddress\r
-             &NewBackingStoreDeviceAddress, // DeviceAddress\r
-             &NewBackingStoreMap            // Mapping\r
-             );\r
+  Status           = VirtioGpuAllocateZeroAndMapBackingStore (\r
+                       VgpuGop->ParentBus,            // VgpuDev\r
+                       NewNumberOfPages,              // NumberOfPages\r
+                       &NewBackingStore,              // HostAddress\r
+                       &NewBackingStoreDeviceAddress, // DeviceAddress\r
+                       &NewBackingStoreMap            // Mapping\r
+                       );\r
   if (EFI_ERROR (Status)) {\r
     goto DestroyHostResource;\r
   }\r
@@ -375,6 +379,7 @@ GopSetMode (
       if (EFI_ERROR (Status2)) {\r
         CpuDeadLoop ();\r
       }\r
+\r
       goto DetachBackingStore;\r
     }\r
 \r
@@ -393,19 +398,19 @@ GopSetMode (
   ASSERT (VgpuGop->ResourceId == 0);\r
   ASSERT (VgpuGop->BackingStore == NULL);\r
 \r
-  VgpuGop->ResourceId = NewResourceId;\r
-  VgpuGop->BackingStore = NewBackingStore;\r
-  VgpuGop->NumberOfPages = NewNumberOfPages;\r
+  VgpuGop->ResourceId      = NewResourceId;\r
+  VgpuGop->BackingStore    = NewBackingStore;\r
+  VgpuGop->NumberOfPages   = NewNumberOfPages;\r
   VgpuGop->BackingStoreMap = NewBackingStoreMap;\r
 \r
   //\r
   // Populate Mode and ModeInfo (mutable fields only).\r
   //\r
-  VgpuGop->GopMode.Mode = ModeNumber;\r
+  VgpuGop->GopMode.Mode                     = ModeNumber;\r
   VgpuGop->GopModeInfo.HorizontalResolution =\r
-                                             mGopResolutions[ModeNumber].Width;\r
+    mGopResolutions[ModeNumber].Width;\r
   VgpuGop->GopModeInfo.VerticalResolution = mGopResolutions[ModeNumber].Height;\r
-  VgpuGop->GopModeInfo.PixelsPerScanLine = mGopResolutions[ModeNumber].Width;\r
+  VgpuGop->GopModeInfo.PixelsPerScanLine  = mGopResolutions[ModeNumber].Width;\r
   return EFI_SUCCESS;\r
 \r
 DetachBackingStore:\r
@@ -437,27 +442,27 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 GopBlt (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL      *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL     *BltBuffer    OPTIONAL,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation,\r
-  IN  UINTN                             SourceX,\r
-  IN  UINTN                             SourceY,\r
-  IN  UINTN                             DestinationX,\r
-  IN  UINTN                             DestinationY,\r
-  IN  UINTN                             Width,\r
-  IN  UINTN                             Height,\r
-  IN  UINTN                             Delta         OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer    OPTIONAL,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,\r
+  IN  UINTN                              SourceX,\r
+  IN  UINTN                              SourceY,\r
+  IN  UINTN                              DestinationX,\r
+  IN  UINTN                              DestinationY,\r
+  IN  UINTN                              Width,\r
+  IN  UINTN                              Height,\r
+  IN  UINTN                              Delta         OPTIONAL\r
   )\r
 {\r
-  VGPU_GOP   *VgpuGop;\r
-  UINT32     CurrentHorizontal;\r
-  UINT32     CurrentVertical;\r
-  UINTN      SegmentSize;\r
-  UINTN      Y;\r
-  UINTN      ResourceOffset;\r
-  EFI_STATUS Status;\r
-\r
-  VgpuGop = VGPU_GOP_FROM_GOP (This);\r
+  VGPU_GOP    *VgpuGop;\r
+  UINT32      CurrentHorizontal;\r
+  UINT32      CurrentVertical;\r
+  UINTN       SegmentSize;\r
+  UINTN       Y;\r
+  UINTN       ResourceOffset;\r
+  EFI_STATUS  Status;\r
+\r
+  VgpuGop           = VGPU_GOP_FROM_GOP (This);\r
   CurrentHorizontal = VgpuGop->GopModeInfo.HorizontalResolution;\r
   CurrentVertical   = VgpuGop->GopModeInfo.VerticalResolution;\r
 \r
@@ -476,8 +481,9 @@ GopBlt (
   // zero, then Width is the entire width of BltBuffer, and the stride is\r
   // supposed to be calculated from Width.\r
   //\r
-  if (BltOperation == EfiBltVideoToBltBuffer ||\r
-      BltOperation == EfiBltBufferToVideo) {\r
+  if ((BltOperation == EfiBltVideoToBltBuffer) ||\r
+      (BltOperation == EfiBltBufferToVideo))\r
+  {\r
     if (Delta == 0) {\r
       Delta = SegmentSize;\r
     }\r
@@ -487,13 +493,15 @@ GopBlt (
   // For operations that write to the display, check if the destination fits\r
   // onto the display.\r
   //\r
-  if (BltOperation == EfiBltVideoFill ||\r
-      BltOperation == EfiBltBufferToVideo ||\r
-      BltOperation == EfiBltVideoToVideo) {\r
-    if (DestinationX > CurrentHorizontal ||\r
-        Width > CurrentHorizontal - DestinationX ||\r
-        DestinationY > CurrentVertical ||\r
-        Height > CurrentVertical - DestinationY) {\r
+  if ((BltOperation == EfiBltVideoFill) ||\r
+      (BltOperation == EfiBltBufferToVideo) ||\r
+      (BltOperation == EfiBltVideoToVideo))\r
+  {\r
+    if ((DestinationX > CurrentHorizontal) ||\r
+        (Width > CurrentHorizontal - DestinationX) ||\r
+        (DestinationY > CurrentVertical) ||\r
+        (Height > CurrentVertical - DestinationY))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
@@ -502,12 +510,14 @@ GopBlt (
   // For operations that read from the display, check if the source fits onto\r
   // the display.\r
   //\r
-  if (BltOperation == EfiBltVideoToBltBuffer ||\r
-      BltOperation == EfiBltVideoToVideo) {\r
-    if (SourceX > CurrentHorizontal ||\r
-        Width > CurrentHorizontal - SourceX ||\r
-        SourceY > CurrentVertical ||\r
-        Height > CurrentVertical - SourceY) {\r
+  if ((BltOperation == EfiBltVideoToBltBuffer) ||\r
+      (BltOperation == EfiBltVideoToVideo))\r
+  {\r
+    if ((SourceX > CurrentHorizontal) ||\r
+        (Width > CurrentHorizontal - SourceX) ||\r
+        (SourceY > CurrentVertical) ||\r
+        (Height > CurrentVertical - SourceY))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
@@ -517,99 +527,103 @@ GopBlt (
   // won't be further steps.\r
   //\r
   switch (BltOperation) {\r
-  case EfiBltVideoFill:\r
-    //\r
-    // Write data from the BltBuffer pixel (0, 0) directly to every pixel of\r
-    // the video display rectangle (DestinationX, DestinationY) (DestinationX +\r
-    // Width, DestinationY + Height). Only one pixel will be used from the\r
-    // BltBuffer. Delta is NOT used.\r
-    //\r
-    for (Y = 0; Y < Height; ++Y) {\r
-      SetMem32 (\r
-        VgpuGop->BackingStore +\r
+    case EfiBltVideoFill:\r
+      //\r
+      // Write data from the BltBuffer pixel (0, 0) directly to every pixel of\r
+      // the video display rectangle (DestinationX, DestinationY) (DestinationX +\r
+      // Width, DestinationY + Height). Only one pixel will be used from the\r
+      // BltBuffer. Delta is NOT used.\r
+      //\r
+      for (Y = 0; Y < Height; ++Y) {\r
+        SetMem32 (\r
+          VgpuGop->BackingStore +\r
           (DestinationY + Y) * CurrentHorizontal + DestinationX,\r
-        SegmentSize,\r
-        *(UINT32 *)BltBuffer\r
-        );\r
-    }\r
-    break;\r
-\r
-  case EfiBltVideoToBltBuffer:\r
-    //\r
-    // Read data from the video display rectangle (SourceX, SourceY) (SourceX +\r
-    // Width, SourceY + Height) and place it in the BltBuffer rectangle\r
-    // (DestinationX, DestinationY ) (DestinationX + Width, DestinationY +\r
-    // Height). If DestinationX or DestinationY is not zero then Delta must be\r
-    // set to the length in bytes of a row in the BltBuffer.\r
-    //\r
-    for (Y = 0; Y < Height; ++Y) {\r
-      CopyMem (\r
-        (UINT8 *)BltBuffer +\r
-          (DestinationY + Y) * Delta + DestinationX * sizeof *BltBuffer,\r
-        VgpuGop->BackingStore +\r
-          (SourceY + Y) * CurrentHorizontal + SourceX,\r
-        SegmentSize\r
-        );\r
-    }\r
-    return EFI_SUCCESS;\r
+          SegmentSize,\r
+          *(UINT32 *)BltBuffer\r
+          );\r
+      }\r
 \r
-  case EfiBltBufferToVideo:\r
-    //\r
-    // Write data from the BltBuffer rectangle (SourceX, SourceY) (SourceX +\r
-    // Width, SourceY + Height) directly to the video display rectangle\r
-    // (DestinationX, DestinationY) (DestinationX + Width, DestinationY +\r
-    // Height). If SourceX or SourceY is not zero then Delta must be set to the\r
-    // length in bytes of a row in the BltBuffer.\r
-    //\r
-    for (Y = 0; Y < Height; ++Y) {\r
-      CopyMem (\r
-        VgpuGop->BackingStore +\r
-          (DestinationY + Y) * CurrentHorizontal + DestinationX,\r
-        (UINT8 *)BltBuffer +\r
-          (SourceY + Y) * Delta + SourceX * sizeof *BltBuffer,\r
-        SegmentSize\r
-        );\r
-    }\r
-    break;\r
+      break;\r
 \r
-  case EfiBltVideoToVideo:\r
-    //\r
-    // Copy from the video display rectangle (SourceX, SourceY) (SourceX +\r
-    // Width, SourceY + Height) to the video display rectangle (DestinationX,\r
-    // DestinationY) (DestinationX + Width, DestinationY + Height). The\r
-    // BltBuffer and Delta are not used in this mode.\r
-    //\r
-    // A single invocation of CopyMem() handles overlap between source and\r
-    // destination (that is, within a single line), but for multiple\r
-    // invocations, we must handle overlaps.\r
-    //\r
-    if (SourceY < DestinationY) {\r
-      Y = Height;\r
-      while (Y > 0) {\r
-        --Y;\r
+    case EfiBltVideoToBltBuffer:\r
+      //\r
+      // Read data from the video display rectangle (SourceX, SourceY) (SourceX +\r
+      // Width, SourceY + Height) and place it in the BltBuffer rectangle\r
+      // (DestinationX, DestinationY ) (DestinationX + Width, DestinationY +\r
+      // Height). If DestinationX or DestinationY is not zero then Delta must be\r
+      // set to the length in bytes of a row in the BltBuffer.\r
+      //\r
+      for (Y = 0; Y < Height; ++Y) {\r
         CopyMem (\r
+          (UINT8 *)BltBuffer +\r
+          (DestinationY + Y) * Delta + DestinationX * sizeof *BltBuffer,\r
           VgpuGop->BackingStore +\r
-            (DestinationY + Y) * CurrentHorizontal + DestinationX,\r
-          VgpuGop->BackingStore +\r
-            (SourceY + Y) * CurrentHorizontal + SourceX,\r
+          (SourceY + Y) * CurrentHorizontal + SourceX,\r
           SegmentSize\r
           );\r
       }\r
-    } else {\r
+\r
+      return EFI_SUCCESS;\r
+\r
+    case EfiBltBufferToVideo:\r
+      //\r
+      // Write data from the BltBuffer rectangle (SourceX, SourceY) (SourceX +\r
+      // Width, SourceY + Height) directly to the video display rectangle\r
+      // (DestinationX, DestinationY) (DestinationX + Width, DestinationY +\r
+      // Height). If SourceX or SourceY is not zero then Delta must be set to the\r
+      // length in bytes of a row in the BltBuffer.\r
+      //\r
       for (Y = 0; Y < Height; ++Y) {\r
         CopyMem (\r
           VgpuGop->BackingStore +\r
-            (DestinationY + Y) * CurrentHorizontal + DestinationX,\r
-          VgpuGop->BackingStore +\r
-            (SourceY + Y) * CurrentHorizontal + SourceX,\r
+          (DestinationY + Y) * CurrentHorizontal + DestinationX,\r
+          (UINT8 *)BltBuffer +\r
+          (SourceY + Y) * Delta + SourceX * sizeof *BltBuffer,\r
           SegmentSize\r
           );\r
       }\r
-    }\r
-    break;\r
 \r
-  default:\r
-    return EFI_INVALID_PARAMETER;\r
+      break;\r
+\r
+    case EfiBltVideoToVideo:\r
+      //\r
+      // Copy from the video display rectangle (SourceX, SourceY) (SourceX +\r
+      // Width, SourceY + Height) to the video display rectangle (DestinationX,\r
+      // DestinationY) (DestinationX + Width, DestinationY + Height). The\r
+      // BltBuffer and Delta are not used in this mode.\r
+      //\r
+      // A single invocation of CopyMem() handles overlap between source and\r
+      // destination (that is, within a single line), but for multiple\r
+      // invocations, we must handle overlaps.\r
+      //\r
+      if (SourceY < DestinationY) {\r
+        Y = Height;\r
+        while (Y > 0) {\r
+          --Y;\r
+          CopyMem (\r
+            VgpuGop->BackingStore +\r
+            (DestinationY + Y) * CurrentHorizontal + DestinationX,\r
+            VgpuGop->BackingStore +\r
+            (SourceY + Y) * CurrentHorizontal + SourceX,\r
+            SegmentSize\r
+            );\r
+        }\r
+      } else {\r
+        for (Y = 0; Y < Height; ++Y) {\r
+          CopyMem (\r
+            VgpuGop->BackingStore +\r
+            (DestinationY + Y) * CurrentHorizontal + DestinationX,\r
+            VgpuGop->BackingStore +\r
+            (SourceY + Y) * CurrentHorizontal + SourceX,\r
+            SegmentSize\r
+            );\r
+        }\r
+      }\r
+\r
+      break;\r
+\r
+    default:\r
+      return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
@@ -648,7 +662,7 @@ GopBlt (
 //\r
 // Template for initializing VGPU_GOP.Gop.\r
 //\r
-CONST EFI_GRAPHICS_OUTPUT_PROTOCOL mGopTemplate = {\r
+CONST EFI_GRAPHICS_OUTPUT_PROTOCOL  mGopTemplate = {\r
   GopQueryMode,\r
   GopSetMode,\r
   GopBlt,\r
index 236cc4789237d6a3d9151ce07099eaa1362db2d4..2155b261d43e7a36074ad8dd81c9078cc9c4a79c 100644 (file)
@@ -36,35 +36,35 @@ typedef struct {
   //\r
   // VirtIo represents access to the Virtio GPU device. Never NULL.\r
   //\r
-  VIRTIO_DEVICE_PROTOCOL   *VirtIo;\r
+  VIRTIO_DEVICE_PROTOCOL      *VirtIo;\r
 \r
   //\r
   // BusName carries a customized name for\r
   // EFI_COMPONENT_NAME2_PROTOCOL.GetControllerName(). It is expressed in table\r
   // form because it can theoretically support several languages. Never NULL.\r
   //\r
-  EFI_UNICODE_STRING_TABLE *BusName;\r
+  EFI_UNICODE_STRING_TABLE    *BusName;\r
 \r
   //\r
   // VirtIo ring used for VirtIo communication.\r
   //\r
-  VRING                    Ring;\r
+  VRING                       Ring;\r
 \r
   //\r
   // Token associated with Ring's mapping for bus master common buffer\r
   // operation, from VirtioRingMap().\r
   //\r
-  VOID                     *RingMap;\r
+  VOID                        *RingMap;\r
 \r
   //\r
   // Event to be signaled at ExitBootServices().\r
   //\r
-  EFI_EVENT                ExitBoot;\r
+  EFI_EVENT                   ExitBoot;\r
 \r
   //\r
   // Common running counter for all VirtIo GPU requests that ask for fencing.\r
   //\r
-  UINT64                   FenceId;\r
+  UINT64                      FenceId;\r
 \r
   //\r
   // The Child field references the GOP wrapper structure. If this pointer is\r
@@ -77,85 +77,86 @@ typedef struct {
   // In practice, this field represents the single head (scanout) that we\r
   // support.\r
   //\r
-  VGPU_GOP                 *Child;\r
+  VGPU_GOP    *Child;\r
 } VGPU_DEV;\r
 \r
 //\r
 // The Graphics Output Protocol wrapper structure.\r
 //\r
-#define VGPU_GOP_SIG SIGNATURE_64 ('V', 'G', 'P', 'U', '_', 'G', 'O', 'P')\r
+#define VGPU_GOP_SIG  SIGNATURE_64 ('V', 'G', 'P', 'U', '_', 'G', 'O', 'P')\r
 \r
 struct VGPU_GOP_STRUCT {\r
-  UINT64                               Signature;\r
+  UINT64                                  Signature;\r
 \r
   //\r
   // ParentBus points to the parent VGPU_DEV object. Never NULL.\r
   //\r
-  VGPU_DEV                             *ParentBus;\r
+  VGPU_DEV                                *ParentBus;\r
 \r
   //\r
   // GopName carries a customized name for\r
   // EFI_COMPONENT_NAME2_PROTOCOL.GetControllerName(). It is expressed in table\r
   // form because it can theoretically support several languages. Never NULL.\r
   //\r
-  EFI_UNICODE_STRING_TABLE             *GopName;\r
+  EFI_UNICODE_STRING_TABLE                *GopName;\r
 \r
   //\r
   // GopHandle is the UEFI child handle that carries the device path ending\r
   // with the ACPI ADR node, and the Graphics Output Protocol. Never NULL.\r
   //\r
-  EFI_HANDLE                           GopHandle;\r
+  EFI_HANDLE                              GopHandle;\r
 \r
   //\r
   // The GopDevicePath field is the device path installed on GopHandle,\r
   // ending with an ACPI ADR node. Never NULL.\r
   //\r
-  EFI_DEVICE_PATH_PROTOCOL             *GopDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL                *GopDevicePath;\r
 \r
   //\r
   // The Gop field is installed on the child handle as Graphics Output Protocol\r
   // interface.\r
   //\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL         Gop;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL            Gop;\r
 \r
   //\r
   // Referenced by Gop.Mode, GopMode provides a summary about the supported\r
   // graphics modes, and the current mode.\r
   //\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE    GopMode;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE       GopMode;\r
 \r
   //\r
   // Referenced by GopMode.Info, GopModeInfo provides detailed information\r
   // about the current mode.\r
   //\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION GopModeInfo;\r
+  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION    GopModeInfo;\r
 \r
   //\r
   // Identifier of the 2D host resource that is in use by this head (scanout)\r
   // of the VirtIo GPU device. Zero until the first successful -- internal --\r
   // Gop.SetMode() call, never zero afterwards.\r
   //\r
-  UINT32                               ResourceId;\r
+  UINT32                                  ResourceId;\r
 \r
   //\r
   // A number of whole pages providing the backing store for the 2D host\r
   // resource identified by ResourceId above. NULL until the first successful\r
   // -- internal -- Gop.SetMode() call, never NULL afterwards.\r
   //\r
-  UINT32                               *BackingStore;\r
-  UINTN                                NumberOfPages;\r
+  UINT32                                  *BackingStore;\r
+  UINTN                                   NumberOfPages;\r
 \r
   //\r
   // Token associated with BackingStore's mapping for bus master common\r
   // buffer operation. BackingStoreMap is valid if, and only if,\r
   // BackingStore is non-NULL.\r
   //\r
-  VOID                                 *BackingStoreMap;\r
+  VOID                                    *BackingStoreMap;\r
 };\r
 \r
 //\r
 // VirtIo GPU initialization, and commands (primitives) for the GPU device.\r
 //\r
+\r
 /**\r
   Configure the VirtIo GPU device that underlies VgpuDev.\r
 \r
@@ -174,7 +175,7 @@ struct VGPU_GOP_STRUCT {
 **/\r
 EFI_STATUS\r
 VirtioGpuInit (\r
-  IN OUT VGPU_DEV *VgpuDev\r
+  IN OUT VGPU_DEV  *VgpuDev\r
   );\r
 \r
 /**\r
@@ -188,7 +189,7 @@ VirtioGpuInit (
 **/\r
 VOID\r
 VirtioGpuUninit (\r
-  IN OUT VGPU_DEV *VgpuDev\r
+  IN OUT VGPU_DEV  *VgpuDev\r
   );\r
 \r
 /**\r
@@ -221,11 +222,11 @@ VirtioGpuUninit (
 **/\r
 EFI_STATUS\r
 VirtioGpuAllocateZeroAndMapBackingStore (\r
-  IN  VGPU_DEV             *VgpuDev,\r
-  IN  UINTN                NumberOfPages,\r
-  OUT VOID                 **HostAddress,\r
-  OUT EFI_PHYSICAL_ADDRESS *DeviceAddress,\r
-  OUT VOID                 **Mapping\r
+  IN  VGPU_DEV              *VgpuDev,\r
+  IN  UINTN                 NumberOfPages,\r
+  OUT VOID                  **HostAddress,\r
+  OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress,\r
+  OUT VOID                  **Mapping\r
   );\r
 \r
 /**\r
@@ -252,10 +253,10 @@ VirtioGpuAllocateZeroAndMapBackingStore (
 **/\r
 VOID\r
 VirtioGpuUnmapAndFreeBackingStore (\r
-  IN VGPU_DEV *VgpuDev,\r
-  IN UINTN    NumberOfPages,\r
-  IN VOID     *HostAddress,\r
-  IN VOID     *Mapping\r
+  IN VGPU_DEV  *VgpuDev,\r
+  IN UINTN     NumberOfPages,\r
+  IN VOID      *HostAddress,\r
+  IN VOID      *Mapping\r
   );\r
 \r
 /**\r
@@ -274,8 +275,8 @@ VirtioGpuUnmapAndFreeBackingStore (
 VOID\r
 EFIAPI\r
 VirtioGpuExitBoot (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   );\r
 \r
 /**\r
@@ -306,63 +307,63 @@ VirtioGpuExitBoot (
 **/\r
 EFI_STATUS\r
 VirtioGpuResourceCreate2d (\r
-  IN OUT VGPU_DEV           *VgpuDev,\r
-  IN     UINT32             ResourceId,\r
-  IN     VIRTIO_GPU_FORMATS Format,\r
-  IN     UINT32             Width,\r
-  IN     UINT32             Height\r
+  IN OUT VGPU_DEV            *VgpuDev,\r
+  IN     UINT32              ResourceId,\r
+  IN     VIRTIO_GPU_FORMATS  Format,\r
+  IN     UINT32              Width,\r
+  IN     UINT32              Height\r
   );\r
 \r
 EFI_STATUS\r
 VirtioGpuResourceUnref (\r
-  IN OUT VGPU_DEV *VgpuDev,\r
-  IN     UINT32   ResourceId\r
+  IN OUT VGPU_DEV  *VgpuDev,\r
+  IN     UINT32    ResourceId\r
   );\r
 \r
 EFI_STATUS\r
 VirtioGpuResourceAttachBacking (\r
-  IN OUT VGPU_DEV             *VgpuDev,\r
-  IN     UINT32               ResourceId,\r
-  IN     EFI_PHYSICAL_ADDRESS BackingStoreDeviceAddress,\r
-  IN     UINTN                NumberOfPages\r
+  IN OUT VGPU_DEV              *VgpuDev,\r
+  IN     UINT32                ResourceId,\r
+  IN     EFI_PHYSICAL_ADDRESS  BackingStoreDeviceAddress,\r
+  IN     UINTN                 NumberOfPages\r
   );\r
 \r
 EFI_STATUS\r
 VirtioGpuResourceDetachBacking (\r
-  IN OUT VGPU_DEV *VgpuDev,\r
-  IN     UINT32   ResourceId\r
+  IN OUT VGPU_DEV  *VgpuDev,\r
+  IN     UINT32    ResourceId\r
   );\r
 \r
 EFI_STATUS\r
 VirtioGpuSetScanout (\r
-  IN OUT VGPU_DEV *VgpuDev,\r
-  IN     UINT32   X,\r
-  IN     UINT32   Y,\r
-  IN     UINT32   Width,\r
-  IN     UINT32   Height,\r
-  IN     UINT32   ScanoutId,\r
-  IN     UINT32   ResourceId\r
+  IN OUT VGPU_DEV  *VgpuDev,\r
+  IN     UINT32    X,\r
+  IN     UINT32    Y,\r
+  IN     UINT32    Width,\r
+  IN     UINT32    Height,\r
+  IN     UINT32    ScanoutId,\r
+  IN     UINT32    ResourceId\r
   );\r
 \r
 EFI_STATUS\r
 VirtioGpuTransferToHost2d (\r
-  IN OUT VGPU_DEV *VgpuDev,\r
-  IN     UINT32   X,\r
-  IN     UINT32   Y,\r
-  IN     UINT32   Width,\r
-  IN     UINT32   Height,\r
-  IN     UINT64   Offset,\r
-  IN     UINT32   ResourceId\r
+  IN OUT VGPU_DEV  *VgpuDev,\r
+  IN     UINT32    X,\r
+  IN     UINT32    Y,\r
+  IN     UINT32    Width,\r
+  IN     UINT32    Height,\r
+  IN     UINT64    Offset,\r
+  IN     UINT32    ResourceId\r
   );\r
 \r
 EFI_STATUS\r
 VirtioGpuResourceFlush (\r
-  IN OUT VGPU_DEV *VgpuDev,\r
-  IN     UINT32   X,\r
-  IN     UINT32   Y,\r
-  IN     UINT32   Width,\r
-  IN     UINT32   Height,\r
-  IN     UINT32   ResourceId\r
+  IN OUT VGPU_DEV  *VgpuDev,\r
+  IN     UINT32    X,\r
+  IN     UINT32    Y,\r
+  IN     UINT32    Width,\r
+  IN     UINT32    Height,\r
+  IN     UINT32    ResourceId\r
   );\r
 \r
 /**\r
@@ -390,13 +391,13 @@ VirtioGpuResourceFlush (
 **/\r
 VOID\r
 ReleaseGopResources (\r
-  IN OUT VGPU_GOP *VgpuGop,\r
-  IN     BOOLEAN  DisableHead\r
+  IN OUT VGPU_GOP  *VgpuGop,\r
+  IN     BOOLEAN   DisableHead\r
   );\r
 \r
 //\r
 // Template for initializing VGPU_GOP.Gop.\r
 //\r
-extern CONST EFI_GRAPHICS_OUTPUT_PROTOCOL mGopTemplate;\r
+extern CONST EFI_GRAPHICS_OUTPUT_PROTOCOL  mGopTemplate;\r
 \r
 #endif // _VIRTIO_GPU_DXE_H_\r
index 483d4f70388640938cef04225aeeae569f513177..e340ca2f8fe4e1ea0a04c719deaf8b2a7e2031ec 100644 (file)
 #include "VirtioNet.h"\r
 \r
 STATIC\r
-EFI_UNICODE_STRING_TABLE mVirtioNetDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mVirtioNetDriverNameTable[] = {\r
   { "eng;en", L"Virtio Network Driver" },\r
   { NULL,     NULL                     }\r
 };\r
 \r
 STATIC\r
-EFI_UNICODE_STRING_TABLE mVirtioNetControllerNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mVirtioNetControllerNameTable[] = {\r
   { "eng;en", L"Virtio Network Device" },\r
   { NULL,     NULL                     }\r
 };\r
@@ -48,14 +48,13 @@ EFI_UNICODE_STRING_TABLE mVirtioNetControllerNameTable[] = {
                                 the language specified by Language.\r
 \r
 **/\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return (Language == NULL || DriverName == NULL) ?\r
@@ -65,11 +64,10 @@ VirtioNetGetDriverName (
            This->SupportedLanguages,\r
            mVirtioNetDriverNameTable,\r
            DriverName,\r
-           (BOOLEAN) (This == &gVirtioNetComponentName) // Iso639Language\r
+           (BOOLEAN)(This == &gVirtioNetComponentName)  // Iso639Language\r
            );\r
 }\r
 \r
-\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by an EFI Driver.\r
@@ -114,21 +112,20 @@ VirtioNetGetDriverName (
                                 the language specified by Language.\r
 \r
 **/\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  ControllerHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
-  if (ControllerHandle == NULL || Language == NULL || ControllerName == NULL) {\r
+  if ((ControllerHandle == NULL) || (Language == NULL) || (ControllerName == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -154,18 +151,18 @@ VirtioNetGetControllerName (
            This->SupportedLanguages,\r
            mVirtioNetControllerNameTable,\r
            ControllerName,\r
-           (BOOLEAN) (This == &gVirtioNetComponentName) // Iso639Language\r
+           (BOOLEAN)(This == &gVirtioNetComponentName)  // Iso639Language\r
            );\r
 }\r
 \r
-EFI_COMPONENT_NAME_PROTOCOL gVirtioNetComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL  gVirtioNetComponentName = {\r
   &VirtioNetGetDriverName,\r
   &VirtioNetGetControllerName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
-EFI_COMPONENT_NAME2_PROTOCOL gVirtioNetComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &VirtioNetGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &VirtioNetGetControllerName,\r
+EFI_COMPONENT_NAME2_PROTOCOL  gVirtioNetComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&VirtioNetGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&VirtioNetGetControllerName,\r
   "en" // SupportedLanguages, RFC 4646 language codes\r
 };\r
index 3c400a60465096fb6a110f9c7003cf42c6a746d3..ac9ac2d7fb395b839f6cedcf3f68086195fad4eb 100644 (file)
@@ -16,7 +16,7 @@
 \r
 #include "VirtioNet.h"\r
 \r
-#define RECEIVE_FILTERS_NO_MCAST ((UINT32) (       \\r
+#define RECEIVE_FILTERS_NO_MCAST  ((UINT32) (      \\r
           EFI_SIMPLE_NETWORK_RECEIVE_UNICAST     | \\r
           EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST   | \\r
           EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS   \\r
@@ -50,36 +50,36 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetGetFeatures (\r
-  IN OUT  VNET_DEV        *Dev,\r
-  OUT     EFI_MAC_ADDRESS *MacAddress,\r
-  OUT     BOOLEAN         *MediaPresentSupported,\r
-  OUT     BOOLEAN         *MediaPresent\r
+  IN OUT  VNET_DEV         *Dev,\r
+  OUT     EFI_MAC_ADDRESS  *MacAddress,\r
+  OUT     BOOLEAN          *MediaPresentSupported,\r
+  OUT     BOOLEAN          *MediaPresent\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT8      NextDevStat;\r
-  UINT64     Features;\r
-  UINTN      MacIdx;\r
-  UINT16     LinkStatus;\r
+  EFI_STATUS  Status;\r
+  UINT8       NextDevStat;\r
+  UINT64      Features;\r
+  UINTN       MacIdx;\r
+  UINT16      LinkStatus;\r
 \r
   //\r
   // Interrogate the device for features (virtio-0.9.5, 2.2.1 Device\r
   // Initialization Sequence), but don't complete setting it up.\r
   //\r
   NextDevStat = 0;             // step 1 -- reset device\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status      = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   NextDevStat |= VSTAT_ACK;    // step 2 -- acknowledge device presence\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto YieldDevice;\r
   }\r
 \r
   NextDevStat |= VSTAT_DRIVER; // step 3 -- we know how to drive it\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto YieldDevice;\r
   }\r
@@ -99,8 +99,10 @@ VirtioNetGetFeatures (
     Status = EFI_UNSUPPORTED;\r
     goto YieldDevice;\r
   }\r
+\r
   for (MacIdx = 0; MacIdx < SIZE_OF_VNET (Mac); ++MacIdx) {\r
-    Status = Dev->VirtIo->ReadDevice (Dev->VirtIo,\r
+    Status = Dev->VirtIo->ReadDevice (\r
+                            Dev->VirtIo,\r
                             OFFSET_OF_VNET (Mac) + MacIdx, // Offset\r
                             1,                             // FieldSize\r
                             1,                             // BufferSize\r
@@ -116,24 +118,25 @@ VirtioNetGetFeatures (
   //\r
   if ((Features & VIRTIO_NET_F_STATUS) == 0) {\r
     *MediaPresentSupported = FALSE;\r
-  }\r
-  else {\r
+  } else {\r
     *MediaPresentSupported = TRUE;\r
-    Status = VIRTIO_CFG_READ (Dev, LinkStatus, &LinkStatus);\r
+    Status                 = VIRTIO_CFG_READ (Dev, LinkStatus, &LinkStatus);\r
     if (EFI_ERROR (Status)) {\r
       goto YieldDevice;\r
     }\r
-    *MediaPresent = (BOOLEAN) ((LinkStatus & VIRTIO_NET_S_LINK_UP) != 0);\r
+\r
+    *MediaPresent = (BOOLEAN)((LinkStatus & VIRTIO_NET_S_LINK_UP) != 0);\r
   }\r
 \r
 YieldDevice:\r
-  Dev->VirtIo->SetDeviceStatus (Dev->VirtIo,\r
-    EFI_ERROR (Status) ? VSTAT_FAILED : 0);\r
+  Dev->VirtIo->SetDeviceStatus (\r
+                 Dev->VirtIo,\r
+                 EFI_ERROR (Status) ? VSTAT_FAILED : 0\r
+                 );\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Set up the Simple Network Protocol fields, the Simple Network Mode fields,\r
   and the Exit Boot Services Event of the virtio-net driver instance.\r
@@ -151,10 +154,10 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetSnpPopulate (\r
-  IN OUT VNET_DEV *Dev\r
+  IN OUT VNET_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // We set up a function here that is asynchronously callable by an\r
@@ -177,8 +180,13 @@ VirtioNetSnpPopulate (
   // I/O)". Because none of our functions block, we'd satisfy an even stronger\r
   // requirement.\r
   //\r
-  Status = gBS->CreateEvent (EVT_NOTIFY_WAIT, TPL_CALLBACK,\r
-                  &VirtioNetIsPacketAvailable, Dev, &Dev->Snp.WaitForPacket);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_NOTIFY_WAIT,\r
+                  TPL_CALLBACK,\r
+                  &VirtioNetIsPacketAvailable,\r
+                  Dev,\r
+                  &Dev->Snp.WaitForPacket\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -199,31 +207,39 @@ VirtioNetSnpPopulate (
   Dev->Snp.Receive        = &VirtioNetReceive;\r
   Dev->Snp.Mode           = &Dev->Snm;\r
 \r
-  Dev->Snm.State                 = EfiSimpleNetworkStopped;\r
-  Dev->Snm.HwAddressSize         = SIZE_OF_VNET (Mac);\r
-  Dev->Snm.MediaHeaderSize       = SIZE_OF_VNET (Mac) + // dst MAC\r
-                                   SIZE_OF_VNET (Mac) + // src MAC\r
-                                   2;                       // Ethertype\r
-  Dev->Snm.MaxPacketSize         = 1500;\r
-  Dev->Snm.NvRamSize             = 0;\r
-  Dev->Snm.NvRamAccessSize       = 0;\r
-  Dev->Snm.ReceiveFilterMask     = RECEIVE_FILTERS_NO_MCAST;\r
-  Dev->Snm.ReceiveFilterSetting  = RECEIVE_FILTERS_NO_MCAST;\r
-  Dev->Snm.MaxMCastFilterCount   = 0;\r
-  Dev->Snm.MCastFilterCount      = 0;\r
-  Dev->Snm.IfType                = 1; // ethernet\r
-  Dev->Snm.MacAddressChangeable  = FALSE;\r
-  Dev->Snm.MultipleTxSupported   = TRUE;\r
+  Dev->Snm.State           = EfiSimpleNetworkStopped;\r
+  Dev->Snm.HwAddressSize   = SIZE_OF_VNET (Mac);\r
+  Dev->Snm.MediaHeaderSize = SIZE_OF_VNET (Mac) +       // dst MAC\r
+                             SIZE_OF_VNET (Mac) +       // src MAC\r
+                             2;                         // Ethertype\r
+  Dev->Snm.MaxPacketSize        = 1500;\r
+  Dev->Snm.NvRamSize            = 0;\r
+  Dev->Snm.NvRamAccessSize      = 0;\r
+  Dev->Snm.ReceiveFilterMask    = RECEIVE_FILTERS_NO_MCAST;\r
+  Dev->Snm.ReceiveFilterSetting = RECEIVE_FILTERS_NO_MCAST;\r
+  Dev->Snm.MaxMCastFilterCount  = 0;\r
+  Dev->Snm.MCastFilterCount     = 0;\r
+  Dev->Snm.IfType               = 1;  // ethernet\r
+  Dev->Snm.MacAddressChangeable = FALSE;\r
+  Dev->Snm.MultipleTxSupported  = TRUE;\r
 \r
   ASSERT (SIZE_OF_VNET (Mac) <= sizeof (EFI_MAC_ADDRESS));\r
 \r
-  Status = VirtioNetGetFeatures (Dev, &Dev->Snm.CurrentAddress,\r
-             &Dev->Snm.MediaPresentSupported, &Dev->Snm.MediaPresent);\r
+  Status = VirtioNetGetFeatures (\r
+             Dev,\r
+             &Dev->Snm.CurrentAddress,\r
+             &Dev->Snm.MediaPresentSupported,\r
+             &Dev->Snm.MediaPresent\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseWaitForPacket;\r
   }\r
-  CopyMem (&Dev->Snm.PermanentAddress, &Dev->Snm.CurrentAddress,\r
-    SIZE_OF_VNET (Mac));\r
+\r
+  CopyMem (\r
+    &Dev->Snm.PermanentAddress,\r
+    &Dev->Snm.CurrentAddress,\r
+    SIZE_OF_VNET (Mac)\r
+    );\r
   SetMem (&Dev->Snm.BroadcastAddress, SIZE_OF_VNET (Mac), 0xFF);\r
 \r
   //\r
@@ -235,8 +251,13 @@ VirtioNetSnpPopulate (
   // could be entered immediately. VirtioNetExitBoot() checks Dev->Snm.State,\r
   // so we're safe.\r
   //\r
-  Status = gBS->CreateEvent (EVT_SIGNAL_EXIT_BOOT_SERVICES, TPL_CALLBACK,\r
-                  &VirtioNetExitBoot, Dev, &Dev->ExitBoot);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+                  TPL_CALLBACK,\r
+                  &VirtioNetExitBoot,\r
+                  Dev,\r
+                  &Dev->ExitBoot\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseWaitForPacket;\r
   }\r
@@ -248,7 +269,6 @@ CloseWaitForPacket:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Release any resources allocated by VirtioNetSnpPopulate().\r
 \r
@@ -263,7 +283,7 @@ STATIC
 VOID\r
 EFIAPI\r
 VirtioNetSnpEvacuate (\r
-  IN OUT VNET_DEV *Dev\r
+  IN OUT VNET_DEV  *Dev\r
   )\r
 {\r
   //\r
@@ -276,7 +296,6 @@ VirtioNetSnpEvacuate (
   gBS->CloseEvent (Dev->Snp.WaitForPacket);\r
 }\r
 \r
-\r
 /**\r
   Tests to see if this driver supports a given controller. If a child device is\r
   provided, it further tests to see if this driver supports creating a handle\r
@@ -330,18 +349,17 @@ VirtioNetSnpEvacuate (
                                    RemainingDevicePath is not supported by the\r
                                    driver specified by This.\r
 **/\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  VIRTIO_DEVICE_PROTOCOL *VirtIo;\r
+  EFI_STATUS              Status;\r
+  VIRTIO_DEVICE_PROTOCOL  *VirtIo;\r
 \r
   //\r
   // Attempt to open the device with the VirtIo set of interfaces. On success,\r
@@ -370,12 +388,15 @@ VirtioNetDriverBindingSupported (
   // We needed VirtIo access only transitorily, to see whether we support the\r
   // device or not.\r
   //\r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Starts a device controller or a bus controller.\r
 \r
@@ -422,34 +443,39 @@ VirtioNetDriverBindingSupported (
   @retval Others                   The driver failed to start the device.\r
 \r
 **/\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  VNET_DEV                 *Dev;\r
-  EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
-  MAC_ADDR_DEVICE_PATH     MacNode;\r
-  VOID                     *ChildVirtIo;\r
+  EFI_STATUS                Status;\r
+  VNET_DEV                  *Dev;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+  MAC_ADDR_DEVICE_PATH      MacNode;\r
+  VOID                      *ChildVirtIo;\r
 \r
   //\r
   // allocate space for the driver instance\r
   //\r
-  Dev = (VNET_DEV *) AllocateZeroPool (sizeof *Dev);\r
+  Dev = (VNET_DEV *)AllocateZeroPool (sizeof *Dev);\r
   if (Dev == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   Dev->Signature = VNET_SIG;\r
 \r
-  Status = gBS->OpenProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-                  (VOID **)&Dev->VirtIo, This->DriverBindingHandle,\r
-                  DeviceHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  (VOID **)&Dev->VirtIo,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeVirtioNet;\r
   }\r
@@ -466,9 +492,14 @@ VirtioNetDriverBindingStart (
   //\r
   // get the device path of the virtio-net device -- one-shot open\r
   //\r
-  Status = gBS->OpenProtocol (DeviceHandle, &gEfiDevicePathProtocolGuid,\r
-                  (VOID **)&DevicePath, This->DriverBindingHandle,\r
-                  DeviceHandle, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  (VOID **)&DevicePath,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle,\r
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto Evacuate;\r
   }\r
@@ -479,9 +510,12 @@ VirtioNetDriverBindingStart (
   MacNode.Header.Type    = MESSAGING_DEVICE_PATH;\r
   MacNode.Header.SubType = MSG_MAC_ADDR_DP;\r
   SetDevicePathNodeLength (&MacNode, sizeof MacNode);\r
-  CopyMem (&MacNode.MacAddress, &Dev->Snm.CurrentAddress,\r
-    sizeof (EFI_MAC_ADDRESS));\r
-  MacNode.IfType         = Dev->Snm.IfType;\r
+  CopyMem (\r
+    &MacNode.MacAddress,\r
+    &Dev->Snm.CurrentAddress,\r
+    sizeof (EFI_MAC_ADDRESS)\r
+    );\r
+  MacNode.IfType = Dev->Snm.IfType;\r
 \r
   Dev->MacDevicePath = AppendDevicePathNode (DevicePath, &MacNode.Header);\r
   if (Dev->MacDevicePath == NULL) {\r
@@ -493,10 +527,14 @@ VirtioNetDriverBindingStart (
   // create a child handle with the Simple Network Protocol and the new\r
   // device path installed on it\r
   //\r
-  Status = gBS->InstallMultipleProtocolInterfaces (&Dev->MacHandle,\r
-                  &gEfiSimpleNetworkProtocolGuid, &Dev->Snp,\r
-                  &gEfiDevicePathProtocolGuid,    Dev->MacDevicePath,\r
-                  NULL);\r
+  Status = gBS->InstallMultipleProtocolInterfaces (\r
+                  &Dev->MacHandle,\r
+                  &gEfiSimpleNetworkProtocolGuid,\r
+                  &Dev->Snp,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  Dev->MacDevicePath,\r
+                  NULL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeMacDevicePath;\r
   }\r
@@ -505,9 +543,14 @@ VirtioNetDriverBindingStart (
   // make a note that we keep this device open with VirtIo for the sake of this\r
   // child\r
   //\r
-  Status = gBS->OpenProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-                  &ChildVirtIo, This->DriverBindingHandle,\r
-                  Dev->MacHandle, EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER);\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  &ChildVirtIo,\r
+                  This->DriverBindingHandle,\r
+                  Dev->MacHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto UninstallMultiple;\r
   }\r
@@ -515,10 +558,14 @@ VirtioNetDriverBindingStart (
   return EFI_SUCCESS;\r
 \r
 UninstallMultiple:\r
-  gBS->UninstallMultipleProtocolInterfaces (Dev->MacHandle,\r
-         &gEfiDevicePathProtocolGuid,    Dev->MacDevicePath,\r
-         &gEfiSimpleNetworkProtocolGuid, &Dev->Snp,\r
-         NULL);\r
+  gBS->UninstallMultipleProtocolInterfaces (\r
+         Dev->MacHandle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         Dev->MacDevicePath,\r
+         &gEfiSimpleNetworkProtocolGuid,\r
+         &Dev->Snp,\r
+         NULL\r
+         );\r
 \r
 FreeMacDevicePath:\r
   FreePool (Dev->MacDevicePath);\r
@@ -527,8 +574,12 @@ Evacuate:
   VirtioNetSnpEvacuate (Dev);\r
 \r
 CloseVirtIo:\r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
 FreeVirtioNet:\r
   FreePool (Dev);\r
@@ -536,7 +587,6 @@ FreeVirtioNet:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stops a device controller or a bus controller.\r
 \r
@@ -574,10 +624,10 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
   if (NumberOfChildren > 0) {\r
@@ -585,17 +635,21 @@ VirtioNetDriverBindingStop (
     // free all resources for whose access we need the child handle, because\r
     // the child handle is going away\r
     //\r
-    EFI_STATUS                  Status;\r
-    EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
-    VNET_DEV                    *Dev;\r
-    EFI_TPL                     OldTpl;\r
+    EFI_STATUS                   Status;\r
+    EFI_SIMPLE_NETWORK_PROTOCOL  *Snp;\r
+    VNET_DEV                     *Dev;\r
+    EFI_TPL                      OldTpl;\r
 \r
     ASSERT (NumberOfChildren == 1);\r
 \r
-    Status = gBS->OpenProtocol (ChildHandleBuffer[0],\r
-                    &gEfiSimpleNetworkProtocolGuid, (VOID **)&Snp,\r
-                    This->DriverBindingHandle, DeviceHandle,\r
-                    EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+    Status = gBS->OpenProtocol (\r
+                    ChildHandleBuffer[0],\r
+                    &gEfiSimpleNetworkProtocolGuid,\r
+                    (VOID **)&Snp,\r
+                    This->DriverBindingHandle,\r
+                    DeviceHandle,\r
+                    EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
     Dev = VIRTIO_NET_FROM_SNP (Snp);\r
 \r
@@ -610,14 +664,21 @@ VirtioNetDriverBindingStop (
       // device in use, cannot stop driver instance\r
       //\r
       Status = EFI_DEVICE_ERROR;\r
-    }\r
-    else {\r
-      gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-             This->DriverBindingHandle, Dev->MacHandle);\r
-      gBS->UninstallMultipleProtocolInterfaces (Dev->MacHandle,\r
-             &gEfiDevicePathProtocolGuid,    Dev->MacDevicePath,\r
-             &gEfiSimpleNetworkProtocolGuid, &Dev->Snp,\r
-             NULL);\r
+    } else {\r
+      gBS->CloseProtocol (\r
+             DeviceHandle,\r
+             &gVirtioDeviceProtocolGuid,\r
+             This->DriverBindingHandle,\r
+             Dev->MacHandle\r
+             );\r
+      gBS->UninstallMultipleProtocolInterfaces (\r
+             Dev->MacHandle,\r
+             &gEfiDevicePathProtocolGuid,\r
+             Dev->MacDevicePath,\r
+             &gEfiSimpleNetworkProtocolGuid,\r
+             &Dev->Snp,\r
+             NULL\r
+             );\r
       FreePool (Dev->MacDevicePath);\r
       VirtioNetSnpEvacuate (Dev);\r
       FreePool (Dev);\r
@@ -630,14 +691,17 @@ VirtioNetDriverBindingStop (
   //\r
   // release remaining resources, tied directly to the parent handle\r
   //\r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-EFI_DRIVER_BINDING_PROTOCOL gVirtioNetDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gVirtioNetDriverBinding = {\r
   &VirtioNetDriverBindingSupported,\r
   &VirtioNetDriverBindingStart,\r
   &VirtioNetDriverBindingStop,\r
index 95e8bda6de11ef0243574e1a75851c73b85f48fb..c3f41dab57bdc4a8888c7c9e53d24da2c58e98b7 100644 (file)
   @retval EFI_SUCCESS           The operation completed successfully.\r
   @retval Others                An unexpected error occurred.\r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r
index 83e96e5e5d91da21c07579716a749d54b13b46ab..4c93607a38cc00a607a8a631b7d36d3743fc9e3f 100644 (file)
                                 context, which is implementation-dependent.\r
 \r
 **/\r
-\r
 VOID\r
 EFIAPI\r
 VirtioNetIsPacketAvailable (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
   //\r
@@ -42,8 +41,8 @@ VirtioNetIsPacketAvailable (
   // almost no documentation in either the UEFI-2.3.1+errC spec or the\r
   // DWG-2.3.1, but WaitForKey does have some.\r
   //\r
-  VNET_DEV *Dev;\r
-  UINT16   RxCurUsed;\r
+  VNET_DEV  *Dev;\r
+  UINT16    RxCurUsed;\r
 \r
   Dev = Context;\r
   if (Dev->Snm.State != EfiSimpleNetworkInitialized) {\r
@@ -65,8 +64,8 @@ VirtioNetIsPacketAvailable (
 VOID\r
 EFIAPI\r
 VirtioNetExitBoot (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
   //\r
@@ -76,7 +75,7 @@ VirtioNetExitBoot (
   // Shut down pending transfers according to DWG-2.3.1, "25.5.1 Exit Boot\r
   // Services Event".\r
   //\r
-  VNET_DEV *Dev;\r
+  VNET_DEV  *Dev;\r
 \r
   DEBUG ((DEBUG_VERBOSE, "%a: Context=0x%p\n", __FUNCTION__, Context));\r
   Dev = Context;\r
index 333a522d503a2ff41edbe78482b10d788244f674..0e13bdc78ce2e0d8286d353186013063636989cf 100644 (file)
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetGetStatus (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  OUT UINT32                     *InterruptStatus OPTIONAL,\r
-  OUT VOID                       **TxBuf OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  OUT UINT32                      *InterruptStatus OPTIONAL,\r
+  OUT VOID                        **TxBuf OPTIONAL\r
   )\r
 {\r
-  VNET_DEV             *Dev;\r
-  EFI_TPL              OldTpl;\r
-  EFI_STATUS           Status;\r
-  UINT16               RxCurUsed;\r
-  UINT16               TxCurUsed;\r
-  EFI_PHYSICAL_ADDRESS DeviceAddress;\r
+  VNET_DEV              *Dev;\r
+  EFI_TPL               OldTpl;\r
+  EFI_STATUS            Status;\r
+  UINT16                RxCurUsed;\r
+  UINT16                TxCurUsed;\r
+  EFI_PHYSICAL_ADDRESS  DeviceAddress;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Dev = VIRTIO_NET_FROM_SNP (This);\r
+  Dev    = VIRTIO_NET_FROM_SNP (This);\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   switch (Dev->Snm.State) {\r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto Exit;\r
-  case EfiSimpleNetworkStarted:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto Exit;\r
-  default:\r
-    break;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto Exit;\r
+    case EfiSimpleNetworkStarted:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto Exit;\r
+    default:\r
+      break;\r
   }\r
 \r
   //\r
   // update link status\r
   //\r
   if (Dev->Snm.MediaPresentSupported) {\r
-    UINT16 LinkStatus;\r
+    UINT16  LinkStatus;\r
 \r
     Status = VIRTIO_CFG_READ (Dev, LinkStatus, &LinkStatus);\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
     }\r
+\r
     Dev->Snm.MediaPresent =\r
-      (BOOLEAN) ((LinkStatus & VIRTIO_NET_S_LINK_UP) != 0);\r
+      (BOOLEAN)((LinkStatus & VIRTIO_NET_S_LINK_UP) != 0);\r
   }\r
 \r
   //\r
@@ -110,6 +110,7 @@ VirtioNetGetStatus (
     if (Dev->RxLastUsed != RxCurUsed) {\r
       *InterruptStatus |= EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT;\r
     }\r
+\r
     if (Dev->TxLastUsed != TxCurUsed) {\r
       ASSERT (Dev->TxCurPending > 0);\r
       *InterruptStatus |= EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT;\r
@@ -119,10 +120,9 @@ VirtioNetGetStatus (
   if (TxBuf != NULL) {\r
     if (Dev->TxLastUsed == TxCurUsed) {\r
       *TxBuf = NULL;\r
-    }\r
-    else {\r
-      UINT16 UsedElemIdx;\r
-      UINT32 DescIdx;\r
+    } else {\r
+      UINT16  UsedElemIdx;\r
+      UINT32  DescIdx;\r
 \r
       //\r
       // fetch the first descriptor among those that the hypervisor reports\r
@@ -132,8 +132,8 @@ VirtioNetGetStatus (
       ASSERT (Dev->TxCurPending <= Dev->TxMaxPending);\r
 \r
       UsedElemIdx = Dev->TxLastUsed++ % Dev->TxRing.QueueSize;\r
-      DescIdx = Dev->TxRing.Used.UsedElem[UsedElemIdx].Id;\r
-      ASSERT (DescIdx < (UINT32) (2 * Dev->TxMaxPending - 1));\r
+      DescIdx     = Dev->TxRing.Used.UsedElem[UsedElemIdx].Id;\r
+      ASSERT (DescIdx < (UINT32)(2 * Dev->TxMaxPending - 1));\r
 \r
       //\r
       // get the device address that has been enqueued for the caller's\r
@@ -144,7 +144,7 @@ VirtioNetGetStatus (
       //\r
       // now this descriptor can be used again to enqueue a transmit buffer\r
       //\r
-      Dev->TxFreeStack[--Dev->TxCurPending] = (UINT16) DescIdx;\r
+      Dev->TxFreeStack[--Dev->TxCurPending] = (UINT16)DescIdx;\r
 \r
       //\r
       // Unmap the device address and perform the reverse mapping to find the\r
index bb3b552d68d73e09fdbc5c06cc7c9a418254b0fe..c77aeea826b5ea3d7351bcc8e83f70c5cfbcb242 100644 (file)
                            VirtioRingMap().\r
   @retval EFI_SUCCESS      Ring initialized.\r
 */\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetInitRing (\r
-  IN OUT VNET_DEV *Dev,\r
-  IN     UINT16   Selector,\r
-  OUT    VRING    *Ring,\r
-  OUT    VOID     **Mapping\r
+  IN OUT VNET_DEV  *Dev,\r
+  IN     UINT16    Selector,\r
+  OUT    VRING     *Ring,\r
+  OUT    VOID      **Mapping\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT16     QueueSize;\r
-  UINT64     RingBaseShift;\r
-  VOID       *MapInfo;\r
+  EFI_STATUS  Status;\r
+  UINT16      QueueSize;\r
+  UINT64      RingBaseShift;\r
+  VOID        *MapInfo;\r
 \r
   //\r
   // step 4b -- allocate selected queue\r
@@ -62,6 +61,7 @@ VirtioNetInitRing (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   Status = Dev->VirtIo->GetQueueNumMax (Dev->VirtIo, &QueueSize);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -74,6 +74,7 @@ VirtioNetInitRing (
   if (QueueSize < 2) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   Status = VirtioRingInit (Dev->VirtIo, QueueSize, Ring);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -122,7 +123,6 @@ ReleaseQueue:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Set up static scaffolding for the VirtioNetTransmit() and\r
   VirtioNetGetStatus() SNP methods.\r
@@ -148,12 +148,11 @@ ReleaseQueue:
                                 VirtioMapAllBytesInSharedBuffer()\r
   @retval EFI_SUCCESS           TX setup successful.\r
 */\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetInitTx (\r
-  IN OUT VNET_DEV *Dev\r
+  IN OUT VNET_DEV  *Dev\r
   )\r
 {\r
   UINTN                 TxSharedReqSize;\r
@@ -162,11 +161,15 @@ VirtioNetInitTx (
   EFI_PHYSICAL_ADDRESS  DeviceAddress;\r
   VOID                  *TxSharedReqBuffer;\r
 \r
-  Dev->TxMaxPending = (UINT16) MIN (Dev->TxRing.QueueSize / 2,\r
-                                 VNET_MAX_PENDING);\r
+  Dev->TxMaxPending = (UINT16)MIN (\r
+                                Dev->TxRing.QueueSize / 2,\r
+                                VNET_MAX_PENDING\r
+                                );\r
   Dev->TxCurPending = 0;\r
-  Dev->TxFreeStack  = AllocatePool (Dev->TxMaxPending *\r
-                        sizeof *Dev->TxFreeStack);\r
+  Dev->TxFreeStack  = AllocatePool (\r
+                        Dev->TxMaxPending *\r
+                        sizeof *Dev->TxFreeStack\r
+                        );\r
   if (Dev->TxFreeStack == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -209,7 +212,6 @@ VirtioNetInitTx (
 \r
   Dev->TxSharedReq = TxSharedReqBuffer;\r
 \r
-\r
   //\r
   // In VirtIo 1.0, the NumBuffers field is mandatory. In 0.9.5, it depends on\r
   // VIRTIO_NET_F_MRG_RXBUF, which we never negotiate.\r
@@ -219,9 +221,9 @@ VirtioNetInitTx (
                     sizeof *Dev->TxSharedReq;\r
 \r
   for (PktIdx = 0; PktIdx < Dev->TxMaxPending; ++PktIdx) {\r
-    UINT16 DescIdx;\r
+    UINT16  DescIdx;\r
 \r
-    DescIdx = (UINT16) (2 * PktIdx);\r
+    DescIdx                  = (UINT16)(2 * PktIdx);\r
     Dev->TxFreeStack[PktIdx] = DescIdx;\r
 \r
     //\r
@@ -229,9 +231,9 @@ VirtioNetInitTx (
     // (unmodified by the host) virtio-net request header.\r
     //\r
     Dev->TxRing.Desc[DescIdx].Addr  = DeviceAddress;\r
-    Dev->TxRing.Desc[DescIdx].Len   = (UINT32) TxSharedReqSize;\r
+    Dev->TxRing.Desc[DescIdx].Len   = (UINT32)TxSharedReqSize;\r
     Dev->TxRing.Desc[DescIdx].Flags = VRING_DESC_F_NEXT;\r
-    Dev->TxRing.Desc[DescIdx].Next  = (UINT16) (DescIdx + 1);\r
+    Dev->TxRing.Desc[DescIdx].Next  = (UINT16)(DescIdx + 1);\r
 \r
     //\r
     // The second descriptor of each pending TX packet is updated on the fly,\r
@@ -261,7 +263,7 @@ VirtioNetInitTx (
   //\r
   // want no interrupt when a transmit completes\r
   //\r
-  *Dev->TxRing.Avail.Flags = (UINT16) VRING_AVAIL_F_NO_INTERRUPT;\r
+  *Dev->TxRing.Avail.Flags = (UINT16)VRING_AVAIL_F_NO_INTERRUPT;\r
 \r
   return EFI_SUCCESS;\r
 \r
@@ -281,7 +283,6 @@ FreeTxFreeStack:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Set up static scaffolding for the VirtioNetReceive() SNP method and enable\r
   live device operation.\r
@@ -304,12 +305,11 @@ FreeTxFreeStack:
   @retval EFI_SUCCESS           RX setup successful. The device is live and may\r
                                 already be writing to the receive area.\r
 */\r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetInitRx (\r
-  IN OUT VNET_DEV *Dev\r
+  IN OUT VNET_DEV  *Dev\r
   )\r
 {\r
   EFI_STATUS            Status;\r
@@ -343,7 +343,7 @@ VirtioNetInitRx (
   // Limit the number of pending RX packets if the queue is big. The division\r
   // by two is due to the above "two descriptors per packet" trait.\r
   //\r
-  RxAlwaysPending = (UINT16) MIN (Dev->RxRing.QueueSize / 2, VNET_MAX_PENDING);\r
+  RxAlwaysPending = (UINT16)MIN (Dev->RxRing.QueueSize / 2, VNET_MAX_PENDING);\r
 \r
   //\r
   // The RxBuf is shared between guest and hypervisor, use\r
@@ -351,13 +351,13 @@ VirtioNetInitRx (
   // BusMasterCommonBuffer so that it can be accessed by both guest and\r
   // hypervisor.\r
   //\r
-  NumBytes = RxAlwaysPending * RxBufSize;\r
+  NumBytes          = RxAlwaysPending * RxBufSize;\r
   Dev->RxBufNrPages = EFI_SIZE_TO_PAGES (NumBytes);\r
-  Status = Dev->VirtIo->AllocateSharedPages (\r
-                          Dev->VirtIo,\r
-                          Dev->RxBufNrPages,\r
-                          &RxBuffer\r
-                          );\r
+  Status            = Dev->VirtIo->AllocateSharedPages (\r
+                                     Dev->VirtIo,\r
+                                     Dev->RxBufNrPages,\r
+                                     &RxBuffer\r
+                                     );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -390,13 +390,13 @@ VirtioNetInitRx (
   // the host should not send interrupts, we'll poll in VirtioNetReceive()\r
   // and VirtioNetIsPacketAvailable().\r
   //\r
-  *Dev->RxRing.Avail.Flags = (UINT16) VRING_AVAIL_F_NO_INTERRUPT;\r
+  *Dev->RxRing.Avail.Flags = (UINT16)VRING_AVAIL_F_NO_INTERRUPT;\r
 \r
   //\r
   // now set up a separate, two-part descriptor chain for each RX packet, and\r
   // link each chain into (from) the available ring as well\r
   //\r
-  DescIdx = 0;\r
+  DescIdx            = 0;\r
   RxBufDeviceAddress = Dev->RxBufDeviceBase;\r
   for (PktIdx = 0; PktIdx < RxAlwaysPending; ++PktIdx) {\r
     //\r
@@ -409,15 +409,15 @@ VirtioNetInitRx (
     // virtio-0.9.5, 2.4.1.1 Placing Buffers into the Descriptor Table\r
     //\r
     Dev->RxRing.Desc[DescIdx].Addr  = RxBufDeviceAddress;\r
-    Dev->RxRing.Desc[DescIdx].Len   = (UINT32) VirtioNetReqSize;\r
+    Dev->RxRing.Desc[DescIdx].Len   = (UINT32)VirtioNetReqSize;\r
     Dev->RxRing.Desc[DescIdx].Flags = VRING_DESC_F_WRITE | VRING_DESC_F_NEXT;\r
-    Dev->RxRing.Desc[DescIdx].Next  = (UINT16) (DescIdx + 1);\r
-    RxBufDeviceAddress += Dev->RxRing.Desc[DescIdx++].Len;\r
+    Dev->RxRing.Desc[DescIdx].Next  = (UINT16)(DescIdx + 1);\r
+    RxBufDeviceAddress             += Dev->RxRing.Desc[DescIdx++].Len;\r
 \r
     Dev->RxRing.Desc[DescIdx].Addr  = RxBufDeviceAddress;\r
-    Dev->RxRing.Desc[DescIdx].Len   = (UINT32) (RxBufSize - VirtioNetReqSize);\r
+    Dev->RxRing.Desc[DescIdx].Len   = (UINT32)(RxBufSize - VirtioNetReqSize);\r
     Dev->RxRing.Desc[DescIdx].Flags = VRING_DESC_F_WRITE;\r
-    RxBufDeviceAddress += Dev->RxRing.Desc[DescIdx++].Len;\r
+    RxBufDeviceAddress             += Dev->RxRing.Desc[DescIdx++].Len;\r
   }\r
 \r
   //\r
@@ -455,7 +455,6 @@ FreeSharedBuffer:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Resets a network adapter and allocates the transmit and receive buffers\r
   required by the network interface; optionally, also requests allocation  of\r
@@ -485,29 +484,29 @@ FreeSharedBuffer:
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetInitialize (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINTN                       ExtraRxBufferSize  OPTIONAL,\r
-  IN UINTN                       ExtraTxBufferSize  OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINTN                        ExtraRxBufferSize  OPTIONAL,\r
+  IN UINTN                        ExtraTxBufferSize  OPTIONAL\r
   )\r
 {\r
-  VNET_DEV   *Dev;\r
-  EFI_TPL    OldTpl;\r
-  EFI_STATUS Status;\r
-  UINT8      NextDevStat;\r
-  UINT64     Features;\r
+  VNET_DEV    *Dev;\r
+  EFI_TPL     OldTpl;\r
+  EFI_STATUS  Status;\r
+  UINT8       NextDevStat;\r
+  UINT64      Features;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
-  if (ExtraRxBufferSize > 0 || ExtraTxBufferSize > 0) {\r
+\r
+  if ((ExtraRxBufferSize > 0) || (ExtraTxBufferSize > 0)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Dev = VIRTIO_NET_FROM_SNP (This);\r
+  Dev    = VIRTIO_NET_FROM_SNP (This);\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   if (Dev->Snm.State != EfiSimpleNetworkStarted) {\r
     Status = EFI_NOT_STARTED;\r
@@ -524,13 +523,13 @@ VirtioNetInitialize (
   // virtio-0.9.5 spec, 2.2.1 Device Initialization Sequence.\r
   //\r
   NextDevStat = VSTAT_ACK;    // step 2 -- acknowledge device presence\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status      = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto InitFailed;\r
   }\r
 \r
   NextDevStat |= VSTAT_DRIVER; // step 3 -- we know how to drive it\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto DeviceFailed;\r
   }\r
@@ -553,8 +552,10 @@ VirtioNetInitialize (
   }\r
 \r
   ASSERT (Features & VIRTIO_NET_F_MAC);\r
-  ASSERT (Dev->Snm.MediaPresentSupported ==\r
-    !!(Features & VIRTIO_NET_F_STATUS));\r
+  ASSERT (\r
+    Dev->Snm.MediaPresentSupported ==\r
+    !!(Features & VIRTIO_NET_F_STATUS)\r
+    );\r
 \r
   Features &= VIRTIO_NET_F_MAC | VIRTIO_NET_F_STATUS | VIRTIO_F_VERSION_1 |\r
               VIRTIO_F_IOMMU_PLATFORM;\r
@@ -598,7 +599,7 @@ VirtioNetInitialize (
   //\r
   if (Dev->VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) {\r
     Features &= ~(UINT64)(VIRTIO_F_VERSION_1 | VIRTIO_F_IOMMU_PLATFORM);\r
-    Status = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);\r
+    Status    = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);\r
     if (EFI_ERROR (Status)) {\r
       goto ReleaseTxRing;\r
     }\r
@@ -608,7 +609,7 @@ VirtioNetInitialize (
   // step 6 -- virtio-net initialization complete\r
   //\r
   NextDevStat |= VSTAT_DRIVER_OK;\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto ReleaseTxRing;\r
   }\r
index e16c61c6bac2fdc8749600577a751f0357ce9658..6870ffa19efd36527a0b415dfb5e70dd70340c08 100644 (file)
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetMcastIpToMac (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     IPv6,\r
-  IN EFI_IP_ADDRESS              *Ip,\r
-  OUT EFI_MAC_ADDRESS            *Mac\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      IPv6,\r
+  IN EFI_IP_ADDRESS               *Ip,\r
+  OUT EFI_MAC_ADDRESS             *Mac\r
   )\r
 {\r
-  VNET_DEV   *Dev;\r
-  EFI_TPL    OldTpl;\r
-  EFI_STATUS Status;\r
+  VNET_DEV    *Dev;\r
+  EFI_TPL     OldTpl;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // http://en.wikipedia.org/wiki/Multicast_address\r
   //\r
-  if (This == NULL || Ip == NULL || Mac == NULL ||\r
-      ( IPv6 && (Ip->v6.Addr[0]       ) != 0xFF) || // invalid IPv6 mcast addr\r
-      (!IPv6 && (Ip->v4.Addr[0] & 0xF0) != 0xE0)    // invalid IPv4 mcast addr\r
-      ) {\r
+  if ((This == NULL) || (Ip == NULL) || (Mac == NULL) ||\r
+      (IPv6 && ((Ip->v6.Addr[0]) != 0xFF)) ||       // invalid IPv6 mcast addr\r
+      (!IPv6 && ((Ip->v4.Addr[0] & 0xF0) != 0xE0))  // invalid IPv4 mcast addr\r
+      )\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Dev = VIRTIO_NET_FROM_SNP (This);\r
+  Dev    = VIRTIO_NET_FROM_SNP (This);\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   switch (Dev->Snm.State) {\r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto Exit;\r
-  case EfiSimpleNetworkStarted:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto Exit;\r
-  default:\r
-    break;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto Exit;\r
+    case EfiSimpleNetworkStarted:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto Exit;\r
+    default:\r
+      break;\r
   }\r
 \r
   //\r
@@ -85,8 +85,7 @@ VirtioNetMcastIpToMac (
     Mac->Addr[3] = Ip->v6.Addr[13];\r
     Mac->Addr[4] = Ip->v6.Addr[14];\r
     Mac->Addr[5] = Ip->v6.Addr[15];\r
-  }\r
-  else {\r
+  } else {\r
     Mac->Addr[0] = 0x01;\r
     Mac->Addr[1] = 0x00;\r
     Mac->Addr[2] = 0x5E;\r
@@ -94,6 +93,7 @@ VirtioNetMcastIpToMac (
     Mac->Addr[4] = Ip->v4.Addr[2];\r
     Mac->Addr[5] = Ip->v4.Addr[3];\r
   }\r
+\r
   Status = EFI_SUCCESS;\r
 \r
 Exit:\r
index cdee9a2aee477f750b8015e245ca54420e59807f..cc0e1da14f71d0d48efcd4a9465b41e2c89d7bef 100644 (file)
                                  interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetReceive (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  OUT UINTN                      *HeaderSize OPTIONAL,\r
-  IN OUT UINTN                   *BufferSize,\r
-  OUT VOID                       *Buffer,\r
-  OUT EFI_MAC_ADDRESS            *SrcAddr    OPTIONAL,\r
-  OUT EFI_MAC_ADDRESS            *DestAddr   OPTIONAL,\r
-  OUT UINT16                     *Protocol   OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  OUT UINTN                       *HeaderSize OPTIONAL,\r
+  IN OUT UINTN                    *BufferSize,\r
+  OUT VOID                        *Buffer,\r
+  OUT EFI_MAC_ADDRESS             *SrcAddr    OPTIONAL,\r
+  OUT EFI_MAC_ADDRESS             *DestAddr   OPTIONAL,\r
+  OUT UINT16                      *Protocol   OPTIONAL\r
   )\r
 {\r
-  VNET_DEV   *Dev;\r
-  EFI_TPL    OldTpl;\r
-  EFI_STATUS Status;\r
-  UINT16     RxCurUsed;\r
-  UINT16     UsedElemIdx;\r
-  UINT32     DescIdx;\r
-  UINT32     RxLen;\r
-  UINTN      OrigBufferSize;\r
-  UINT8      *RxPtr;\r
-  UINT16     AvailIdx;\r
-  EFI_STATUS NotifyStatus;\r
-  UINTN      RxBufOffset;\r
-\r
-  if (This == NULL || BufferSize == NULL || Buffer == NULL) {\r
+  VNET_DEV    *Dev;\r
+  EFI_TPL     OldTpl;\r
+  EFI_STATUS  Status;\r
+  UINT16      RxCurUsed;\r
+  UINT16      UsedElemIdx;\r
+  UINT32      DescIdx;\r
+  UINT32      RxLen;\r
+  UINTN       OrigBufferSize;\r
+  UINT8       *RxPtr;\r
+  UINT16      AvailIdx;\r
+  EFI_STATUS  NotifyStatus;\r
+  UINTN       RxBufOffset;\r
+\r
+  if ((This == NULL) || (BufferSize == NULL) || (Buffer == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Dev = VIRTIO_NET_FROM_SNP (This);\r
+  Dev    = VIRTIO_NET_FROM_SNP (This);\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   switch (Dev->Snm.State) {\r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto Exit;\r
-  case EfiSimpleNetworkStarted:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto Exit;\r
-  default:\r
-    break;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto Exit;\r
+    case EfiSimpleNetworkStarted:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto Exit;\r
+    default:\r
+      break;\r
   }\r
 \r
   //\r
@@ -108,8 +107,8 @@ VirtioNetReceive (
   }\r
 \r
   UsedElemIdx = Dev->RxLastUsed % Dev->RxRing.QueueSize;\r
-  DescIdx = Dev->RxRing.Used.UsedElem[UsedElemIdx].Id;\r
-  RxLen   = Dev->RxRing.Used.UsedElem[UsedElemIdx].Len;\r
+  DescIdx     = Dev->RxRing.Used.UsedElem[UsedElemIdx].Id;\r
+  RxLen       = Dev->RxRing.Used.UsedElem[UsedElemIdx].Len;\r
 \r
   //\r
   // the virtio-net request header must be complete; we skip it\r
@@ -122,7 +121,7 @@ VirtioNetReceive (
   ASSERT (RxLen <= Dev->RxRing.Desc[DescIdx + 1].Len);\r
 \r
   OrigBufferSize = *BufferSize;\r
-  *BufferSize = RxLen;\r
+  *BufferSize    = RxLen;\r
 \r
   if (OrigBufferSize < RxLen) {\r
     Status = EFI_BUFFER_TOO_SMALL;\r
@@ -146,16 +145,19 @@ VirtioNetReceive (
   if (DestAddr != NULL) {\r
     CopyMem (DestAddr, RxPtr, SIZE_OF_VNET (Mac));\r
   }\r
+\r
   RxPtr += SIZE_OF_VNET (Mac);\r
 \r
   if (SrcAddr != NULL) {\r
     CopyMem (SrcAddr, RxPtr, SIZE_OF_VNET (Mac));\r
   }\r
+\r
   RxPtr += SIZE_OF_VNET (Mac);\r
 \r
   if (Protocol != NULL) {\r
-    *Protocol = (UINT16) ((RxPtr[0] << 8) | RxPtr[1]);\r
+    *Protocol = (UINT16)((RxPtr[0] << 8) | RxPtr[1]);\r
   }\r
+\r
   RxPtr += sizeof (UINT16);\r
 \r
   Status = EFI_SUCCESS;\r
@@ -166,16 +168,17 @@ RecycleDesc:
   //\r
   // virtio-0.9.5, 2.4.1 Supplying Buffers to The Device\r
   //\r
-  AvailIdx = *Dev->RxRing.Avail.Idx;\r
+  AvailIdx                                                   = *Dev->RxRing.Avail.Idx;\r
   Dev->RxRing.Avail.Ring[AvailIdx++ % Dev->RxRing.QueueSize] =\r
-    (UINT16) DescIdx;\r
+    (UINT16)DescIdx;\r
 \r
   MemoryFence ();\r
   *Dev->RxRing.Avail.Idx = AvailIdx;\r
 \r
   MemoryFence ();\r
   NotifyStatus = Dev->VirtIo->SetQueueNotify (Dev->VirtIo, VIRTIO_NET_Q_RX);\r
-  if (!EFI_ERROR (Status)) { // earlier error takes precedence\r
+  if (!EFI_ERROR (Status)) {\r
+    // earlier error takes precedence\r
     Status = NotifyStatus;\r
   }\r
 \r
index 9d5ce29b79a8d5fd28db8338426aecad3c982f17..18027a563aadaa60962945af2341687341b952e2 100644 (file)
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetReceiveFilters (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINT32                      Enable,\r
-  IN UINT32                      Disable,\r
-  IN BOOLEAN                     ResetMCastFilter,\r
-  IN UINTN                       MCastFilterCnt    OPTIONAL,\r
-  IN EFI_MAC_ADDRESS             *MCastFilter      OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINT32                       Enable,\r
+  IN UINT32                       Disable,\r
+  IN BOOLEAN                      ResetMCastFilter,\r
+  IN UINTN                        MCastFilterCnt    OPTIONAL,\r
+  IN EFI_MAC_ADDRESS              *MCastFilter      OPTIONAL\r
   )\r
 {\r
-  VNET_DEV   *Dev;\r
-  EFI_TPL    OldTpl;\r
-  EFI_STATUS Status;\r
+  VNET_DEV    *Dev;\r
+  EFI_TPL     OldTpl;\r
+  EFI_STATUS  Status;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Dev = VIRTIO_NET_FROM_SNP (This);\r
+  Dev    = VIRTIO_NET_FROM_SNP (This);\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   switch (Dev->Snm.State) {\r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto Exit;\r
-  case EfiSimpleNetworkStarted:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto Exit;\r
-  default:\r
-    break;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto Exit;\r
+    case EfiSimpleNetworkStarted:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto Exit;\r
+    default:\r
+      break;\r
   }\r
 \r
   //\r
@@ -89,9 +88,9 @@ VirtioNetReceiveFilters (
   // discarding any packets getting through the filter.\r
   //\r
   Status = (\r
-    ((Enable | Disable) & ~Dev->Snm.ReceiveFilterMask) != 0 ||\r
-    (!ResetMCastFilter && MCastFilterCnt > Dev->Snm.MaxMCastFilterCount)\r
-    ) ? EFI_INVALID_PARAMETER : EFI_SUCCESS;\r
+            ((Enable | Disable) & ~Dev->Snm.ReceiveFilterMask) != 0 ||\r
+            (!ResetMCastFilter && MCastFilterCnt > Dev->Snm.MaxMCastFilterCount)\r
+            ) ? EFI_INVALID_PARAMETER : EFI_SUCCESS;\r
 \r
 Exit:\r
   gBS->RestoreTPL (OldTpl);\r
index d1e3ecfa5a0f0fd8a1c0ac2a78f62183e16700c1..d03255ab508f51484e5931499cbacaa8db520297 100644 (file)
@@ -17,9 +17,9 @@
 // info of the packets queued in TxRing\r
 //\r
 typedef struct {\r
-  VOID                  *Buffer;\r
-  EFI_PHYSICAL_ADDRESS  DeviceAddress;  // lookup key for reverse mapping\r
-  VOID                  *BufMap;\r
+  VOID                    *Buffer;\r
+  EFI_PHYSICAL_ADDRESS    DeviceAddress; // lookup key for reverse mapping\r
+  VOID                    *BufMap;\r
 } TX_BUF_MAP_INFO;\r
 \r
 /**\r
@@ -36,11 +36,10 @@ typedef struct {
   @param[in,out] Dev  The VNET_DEV driver instance being shut down, or whose\r
                       partial, failed initialization is being rolled back.\r
 */\r
-\r
 VOID\r
 EFIAPI\r
 VirtioNetShutdownRx (\r
-  IN OUT VNET_DEV *Dev\r
+  IN OUT VNET_DEV  *Dev\r
   )\r
 {\r
   Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, Dev->RxBufMap);\r
@@ -51,16 +50,15 @@ VirtioNetShutdownRx (
                  );\r
 }\r
 \r
-\r
 VOID\r
 EFIAPI\r
 VirtioNetShutdownTx (\r
-  IN OUT VNET_DEV *Dev\r
+  IN OUT VNET_DEV  *Dev\r
   )\r
 {\r
-  ORDERED_COLLECTION_ENTRY *Entry, *Entry2;\r
-  TX_BUF_MAP_INFO          *TxBufMapInfo;\r
-  VOID                     *UserStruct;\r
+  ORDERED_COLLECTION_ENTRY  *Entry, *Entry2;\r
+  TX_BUF_MAP_INFO           *TxBufMapInfo;\r
+  VOID                      *UserStruct;\r
 \r
   Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, Dev->TxSharedReqMap);\r
   Dev->VirtIo->FreeSharedPages (\r
@@ -71,13 +69,15 @@ VirtioNetShutdownTx (
 \r
   for (Entry = OrderedCollectionMin (Dev->TxBufCollection);\r
        Entry != NULL;\r
-       Entry = Entry2) {\r
+       Entry = Entry2)\r
+  {\r
     Entry2 = OrderedCollectionNext (Entry);\r
     OrderedCollectionDelete (Dev->TxBufCollection, Entry, &UserStruct);\r
     TxBufMapInfo = UserStruct;\r
     Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, TxBufMapInfo->BufMap);\r
     FreePool (TxBufMapInfo);\r
   }\r
+\r
   OrderedCollectionUninit (Dev->TxBufCollection);\r
 \r
   FreePool (Dev->TxFreeStack);\r
@@ -94,16 +94,15 @@ VirtioNetShutdownTx (
 VOID\r
 EFIAPI\r
 VirtioNetUninitRing (\r
-  IN OUT VNET_DEV *Dev,\r
-  IN OUT VRING    *Ring,\r
-  IN     VOID     *RingMap\r
+  IN OUT VNET_DEV  *Dev,\r
+  IN OUT VRING     *Ring,\r
+  IN     VOID      *RingMap\r
   )\r
 {\r
   Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, RingMap);\r
   VirtioRingUninit (Dev->VirtIo, Ring);\r
 }\r
 \r
-\r
 /**\r
   Map Caller-supplied TxBuf buffer to the device-mapped address\r
 \r
@@ -129,10 +128,10 @@ VirtioNetMapTxBuf (
   OUT EFI_PHYSICAL_ADDRESS  *DeviceAddress\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  TX_BUF_MAP_INFO           *TxBufMapInfo;\r
-  EFI_PHYSICAL_ADDRESS      Address;\r
-  VOID                      *Mapping;\r
+  EFI_STATUS            Status;\r
+  TX_BUF_MAP_INFO       *TxBufMapInfo;\r
+  EFI_PHYSICAL_ADDRESS  Address;\r
+  VOID                  *Mapping;\r
 \r
   TxBufMapInfo = AllocatePool (sizeof (*TxBufMapInfo));\r
   if (TxBufMapInfo == NULL) {\r
@@ -146,14 +145,14 @@ VirtioNetMapTxBuf (
              NumberOfBytes,\r
              &Address,\r
              &Mapping\r
-            );\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeTxBufMapInfo;\r
   }\r
 \r
-  TxBufMapInfo->Buffer = Buffer;\r
+  TxBufMapInfo->Buffer        = Buffer;\r
   TxBufMapInfo->DeviceAddress = Address;\r
-  TxBufMapInfo->BufMap = Mapping;\r
+  TxBufMapInfo->BufMap        = Mapping;\r
 \r
   Status = OrderedCollectionInsert (\r
              Dev->TxBufCollection,\r
@@ -161,26 +160,26 @@ VirtioNetMapTxBuf (
              TxBufMapInfo\r
              );\r
   switch (Status) {\r
-  case EFI_OUT_OF_RESOURCES:\r
-    goto UnmapTxBuf;\r
-  case EFI_ALREADY_STARTED:\r
-    //\r
-    // This should never happen: it implies\r
-    //\r
-    // - an identity-mapping VIRTIO_DEVICE_PROTOCOL.MapSharedBuffer()\r
-    //   implementation -- which is fine,\r
-    //\r
-    // - and an SNP client that queues multiple instances of the exact same\r
-    //   buffer address with SNP.Transmit() -- which is undefined behavior,\r
-    //   based on the TxBuf language in UEFI-2.7,\r
-    //   EFI_SIMPLE_NETWORK.GetStatus().\r
-    //\r
-    ASSERT (FALSE);\r
-    Status = EFI_INVALID_PARAMETER;\r
-    goto UnmapTxBuf;\r
-  default:\r
-    ASSERT_EFI_ERROR (Status);\r
-    break;\r
+    case EFI_OUT_OF_RESOURCES:\r
+      goto UnmapTxBuf;\r
+    case EFI_ALREADY_STARTED:\r
+      //\r
+      // This should never happen: it implies\r
+      //\r
+      // - an identity-mapping VIRTIO_DEVICE_PROTOCOL.MapSharedBuffer()\r
+      //   implementation -- which is fine,\r
+      //\r
+      // - and an SNP client that queues multiple instances of the exact same\r
+      //   buffer address with SNP.Transmit() -- which is undefined behavior,\r
+      //   based on the TxBuf language in UEFI-2.7,\r
+      //   EFI_SIMPLE_NETWORK.GetStatus().\r
+      //\r
+      ASSERT (FALSE);\r
+      Status = EFI_INVALID_PARAMETER;\r
+      goto UnmapTxBuf;\r
+    default:\r
+      ASSERT_EFI_ERROR (Status);\r
+      break;\r
   }\r
 \r
   *DeviceAddress = Address;\r
@@ -253,12 +252,12 @@ VirtioNetUnmapTxBuf (
 INTN\r
 EFIAPI\r
 VirtioNetTxBufMapInfoCompare (\r
-  IN CONST VOID *UserStruct1,\r
-  IN CONST VOID *UserStruct2\r
+  IN CONST VOID  *UserStruct1,\r
+  IN CONST VOID  *UserStruct2\r
   )\r
 {\r
-  CONST TX_BUF_MAP_INFO *MapInfo1;\r
-  CONST TX_BUF_MAP_INFO *MapInfo2;\r
+  CONST TX_BUF_MAP_INFO  *MapInfo1;\r
+  CONST TX_BUF_MAP_INFO  *MapInfo2;\r
 \r
   MapInfo1 = UserStruct1;\r
   MapInfo2 = UserStruct2;\r
@@ -287,15 +286,15 @@ VirtioNetTxBufMapInfoCompare (
 INTN\r
 EFIAPI\r
 VirtioNetTxBufDeviceAddressCompare (\r
-  IN CONST VOID *StandaloneKey,\r
-  IN CONST VOID *UserStruct\r
+  IN CONST VOID  *StandaloneKey,\r
+  IN CONST VOID  *UserStruct\r
   )\r
 {\r
-  CONST EFI_PHYSICAL_ADDRESS *DeviceAddress;\r
-  CONST TX_BUF_MAP_INFO      *MapInfo;\r
+  CONST EFI_PHYSICAL_ADDRESS  *DeviceAddress;\r
+  CONST TX_BUF_MAP_INFO       *MapInfo;\r
 \r
   DeviceAddress = StandaloneKey;\r
-  MapInfo = UserStruct;\r
+  MapInfo       = UserStruct;\r
 \r
   return *DeviceAddress < MapInfo->DeviceAddress ? -1 :\r
          *DeviceAddress > MapInfo->DeviceAddress ?  1 :\r
index a217b8379910e4aaea23edd8427f3dc7d82ccc8b..a589d458ab708ca9f18679f45d72be8fbb640d38 100644 (file)
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetShutdown (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   )\r
 {\r
-  VNET_DEV   *Dev;\r
-  EFI_TPL    OldTpl;\r
-  EFI_STATUS Status;\r
+  VNET_DEV    *Dev;\r
+  EFI_TPL     OldTpl;\r
+  EFI_STATUS  Status;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Dev = VIRTIO_NET_FROM_SNP (This);\r
+  Dev    = VIRTIO_NET_FROM_SNP (This);\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   switch (Dev->Snm.State) {\r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto Exit;\r
-  case EfiSimpleNetworkStarted:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto Exit;\r
-  default:\r
-    break;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto Exit;\r
+    case EfiSimpleNetworkStarted:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto Exit;\r
+    default:\r
+      break;\r
   }\r
 \r
   Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);\r
@@ -65,7 +64,7 @@ VirtioNetShutdown (
   VirtioNetUninitRing (Dev, &Dev->RxRing, Dev->RxRingMap);\r
 \r
   Dev->Snm.State = EfiSimpleNetworkStarted;\r
-  Status = EFI_SUCCESS;\r
+  Status         = EFI_SUCCESS;\r
 \r
 Exit:\r
   gBS->RestoreTPL (OldTpl);\r
index b8161fbe32c93fe820d7cae8cee467d4b3b0f094..a45953eeb12be1933e0ffb2c2252890d7d322806 100644 (file)
   @retval EFI_UNSUPPORTED       This function is not supported by the network\r
                                 interface.\r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetStart (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   )\r
 {\r
-  VNET_DEV   *Dev;\r
-  EFI_TPL    OldTpl;\r
-  EFI_STATUS Status;\r
+  VNET_DEV    *Dev;\r
+  EFI_TPL     OldTpl;\r
+  EFI_STATUS  Status;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Dev = VIRTIO_NET_FROM_SNP (This);\r
+  Dev    = VIRTIO_NET_FROM_SNP (This);\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   if (Dev->Snm.State != EfiSimpleNetworkStopped) {\r
     Status = EFI_ALREADY_STARTED;\r
-  }\r
-  else {\r
+  } else {\r
     Dev->Snm.State = EfiSimpleNetworkStarted;\r
-    Status = EFI_SUCCESS;\r
+    Status         = EFI_SUCCESS;\r
   }\r
 \r
   gBS->RestoreTPL (OldTpl);\r
index 3dc7bec8fd2a4b89d0dc3729cf8c706ac8ad78e8..b1ca3c86af67ccbfd6c846b9562fec2916715648 100644 (file)
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetStop (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   )\r
 {\r
-  VNET_DEV   *Dev;\r
-  EFI_TPL    OldTpl;\r
-  EFI_STATUS Status;\r
+  VNET_DEV    *Dev;\r
+  EFI_TPL     OldTpl;\r
+  EFI_STATUS  Status;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Dev = VIRTIO_NET_FROM_SNP (This);\r
+  Dev    = VIRTIO_NET_FROM_SNP (This);\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   if (Dev->Snm.State != EfiSimpleNetworkStarted) {\r
     Status = EFI_NOT_STARTED;\r
-  }\r
-  else {\r
+  } else {\r
     Dev->Snm.State = EfiSimpleNetworkStopped;\r
-    Status = EFI_SUCCESS;\r
+    Status         = EFI_SUCCESS;\r
   }\r
 \r
   gBS->RestoreTPL (OldTpl);\r
index 2218139b33bd979fc2f2fe3236e9efd0a39b36c4..315e0b742545fb00b8917b2f1660708d0c229181 100644 (file)
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetTransmit (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINTN                       HeaderSize,\r
-  IN UINTN                       BufferSize,\r
-  IN /* +OUT! */ VOID            *Buffer,\r
-  IN EFI_MAC_ADDRESS             *SrcAddr  OPTIONAL,\r
-  IN EFI_MAC_ADDRESS             *DestAddr OPTIONAL,\r
-  IN UINT16                      *Protocol OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINTN                        HeaderSize,\r
+  IN UINTN                        BufferSize,\r
+  IN /* +OUT! */ VOID             *Buffer,\r
+  IN EFI_MAC_ADDRESS              *SrcAddr  OPTIONAL,\r
+  IN EFI_MAC_ADDRESS              *DestAddr OPTIONAL,\r
+  IN UINT16                       *Protocol OPTIONAL\r
   )\r
 {\r
   VNET_DEV              *Dev;\r
@@ -74,27 +73,28 @@ VirtioNetTransmit (
   UINT16                AvailIdx;\r
   EFI_PHYSICAL_ADDRESS  DeviceAddress;\r
 \r
-  if (This == NULL || BufferSize == 0 || Buffer == NULL) {\r
+  if ((This == NULL) || (BufferSize == 0) || (Buffer == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Dev = VIRTIO_NET_FROM_SNP (This);\r
+  Dev    = VIRTIO_NET_FROM_SNP (This);\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
   switch (Dev->Snm.State) {\r
-  case EfiSimpleNetworkStopped:\r
-    Status = EFI_NOT_STARTED;\r
-    goto Exit;\r
-  case EfiSimpleNetworkStarted:\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto Exit;\r
-  default:\r
-    break;\r
+    case EfiSimpleNetworkStopped:\r
+      Status = EFI_NOT_STARTED;\r
+      goto Exit;\r
+    case EfiSimpleNetworkStarted:\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto Exit;\r
+    default:\r
+      break;\r
   }\r
 \r
   if (BufferSize < Dev->Snm.MediaHeaderSize) {\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Exit;\r
   }\r
+\r
   if (BufferSize > Dev->Snm.MediaHeaderSize + Dev->Snm.MaxPacketSize) {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto Exit;\r
@@ -114,28 +114,32 @@ VirtioNetTransmit (
   // dst MAC, src MAC, Ethertype\r
   //\r
   if (HeaderSize != 0) {\r
-    UINT8 *Ptr;\r
+    UINT8  *Ptr;\r
 \r
-    if (HeaderSize != Dev->Snm.MediaHeaderSize ||\r
-        DestAddr == NULL || Protocol == NULL) {\r
+    if ((HeaderSize != Dev->Snm.MediaHeaderSize) ||\r
+        (DestAddr == NULL) || (Protocol == NULL))\r
+    {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto Exit;\r
     }\r
+\r
     Ptr = Buffer;\r
     ASSERT (SIZE_OF_VNET (Mac) <= sizeof (EFI_MAC_ADDRESS));\r
 \r
     CopyMem (Ptr, DestAddr, SIZE_OF_VNET (Mac));\r
     Ptr += SIZE_OF_VNET (Mac);\r
 \r
-    CopyMem (Ptr,\r
+    CopyMem (\r
+      Ptr,\r
       (SrcAddr == NULL) ? &Dev->Snm.CurrentAddress : SrcAddr,\r
-      SIZE_OF_VNET (Mac));\r
+      SIZE_OF_VNET (Mac)\r
+      );\r
     Ptr += SIZE_OF_VNET (Mac);\r
 \r
-    *Ptr++ = (UINT8) (*Protocol >> 8);\r
-    *Ptr++ = (UINT8) *Protocol;\r
+    *Ptr++ = (UINT8)(*Protocol >> 8);\r
+    *Ptr++ = (UINT8)*Protocol;\r
 \r
-    ASSERT ((UINTN) (Ptr - (UINT8 *) Buffer) == Dev->Snm.MediaHeaderSize);\r
+    ASSERT ((UINTN)(Ptr - (UINT8 *)Buffer) == Dev->Snm.MediaHeaderSize);\r
   }\r
 \r
   //\r
@@ -155,15 +159,15 @@ VirtioNetTransmit (
   //\r
   // virtio-0.9.5, 2.4.1 Supplying Buffers to The Device\r
   //\r
-  DescIdx = Dev->TxFreeStack[Dev->TxCurPending++];\r
-  Dev->TxRing.Desc[DescIdx + 1].Addr  = DeviceAddress;\r
-  Dev->TxRing.Desc[DescIdx + 1].Len   = (UINT32) BufferSize;\r
+  DescIdx                            = Dev->TxFreeStack[Dev->TxCurPending++];\r
+  Dev->TxRing.Desc[DescIdx + 1].Addr = DeviceAddress;\r
+  Dev->TxRing.Desc[DescIdx + 1].Len  = (UINT32)BufferSize;\r
 \r
   //\r
   // the available index is never written by the host, we can read it back\r
   // without a barrier\r
   //\r
-  AvailIdx = *Dev->TxRing.Avail.Idx;\r
+  AvailIdx                                                   = *Dev->TxRing.Avail.Idx;\r
   Dev->TxRing.Avail.Ring[AvailIdx++ % Dev->TxRing.QueueSize] = DescIdx;\r
 \r
   MemoryFence ();\r
index e41cc31b27a56067cf72e37a328997d83c7896be..2d0c1ab91349df9494c1cb12f59d697d0aedd321 100644 (file)
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetReset (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     ExtendedVerification\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      ExtendedVerification\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Modifies or resets the current station address, if supported.\r
 \r
@@ -63,19 +61,17 @@ VirtioNetReset (
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetStationAddress (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     Reset,\r
-  IN EFI_MAC_ADDRESS             *New OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      Reset,\r
+  IN EFI_MAC_ADDRESS              *New OPTIONAL\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Resets or collects the statistics on a network interface.\r
 \r
@@ -102,20 +98,18 @@ VirtioNetStationAddress (
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetStatistics (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     Reset,\r
-  IN OUT UINTN                   *StatisticsSize   OPTIONAL,\r
-  OUT EFI_NETWORK_STATISTICS     *StatisticsTable  OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      Reset,\r
+  IN OUT UINTN                    *StatisticsSize   OPTIONAL,\r
+  OUT EFI_NETWORK_STATISTICS      *StatisticsTable  OPTIONAL\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 /**\r
   Performs read and write operations on the NVRAM device attached to a  network\r
   interface.\r
@@ -139,15 +133,14 @@ VirtioNetStatistics (
                                 interface.\r
 \r
 **/\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetNvData (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     ReadWrite,\r
-  IN UINTN                       Offset,\r
-  IN UINTN                       BufferSize,\r
-  IN OUT VOID                    *Buffer\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      ReadWrite,\r
+  IN UINTN                        Offset,\r
+  IN UINTN                        BufferSize,\r
+  IN OUT VOID                     *Buffer\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
index 711b7c4cfae8dc22e87877c58c7d6cf65b1050a2..719c5751320a2912216690211fcd51a0336dbde0 100644 (file)
 #include <Protocol/SimpleNetwork.h>\r
 #include <Library/OrderedCollectionLib.h>\r
 \r
-#define VNET_SIG SIGNATURE_32 ('V', 'N', 'E', 'T')\r
+#define VNET_SIG  SIGNATURE_32 ('V', 'N', 'E', 'T')\r
 \r
 //\r
 // maximum number of pending packets, separately for each direction\r
 //\r
-#define VNET_MAX_PENDING 64\r
+#define VNET_MAX_PENDING  64\r
 \r
 //\r
 // State diagram:\r
@@ -69,36 +69,35 @@ typedef struct {
   //\r
   //                          field              init function\r
   //                          ------------------ ------------------------------\r
-  UINT32                      Signature;         // VirtioNetDriverBindingStart\r
-  VIRTIO_DEVICE_PROTOCOL      *VirtIo;           // VirtioNetDriverBindingStart\r
-  EFI_SIMPLE_NETWORK_PROTOCOL Snp;               // VirtioNetSnpPopulate\r
-  EFI_SIMPLE_NETWORK_MODE     Snm;               // VirtioNetSnpPopulate\r
-  EFI_EVENT                   ExitBoot;          // VirtioNetSnpPopulate\r
-  EFI_DEVICE_PATH_PROTOCOL    *MacDevicePath;    // VirtioNetDriverBindingStart\r
-  EFI_HANDLE                  MacHandle;         // VirtioNetDriverBindingStart\r
-\r
-  VRING                       RxRing;            // VirtioNetInitRing\r
-  VOID                        *RxRingMap;        // VirtioRingMap and\r
-                                                 // VirtioNetInitRing\r
-  UINT8                       *RxBuf;            // VirtioNetInitRx\r
-  UINT16                      RxLastUsed;        // VirtioNetInitRx\r
-  UINTN                       RxBufNrPages;      // VirtioNetInitRx\r
-  EFI_PHYSICAL_ADDRESS        RxBufDeviceBase;   // VirtioNetInitRx\r
-  VOID                        *RxBufMap;         // VirtioNetInitRx\r
-\r
-  VRING                       TxRing;            // VirtioNetInitRing\r
-  VOID                        *TxRingMap;        // VirtioRingMap and\r
-                                                 // VirtioNetInitRing\r
-  UINT16                      TxMaxPending;      // VirtioNetInitTx\r
-  UINT16                      TxCurPending;      // VirtioNetInitTx\r
-  UINT16                      *TxFreeStack;      // VirtioNetInitTx\r
-  VIRTIO_1_0_NET_REQ          *TxSharedReq;      // VirtioNetInitTx\r
-  VOID                        *TxSharedReqMap;   // VirtioNetInitTx\r
-  UINT16                      TxLastUsed;        // VirtioNetInitTx\r
-  ORDERED_COLLECTION          *TxBufCollection;  // VirtioNetInitTx\r
+  UINT32                         Signature;      // VirtioNetDriverBindingStart\r
+  VIRTIO_DEVICE_PROTOCOL         *VirtIo;        // VirtioNetDriverBindingStart\r
+  EFI_SIMPLE_NETWORK_PROTOCOL    Snp;            // VirtioNetSnpPopulate\r
+  EFI_SIMPLE_NETWORK_MODE        Snm;            // VirtioNetSnpPopulate\r
+  EFI_EVENT                      ExitBoot;       // VirtioNetSnpPopulate\r
+  EFI_DEVICE_PATH_PROTOCOL       *MacDevicePath; // VirtioNetDriverBindingStart\r
+  EFI_HANDLE                     MacHandle;      // VirtioNetDriverBindingStart\r
+\r
+  VRING                          RxRing;          // VirtioNetInitRing\r
+  VOID                           *RxRingMap;      // VirtioRingMap and\r
+                                                  // VirtioNetInitRing\r
+  UINT8                          *RxBuf;          // VirtioNetInitRx\r
+  UINT16                         RxLastUsed;      // VirtioNetInitRx\r
+  UINTN                          RxBufNrPages;    // VirtioNetInitRx\r
+  EFI_PHYSICAL_ADDRESS           RxBufDeviceBase; // VirtioNetInitRx\r
+  VOID                           *RxBufMap;       // VirtioNetInitRx\r
+\r
+  VRING                          TxRing;           // VirtioNetInitRing\r
+  VOID                           *TxRingMap;       // VirtioRingMap and\r
+                                                   // VirtioNetInitRing\r
+  UINT16                         TxMaxPending;     // VirtioNetInitTx\r
+  UINT16                         TxCurPending;     // VirtioNetInitTx\r
+  UINT16                         *TxFreeStack;     // VirtioNetInitTx\r
+  VIRTIO_1_0_NET_REQ             *TxSharedReq;     // VirtioNetInitTx\r
+  VOID                           *TxSharedReqMap;  // VirtioNetInitTx\r
+  UINT16                         TxLastUsed;       // VirtioNetInitTx\r
+  ORDERED_COLLECTION             *TxBufCollection; // VirtioNetInitTx\r
 } VNET_DEV;\r
 \r
-\r
 //\r
 // In order to avoid duplication of interface documentation, please find all\r
 // leading comments near the respective function / variable definitions (not\r
@@ -119,7 +118,7 @@ typedef struct {
                                                 (Value)                     \\r
                                                 ))\r
 \r
-#define VIRTIO_CFG_READ(Dev, Field, Pointer) ((Dev)->VirtIo->ReadDevice (   \\r
+#define VIRTIO_CFG_READ(Dev, Field, Pointer)  ((Dev)->VirtIo->ReadDevice (  \\r
                                                 (Dev)->VirtIo,              \\r
                                                 OFFSET_OF_VNET (Field),     \\r
                                                 SIZE_OF_VNET (Field),       \\r
@@ -130,13 +129,13 @@ typedef struct {
 //\r
 // component naming\r
 //\r
-extern EFI_COMPONENT_NAME_PROTOCOL gVirtioNetComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL gVirtioNetComponentName2;\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gVirtioNetComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gVirtioNetComponentName2;\r
 \r
 //\r
 // driver binding\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL gVirtioNetDriverBinding;\r
+extern EFI_DRIVER_BINDING_PROTOCOL  gVirtioNetDriverBinding;\r
 \r
 //\r
 // member functions implementing the Simple Network Protocol\r
@@ -144,113 +143,113 @@ extern EFI_DRIVER_BINDING_PROTOCOL gVirtioNetDriverBinding;
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetStart (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetStop (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetInitialize (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINTN                       ExtraRxBufferSize  OPTIONAL,\r
-  IN UINTN                       ExtraTxBufferSize  OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINTN                        ExtraRxBufferSize  OPTIONAL,\r
+  IN UINTN                        ExtraTxBufferSize  OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetReset (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     ExtendedVerification\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      ExtendedVerification\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetShutdown (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetReceiveFilters (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINT32                      Enable,\r
-  IN UINT32                      Disable,\r
-  IN BOOLEAN                     ResetMCastFilter,\r
-  IN UINTN                       MCastFilterCnt    OPTIONAL,\r
-  IN EFI_MAC_ADDRESS             *MCastFilter      OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINT32                       Enable,\r
+  IN UINT32                       Disable,\r
+  IN BOOLEAN                      ResetMCastFilter,\r
+  IN UINTN                        MCastFilterCnt    OPTIONAL,\r
+  IN EFI_MAC_ADDRESS              *MCastFilter      OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetStationAddress (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     Reset,\r
-  IN EFI_MAC_ADDRESS             *New OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      Reset,\r
+  IN EFI_MAC_ADDRESS              *New OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetStatistics (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     Reset,\r
-  IN OUT UINTN                   *StatisticsSize   OPTIONAL,\r
-  OUT EFI_NETWORK_STATISTICS     *StatisticsTable  OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      Reset,\r
+  IN OUT UINTN                    *StatisticsSize   OPTIONAL,\r
+  OUT EFI_NETWORK_STATISTICS      *StatisticsTable  OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetMcastIpToMac (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     IPv6,\r
-  IN EFI_IP_ADDRESS              *Ip,\r
-  OUT EFI_MAC_ADDRESS            *Mac\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      IPv6,\r
+  IN EFI_IP_ADDRESS               *Ip,\r
+  OUT EFI_MAC_ADDRESS             *Mac\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetNvData (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN BOOLEAN                     ReadWrite,\r
-  IN UINTN                       Offset,\r
-  IN UINTN                       BufferSize,\r
-  IN OUT VOID                    *Buffer\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN BOOLEAN                      ReadWrite,\r
+  IN UINTN                        Offset,\r
+  IN UINTN                        BufferSize,\r
+  IN OUT VOID                     *Buffer\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetGetStatus (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  OUT UINT32                     *InterruptStatus OPTIONAL,\r
-  OUT VOID                       **TxBuf OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  OUT UINT32                      *InterruptStatus OPTIONAL,\r
+  OUT VOID                        **TxBuf OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetTransmit (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  IN UINTN                       HeaderSize,\r
-  IN UINTN                       BufferSize,\r
-  IN /* +OUT! */ VOID            *Buffer,\r
-  IN EFI_MAC_ADDRESS             *SrcAddr  OPTIONAL,\r
-  IN EFI_MAC_ADDRESS             *DestAddr OPTIONAL,\r
-  IN UINT16                      *Protocol OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  IN UINTN                        HeaderSize,\r
+  IN UINTN                        BufferSize,\r
+  IN /* +OUT! */ VOID             *Buffer,\r
+  IN EFI_MAC_ADDRESS              *SrcAddr  OPTIONAL,\r
+  IN EFI_MAC_ADDRESS              *DestAddr OPTIONAL,\r
+  IN UINT16                       *Protocol OPTIONAL\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioNetReceive (\r
-  IN EFI_SIMPLE_NETWORK_PROTOCOL *This,\r
-  OUT UINTN                      *HeaderSize OPTIONAL,\r
-  IN OUT UINTN                   *BufferSize,\r
-  OUT VOID                       *Buffer,\r
-  OUT EFI_MAC_ADDRESS            *SrcAddr    OPTIONAL,\r
-  OUT EFI_MAC_ADDRESS            *DestAddr   OPTIONAL,\r
-  OUT UINT16                     *Protocol   OPTIONAL\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL  *This,\r
+  OUT UINTN                       *HeaderSize OPTIONAL,\r
+  IN OUT UINTN                    *BufferSize,\r
+  OUT VOID                        *Buffer,\r
+  OUT EFI_MAC_ADDRESS             *SrcAddr    OPTIONAL,\r
+  OUT EFI_MAC_ADDRESS             *DestAddr   OPTIONAL,\r
+  OUT UINT16                      *Protocol   OPTIONAL\r
   );\r
 \r
 //\r
@@ -259,21 +258,21 @@ VirtioNetReceive (
 VOID\r
 EFIAPI\r
 VirtioNetShutdownRx (\r
-  IN OUT VNET_DEV *Dev\r
+  IN OUT VNET_DEV  *Dev\r
   );\r
 \r
 VOID\r
 EFIAPI\r
 VirtioNetShutdownTx (\r
-  IN OUT VNET_DEV *Dev\r
+  IN OUT VNET_DEV  *Dev\r
   );\r
 \r
 VOID\r
 EFIAPI\r
 VirtioNetUninitRing (\r
-  IN OUT VNET_DEV *Dev,\r
-  IN OUT VRING    *Ring,\r
-  IN     VOID     *RingMap\r
+  IN OUT VNET_DEV  *Dev,\r
+  IN OUT VRING     *Ring,\r
+  IN     VOID      *RingMap\r
   );\r
 \r
 //\r
@@ -300,33 +299,32 @@ VirtioNetUnmapTxBuf (
 INTN\r
 EFIAPI\r
 VirtioNetTxBufMapInfoCompare (\r
-  IN CONST VOID *UserStruct1,\r
-  IN CONST VOID *UserStruct2\r
+  IN CONST VOID  *UserStruct1,\r
+  IN CONST VOID  *UserStruct2\r
   );\r
 \r
 INTN\r
 EFIAPI\r
 VirtioNetTxBufDeviceAddressCompare (\r
-  IN CONST VOID *StandaloneKey,\r
-  IN CONST VOID *UserStruct\r
+  IN CONST VOID  *StandaloneKey,\r
+  IN CONST VOID  *UserStruct\r
   );\r
 \r
-\r
 //\r
 // event callbacks\r
 //\r
 VOID\r
 EFIAPI\r
 VirtioNetIsPacketAvailable (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   );\r
 \r
 VOID\r
 EFIAPI\r
 VirtioNetExitBoot (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   );\r
 \r
 #endif // _VIRTIO_NET_DXE_H_\r
index c5c8d5ebef1d82345cc2f2cfcff9c2b3693d917e..b4ac195b0d52b07ebe38488f5479415fa4d54f6f 100644 (file)
@@ -20,7 +20,7 @@
 \r
 #include "VirtioPciDevice.h"\r
 \r
-STATIC VIRTIO_DEVICE_PROTOCOL mDeviceProtocolTemplate = {\r
+STATIC VIRTIO_DEVICE_PROTOCOL  mDeviceProtocolTemplate = {\r
   0,                                    // Revision\r
   0,                                    // SubSystemDeviceId\r
   VirtioPciGetDeviceFeatures,           // GetDeviceFeatures\r
@@ -67,16 +67,16 @@ STATIC VIRTIO_DEVICE_PROTOCOL mDeviceProtocolTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciIoRead (\r
-  IN  VIRTIO_PCI_DEVICE         *Dev,\r
-  IN  UINTN                     FieldOffset,\r
-  IN  UINTN                     FieldSize,\r
-  IN  UINTN                     BufferSize,\r
-  OUT VOID                      *Buffer\r
+  IN  VIRTIO_PCI_DEVICE  *Dev,\r
+  IN  UINTN              FieldOffset,\r
+  IN  UINTN              FieldSize,\r
+  IN  UINTN              BufferSize,\r
+  OUT VOID               *Buffer\r
   )\r
 {\r
-  UINTN                     Count;\r
-  EFI_PCI_IO_PROTOCOL_WIDTH Width;\r
-  EFI_PCI_IO_PROTOCOL       *PciIo;\r
+  UINTN                      Count;\r
+  EFI_PCI_IO_PROTOCOL_WIDTH  Width;\r
+  EFI_PCI_IO_PROTOCOL        *PciIo;\r
 \r
   ASSERT (FieldSize == BufferSize);\r
 \r
@@ -105,9 +105,9 @@ VirtioPciIoRead (
       //\r
       Count = 2;\r
 \r
-      //\r
-      // fall through\r
-      //\r
+    //\r
+    // fall through\r
+    //\r
     case 4:\r
       Width = EfiPciIoWidthUint32;\r
       break;\r
@@ -150,15 +150,15 @@ VirtioPciIoRead (
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciIoWrite (\r
-  IN  VIRTIO_PCI_DEVICE         *Dev,\r
-  IN UINTN                      FieldOffset,\r
-  IN UINTN                      FieldSize,\r
-  IN UINT64                     Value\r
+  IN  VIRTIO_PCI_DEVICE  *Dev,\r
+  IN UINTN               FieldOffset,\r
+  IN UINTN               FieldSize,\r
+  IN UINT64              Value\r
   )\r
 {\r
-  UINTN                     Count;\r
-  EFI_PCI_IO_PROTOCOL_WIDTH Width;\r
-  EFI_PCI_IO_PROTOCOL       *PciIo;\r
+  UINTN                      Count;\r
+  EFI_PCI_IO_PROTOCOL_WIDTH  Width;\r
+  EFI_PCI_IO_PROTOCOL        *PciIo;\r
 \r
   PciIo = Dev->PciIo;\r
   Count = 1;\r
@@ -185,9 +185,9 @@ VirtioPciIoWrite (
       //\r
       Count = Count * 2;\r
 \r
-      //\r
-      // fall through\r
-      //\r
+    //\r
+    // fall through\r
+    //\r
     case 4:\r
       Width = EfiPciIoWidthUint32;\r
       break;\r
@@ -236,14 +236,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciDeviceBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE00          Pci;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
 \r
   //\r
   // Attempt to open the device with the PciIo set of interfaces. On success,\r
@@ -284,7 +284,8 @@ VirtioPciDeviceBindingSupported (
     if ((Pci.Hdr.VendorId == VIRTIO_VENDOR_ID) &&\r
         (Pci.Hdr.DeviceId >= 0x1000) &&\r
         (Pci.Hdr.DeviceId <= 0x103F) &&\r
-        (Pci.Hdr.RevisionID == 0x00)) {\r
+        (Pci.Hdr.RevisionID == 0x00))\r
+    {\r
       Status = EFI_SUCCESS;\r
     } else {\r
       Status = EFI_UNSUPPORTED;\r
@@ -295,8 +296,12 @@ VirtioPciDeviceBindingSupported (
   // We needed PCI IO access only transitorily, to see whether we support the\r
   // device or not.\r
   //\r
-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
   return Status;\r
 }\r
@@ -321,12 +326,12 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciInit (\r
-  IN OUT VIRTIO_PCI_DEVICE *Device\r
+  IN OUT VIRTIO_PCI_DEVICE  *Device\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  EFI_PCI_IO_PROTOCOL   *PciIo;\r
-  PCI_TYPE00            Pci;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
 \r
   ASSERT (Device != NULL);\r
   PciIo = Device->PciIo;\r
@@ -334,13 +339,13 @@ VirtioPciInit (
   ASSERT (PciIo->Pci.Read != NULL);\r
 \r
   Status = PciIo->Pci.Read (\r
-                        PciIo,                        // (protocol, device)\r
-                                                      // handle\r
-                        EfiPciIoWidthUint32,          // access width & copy\r
-                                                      // mode\r
-                        0,                            // Offset\r
+                        PciIo,                          // (protocol, device)\r
+                                                        // handle\r
+                        EfiPciIoWidthUint32,            // access width & copy\r
+                                                        // mode\r
+                        0,                              // Offset\r
                         sizeof (Pci) / sizeof (UINT32), // Count\r
-                        &Pci                          // target buffer\r
+                        &Pci                            // target buffer\r
                         );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -349,13 +354,16 @@ VirtioPciInit (
   //\r
   // Copy protocol template\r
   //\r
-  CopyMem (&Device->VirtioDevice, &mDeviceProtocolTemplate,\r
-      sizeof (VIRTIO_DEVICE_PROTOCOL));\r
+  CopyMem (\r
+    &Device->VirtioDevice,\r
+    &mDeviceProtocolTemplate,\r
+    sizeof (VIRTIO_DEVICE_PROTOCOL)\r
+    );\r
 \r
   //\r
   // Initialize the protocol interface attributes\r
   //\r
-  Device->VirtioDevice.Revision = VIRTIO_SPEC_REVISION (0, 9, 5);\r
+  Device->VirtioDevice.Revision          = VIRTIO_SPEC_REVISION (0, 9, 5);\r
   Device->VirtioDevice.SubSystemDeviceId = Pci.Device.SubsystemID;\r
 \r
   //\r
@@ -363,7 +371,7 @@ VirtioPciInit (
   //       the offset would become 24 after enabling MSI-X.\r
   //\r
   Device->DeviceSpecificConfigurationOffset =\r
-      VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_PCI;\r
+    VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_PCI;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -376,12 +384,11 @@ VirtioPciInit (
   @param[in, out]  Dev  The device to clean up.\r
 \r
 **/\r
-\r
 STATIC\r
 VOID\r
 EFIAPI\r
 VirtioPciUninit (\r
-  IN OUT VIRTIO_PCI_DEVICE *Device\r
+  IN OUT VIRTIO_PCI_DEVICE  *Device\r
   )\r
 {\r
   // Note: This function mirrors VirtioPciInit() that does not allocate any\r
@@ -420,22 +427,27 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciDeviceBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE   *Device;\r
-  EFI_STATUS           Status;\r
+  VIRTIO_PCI_DEVICE  *Device;\r
+  EFI_STATUS         Status;\r
 \r
-  Device = (VIRTIO_PCI_DEVICE *) AllocateZeroPool (sizeof *Device);\r
+  Device = (VIRTIO_PCI_DEVICE *)AllocateZeroPool (sizeof *Device);\r
   if (Device == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->OpenProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-                  (VOID **)&Device->PciIo, This->DriverBindingHandle,\r
-                  DeviceHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  (VOID **)&Device->PciIo,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeVirtioPci;\r
   }\r
@@ -451,8 +463,12 @@ VirtioPciDeviceBindingStart (
   //\r
   // For virtio-pci we only need IO space access.\r
   //\r
-  Status = Device->PciIo->Attributes (Device->PciIo,\r
-      EfiPciIoAttributeOperationGet, 0, &Device->OriginalPciAttributes);\r
+  Status = Device->PciIo->Attributes (\r
+                            Device->PciIo,\r
+                            EfiPciIoAttributeOperationGet,\r
+                            0,\r
+                            &Device->OriginalPciAttributes\r
+                            );\r
   if (EFI_ERROR (Status)) {\r
     goto ClosePciIo;\r
   }\r
@@ -482,9 +498,12 @@ VirtioPciDeviceBindingStart (
   // interface.\r
   //\r
   Device->Signature = VIRTIO_PCI_DEVICE_SIGNATURE;\r
-  Status = gBS->InstallProtocolInterface (&DeviceHandle,\r
-                  &gVirtioDeviceProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  &Device->VirtioDevice);\r
+  Status            = gBS->InstallProtocolInterface (\r
+                             &DeviceHandle,\r
+                             &gVirtioDeviceProtocolGuid,\r
+                             EFI_NATIVE_INTERFACE,\r
+                             &Device->VirtioDevice\r
+                             );\r
   if (EFI_ERROR (Status)) {\r
     goto UninitDev;\r
   }\r
@@ -495,12 +514,20 @@ UninitDev:
   VirtioPciUninit (Device);\r
 \r
 RestorePciAttributes:\r
-  Device->PciIo->Attributes (Device->PciIo, EfiPciIoAttributeOperationSet,\r
-                Device->OriginalPciAttributes, NULL);\r
+  Device->PciIo->Attributes (\r
+                   Device->PciIo,\r
+                   EfiPciIoAttributeOperationSet,\r
+                   Device->OriginalPciAttributes,\r
+                   NULL\r
+                   );\r
 \r
 ClosePciIo:\r
-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
 FreeVirtioPci:\r
   FreePool (Device);\r
@@ -537,13 +564,13 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciDeviceBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
+  EFI_STATUS              Status;\r
   VIRTIO_DEVICE_PROTOCOL  *VirtioDevice;\r
   VIRTIO_PCI_DEVICE       *Device;\r
 \r
@@ -564,32 +591,42 @@ VirtioPciDeviceBindingStop (
   //\r
   // Handle Stop() requests for in-use driver instances gracefully.\r
   //\r
-  Status = gBS->UninstallProtocolInterface (DeviceHandle,\r
-                  &gVirtioDeviceProtocolGuid, &Device->VirtioDevice);\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  DeviceHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  &Device->VirtioDevice\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   VirtioPciUninit (Device);\r
 \r
-  Device->PciIo->Attributes (Device->PciIo, EfiPciIoAttributeOperationSet,\r
-                Device->OriginalPciAttributes, NULL);\r
-\r
-  Status = gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  Device->PciIo->Attributes (\r
+                   Device->PciIo,\r
+                   EfiPciIoAttributeOperationSet,\r
+                   Device->OriginalPciAttributes,\r
+                   NULL\r
+                   );\r
+\r
+  Status = gBS->CloseProtocol (\r
+                  DeviceHandle,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle\r
+                  );\r
 \r
   FreePool (Device);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 //\r
 // The static object that groups the Supported() (ie. probe), Start() and\r
 // Stop() functions of the driver together. Refer to UEFI Spec 2.3.1 + Errata\r
 // C, 10.1 EFI Driver Binding Protocol.\r
 //\r
-STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {\r
+STATIC EFI_DRIVER_BINDING_PROTOCOL  gDriverBinding = {\r
   &VirtioPciDeviceBindingSupported,\r
   &VirtioPciDeviceBindingStart,\r
   &VirtioPciDeviceBindingStop,\r
@@ -599,7 +636,6 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
   NULL  // DriverBindingHandle, ditto\r
 };\r
 \r
-\r
 //\r
 // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL and\r
 // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's name\r
@@ -608,20 +644,20 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
 // Guide for UEFI 2.3.1 v1.01, 11 UEFI Driver and Controller Names.\r
 //\r
 STATIC\r
-EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "eng;en", L"Virtio PCI Driver" },\r
-  { NULL,     NULL                   }\r
+  { NULL,     NULL                 }\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName;\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -636,39 +672,38 @@ VirtioPciGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName = {\r
   &VirtioPciGetDriverName,\r
   &VirtioPciGetDeviceName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME2_PROTOCOL gComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &VirtioPciGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &VirtioPciGetDeviceName,\r
+EFI_COMPONENT_NAME2_PROTOCOL  gComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&VirtioPciGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&VirtioPciGetDeviceName,\r
   "en" // SupportedLanguages, RFC 4646 language codes\r
 };\r
 \r
-\r
 //\r
 // Entry point of this driver.\r
 //\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciDeviceEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r
index fe8514d42a2e0bedb468e3aa7b9300f3326de5c0..772a03c44697e494816ce09e0608d095f7237f69 100644 (file)
 \r
 #include <IndustryStandard/Virtio.h>\r
 \r
-#define VIRTIO_PCI_DEVICE_SIGNATURE   SIGNATURE_32 ('V', 'P', 'C', 'I')\r
+#define VIRTIO_PCI_DEVICE_SIGNATURE  SIGNATURE_32 ('V', 'P', 'C', 'I')\r
 \r
 typedef struct {\r
-  UINT32                 Signature;\r
-  VIRTIO_DEVICE_PROTOCOL VirtioDevice;\r
-  EFI_PCI_IO_PROTOCOL   *PciIo;\r
-  UINT64                 OriginalPciAttributes;\r
-  UINT32                 DeviceSpecificConfigurationOffset;\r
+  UINT32                    Signature;\r
+  VIRTIO_DEVICE_PROTOCOL    VirtioDevice;\r
+  EFI_PCI_IO_PROTOCOL       *PciIo;\r
+  UINT64                    OriginalPciAttributes;\r
+  UINT32                    DeviceSpecificConfigurationOffset;\r
 } VIRTIO_PCI_DEVICE;\r
 \r
 #define VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE(Device) \\r
     CR (Device, VIRTIO_PCI_DEVICE, VirtioDevice, VIRTIO_PCI_DEVICE_SIGNATURE)\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciIoRead (\r
-  IN  VIRTIO_PCI_DEVICE         *Dev,\r
-  IN  UINTN                      FieldOffset,\r
-  IN  UINTN                      FieldSize,\r
-  IN  UINTN                      BufferSize,\r
-  OUT VOID                       *Buffer\r
+  IN  VIRTIO_PCI_DEVICE  *Dev,\r
+  IN  UINTN              FieldOffset,\r
+  IN  UINTN              FieldSize,\r
+  IN  UINTN              BufferSize,\r
+  OUT VOID               *Buffer\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciIoWrite (\r
-  IN  VIRTIO_PCI_DEVICE         *Dev,\r
-  IN UINTN                       FieldOffset,\r
-  IN UINTN                       FieldSize,\r
-  IN UINT64                      Value\r
+  IN  VIRTIO_PCI_DEVICE  *Dev,\r
+  IN UINTN               FieldOffset,\r
+  IN UINTN               FieldSize,\r
+  IN UINT64              Value\r
   );\r
 \r
 /********************************************\r
@@ -58,27 +57,27 @@ VirtioPciIoWrite (
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciDeviceRead (\r
-  IN  VIRTIO_DEVICE_PROTOCOL     *This,\r
-  IN  UINTN                      FieldOffset,\r
-  IN  UINTN                      FieldSize,\r
-  IN  UINTN                      BufferSize,\r
-  OUT VOID                       *Buffer\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   FieldOffset,\r
+  IN  UINTN                   FieldSize,\r
+  IN  UINTN                   BufferSize,\r
+  OUT VOID                    *Buffer\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciDeviceWrite (\r
-  IN VIRTIO_DEVICE_PROTOCOL      *This,\r
-  IN UINTN                       FieldOffset,\r
-  IN UINTN                       FieldSize,\r
-  IN UINT64                      Value\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN UINTN                   FieldOffset,\r
+  IN UINTN                   FieldSize,\r
+  IN UINT64                  Value\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciGetDeviceFeatures (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
-  OUT UINT64                *DeviceFeatures\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  OUT UINT64                 *DeviceFeatures\r
   );\r
 \r
 EFI_STATUS\r
@@ -91,15 +90,15 @@ VirtioPciGetQueueSize (
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetQueueAlignment (\r
-  IN  VIRTIO_DEVICE_PROTOCOL         *This,\r
-  IN  UINT32                         Alignment\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINT32                  Alignment\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetPageSize (\r
-  IN  VIRTIO_DEVICE_PROTOCOL         *This,\r
-  IN  UINT32                         PageSize\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINT32                  PageSize\r
   );\r
 \r
 EFI_STATUS\r
@@ -113,7 +112,7 @@ EFI_STATUS
 EFIAPI\r
 VirtioPciSetGuestFeatures (\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
-  IN UINT64                   Features\r
+  IN UINT64                  Features\r
   );\r
 \r
 EFI_STATUS\r
@@ -127,62 +126,63 @@ VirtioPciSetQueueAddress (
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetQueueSel (\r
-  IN  VIRTIO_DEVICE_PROTOCOL         *This,\r
-  IN  UINT16                         Sel\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINT16                  Sel\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetQueueNotify (\r
-  IN  VIRTIO_DEVICE_PROTOCOL         *This,\r
-  IN  UINT16                         Index\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINT16                  Index\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetQueueSize (\r
-  IN  VIRTIO_DEVICE_PROTOCOL         *This,\r
-  IN  UINT16                         Size\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINT16                  Size\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetDeviceStatus (\r
-  IN  VIRTIO_DEVICE_PROTOCOL         *This,\r
-  IN  UINT8                          DeviceStatus\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINT8                   DeviceStatus\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciAllocateSharedPages (\r
-  IN  VIRTIO_DEVICE_PROTOCOL        *This,\r
-  IN  UINTN                         NumPages,\r
-  OUT VOID                          **HostAddress\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   NumPages,\r
+  OUT VOID                    **HostAddress\r
   );\r
 \r
 VOID\r
 EFIAPI\r
 VirtioPciFreeSharedPages (\r
-  IN  VIRTIO_DEVICE_PROTOCOL        *This,\r
-  IN  UINTN                         NumPages,\r
-  IN  VOID                          *HostAddress\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   NumPages,\r
+  IN  VOID                    *HostAddress\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciMapSharedBuffer (\r
-  IN      VIRTIO_DEVICE_PROTOCOL        *This,\r
-  IN      VIRTIO_MAP_OPERATION          Operation,\r
-  IN      VOID                          *HostAddress,\r
-  IN OUT  UINTN                         *NumberOfBytes,\r
-  OUT     EFI_PHYSICAL_ADDRESS          *DeviceAddress,\r
-  OUT     VOID                          **Mapping\r
+  IN      VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN      VIRTIO_MAP_OPERATION    Operation,\r
+  IN      VOID                    *HostAddress,\r
+  IN OUT  UINTN                   *NumberOfBytes,\r
+  OUT     EFI_PHYSICAL_ADDRESS    *DeviceAddress,\r
+  OUT     VOID                    **Mapping\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciUnmapSharedBuffer (\r
-  IN  VIRTIO_DEVICE_PROTOCOL        *This,\r
-  IN  VOID                          *Mapping\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  VOID                    *Mapping\r
   );\r
+\r
 #endif // _VIRTIO_PCI_DEVICE_DXE_H_\r
index 46a9354be0389cbbaa111e7e3bff7e5d0c574b1f..92165de226cf6dc8ac1d292f7459bc65d59fc587 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciDeviceRead (\r
-  IN  VIRTIO_DEVICE_PROTOCOL    *This,\r
-  IN  UINTN                     FieldOffset,\r
-  IN  UINTN                     FieldSize,\r
-  IN  UINTN                     BufferSize,\r
-  OUT VOID                      *Buffer\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   FieldOffset,\r
+  IN  UINTN                   FieldSize,\r
+  IN  UINTN                   BufferSize,\r
+  OUT VOID                    *Buffer\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE         *Dev;\r
+  VIRTIO_PCI_DEVICE  *Dev;\r
 \r
   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  return VirtioPciIoRead (Dev,\r
-      Dev->DeviceSpecificConfigurationOffset + FieldOffset,\r
-      FieldSize, BufferSize, Buffer);\r
+  return VirtioPciIoRead (\r
+           Dev,\r
+           Dev->DeviceSpecificConfigurationOffset + FieldOffset,\r
+           FieldSize,\r
+           BufferSize,\r
+           Buffer\r
+           );\r
 }\r
 \r
 /**\r
@@ -78,30 +82,34 @@ VirtioPciDeviceRead (
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciDeviceWrite (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
-  IN UINTN                  FieldOffset,\r
-  IN UINTN                  FieldSize,\r
-  IN UINT64                 Value\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN UINTN                   FieldOffset,\r
+  IN UINTN                   FieldSize,\r
+  IN UINT64                  Value\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE         *Dev;\r
+  VIRTIO_PCI_DEVICE  *Dev;\r
 \r
   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  return VirtioPciIoWrite (Dev,\r
-      Dev->DeviceSpecificConfigurationOffset + FieldOffset, FieldSize, Value);\r
+  return VirtioPciIoWrite (\r
+           Dev,\r
+           Dev->DeviceSpecificConfigurationOffset + FieldOffset,\r
+           FieldSize,\r
+           Value\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciGetDeviceFeatures (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
-  OUT UINT64                *DeviceFeatures\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  OUT UINT64                 *DeviceFeatures\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE         *Dev;\r
-  EFI_STATUS                Status;\r
-  UINT32                    Features32;\r
+  VIRTIO_PCI_DEVICE  *Dev;\r
+  EFI_STATUS         Status;\r
+  UINT32             Features32;\r
 \r
   if (DeviceFeatures == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -109,11 +117,17 @@ VirtioPciGetDeviceFeatures (
 \r
   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  Status = VirtioPciIoRead (Dev, VIRTIO_PCI_OFFSET_DEVICE_FEATURES,\r
-             sizeof (UINT32), sizeof (UINT32), &Features32);\r
+  Status = VirtioPciIoRead (\r
+             Dev,\r
+             VIRTIO_PCI_OFFSET_DEVICE_FEATURES,\r
+             sizeof (UINT32),\r
+             sizeof (UINT32),\r
+             &Features32\r
+             );\r
   if (!EFI_ERROR (Status)) {\r
     *DeviceFeatures = Features32;\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -124,7 +138,7 @@ VirtioPciGetQueueSize (
   OUT UINT16                  *QueueNumMax\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE         *Dev;\r
+  VIRTIO_PCI_DEVICE  *Dev;\r
 \r
   if (QueueNumMax == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -132,8 +146,13 @@ VirtioPciGetQueueSize (
 \r
   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  return VirtioPciIoRead (Dev, VIRTIO_PCI_OFFSET_QUEUE_SIZE, sizeof (UINT16),\r
-      sizeof (UINT16), QueueNumMax);\r
+  return VirtioPciIoRead (\r
+           Dev,\r
+           VIRTIO_PCI_OFFSET_QUEUE_SIZE,\r
+           sizeof (UINT16),\r
+           sizeof (UINT16),\r
+           QueueNumMax\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
@@ -143,7 +162,7 @@ VirtioPciGetDeviceStatus (
   OUT UINT8                   *DeviceStatus\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE         *Dev;\r
+  VIRTIO_PCI_DEVICE  *Dev;\r
 \r
   if (DeviceStatus == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -151,26 +170,36 @@ VirtioPciGetDeviceStatus (
 \r
   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  return VirtioPciIoRead (Dev, VIRTIO_PCI_OFFSET_QUEUE_DEVICE_STATUS,\r
-      sizeof (UINT8), sizeof (UINT8), DeviceStatus);\r
+  return VirtioPciIoRead (\r
+           Dev,\r
+           VIRTIO_PCI_OFFSET_QUEUE_DEVICE_STATUS,\r
+           sizeof (UINT8),\r
+           sizeof (UINT8),\r
+           DeviceStatus\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetGuestFeatures (\r
   IN VIRTIO_DEVICE_PROTOCOL  *This,\r
-  IN UINT64                   Features\r
+  IN UINT64                  Features\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE *Dev;\r
+  VIRTIO_PCI_DEVICE  *Dev;\r
 \r
   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
   if (Features > MAX_UINT32) {\r
     return EFI_UNSUPPORTED;\r
   }\r
-  return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_GUEST_FEATURES,\r
-      sizeof (UINT32), Features);\r
+\r
+  return VirtioPciIoWrite (\r
+           Dev,\r
+           VIRTIO_PCI_OFFSET_GUEST_FEATURES,\r
+           sizeof (UINT32),\r
+           Features\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
@@ -181,35 +210,43 @@ VirtioPciSetQueueAddress (
   IN UINT64                  RingBaseShift\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE *Dev;\r
+  VIRTIO_PCI_DEVICE  *Dev;\r
 \r
   ASSERT (RingBaseShift == 0);\r
 \r
   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_QUEUE_ADDRESS, sizeof (UINT32),\r
-      (UINT32)((UINTN)Ring->Base >> EFI_PAGE_SHIFT));\r
+  return VirtioPciIoWrite (\r
+           Dev,\r
+           VIRTIO_PCI_OFFSET_QUEUE_ADDRESS,\r
+           sizeof (UINT32),\r
+           (UINT32)((UINTN)Ring->Base >> EFI_PAGE_SHIFT)\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetQueueSel (\r
-  IN  VIRTIO_DEVICE_PROTOCOL    *This,\r
-  IN  UINT16                    Sel\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINT16                  Sel\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE *Dev;\r
+  VIRTIO_PCI_DEVICE  *Dev;\r
 \r
   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_QUEUE_SELECT, sizeof (UINT16),\r
-      Sel);\r
+  return VirtioPciIoWrite (\r
+           Dev,\r
+           VIRTIO_PCI_OFFSET_QUEUE_SELECT,\r
+           sizeof (UINT16),\r
+           Sel\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetQueueAlignment (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN  UINT32                  Alignment\r
   )\r
 {\r
@@ -219,7 +256,7 @@ VirtioPciSetQueueAlignment (
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetPageSize (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN  UINT32                  PageSize\r
   )\r
 {\r
@@ -229,23 +266,27 @@ VirtioPciSetPageSize (
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetQueueNotify (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *This,\r
-  IN  UINT16                 Index\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINT16                  Index\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE *Dev;\r
+  VIRTIO_PCI_DEVICE  *Dev;\r
 \r
   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_QUEUE_NOTIFY, sizeof (UINT16),\r
-      Index);\r
+  return VirtioPciIoWrite (\r
+           Dev,\r
+           VIRTIO_PCI_OFFSET_QUEUE_NOTIFY,\r
+           sizeof (UINT16),\r
+           Index\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetQueueSize (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *This,\r
-  IN  UINT16                 Size\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINT16                  Size\r
   )\r
 {\r
   //\r
@@ -258,16 +299,20 @@ VirtioPciSetQueueSize (
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciSetDeviceStatus (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *This,\r
-  IN  UINT8                  DeviceStatus\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINT8                   DeviceStatus\r
   )\r
 {\r
-  VIRTIO_PCI_DEVICE *Dev;\r
+  VIRTIO_PCI_DEVICE  *Dev;\r
 \r
   Dev = VIRTIO_PCI_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  return VirtioPciIoWrite (Dev, VIRTIO_PCI_OFFSET_QUEUE_DEVICE_STATUS,\r
-      sizeof (UINT8), DeviceStatus);\r
+  return VirtioPciIoWrite (\r
+           Dev,\r
+           VIRTIO_PCI_OFFSET_QUEUE_DEVICE_STATUS,\r
+           sizeof (UINT8),\r
+           DeviceStatus\r
+           );\r
 }\r
 \r
 EFI_STATUS\r
@@ -278,7 +323,7 @@ VirtioPciAllocateSharedPages (
   OUT VOID                    **HostAddress\r
   )\r
 {\r
-  VOID        *Buffer;\r
+  VOID  *Buffer;\r
 \r
   Buffer = AllocatePages (NumPages);\r
   if (Buffer == NULL) {\r
@@ -311,8 +356,8 @@ VirtioPciMapSharedBuffer (
   OUT     VOID                    **Mapping\r
   )\r
 {\r
-  *DeviceAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress;\r
-  *Mapping = NULL;\r
+  *DeviceAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)HostAddress;\r
+  *Mapping       = NULL;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -320,8 +365,8 @@ VirtioPciMapSharedBuffer (
 EFI_STATUS\r
 EFIAPI\r
 VirtioPciUnmapSharedBuffer (\r
-  IN VIRTIO_DEVICE_PROTOCOL    *This,\r
-  IN VOID                      *Mapping\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN VOID                    *Mapping\r
   )\r
 {\r
   return EFI_SUCCESS;\r
index 9525abdabe790bd610f7bfd4056a22de7dca039f..aabc7230ab67265f793e057dba2ec1a524c88d01 100644 (file)
@@ -64,12 +64,12 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioRngGetInfo (\r
-  IN      EFI_RNG_PROTOCOL        *This,\r
-  IN OUT  UINTN                   *RNGAlgorithmListSize,\r
-  OUT     EFI_RNG_ALGORITHM       *RNGAlgorithmList\r
+  IN      EFI_RNG_PROTOCOL   *This,\r
+  IN OUT  UINTN              *RNGAlgorithmListSize,\r
+  OUT     EFI_RNG_ALGORITHM  *RNGAlgorithmList\r
   )\r
 {\r
-  if (This == NULL || RNGAlgorithmListSize == NULL) {\r
+  if ((This == NULL) || (RNGAlgorithmListSize == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -121,31 +121,32 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioRngGetRNG (\r
-  IN EFI_RNG_PROTOCOL            *This,\r
-  IN EFI_RNG_ALGORITHM           *RNGAlgorithm  OPTIONAL,\r
-  IN UINTN                       RNGValueLength,\r
-  OUT UINT8                      *RNGValue\r
+  IN EFI_RNG_PROTOCOL   *This,\r
+  IN EFI_RNG_ALGORITHM  *RNGAlgorithm  OPTIONAL,\r
+  IN UINTN              RNGValueLength,\r
+  OUT UINT8             *RNGValue\r
   )\r
 {\r
-  VIRTIO_RNG_DEV            *Dev;\r
-  DESC_INDICES              Indices;\r
-  volatile UINT8            *Buffer;\r
-  UINTN                     Index;\r
-  UINT32                    Len;\r
-  UINT32                    BufferSize;\r
-  EFI_STATUS                Status;\r
-  EFI_PHYSICAL_ADDRESS      DeviceAddress;\r
-  VOID                      *Mapping;\r
-\r
-  if (This == NULL || RNGValueLength == 0 || RNGValue == NULL) {\r
+  VIRTIO_RNG_DEV        *Dev;\r
+  DESC_INDICES          Indices;\r
+  volatile UINT8        *Buffer;\r
+  UINTN                 Index;\r
+  UINT32                Len;\r
+  UINT32                BufferSize;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  DeviceAddress;\r
+  VOID                  *Mapping;\r
+\r
+  if ((This == NULL) || (RNGValueLength == 0) || (RNGValue == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // We only support the raw algorithm, so reject requests for anything else\r
   //\r
-  if (RNGAlgorithm != NULL &&\r
-      !CompareGuid (RNGAlgorithm, &gEfiRngAlgorithmRaw)) {\r
+  if ((RNGAlgorithm != NULL) &&\r
+      !CompareGuid (RNGAlgorithm, &gEfiRngAlgorithmRaw))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -180,17 +181,21 @@ VirtioRngGetRNG (
     BufferSize = (UINT32)MIN (RNGValueLength - Index, (UINTN)MAX_UINT32);\r
 \r
     VirtioPrepare (&Dev->Ring, &Indices);\r
-    VirtioAppendDesc (&Dev->Ring,\r
+    VirtioAppendDesc (\r
+      &Dev->Ring,\r
       DeviceAddress + Index,\r
       BufferSize,\r
       VRING_DESC_F_WRITE,\r
-      &Indices);\r
+      &Indices\r
+      );\r
 \r
     if (VirtioFlush (Dev->VirtIo, 0, &Dev->Ring, &Indices, &Len) !=\r
-        EFI_SUCCESS) {\r
+        EFI_SUCCESS)\r
+    {\r
       Status = EFI_DEVICE_ERROR;\r
       goto UnmapBuffer;\r
     }\r
+\r
     ASSERT (Len > 0);\r
     ASSERT (Len <= BufferSize);\r
   }\r
@@ -207,6 +212,7 @@ VirtioRngGetRNG (
   for (Index = 0; Index < RNGValueLength; Index++) {\r
     RNGValue[Index] = Buffer[Index];\r
   }\r
+\r
   Status = EFI_SUCCESS;\r
 \r
 UnmapBuffer:\r
@@ -227,32 +233,32 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioRngInit (\r
-  IN OUT VIRTIO_RNG_DEV *Dev\r
+  IN OUT VIRTIO_RNG_DEV  *Dev\r
   )\r
 {\r
-  UINT8      NextDevStat;\r
-  EFI_STATUS Status;\r
-  UINT16     QueueSize;\r
-  UINT64     Features;\r
-  UINT64     RingBaseShift;\r
+  UINT8       NextDevStat;\r
+  EFI_STATUS  Status;\r
+  UINT16      QueueSize;\r
+  UINT64      Features;\r
+  UINT64      RingBaseShift;\r
 \r
   //\r
   // Execute virtio-0.9.5, 2.2.1 Device Initialization Sequence.\r
   //\r
   NextDevStat = 0;             // step 1 -- reset device\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status      = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
 \r
   NextDevStat |= VSTAT_ACK;    // step 2 -- acknowledge device presence\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
 \r
   NextDevStat |= VSTAT_DRIVER; // step 3 -- we know how to drive it\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
@@ -293,6 +299,7 @@ VirtioRngInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   Status = Dev->VirtIo->GetQueueNumMax (Dev->VirtIo, &QueueSize);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
@@ -355,7 +362,7 @@ VirtioRngInit (
   //\r
   if (Dev->VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) {\r
     Features &= ~(UINT64)(VIRTIO_F_VERSION_1 | VIRTIO_F_IOMMU_PLATFORM);\r
-    Status = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);\r
+    Status    = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);\r
     if (EFI_ERROR (Status)) {\r
       goto UnmapQueue;\r
     }\r
@@ -365,7 +372,7 @@ VirtioRngInit (
   // step 6 -- initialization complete\r
   //\r
   NextDevStat |= VSTAT_DRIVER_OK;\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto UnmapQueue;\r
   }\r
@@ -373,8 +380,8 @@ VirtioRngInit (
   //\r
   // populate the exported interface's attributes\r
   //\r
-  Dev->Rng.GetInfo    = VirtioRngGetInfo;\r
-  Dev->Rng.GetRNG     = VirtioRngGetRNG;\r
+  Dev->Rng.GetInfo = VirtioRngGetInfo;\r
+  Dev->Rng.GetRNG  = VirtioRngGetRNG;\r
 \r
   return EFI_SUCCESS;\r
 \r
@@ -395,12 +402,11 @@ Failed:
   return Status; // reached only via Failed above\r
 }\r
 \r
-\r
 STATIC\r
 VOID\r
 EFIAPI\r
 VirtioRngUninit (\r
-  IN OUT VIRTIO_RNG_DEV *Dev\r
+  IN OUT VIRTIO_RNG_DEV  *Dev\r
   )\r
 {\r
   //\r
@@ -423,11 +429,11 @@ STATIC
 VOID\r
 EFIAPI\r
 VirtioRngExitBoot (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  VIRTIO_RNG_DEV *Dev;\r
+  VIRTIO_RNG_DEV  *Dev;\r
 \r
   DEBUG ((DEBUG_VERBOSE, "%a: Context=0x%p\n", __FUNCTION__, Context));\r
   //\r
@@ -441,7 +447,6 @@ VirtioRngExitBoot (
   Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);\r
 }\r
 \r
-\r
 //\r
 // Probe, start and stop functions of this driver, called by the DXE core for\r
 // specific devices.\r
@@ -461,13 +466,13 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioRngDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  VIRTIO_DEVICE_PROTOCOL *VirtIo;\r
+  EFI_STATUS              Status;\r
+  VIRTIO_DEVICE_PROTOCOL  *VirtIo;\r
 \r
   //\r
   // Attempt to open the device with the VirtIo set of interfaces. On success,\r
@@ -496,8 +501,12 @@ VirtioRngDriverBindingSupported (
   // We needed VirtIo access only transitorily, to see whether we support the\r
   // device or not.\r
   //\r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
   return Status;\r
 }\r
 \r
@@ -505,22 +514,27 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioRngDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
   VIRTIO_RNG_DEV  *Dev;\r
-  EFI_STATUS Status;\r
+  EFI_STATUS      Status;\r
 \r
-  Dev = (VIRTIO_RNG_DEV *) AllocateZeroPool (sizeof *Dev);\r
+  Dev = (VIRTIO_RNG_DEV *)AllocateZeroPool (sizeof *Dev);\r
   if (Dev == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->OpenProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-                  (VOID **)&Dev->VirtIo, This->DriverBindingHandle,\r
-                  DeviceHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  (VOID **)&Dev->VirtIo,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeVirtioRng;\r
   }\r
@@ -533,8 +547,13 @@ VirtioRngDriverBindingStart (
     goto CloseVirtIo;\r
   }\r
 \r
-  Status = gBS->CreateEvent (EVT_SIGNAL_EXIT_BOOT_SERVICES, TPL_CALLBACK,\r
-                  &VirtioRngExitBoot, Dev, &Dev->ExitBoot);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+                  TPL_CALLBACK,\r
+                  &VirtioRngExitBoot,\r
+                  Dev,\r
+                  &Dev->ExitBoot\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto UninitDev;\r
   }\r
@@ -544,9 +563,12 @@ VirtioRngDriverBindingStart (
   // interface.\r
   //\r
   Dev->Signature = VIRTIO_RNG_SIG;\r
-  Status = gBS->InstallProtocolInterface (&DeviceHandle,\r
-                  &gEfiRngProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  &Dev->Rng);\r
+  Status         = gBS->InstallProtocolInterface (\r
+                          &DeviceHandle,\r
+                          &gEfiRngProtocolGuid,\r
+                          EFI_NATIVE_INTERFACE,\r
+                          &Dev->Rng\r
+                          );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseExitBoot;\r
   }\r
@@ -560,8 +582,12 @@ UninitDev:
   VirtioRngUninit (Dev);\r
 \r
 CloseVirtIo:\r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
 FreeVirtioRng:\r
   FreePool (Dev);\r
@@ -569,20 +595,19 @@ FreeVirtioRng:
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioRngDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_RNG_PROTOCOL                *Rng;\r
-  VIRTIO_RNG_DEV                  *Dev;\r
+  EFI_STATUS        Status;\r
+  EFI_RNG_PROTOCOL  *Rng;\r
+  VIRTIO_RNG_DEV    *Dev;\r
 \r
   Status = gBS->OpenProtocol (\r
                   DeviceHandle,                     // candidate device\r
@@ -601,8 +626,11 @@ VirtioRngDriverBindingStop (
   //\r
   // Handle Stop() requests for in-use driver instances gracefully.\r
   //\r
-  Status = gBS->UninstallProtocolInterface (DeviceHandle,\r
-                  &gEfiRngProtocolGuid, &Dev->Rng);\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  DeviceHandle,\r
+                  &gEfiRngProtocolGuid,\r
+                  &Dev->Rng\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -611,21 +639,24 @@ VirtioRngDriverBindingStop (
 \r
   VirtioRngUninit (Dev);\r
 \r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
   FreePool (Dev);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 //\r
 // The static object that groups the Supported() (ie. probe), Start() and\r
 // Stop() functions of the driver together. Refer to UEFI Spec 2.3.1 + Errata\r
 // C, 10.1 EFI Driver Binding Protocol.\r
 //\r
-STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {\r
+STATIC EFI_DRIVER_BINDING_PROTOCOL  gDriverBinding = {\r
   &VirtioRngDriverBindingSupported,\r
   &VirtioRngDriverBindingStart,\r
   &VirtioRngDriverBindingStop,\r
@@ -635,7 +666,6 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
   NULL  // DriverBindingHandle, ditto\r
 };\r
 \r
-\r
 //\r
 // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL and\r
 // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's name\r
@@ -645,21 +675,21 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
 //\r
 \r
 STATIC\r
-EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "eng;en", L"Virtio Random Number Generator Driver" },\r
-  { NULL,     NULL                   }\r
+  { NULL,     NULL                                     }\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName;\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName;\r
 \r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioRngGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -675,39 +705,38 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 VirtioRngGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName = {\r
   &VirtioRngGetDriverName,\r
   &VirtioRngGetDeviceName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME2_PROTOCOL gComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &VirtioRngGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &VirtioRngGetDeviceName,\r
+EFI_COMPONENT_NAME2_PROTOCOL  gComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&VirtioRngGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&VirtioRngGetDeviceName,\r
   "en" // SupportedLanguages, RFC 4646 language codes\r
 };\r
 \r
-\r
 //\r
 // Entry point of this driver.\r
 //\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioRngEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r
index 21b9103097871dad60113f10c57746edbd989cd6..2da99540a208fda5da815bf6bbd4393c589f9db3 100644 (file)
@@ -17,7 +17,7 @@
 \r
 #include <IndustryStandard/Virtio.h>\r
 \r
-#define VIRTIO_RNG_SIG SIGNATURE_32 ('V', 'R', 'N', 'G')\r
+#define VIRTIO_RNG_SIG  SIGNATURE_32 ('V', 'R', 'N', 'G')\r
 \r
 typedef struct {\r
   //\r
index 935d15439579dbececfaac87875d3b70d46e2983..d44f9ebca7db0ab43b4cead6b3e4734edb6aa4cd 100644 (file)
@@ -76,7 +76,7 @@
                                                 (Value)                     \\r
                                                 ))\r
 \r
-#define VIRTIO_CFG_READ(Dev, Field, Pointer) ((Dev)->VirtIo->ReadDevice (   \\r
+#define VIRTIO_CFG_READ(Dev, Field, Pointer)  ((Dev)->VirtIo->ReadDevice (  \\r
                                                 (Dev)->VirtIo,              \\r
                                                 OFFSET_OF_VSCSI (Field),    \\r
                                                 SIZE_OF_VSCSI (Field),      \\r
@@ -84,7 +84,6 @@
                                                 (Pointer)                   \\r
                                                 ))\r
 \r
-\r
 //\r
 // UEFI Spec 2.3.1 + Errata C, 14.7 Extended SCSI Pass Thru Protocol specifies\r
 // the PassThru() interface. Beside returning a status code, the function must\r
@@ -153,32 +152,32 @@ PopulateRequest (
   OUT    volatile VIRTIO_SCSI_REQ                             *Request\r
   )\r
 {\r
-  UINTN Idx;\r
+  UINTN  Idx;\r
 \r
   if (\r
       //\r
       // bidirectional transfer was requested, but the host doesn't support it\r
       //\r
-      (Packet->InTransferLength > 0 && Packet->OutTransferLength > 0 &&\r
+      ((Packet->InTransferLength > 0) && (Packet->OutTransferLength > 0) &&\r
        !Dev->InOutSupported) ||\r
 \r
       //\r
       // a target / LUN was addressed that's impossible to encode for the host\r
       //\r
-      Target > 0xFF || Lun >= 0x4000 ||\r
+      (Target > 0xFF) || (Lun >= 0x4000) ||\r
 \r
       //\r
       // Command Descriptor Block bigger than VIRTIO_SCSI_CDB_SIZE\r
       //\r
-      Packet->CdbLength > VIRTIO_SCSI_CDB_SIZE ||\r
+      (Packet->CdbLength > VIRTIO_SCSI_CDB_SIZE) ||\r
 \r
       //\r
       // From virtio-0.9.5, 2.3.2 Descriptor Table:\r
       // "no descriptor chain may be more than 2^32 bytes long in total".\r
       //\r
-      (UINT64) Packet->InTransferLength + Packet->OutTransferLength > SIZE_1GB\r
-      ) {\r
-\r
+      ((UINT64)Packet->InTransferLength + Packet->OutTransferLength > SIZE_1GB)\r
+      )\r
+  {\r
     //\r
     // this error code doesn't require updates to the Packet output fields\r
     //\r
@@ -189,35 +188,35 @@ PopulateRequest (
       //\r
       // addressed invalid device\r
       //\r
-      Target > Dev->MaxTarget || Lun > Dev->MaxLun ||\r
+      (Target > Dev->MaxTarget) || (Lun > Dev->MaxLun) ||\r
 \r
       //\r
       // invalid direction (there doesn't seem to be a macro for the "no data\r
       // transferred" "direction", eg. for TEST UNIT READY)\r
       //\r
-      Packet->DataDirection > EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL ||\r
+      (Packet->DataDirection > EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL) ||\r
 \r
       //\r
       // trying to receive, but destination pointer is NULL, or contradicting\r
       // transfer direction\r
       //\r
-      (Packet->InTransferLength > 0 &&\r
-       (Packet->InDataBuffer == NULL ||\r
-        Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_WRITE\r
-        )\r
-       ) ||\r
+      ((Packet->InTransferLength > 0) &&\r
+       ((Packet->InDataBuffer == NULL) ||\r
+        (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_WRITE)\r
+       )\r
+      ) ||\r
 \r
       //\r
       // trying to send, but source pointer is NULL, or contradicting transfer\r
       // direction\r
       //\r
-      (Packet->OutTransferLength > 0 &&\r
-       (Packet->OutDataBuffer == NULL ||\r
-        Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ\r
-        )\r
+      ((Packet->OutTransferLength > 0) &&\r
+       ((Packet->OutDataBuffer == NULL) ||\r
+        (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ)\r
        )\r
-      ) {\r
-\r
+      )\r
+      )\r
+  {\r
     //\r
     // this error code doesn't require updates to the Packet output fields\r
     //\r
@@ -229,16 +228,17 @@ PopulateRequest (
   // then the combined size of a bidirectional request will not exceed the\r
   // virtio-scsi device's transfer limit either.\r
   //\r
-  if (ALIGN_VALUE (Packet->OutTransferLength, 512) / 512\r
-        > Dev->MaxSectors / 2 ||\r
-      ALIGN_VALUE (Packet->InTransferLength,  512) / 512\r
-        > Dev->MaxSectors / 2) {\r
+  if ((ALIGN_VALUE (Packet->OutTransferLength, 512) / 512\r
+       > Dev->MaxSectors / 2) ||\r
+      (ALIGN_VALUE (Packet->InTransferLength, 512) / 512\r
+       > Dev->MaxSectors / 2))\r
+  {\r
     Packet->InTransferLength  = (Dev->MaxSectors / 2) * 512;\r
     Packet->OutTransferLength = (Dev->MaxSectors / 2) * 512;\r
     Packet->HostAdapterStatus =\r
-                        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
-    Packet->TargetStatus      = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
-    Packet->SenseDataLength   = 0;\r
+      EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+    Packet->TargetStatus    = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
+    Packet->SenseDataLength = 0;\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
@@ -247,22 +247,21 @@ PopulateRequest (
   // Device Operation: request queues\r
   //\r
   Request->Lun[0] = 1;\r
-  Request->Lun[1] = (UINT8) Target;\r
-  Request->Lun[2] = (UINT8) (((UINT32)Lun >> 8) | 0x40);\r
-  Request->Lun[3] = (UINT8) Lun;\r
+  Request->Lun[1] = (UINT8)Target;\r
+  Request->Lun[2] = (UINT8)(((UINT32)Lun >> 8) | 0x40);\r
+  Request->Lun[3] = (UINT8)Lun;\r
 \r
   //\r
   // CopyMem() would cast away the "volatile" qualifier before access, which is\r
   // undefined behavior (ISO C99 6.7.3p5)\r
   //\r
   for (Idx = 0; Idx < Packet->CdbLength; ++Idx) {\r
-    Request->Cdb[Idx] = ((UINT8 *) Packet->Cdb)[Idx];\r
+    Request->Cdb[Idx] = ((UINT8 *)Packet->Cdb)[Idx];\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
 \r
   Parse the virtio-scsi device's response, translate it to an EFI status code,\r
@@ -288,22 +287,23 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 ParseResponse (\r
-  IN OUT                EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN     CONST volatile VIRTIO_SCSI_RESP                           *Response\r
+  IN OUT                EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN     CONST volatile VIRTIO_SCSI_RESP                            *Response\r
   )\r
 {\r
-  UINTN ResponseSenseLen;\r
-  UINTN Idx;\r
+  UINTN  ResponseSenseLen;\r
+  UINTN  Idx;\r
 \r
   //\r
   // return sense data (length and contents) in all cases, truncated if needed\r
   //\r
   ResponseSenseLen = MIN (Response->SenseLen, VIRTIO_SCSI_SENSE_SIZE);\r
   if (Packet->SenseDataLength > ResponseSenseLen) {\r
-    Packet->SenseDataLength = (UINT8) ResponseSenseLen;\r
+    Packet->SenseDataLength = (UINT8)ResponseSenseLen;\r
   }\r
+\r
   for (Idx = 0; Idx < Packet->SenseDataLength; ++Idx) {\r
-    ((UINT8 *) Packet->SenseData)[Idx] = Response->Sense[Idx];\r
+    ((UINT8 *)Packet->SenseData)[Idx] = Response->Sense[Idx];\r
   }\r
 \r
   //\r
@@ -321,9 +321,8 @@ ParseResponse (
   //  V  @ OutTransferLength + InTransferLength    -+- @ 0\r
   //\r
   if (Response->Residual <= Packet->InTransferLength) {\r
-    Packet->InTransferLength  -= Response->Residual;\r
-  }\r
-  else {\r
+    Packet->InTransferLength -= Response->Residual;\r
+  } else {\r
     Packet->OutTransferLength -= Response->Residual - Packet->InTransferLength;\r
     Packet->InTransferLength   = 0;\r
   }\r
@@ -338,50 +337,49 @@ ParseResponse (
   // response code\r
   //\r
   switch (Response->Response) {\r
-  case VIRTIO_SCSI_S_OK:\r
-    Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK;\r
-    return EFI_SUCCESS;\r
+    case VIRTIO_SCSI_S_OK:\r
+      Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK;\r
+      return EFI_SUCCESS;\r
 \r
-  case VIRTIO_SCSI_S_OVERRUN:\r
-    Packet->HostAdapterStatus =\r
-                        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
-    break;\r
+    case VIRTIO_SCSI_S_OVERRUN:\r
+      Packet->HostAdapterStatus =\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+      break;\r
 \r
-  case VIRTIO_SCSI_S_BAD_TARGET:\r
-    //\r
-    // This is non-intuitive but explicitly required by the\r
-    // EFI_EXT_SCSI_PASS_THRU_PROTOCOL.PassThru() specification for\r
-    // disconnected (but otherwise valid) target / LUN addresses.\r
-    //\r
-    Packet->HostAdapterStatus =\r
-                              EFI_EXT_SCSI_STATUS_HOST_ADAPTER_TIMEOUT_COMMAND;\r
-    return EFI_TIMEOUT;\r
+    case VIRTIO_SCSI_S_BAD_TARGET:\r
+      //\r
+      // This is non-intuitive but explicitly required by the\r
+      // EFI_EXT_SCSI_PASS_THRU_PROTOCOL.PassThru() specification for\r
+      // disconnected (but otherwise valid) target / LUN addresses.\r
+      //\r
+      Packet->HostAdapterStatus =\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_TIMEOUT_COMMAND;\r
+      return EFI_TIMEOUT;\r
 \r
-  case VIRTIO_SCSI_S_RESET:\r
-    Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_BUS_RESET;\r
-    break;\r
+    case VIRTIO_SCSI_S_RESET:\r
+      Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_BUS_RESET;\r
+      break;\r
 \r
-  case VIRTIO_SCSI_S_BUSY:\r
-    Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK;\r
-    return EFI_NOT_READY;\r
+    case VIRTIO_SCSI_S_BUSY:\r
+      Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK;\r
+      return EFI_NOT_READY;\r
 \r
-  //\r
-  // Lump together the rest. The mapping for VIRTIO_SCSI_S_ABORTED is\r
-  // intentional as well, not an oversight.\r
-  //\r
-  case VIRTIO_SCSI_S_ABORTED:\r
-  case VIRTIO_SCSI_S_TRANSPORT_FAILURE:\r
-  case VIRTIO_SCSI_S_TARGET_FAILURE:\r
-  case VIRTIO_SCSI_S_NEXUS_FAILURE:\r
-  case VIRTIO_SCSI_S_FAILURE:\r
-  default:\r
-    Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OTHER;\r
+    //\r
+    // Lump together the rest. The mapping for VIRTIO_SCSI_S_ABORTED is\r
+    // intentional as well, not an oversight.\r
+    //\r
+    case VIRTIO_SCSI_S_ABORTED:\r
+    case VIRTIO_SCSI_S_TRANSPORT_FAILURE:\r
+    case VIRTIO_SCSI_S_TARGET_FAILURE:\r
+    case VIRTIO_SCSI_S_NEXUS_FAILURE:\r
+    case VIRTIO_SCSI_S_FAILURE:\r
+    default:\r
+      Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OTHER;\r
   }\r
 \r
   return EFI_DEVICE_ERROR;\r
 }\r
 \r
-\r
 /**\r
 \r
   The function can be used to create a fake host adapter error.\r
@@ -412,7 +410,6 @@ ReportHostAdapterError (
   return EFI_DEVICE_ERROR;\r
 }\r
 \r
-\r
 //\r
 // The next seven functions implement EFI_EXT_SCSI_PASS_THRU_PROTOCOL\r
 // for the virtio-scsi HBA. Refer to UEFI Spec 2.3.1 + Errata C, sections\r
@@ -423,31 +420,31 @@ ReportHostAdapterError (
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiPassThru (\r
-  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL            *This,\r
-  IN     UINT8                                      *Target,\r
-  IN     UINT64                                     Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN     EFI_EVENT                                  Event   OPTIONAL\r
+  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL             *This,\r
+  IN     UINT8                                       *Target,\r
+  IN     UINT64                                      Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN     EFI_EVENT                                   Event   OPTIONAL\r
   )\r
 {\r
-  VSCSI_DEV                 *Dev;\r
-  UINT16                    TargetValue;\r
-  EFI_STATUS                Status;\r
-  volatile VIRTIO_SCSI_REQ  Request;\r
-  volatile VIRTIO_SCSI_RESP *Response;\r
-  VOID                      *ResponseBuffer;\r
-  DESC_INDICES              Indices;\r
-  VOID                      *RequestMapping;\r
-  VOID                      *ResponseMapping;\r
-  VOID                      *InDataMapping;\r
-  VOID                      *OutDataMapping;\r
-  EFI_PHYSICAL_ADDRESS      RequestDeviceAddress;\r
-  EFI_PHYSICAL_ADDRESS      ResponseDeviceAddress;\r
-  EFI_PHYSICAL_ADDRESS      InDataDeviceAddress;\r
-  EFI_PHYSICAL_ADDRESS      OutDataDeviceAddress;\r
-  VOID                      *InDataBuffer;\r
-  UINTN                     InDataNumPages;\r
-  BOOLEAN                   OutDataBufferIsMapped;\r
+  VSCSI_DEV                  *Dev;\r
+  UINT16                     TargetValue;\r
+  EFI_STATUS                 Status;\r
+  volatile VIRTIO_SCSI_REQ   Request;\r
+  volatile VIRTIO_SCSI_RESP  *Response;\r
+  VOID                       *ResponseBuffer;\r
+  DESC_INDICES               Indices;\r
+  VOID                       *RequestMapping;\r
+  VOID                       *ResponseMapping;\r
+  VOID                       *InDataMapping;\r
+  VOID                       *OutDataMapping;\r
+  EFI_PHYSICAL_ADDRESS       RequestDeviceAddress;\r
+  EFI_PHYSICAL_ADDRESS       ResponseDeviceAddress;\r
+  EFI_PHYSICAL_ADDRESS       InDataDeviceAddress;\r
+  EFI_PHYSICAL_ADDRESS       OutDataDeviceAddress;\r
+  VOID                       *InDataBuffer;\r
+  UINTN                      InDataNumPages;\r
+  BOOLEAN                    OutDataBufferIsMapped;\r
 \r
   //\r
   // Set InDataMapping,OutDataMapping,InDataDeviceAddress and OutDataDeviceAddress to\r
@@ -458,14 +455,14 @@ VirtioScsiPassThru (
   InDataDeviceAddress  = 0;\r
   OutDataDeviceAddress = 0;\r
 \r
-  ZeroMem ((VOID*) &Request, sizeof (Request));\r
+  ZeroMem ((VOID *)&Request, sizeof (Request));\r
 \r
   Dev = VIRTIO_SCSI_FROM_PASS_THRU (This);\r
   CopyMem (&TargetValue, Target, sizeof TargetValue);\r
 \r
-  InDataBuffer = NULL;\r
+  InDataBuffer          = NULL;\r
   OutDataBufferIsMapped = FALSE;\r
-  InDataNumPages = 0;\r
+  InDataNumPages        = 0;\r
 \r
   Status = PopulateRequest (Dev, TargetValue, Lun, Packet, &Request);\r
   if (EFI_ERROR (Status)) {\r
@@ -478,10 +475,11 @@ VirtioScsiPassThru (
   Status = VirtioMapAllBytesInSharedBuffer (\r
              Dev->VirtIo,\r
              VirtioOperationBusMasterRead,\r
-             (VOID *) &Request,\r
+             (VOID *)&Request,\r
              sizeof Request,\r
              &RequestDeviceAddress,\r
-             &RequestMapping);\r
+             &RequestMapping\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return ReportHostAdapterError (Packet);\r
   }\r
@@ -506,11 +504,11 @@ VirtioScsiPassThru (
     // buffer into Packet->InDataBuffer.\r
     //\r
     InDataNumPages = EFI_SIZE_TO_PAGES ((UINTN)Packet->InTransferLength);\r
-    Status = Dev->VirtIo->AllocateSharedPages (\r
-                            Dev->VirtIo,\r
-                            InDataNumPages,\r
-                            &InDataBuffer\r
-                            );\r
+    Status         = Dev->VirtIo->AllocateSharedPages (\r
+                                    Dev->VirtIo,\r
+                                    InDataNumPages,\r
+                                    &InDataBuffer\r
+                                    );\r
     if (EFI_ERROR (Status)) {\r
       Status = ReportHostAdapterError (Packet);\r
       goto UnmapRequestBuffer;\r
@@ -653,8 +651,14 @@ VirtioScsiPassThru (
   // EFI_NOT_READY would save us the effort, but it would also suggest that the\r
   // caller retry.\r
   //\r
-  if (VirtioFlush (Dev->VirtIo, VIRTIO_SCSI_REQUEST_QUEUE, &Dev->Ring,\r
-        &Indices, NULL) != EFI_SUCCESS) {\r
+  if (VirtioFlush (\r
+        Dev->VirtIo,\r
+        VIRTIO_SCSI_REQUEST_QUEUE,\r
+        &Dev->Ring,\r
+        &Indices,\r
+        NULL\r
+        ) != EFI_SUCCESS)\r
+  {\r
     Status = ReportHostAdapterError (Packet);\r
     goto UnmapResponseBuffer;\r
   }\r
@@ -701,19 +705,18 @@ UnmapRequestBuffer:
   return Status;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiGetNextTargetLun (\r
-  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN OUT UINT8                           **TargetPointer,\r
-  IN OUT UINT64                          *Lun\r
+  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                            **TargetPointer,\r
+  IN OUT UINT64                           *Lun\r
   )\r
 {\r
-  UINT8     *Target;\r
-  UINTN     Idx;\r
-  UINT16    LastTarget;\r
-  VSCSI_DEV *Dev;\r
+  UINT8      *Target;\r
+  UINTN      Idx;\r
+  UINT16     LastTarget;\r
+  VSCSI_DEV  *Dev;\r
 \r
   //\r
   // the TargetPointer input parameter is unnecessarily a pointer-to-pointer\r
@@ -723,8 +726,9 @@ VirtioScsiGetNextTargetLun (
   //\r
   // Search for first non-0xFF byte. If not found, return first target & LUN.\r
   //\r
-  for (Idx = 0; Idx < TARGET_MAX_BYTES && Target[Idx] == 0xFF; ++Idx)\r
-    ;\r
+  for (Idx = 0; Idx < TARGET_MAX_BYTES && Target[Idx] == 0xFF; ++Idx) {\r
+  }\r
+\r
   if (Idx == TARGET_MAX_BYTES) {\r
     SetMem (Target, TARGET_MAX_BYTES, 0x00);\r
     *Lun = 0;\r
@@ -740,7 +744,7 @@ VirtioScsiGetNextTargetLun (
   // increment (target, LUN) pair if valid on input\r
   //\r
   Dev = VIRTIO_SCSI_FROM_PASS_THRU (This);\r
-  if (LastTarget > Dev->MaxTarget || *Lun > Dev->MaxLun) {\r
+  if ((LastTarget > Dev->MaxTarget) || (*Lun > Dev->MaxLun)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -759,19 +763,18 @@ VirtioScsiGetNextTargetLun (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiBuildDevicePath (\r
-  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN     UINT8                           *Target,\r
-  IN     UINT64                          Lun,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL        **DevicePath\r
+  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN     UINT8                            *Target,\r
+  IN     UINT64                           Lun,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL         **DevicePath\r
   )\r
 {\r
-  UINT16           TargetValue;\r
-  VSCSI_DEV        *Dev;\r
-  SCSI_DEVICE_PATH *ScsiDevicePath;\r
+  UINT16            TargetValue;\r
+  VSCSI_DEV         *Dev;\r
+  SCSI_DEVICE_PATH  *ScsiDevicePath;\r
 \r
   if (DevicePath == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -779,7 +782,7 @@ VirtioScsiBuildDevicePath (
 \r
   CopyMem (&TargetValue, Target, sizeof TargetValue);\r
   Dev = VIRTIO_SCSI_FROM_PASS_THRU (This);\r
-  if (TargetValue > Dev->MaxTarget || Lun > Dev->MaxLun || Lun > 0xFFFF) {\r
+  if ((TargetValue > Dev->MaxTarget) || (Lun > Dev->MaxLun) || (Lun > 0xFFFF)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -790,43 +793,45 @@ VirtioScsiBuildDevicePath (
 \r
   ScsiDevicePath->Header.Type      = MESSAGING_DEVICE_PATH;\r
   ScsiDevicePath->Header.SubType   = MSG_SCSI_DP;\r
-  ScsiDevicePath->Header.Length[0] = (UINT8)  sizeof *ScsiDevicePath;\r
-  ScsiDevicePath->Header.Length[1] = (UINT8) (sizeof *ScsiDevicePath >> 8);\r
+  ScsiDevicePath->Header.Length[0] = (UINT8)sizeof *ScsiDevicePath;\r
+  ScsiDevicePath->Header.Length[1] = (UINT8)(sizeof *ScsiDevicePath >> 8);\r
   ScsiDevicePath->Pun              = TargetValue;\r
-  ScsiDevicePath->Lun              = (UINT16) Lun;\r
+  ScsiDevicePath->Lun              = (UINT16)Lun;\r
 \r
   *DevicePath = &ScsiDevicePath->Header;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiGetTargetLun (\r
-  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL        *DevicePath,\r
-  OUT UINT8                           **TargetPointer,\r
-  OUT UINT64                          *Lun\r
+  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL         *DevicePath,\r
+  OUT UINT8                            **TargetPointer,\r
+  OUT UINT64                           *Lun\r
   )\r
 {\r
-  SCSI_DEVICE_PATH *ScsiDevicePath;\r
-  VSCSI_DEV        *Dev;\r
-  UINT8            *Target;\r
+  SCSI_DEVICE_PATH  *ScsiDevicePath;\r
+  VSCSI_DEV         *Dev;\r
+  UINT8             *Target;\r
 \r
-  if (DevicePath == NULL || TargetPointer == NULL || *TargetPointer == NULL ||\r
-      Lun == NULL) {\r
+  if ((DevicePath == NULL) || (TargetPointer == NULL) || (*TargetPointer == NULL) ||\r
+      (Lun == NULL))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (DevicePath->Type    != MESSAGING_DEVICE_PATH ||\r
-      DevicePath->SubType != MSG_SCSI_DP) {\r
+  if ((DevicePath->Type    != MESSAGING_DEVICE_PATH) ||\r
+      (DevicePath->SubType != MSG_SCSI_DP))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  ScsiDevicePath = (SCSI_DEVICE_PATH *) DevicePath;\r
-  Dev = VIRTIO_SCSI_FROM_PASS_THRU (This);\r
-  if (ScsiDevicePath->Pun > Dev->MaxTarget ||\r
-      ScsiDevicePath->Lun > Dev->MaxLun) {\r
+  ScsiDevicePath = (SCSI_DEVICE_PATH *)DevicePath;\r
+  Dev            = VIRTIO_SCSI_FROM_PASS_THRU (This);\r
+  if ((ScsiDevicePath->Pun > Dev->MaxTarget) ||\r
+      (ScsiDevicePath->Lun > Dev->MaxLun))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -843,40 +848,37 @@ VirtioScsiGetTargetLun (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiResetChannel (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiResetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN UINT8                           *Target,\r
-  IN UINT64                          Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiGetNextTarget (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN OUT UINT8                       **TargetPointer\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **TargetPointer\r
   )\r
 {\r
-  UINT8     *Target;\r
-  UINTN     Idx;\r
-  UINT16    LastTarget;\r
-  VSCSI_DEV *Dev;\r
+  UINT8      *Target;\r
+  UINTN      Idx;\r
+  UINT16     LastTarget;\r
+  VSCSI_DEV  *Dev;\r
 \r
   //\r
   // the TargetPointer input parameter is unnecessarily a pointer-to-pointer\r
@@ -886,8 +888,9 @@ VirtioScsiGetNextTarget (
   //\r
   // Search for first non-0xFF byte. If not found, return first target.\r
   //\r
-  for (Idx = 0; Idx < TARGET_MAX_BYTES && Target[Idx] == 0xFF; ++Idx)\r
-    ;\r
+  for (Idx = 0; Idx < TARGET_MAX_BYTES && Target[Idx] == 0xFF; ++Idx) {\r
+  }\r
+\r
   if (Idx == TARGET_MAX_BYTES) {\r
     SetMem (Target, TARGET_MAX_BYTES, 0x00);\r
     return EFI_SUCCESS;\r
@@ -915,39 +918,38 @@ VirtioScsiGetNextTarget (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiInit (\r
-  IN OUT VSCSI_DEV *Dev\r
+  IN OUT VSCSI_DEV  *Dev\r
   )\r
 {\r
-  UINT8      NextDevStat;\r
-  EFI_STATUS Status;\r
-  UINT64     RingBaseShift;\r
-  UINT64     Features;\r
-  UINT16     MaxChannel; // for validation only\r
-  UINT32     NumQueues;  // for validation only\r
-  UINT16     QueueSize;\r
+  UINT8       NextDevStat;\r
+  EFI_STATUS  Status;\r
+  UINT64      RingBaseShift;\r
+  UINT64      Features;\r
+  UINT16      MaxChannel; // for validation only\r
+  UINT32      NumQueues;  // for validation only\r
+  UINT16      QueueSize;\r
 \r
   //\r
   // Execute virtio-0.9.5, 2.2.1 Device Initialization Sequence.\r
   //\r
   NextDevStat = 0;             // step 1 -- reset device\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status      = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
 \r
   NextDevStat |= VSTAT_ACK;    // step 2 -- acknowledge device presence\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
 \r
   NextDevStat |= VSTAT_DRIVER; // step 3 -- we know how to drive it\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
@@ -967,12 +969,14 @@ VirtioScsiInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
-  Dev->InOutSupported = (BOOLEAN) ((Features & VIRTIO_SCSI_F_INOUT) != 0);\r
+\r
+  Dev->InOutSupported = (BOOLEAN)((Features & VIRTIO_SCSI_F_INOUT) != 0);\r
 \r
   Status = VIRTIO_CFG_READ (Dev, MaxChannel, &MaxChannel);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   if (MaxChannel != 0) {\r
     //\r
     // this driver is for a single-channel virtio-scsi HBA\r
@@ -985,6 +989,7 @@ VirtioScsiInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   if (NumQueues < 1) {\r
     Status = EFI_UNSUPPORTED;\r
     goto Failed;\r
@@ -994,6 +999,7 @@ VirtioScsiInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   if (Dev->MaxTarget > PcdGet16 (PcdVirtioScsiMaxTargetLimit)) {\r
     Dev->MaxTarget = PcdGet16 (PcdVirtioScsiMaxTargetLimit);\r
   }\r
@@ -1002,6 +1008,7 @@ VirtioScsiInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   if (Dev->MaxLun > PcdGet32 (PcdVirtioScsiMaxLunLimit)) {\r
     Dev->MaxLun = PcdGet32 (PcdVirtioScsiMaxLunLimit);\r
   }\r
@@ -1010,6 +1017,7 @@ VirtioScsiInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   if (Dev->MaxSectors < 2) {\r
     //\r
     // We must be able to halve it for bidirectional transfers\r
@@ -1040,10 +1048,12 @@ VirtioScsiInit (
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   Status = Dev->VirtIo->GetQueueNumMax (Dev->VirtIo, &QueueSize);\r
   if (EFI_ERROR (Status)) {\r
     goto Failed;\r
   }\r
+\r
   //\r
   // VirtioScsiPassThru() uses at most four descriptors\r
   //\r
@@ -1101,7 +1111,7 @@ VirtioScsiInit (
   //\r
   if (Dev->VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) {\r
     Features &= ~(UINT64)(VIRTIO_F_VERSION_1 | VIRTIO_F_IOMMU_PLATFORM);\r
-    Status = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);\r
+    Status    = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);\r
     if (EFI_ERROR (Status)) {\r
       goto UnmapQueue;\r
     }\r
@@ -1115,6 +1125,7 @@ VirtioScsiInit (
   if (EFI_ERROR (Status)) {\r
     goto UnmapQueue;\r
   }\r
+\r
   Status = VIRTIO_CFG_WRITE (Dev, SenseSize, VIRTIO_SCSI_SENSE_SIZE);\r
   if (EFI_ERROR (Status)) {\r
     goto UnmapQueue;\r
@@ -1124,7 +1135,7 @@ VirtioScsiInit (
   // step 6 -- initialization complete\r
   //\r
   NextDevStat |= VSTAT_DRIVER_OK;\r
-  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
+  Status       = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);\r
   if (EFI_ERROR (Status)) {\r
     goto UnmapQueue;\r
   }\r
@@ -1184,12 +1195,11 @@ Failed:
   return Status; // reached only via Failed above\r
 }\r
 \r
-\r
 STATIC\r
 VOID\r
 EFIAPI\r
 VirtioScsiUninit (\r
-  IN OUT VSCSI_DEV *Dev\r
+  IN OUT VSCSI_DEV  *Dev\r
   )\r
 {\r
   //\r
@@ -1207,11 +1217,10 @@ VirtioScsiUninit (
   Dev->VirtIo->UnmapSharedBuffer (Dev->VirtIo, Dev->RingMap);\r
   VirtioRingUninit (Dev->VirtIo, &Dev->Ring);\r
 \r
-  SetMem (&Dev->PassThru,     sizeof Dev->PassThru,     0x00);\r
+  SetMem (&Dev->PassThru, sizeof Dev->PassThru, 0x00);\r
   SetMem (&Dev->PassThruMode, sizeof Dev->PassThruMode, 0x00);\r
 }\r
 \r
-\r
 //\r
 // Event notification function enqueued by ExitBootServices().\r
 //\r
@@ -1220,11 +1229,11 @@ STATIC
 VOID\r
 EFIAPI\r
 VirtioScsiExitBoot (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  VSCSI_DEV *Dev;\r
+  VSCSI_DEV  *Dev;\r
 \r
   DEBUG ((DEBUG_VERBOSE, "%a: Context=0x%p\n", __FUNCTION__, Context));\r
   //\r
@@ -1238,7 +1247,6 @@ VirtioScsiExitBoot (
   Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);\r
 }\r
 \r
-\r
 //\r
 // Probe, start and stop functions of this driver, called by the DXE core for\r
 // specific devices.\r
@@ -1257,13 +1265,13 @@ VirtioScsiExitBoot (
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS             Status;\r
-  VIRTIO_DEVICE_PROTOCOL *VirtIo;\r
+  EFI_STATUS              Status;\r
+  VIRTIO_DEVICE_PROTOCOL  *VirtIo;\r
 \r
   //\r
   // Attempt to open the device with the VirtIo set of interfaces. On success,\r
@@ -1292,31 +1300,39 @@ VirtioScsiDriverBindingSupported (
   // We needed VirtIo access only transitorily, to see whether we support the\r
   // device or not.\r
   //\r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
   return Status;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  VSCSI_DEV  *Dev;\r
-  EFI_STATUS Status;\r
+  VSCSI_DEV   *Dev;\r
+  EFI_STATUS  Status;\r
 \r
-  Dev = (VSCSI_DEV *) AllocateZeroPool (sizeof *Dev);\r
+  Dev = (VSCSI_DEV *)AllocateZeroPool (sizeof *Dev);\r
   if (Dev == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->OpenProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-                  (VOID **)&Dev->VirtIo, This->DriverBindingHandle,\r
-                  DeviceHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gVirtioDeviceProtocolGuid,\r
+                  (VOID **)&Dev->VirtIo,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeVirtioScsi;\r
   }\r
@@ -1329,8 +1345,13 @@ VirtioScsiDriverBindingStart (
     goto CloseVirtIo;\r
   }\r
 \r
-  Status = gBS->CreateEvent (EVT_SIGNAL_EXIT_BOOT_SERVICES, TPL_CALLBACK,\r
-                  &VirtioScsiExitBoot, Dev, &Dev->ExitBoot);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+                  TPL_CALLBACK,\r
+                  &VirtioScsiExitBoot,\r
+                  Dev,\r
+                  &Dev->ExitBoot\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto UninitDev;\r
   }\r
@@ -1340,9 +1361,12 @@ VirtioScsiDriverBindingStart (
   // interface.\r
   //\r
   Dev->Signature = VSCSI_SIG;\r
-  Status = gBS->InstallProtocolInterface (&DeviceHandle,\r
-                  &gEfiExtScsiPassThruProtocolGuid, EFI_NATIVE_INTERFACE,\r
-                  &Dev->PassThru);\r
+  Status         = gBS->InstallProtocolInterface (\r
+                          &DeviceHandle,\r
+                          &gEfiExtScsiPassThruProtocolGuid,\r
+                          EFI_NATIVE_INTERFACE,\r
+                          &Dev->PassThru\r
+                          );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseExitBoot;\r
   }\r
@@ -1356,8 +1380,12 @@ UninitDev:
   VirtioScsiUninit (Dev);\r
 \r
 CloseVirtIo:\r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
 FreeVirtioScsi:\r
   FreePool (Dev);\r
@@ -1365,19 +1393,18 @@ FreeVirtioScsi:
   return Status;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *PassThru;\r
-  VSCSI_DEV                       *Dev;\r
+  EFI_STATUS                       Status;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *PassThru;\r
+  VSCSI_DEV                        *Dev;\r
 \r
   Status = gBS->OpenProtocol (\r
                   DeviceHandle,                     // candidate device\r
@@ -1396,8 +1423,11 @@ VirtioScsiDriverBindingStop (
   //\r
   // Handle Stop() requests for in-use driver instances gracefully.\r
   //\r
-  Status = gBS->UninstallProtocolInterface (DeviceHandle,\r
-                  &gEfiExtScsiPassThruProtocolGuid, &Dev->PassThru);\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  DeviceHandle,\r
+                  &gEfiExtScsiPassThruProtocolGuid,\r
+                  &Dev->PassThru\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1406,21 +1436,24 @@ VirtioScsiDriverBindingStop (
 \r
   VirtioScsiUninit (Dev);\r
 \r
-  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gVirtioDeviceProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
   FreePool (Dev);\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 //\r
 // The static object that groups the Supported() (ie. probe), Start() and\r
 // Stop() functions of the driver together. Refer to UEFI Spec 2.3.1 + Errata\r
 // C, 10.1 EFI Driver Binding Protocol.\r
 //\r
-STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {\r
+STATIC EFI_DRIVER_BINDING_PROTOCOL  gDriverBinding = {\r
   &VirtioScsiDriverBindingSupported,\r
   &VirtioScsiDriverBindingStart,\r
   &VirtioScsiDriverBindingStop,\r
@@ -1430,7 +1463,6 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
   NULL  // DriverBindingHandle, ditto\r
 };\r
 \r
-\r
 //\r
 // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL and\r
 // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's name\r
@@ -1444,20 +1476,20 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
 //\r
 \r
 STATIC\r
-EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "eng;en", L"Virtio SCSI Host Driver" },\r
-  { NULL,     NULL                   }\r
+  { NULL,     NULL                       }\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName;\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -1472,39 +1504,38 @@ VirtioScsiGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName = {\r
   &VirtioScsiGetDriverName,\r
   &VirtioScsiGetDeviceName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME2_PROTOCOL gComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &VirtioScsiGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &VirtioScsiGetDeviceName,\r
+EFI_COMPONENT_NAME2_PROTOCOL  gComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&VirtioScsiGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&VirtioScsiGetDeviceName,\r
   "en" // SupportedLanguages, RFC 4646 language codes\r
 };\r
 \r
-\r
 //\r
 // Entry point of this driver.\r
 //\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r
index af1901891f8aa0341ec45b9d47243beb95deeb45..e7aa16dc2fbb6024721b3f7863da99d1c8302043 100644 (file)
@@ -18,7 +18,6 @@
 \r
 #include <IndustryStandard/Virtio.h>\r
 \r
-\r
 //\r
 // This driver supports 2-byte target identifiers and 4-byte LUN identifiers.\r
 //\r
 // AdapterId and our target identifiers.\r
 //\r
 #if TARGET_MAX_BYTES < 4\r
-#  error "virtio-scsi requires TARGET_MAX_BYTES >= 4"\r
+  #error "virtio-scsi requires TARGET_MAX_BYTES >= 4"\r
 #endif\r
 \r
-\r
-#define VSCSI_SIG SIGNATURE_32 ('V', 'S', 'C', 'S')\r
+#define VSCSI_SIG  SIGNATURE_32 ('V', 'S', 'C', 'S')\r
 \r
 typedef struct {\r
   //\r
@@ -44,23 +42,22 @@ typedef struct {
   //\r
   //                              field              init function       init depth\r
   //                              ----------------   ------------------  ----------\r
-  UINT32                          Signature;      // DriverBindingStart  0\r
-  VIRTIO_DEVICE_PROTOCOL          *VirtIo;        // DriverBindingStart  0\r
-  EFI_EVENT                       ExitBoot;       // DriverBindingStart  0\r
-  BOOLEAN                         InOutSupported; // VirtioScsiInit      1\r
-  UINT16                          MaxTarget;      // VirtioScsiInit      1\r
-  UINT32                          MaxLun;         // VirtioScsiInit      1\r
-  UINT32                          MaxSectors;     // VirtioScsiInit      1\r
-  VRING                           Ring;           // VirtioRingInit      2\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL PassThru;       // VirtioScsiInit      1\r
-  EFI_EXT_SCSI_PASS_THRU_MODE     PassThruMode;   // VirtioScsiInit      1\r
-  VOID                            *RingMap;       // VirtioRingMap       2\r
+  UINT32                             Signature;      // DriverBindingStart  0\r
+  VIRTIO_DEVICE_PROTOCOL             *VirtIo;        // DriverBindingStart  0\r
+  EFI_EVENT                          ExitBoot;       // DriverBindingStart  0\r
+  BOOLEAN                            InOutSupported; // VirtioScsiInit      1\r
+  UINT16                             MaxTarget;      // VirtioScsiInit      1\r
+  UINT32                             MaxLun;         // VirtioScsiInit      1\r
+  UINT32                             MaxSectors;     // VirtioScsiInit      1\r
+  VRING                              Ring;           // VirtioRingInit      2\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL    PassThru;       // VirtioScsiInit      1\r
+  EFI_EXT_SCSI_PASS_THRU_MODE        PassThruMode;   // VirtioScsiInit      1\r
+  VOID                               *RingMap;       // VirtioRingMap       2\r
 } VSCSI_DEV;\r
 \r
 #define VIRTIO_SCSI_FROM_PASS_THRU(PassThruPointer) \\r
         CR (PassThruPointer, VSCSI_DEV, PassThru, VSCSI_SIG)\r
 \r
-\r
 //\r
 // Probe, start and stop functions of this driver, called by the DXE core for\r
 // specific devices.\r
@@ -73,31 +70,28 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   );\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   );\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   );\r
 \r
-\r
 //\r
 // The next seven functions implement EFI_EXT_SCSI_PASS_THRU_PROTOCOL\r
 // for the virtio-scsi HBA. Refer to UEFI Spec 2.3.1 + Errata C, sections\r
@@ -108,67 +102,60 @@ VirtioScsiDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiPassThru (\r
-  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL            *This,\r
-  IN     UINT8                                      *Target,\r
-  IN     UINT64                                     Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN     EFI_EVENT                                  Event   OPTIONAL\r
+  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL             *This,\r
+  IN     UINT8                                       *Target,\r
+  IN     UINT64                                      Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN     EFI_EVENT                                   Event   OPTIONAL\r
   );\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiGetNextTargetLun (\r
-  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN OUT UINT8                           **Target,\r
-  IN OUT UINT64                          *Lun\r
+  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                            **Target,\r
+  IN OUT UINT64                           *Lun\r
   );\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiBuildDevicePath (\r
-  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN     UINT8                           *Target,\r
-  IN     UINT64                          Lun,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL        **DevicePath\r
+  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN     UINT8                            *Target,\r
+  IN     UINT64                           Lun,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL         **DevicePath\r
   );\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiGetTargetLun (\r
-  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL        *DevicePath,\r
-  OUT UINT8                           **Target,\r
-  OUT UINT64                          *Lun\r
+  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL         *DevicePath,\r
+  OUT UINT8                            **Target,\r
+  OUT UINT64                           *Lun\r
   );\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiResetChannel (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This\r
   );\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiResetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN UINT8                           *Target,\r
-  IN UINT64                          Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun\r
   );\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiGetNextTarget (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,\r
-  IN OUT UINT8                       **Target\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **Target\r
   );\r
 \r
-\r
 //\r
 // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL and\r
 // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's name\r
@@ -184,20 +171,19 @@ VirtioScsiGetNextTarget (
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   );\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 VirtioScsiGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   );\r
 \r
 #endif // _VIRTIO_SCSI_DXE_H_\r
index 60576f3cc6d63ea8803410c2a4ebeceef901b7f2..e06bb25dfc153056de79b92b70e3dd6ad6195859 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 InstallAcpiTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiTable\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiTable\r
   )\r
 {\r
-  EFI_STATUS                         Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (XenDetected ()) {\r
     Status = InstallXenTables (AcpiTable);\r
@@ -38,4 +38,3 @@ InstallAcpiTables (
 \r
   return Status;\r
 }\r
-\r
index 47d9769ed12b1db386523d7e91a6af04f84f84e7..ccb5b092ad9d6e39bf053a7d7e93bd19647baef8 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 InstallXenTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiProtocol\r
   );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 InstallAcpiTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiTable\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiTable\r
   );\r
 \r
 #endif\r
-\r
index 1a23790a3b2c39627191359f6b271c65fa4022f1..3bd015223fb43f8db0e7bd1d46dc72321fb58987 100644 (file)
@@ -19,24 +19,23 @@ FindAcpiTableProtocol (
   VOID\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  EFI_ACPI_TABLE_PROTOCOL *AcpiTable;\r
+  EFI_STATUS               Status;\r
+  EFI_ACPI_TABLE_PROTOCOL  *AcpiTable;\r
 \r
   Status = gBS->LocateProtocol (\r
                   &gEfiAcpiTableProtocolGuid,\r
                   NULL,\r
-                  (VOID**)&AcpiTable\r
+                  (VOID **)&AcpiTable\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
   return AcpiTable;\r
 }\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 AcpiPlatformEntryPoint (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return InstallAcpiTables (FindAcpiTableProtocol ());\r
index 151376176f7d99282a3324502297919a75265396..cc2fa2cdcf8c4fa609bfb4b3daf5aad06095b47b 100644 (file)
@@ -15,8 +15,8 @@
 \r
 #include "AcpiPlatform.h"\r
 \r
-#define XEN_ACPI_PHYSICAL_ADDRESS         0x000EA020\r
-#define XEN_BIOS_PHYSICAL_END             0x000FFFFF\r
+#define XEN_ACPI_PHYSICAL_ADDRESS  0x000EA020\r
+#define XEN_BIOS_PHYSICAL_END      0x000FFFFF\r
 \r
 EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER  *XenAcpiRsdpStructurePtr = NULL;\r
 \r
@@ -34,13 +34,13 @@ EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER  *XenAcpiRsdpStructurePtr = NULL;
 EFI_STATUS\r
 EFIAPI\r
 GetXenAcpiRsdp (\r
-  OUT   EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER   **RsdpPtr\r
+  OUT   EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER  **RsdpPtr\r
   )\r
 {\r
-  EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER   *RsdpStructurePtr;\r
-  UINT8                                          *XenAcpiPtr;\r
-  UINT8                                          Sum;\r
-  EFI_XEN_INFO                                   *XenInfo;\r
+  EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER  *RsdpStructurePtr;\r
+  UINT8                                         *XenAcpiPtr;\r
+  UINT8                                         Sum;\r
+  EFI_XEN_INFO                                  *XenInfo;\r
 \r
   //\r
   // Detect the RSDP structure\r
@@ -52,8 +52,12 @@ GetXenAcpiRsdp (
   XenInfo = XenGetInfoHOB ();\r
   ASSERT (XenInfo != NULL);\r
   if (XenInfo->RsdpPvh != NULL) {\r
-    DEBUG ((DEBUG_INFO, "%a: Use ACPI RSDP table at 0x%p\n",\r
-      gEfiCallerBaseName, XenInfo->RsdpPvh));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: Use ACPI RSDP table at 0x%p\n",\r
+      gEfiCallerBaseName,\r
+      XenInfo->RsdpPvh\r
+      ));\r
     *RsdpPtr = XenInfo->RsdpPvh;\r
     return EFI_SUCCESS;\r
   }\r
@@ -61,14 +65,14 @@ GetXenAcpiRsdp (
   //\r
   // Otherwise, look for the HVM one\r
   //\r
-  for (XenAcpiPtr = (UINT8*)(UINTN) XEN_ACPI_PHYSICAL_ADDRESS;\r
-       XenAcpiPtr < (UINT8*)(UINTN) XEN_BIOS_PHYSICAL_END;\r
-       XenAcpiPtr += 0x10) {\r
-\r
+  for (XenAcpiPtr = (UINT8 *)(UINTN)XEN_ACPI_PHYSICAL_ADDRESS;\r
+       XenAcpiPtr < (UINT8 *)(UINTN)XEN_BIOS_PHYSICAL_END;\r
+       XenAcpiPtr += 0x10)\r
+  {\r
     RsdpStructurePtr = (EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER *)\r
-                         (UINTN) XenAcpiPtr;\r
+                       (UINTN)XenAcpiPtr;\r
 \r
-    if (!AsciiStrnCmp ((CHAR8 *) &RsdpStructurePtr->Signature, "RSD PTR ", 8)) {\r
+    if (!AsciiStrnCmp ((CHAR8 *)&RsdpStructurePtr->Signature, "RSD PTR ", 8)) {\r
       //\r
       // RSDP ACPI 1.0 checksum for 1.0/2.0/3.0 table.\r
       // This is only the first 20 bytes of the structure\r
@@ -93,6 +97,7 @@ GetXenAcpiRsdp (
           return EFI_ABORTED;\r
         }\r
       }\r
+\r
       *RsdpPtr = RsdpStructurePtr;\r
       return EFI_SUCCESS;\r
     }\r
@@ -119,31 +124,31 @@ GetXenAcpiRsdp (
 EFI_STATUS\r
 EFIAPI\r
 InstallXenTables (\r
-  IN   EFI_ACPI_TABLE_PROTOCOL       *AcpiProtocol\r
+  IN   EFI_ACPI_TABLE_PROTOCOL  *AcpiProtocol\r
   )\r
 {\r
-  EFI_STATUS                                       Status;\r
-  UINTN                                            TableHandle;\r
-\r
-  EFI_ACPI_DESCRIPTION_HEADER                      *Rsdt;\r
-  EFI_ACPI_DESCRIPTION_HEADER                      *Xsdt;\r
-  VOID                                             *CurrentTableEntry;\r
-  UINTN                                            CurrentTablePointer;\r
-  EFI_ACPI_DESCRIPTION_HEADER                      *CurrentTable;\r
-  UINTN                                            Index;\r
-  UINTN                                            NumberOfTableEntries;\r
-  EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE        *Fadt2Table;\r
-  EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE        *Fadt1Table;\r
-  EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE     *Facs2Table;\r
-  EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE     *Facs1Table;\r
-  EFI_ACPI_DESCRIPTION_HEADER                      *DsdtTable;\r
-\r
-  Fadt2Table  = NULL;\r
-  Fadt1Table  = NULL;\r
-  Facs2Table  = NULL;\r
-  Facs1Table  = NULL;\r
-  DsdtTable   = NULL;\r
-  TableHandle = 0;\r
+  EFI_STATUS  Status;\r
+  UINTN       TableHandle;\r
+\r
+  EFI_ACPI_DESCRIPTION_HEADER                   *Rsdt;\r
+  EFI_ACPI_DESCRIPTION_HEADER                   *Xsdt;\r
+  VOID                                          *CurrentTableEntry;\r
+  UINTN                                         CurrentTablePointer;\r
+  EFI_ACPI_DESCRIPTION_HEADER                   *CurrentTable;\r
+  UINTN                                         Index;\r
+  UINTN                                         NumberOfTableEntries;\r
+  EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE     *Fadt2Table;\r
+  EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE     *Fadt1Table;\r
+  EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *Facs2Table;\r
+  EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *Facs1Table;\r
+  EFI_ACPI_DESCRIPTION_HEADER                   *DsdtTable;\r
+\r
+  Fadt2Table           = NULL;\r
+  Fadt1Table           = NULL;\r
+  Facs2Table           = NULL;\r
+  Facs1Table           = NULL;\r
+  DsdtTable            = NULL;\r
+  TableHandle          = 0;\r
   NumberOfTableEntries = 0;\r
 \r
   //\r
@@ -163,11 +168,11 @@ InstallXenTables (
     // Retrieve the addresses of XSDT and\r
     // calculate the number of its table entries.\r
     //\r
-    Xsdt = (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN)\r
-             XenAcpiRsdpStructurePtr->XsdtAddress;\r
+    Xsdt = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)\r
+           XenAcpiRsdpStructurePtr->XsdtAddress;\r
     NumberOfTableEntries = (Xsdt->Length -\r
-                             sizeof (EFI_ACPI_DESCRIPTION_HEADER)) /\r
-                             sizeof (UINT64);\r
+                            sizeof (EFI_ACPI_DESCRIPTION_HEADER)) /\r
+                           sizeof (UINT64);\r
 \r
     //\r
     // Install ACPI tables found in XSDT.\r
@@ -176,11 +181,11 @@ InstallXenTables (
       //\r
       // Get the table entry from XSDT\r
       //\r
-      CurrentTableEntry = (VOID *) ((UINT8 *) Xsdt +\r
-                            sizeof (EFI_ACPI_DESCRIPTION_HEADER) +\r
-                            Index * sizeof (UINT64));\r
-      CurrentTablePointer = (UINTN) *(UINT64 *)CurrentTableEntry;\r
-      CurrentTable = (EFI_ACPI_DESCRIPTION_HEADER *) CurrentTablePointer;\r
+      CurrentTableEntry = (VOID *)((UINT8 *)Xsdt +\r
+                                   sizeof (EFI_ACPI_DESCRIPTION_HEADER) +\r
+                                   Index * sizeof (UINT64));\r
+      CurrentTablePointer = (UINTN)*(UINT64 *)CurrentTableEntry;\r
+      CurrentTable        = (EFI_ACPI_DESCRIPTION_HEADER *)CurrentTablePointer;\r
 \r
       //\r
       // Install the XSDT tables\r
@@ -199,25 +204,24 @@ InstallXenTables (
       //\r
       // Get the FACS and DSDT table address from the table FADT\r
       //\r
-      if (!AsciiStrnCmp ((CHAR8 *) &CurrentTable->Signature, "FACP", 4)) {\r
+      if (!AsciiStrnCmp ((CHAR8 *)&CurrentTable->Signature, "FACP", 4)) {\r
         Fadt2Table = (EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE *)\r
-                       (UINTN) CurrentTablePointer;\r
+                     (UINTN)CurrentTablePointer;\r
         Facs2Table = (EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)\r
-                       (UINTN) Fadt2Table->FirmwareCtrl;\r
-        DsdtTable  = (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN) Fadt2Table->Dsdt;\r
+                     (UINTN)Fadt2Table->FirmwareCtrl;\r
+        DsdtTable = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt2Table->Dsdt;\r
       }\r
     }\r
-  }\r
-  else if (XenAcpiRsdpStructurePtr->RsdtAddress) {\r
+  } else if (XenAcpiRsdpStructurePtr->RsdtAddress) {\r
     //\r
     // Retrieve the addresses of RSDT and\r
     // calculate the number of its table entries.\r
     //\r
-    Rsdt = (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN)\r
-             XenAcpiRsdpStructurePtr->RsdtAddress;\r
+    Rsdt = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)\r
+           XenAcpiRsdpStructurePtr->RsdtAddress;\r
     NumberOfTableEntries = (Rsdt->Length -\r
-                             sizeof (EFI_ACPI_DESCRIPTION_HEADER)) /\r
-                             sizeof (UINT32);\r
+                            sizeof (EFI_ACPI_DESCRIPTION_HEADER)) /\r
+                           sizeof (UINT32);\r
 \r
     //\r
     // Install ACPI tables found in XSDT.\r
@@ -226,11 +230,11 @@ InstallXenTables (
       //\r
       // Get the table entry from RSDT\r
       //\r
-      CurrentTableEntry = (UINT32 *) ((UINT8 *) Rsdt +\r
-                            sizeof (EFI_ACPI_DESCRIPTION_HEADER) +\r
-                            Index * sizeof (UINT32));\r
+      CurrentTableEntry = (UINT32 *)((UINT8 *)Rsdt +\r
+                                     sizeof (EFI_ACPI_DESCRIPTION_HEADER) +\r
+                                     Index * sizeof (UINT32));\r
       CurrentTablePointer = *(UINT32 *)CurrentTableEntry;\r
-      CurrentTable = (EFI_ACPI_DESCRIPTION_HEADER *) CurrentTablePointer;\r
+      CurrentTable        = (EFI_ACPI_DESCRIPTION_HEADER *)CurrentTablePointer;\r
 \r
       //\r
       // Install the RSDT tables\r
@@ -249,12 +253,12 @@ InstallXenTables (
       //\r
       // Get the FACS and DSDT table address from the table FADT\r
       //\r
-      if (!AsciiStrnCmp ((CHAR8 *) &CurrentTable->Signature, "FACP", 4)) {\r
+      if (!AsciiStrnCmp ((CHAR8 *)&CurrentTable->Signature, "FACP", 4)) {\r
         Fadt1Table = (EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE *)\r
-                       (UINTN) CurrentTablePointer;\r
+                     (UINTN)CurrentTablePointer;\r
         Facs1Table = (EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)\r
-                       (UINTN) Fadt1Table->FirmwareCtrl;\r
-        DsdtTable  = (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN) Fadt1Table->Dsdt;\r
+                     (UINTN)Fadt1Table->FirmwareCtrl;\r
+        DsdtTable = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt1Table->Dsdt;\r
       }\r
     }\r
   }\r
@@ -275,8 +279,7 @@ InstallXenTables (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
-  }\r
-  else if (Fadt1Table) {\r
+  } else if (Fadt1Table) {\r
     //\r
     // FACS 1.0\r
     //\r
@@ -313,4 +316,3 @@ InstallXenTables (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index 83e7628a2cf003beff8f004c04ee87629689e18e..9141e9264fc9ba8d8aaa7e90df2b4f0e02e63072 100644 (file)
@@ -14,7 +14,7 @@
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
 EFI_COMPONENT_NAME_PROTOCOL  gXenBusDxeComponentName = {\r
-  (EFI_COMPONENT_NAME_GET_DRIVER_NAME)    XenBusDxeComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME_GET_DRIVER_NAME)XenBusDxeComponentNameGetDriverName,\r
   (EFI_COMPONENT_NAME_GET_CONTROLLER_NAME)XenBusDxeComponentNameGetControllerName,\r
   "eng"\r
 };\r
@@ -33,18 +33,18 @@ EFI_COMPONENT_NAME2_PROTOCOL  gXenBusDxeComponentName2 = {
 /// Table of driver names\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_UNICODE_STRING_TABLE mXenBusDxeDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mXenBusDxeDriverNameTable[] = {\r
   { "eng;en", (CHAR16 *)L"XenBus Bus Driver" },\r
-  { NULL, NULL }\r
+  { NULL,     NULL                           }\r
 };\r
 \r
 ///\r
 /// Table of controller names\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_UNICODE_STRING_TABLE mXenBusDxeControllerNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mXenBusDxeControllerNameTable[] = {\r
   { "eng;en", (CHAR16 *)L"XenBus Controller" },\r
-  { NULL, NULL }\r
+  { NULL,     NULL                           }\r
 };\r
 \r
 /**\r
index 6c905b511f80a70635034ff15bfe572a74d589bd..810c9bdb7fcc6593e23492da51ab3a3922e8e015 100644 (file)
 \r
 UINT32\r
 XenEventChannelNotify (\r
-  IN XENBUS_DEVICE *Dev,\r
-  IN evtchn_port_t Port\r
+  IN XENBUS_DEVICE  *Dev,\r
+  IN evtchn_port_t  Port\r
   )\r
 {\r
-  INTN ReturnCode;\r
-  evtchn_send_t Send;\r
+  INTN           ReturnCode;\r
+  evtchn_send_t  Send;\r
 \r
-  Send.port = Port;\r
+  Send.port  = Port;\r
   ReturnCode = XenHypercallEventChannelOp (EVTCHNOP_send, &Send);\r
   return (UINT32)ReturnCode;\r
 }\r
@@ -30,23 +30,25 @@ XenEventChannelNotify (
 UINT32\r
 EFIAPI\r
 XenBusEventChannelAllocate (\r
-  IN  XENBUS_PROTOCOL *This,\r
-  IN  domid_t         DomainId,\r
-  OUT evtchn_port_t   *Port\r
+  IN  XENBUS_PROTOCOL  *This,\r
+  IN  domid_t          DomainId,\r
+  OUT evtchn_port_t    *Port\r
   )\r
 {\r
-  evtchn_alloc_unbound_t Parameter;\r
-  UINT32 ReturnCode;\r
+  evtchn_alloc_unbound_t  Parameter;\r
+  UINT32                  ReturnCode;\r
 \r
-  Parameter.dom = DOMID_SELF;\r
+  Parameter.dom        = DOMID_SELF;\r
   Parameter.remote_dom = DomainId;\r
-  ReturnCode = (UINT32)XenHypercallEventChannelOp (\r
+  ReturnCode           = (UINT32)XenHypercallEventChannelOp (\r
                                    EVTCHNOP_alloc_unbound,\r
-                                   &Parameter);\r
+                                   &Parameter\r
+                                   );\r
   if (ReturnCode != 0) {\r
     DEBUG ((DEBUG_ERROR, "ERROR: alloc_unbound failed with rc=%d", ReturnCode));\r
     return ReturnCode;\r
   }\r
+\r
   *Port = Parameter.port;\r
   return ReturnCode;\r
 }\r
@@ -54,24 +56,24 @@ XenBusEventChannelAllocate (
 UINT32\r
 EFIAPI\r
 XenBusEventChannelNotify (\r
-  IN XENBUS_PROTOCOL *This,\r
-  IN evtchn_port_t   Port\r
+  IN XENBUS_PROTOCOL  *This,\r
+  IN evtchn_port_t    Port\r
   )\r
 {\r
-  XENBUS_PRIVATE_DATA *Private;\r
+  XENBUS_PRIVATE_DATA  *Private;\r
 \r
-  Private = XENBUS_PRIVATE_DATA_FROM_THIS(This);\r
+  Private = XENBUS_PRIVATE_DATA_FROM_THIS (This);\r
   return XenEventChannelNotify (Private->Dev, Port);\r
 }\r
 \r
 UINT32\r
 EFIAPI\r
 XenBusEventChannelClose (\r
-  IN XENBUS_PROTOCOL *This,\r
-  IN evtchn_port_t   Port\r
+  IN XENBUS_PROTOCOL  *This,\r
+  IN evtchn_port_t    Port\r
   )\r
 {\r
-  evtchn_close_t Close;\r
+  evtchn_close_t  Close;\r
 \r
   Close.port = Port;\r
   return (UINT32)XenHypercallEventChannelOp (EVTCHNOP_close, &Close);\r
index 793571fab6d130c2c9ddcc97009277bb08cf8af4..1e748825dd4aaf270fe65539fc83b7a99ebd6e43 100644 (file)
@@ -6,6 +6,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
+\r
 #ifndef __XENBUS_EVENT_CHANNEL_H\r
 #define __XENBUS_EVENT_CHANNEL_H\r
 \r
@@ -23,8 +24,8 @@
 **/\r
 UINT32\r
 XenEventChannelNotify (\r
-  IN XENBUS_DEVICE *Dev,\r
-  IN evtchn_port_t Port\r
+  IN XENBUS_DEVICE  *Dev,\r
+  IN evtchn_port_t  Port\r
   );\r
 \r
 /*\r
@@ -44,9 +45,9 @@ XenEventChannelNotify (
 UINT32\r
 EFIAPI\r
 XenBusEventChannelAllocate (\r
-  IN  XENBUS_PROTOCOL *This,\r
-  IN  domid_t         DomainId,\r
-  OUT evtchn_port_t   *Port\r
+  IN  XENBUS_PROTOCOL  *This,\r
+  IN  domid_t          DomainId,\r
+  OUT evtchn_port_t    *Port\r
   );\r
 \r
 /**\r
@@ -60,8 +61,8 @@ XenBusEventChannelAllocate (
 UINT32\r
 EFIAPI\r
 XenBusEventChannelNotify (\r
-  IN XENBUS_PROTOCOL *This,\r
-  IN evtchn_port_t   Port\r
+  IN XENBUS_PROTOCOL  *This,\r
+  IN evtchn_port_t    Port\r
   );\r
 \r
 /**\r
@@ -75,8 +76,8 @@ XenBusEventChannelNotify (
 UINT32\r
 EFIAPI\r
 XenBusEventChannelClose (\r
-  IN XENBUS_PROTOCOL *This,\r
-  IN evtchn_port_t   Port\r
+  IN XENBUS_PROTOCOL  *This,\r
+  IN evtchn_port_t    Port\r
   );\r
 \r
 #endif\r
index 58d687abad6b48d2317cb6aba485eabe5d1ffbd0..76e0e8f17f0b4f9ed84402a3c52432dedb8ddbd5 100644 (file)
 \r
 #include "GrantTable.h"\r
 \r
-#define NR_RESERVED_ENTRIES 8\r
+#define NR_RESERVED_ENTRIES  8\r
 \r
-#define NR_GRANT_FRAMES (FixedPcdGet32 (PcdXenGrantFrames))\r
-#define NR_GRANT_ENTRIES (NR_GRANT_FRAMES * EFI_PAGE_SIZE / sizeof(grant_entry_v1_t))\r
+#define NR_GRANT_FRAMES   (FixedPcdGet32 (PcdXenGrantFrames))\r
+#define NR_GRANT_ENTRIES  (NR_GRANT_FRAMES * EFI_PAGE_SIZE / sizeof(grant_entry_v1_t))\r
 \r
-STATIC grant_entry_v1_t *GrantTable = NULL;\r
-STATIC grant_ref_t GrantList[NR_GRANT_ENTRIES];\r
-STATIC EFI_LOCK mGrantListLock;\r
+STATIC grant_entry_v1_t  *GrantTable = NULL;\r
+STATIC grant_ref_t       GrantList[NR_GRANT_ENTRIES];\r
+STATIC EFI_LOCK          mGrantListLock;\r
 #ifdef GNT_DEBUG\r
-STATIC BOOLEAN GrantInUseList[NR_GRANT_ENTRIES];\r
+STATIC BOOLEAN  GrantInUseList[NR_GRANT_ENTRIES];\r
 #endif\r
 \r
 STATIC\r
 VOID\r
 XenGrantTablePutFreeEntry (\r
-  grant_ref_t Ref\r
+  grant_ref_t  Ref\r
   )\r
 {\r
   EfiAcquireLock (&mGrantListLock);\r
-#ifdef GNT_DEBUG\r
+ #ifdef GNT_DEBUG\r
   ASSERT (GrantInUseList[Ref]);\r
   GrantInUseList[Ref] = FALSE;\r
-#endif\r
+ #endif\r
   GrantList[Ref] = GrantList[0];\r
-  GrantList[0] = Ref;\r
+  GrantList[0]   = Ref;\r
   EfiReleaseLock (&mGrantListLock);\r
 }\r
 \r
@@ -54,16 +54,16 @@ XenGrantTableGetFreeEntry (
   VOID\r
   )\r
 {\r
-  grant_ref_t Ref;\r
+  grant_ref_t  Ref;\r
 \r
   EfiAcquireLock (&mGrantListLock);\r
   Ref = GrantList[0];\r
   ASSERT (Ref >= NR_RESERVED_ENTRIES && Ref < NR_GRANT_ENTRIES);\r
   GrantList[0] = GrantList[Ref];\r
-#ifdef GNT_DEBUG\r
+ #ifdef GNT_DEBUG\r
   ASSERT (!GrantInUseList[Ref]);\r
   GrantInUseList[Ref] = TRUE;\r
-#endif\r
+ #endif\r
   EfiReleaseLock (&mGrantListLock);\r
   return Ref;\r
 }\r
@@ -76,11 +76,11 @@ XenGrantTableGrantAccess (
   IN BOOLEAN  ReadOnly\r
   )\r
 {\r
-  grant_ref_t Ref;\r
-  UINT16 Flags;\r
+  grant_ref_t  Ref;\r
+  UINT16       Flags;\r
 \r
   ASSERT (GrantTable != NULL);\r
-  Ref = XenGrantTableGetFreeEntry ();\r
+  Ref                   = XenGrantTableGetFreeEntry ();\r
   GrantTable[Ref].frame = (UINT32)Frame;\r
   GrantTable[Ref].domid = DomainId;\r
   MemoryFence ();\r
@@ -88,6 +88,7 @@ XenGrantTableGrantAccess (
   if (ReadOnly) {\r
     Flags |= GTF_readonly;\r
   }\r
+\r
   GrantTable[Ref].flags = Flags;\r
 \r
   return Ref;\r
@@ -96,10 +97,10 @@ XenGrantTableGrantAccess (
 STATIC\r
 EFI_STATUS\r
 XenGrantTableEndAccess (\r
-  grant_ref_t Ref\r
+  grant_ref_t  Ref\r
   )\r
 {\r
-  UINT16 Flags, OldFlags;\r
+  UINT16  Flags, OldFlags;\r
 \r
   ASSERT (GrantTable != NULL);\r
   ASSERT (Ref >= NR_RESERVED_ENTRIES && Ref < NR_GRANT_ENTRIES);\r
@@ -110,6 +111,7 @@ XenGrantTableEndAccess (
       DEBUG ((DEBUG_WARN, "WARNING: g.e. still in use! (%x)\n", Flags));\r
       return EFI_NOT_READY;\r
     }\r
+\r
     OldFlags = InterlockedCompareExchange16 (&GrantTable[Ref].flags, Flags, 0);\r
   } while (OldFlags != Flags);\r
 \r
@@ -122,40 +124,42 @@ XenGrantTableInit (
   IN XENBUS_DEVICE  *Dev\r
   )\r
 {\r
-  xen_add_to_physmap_t Parameters;\r
-  INTN Index;\r
-  INTN ReturnCode;\r
+  xen_add_to_physmap_t  Parameters;\r
+  INTN                  Index;\r
+  INTN                  ReturnCode;\r
 \r
-#ifdef GNT_DEBUG\r
-  SetMem(GrantInUseList, sizeof (GrantInUseList), 1);\r
-#endif\r
+ #ifdef GNT_DEBUG\r
+  SetMem (GrantInUseList, sizeof (GrantInUseList), 1);\r
+ #endif\r
   EfiInitializeLock (&mGrantListLock, TPL_NOTIFY);\r
   for (Index = NR_RESERVED_ENTRIES; Index < NR_GRANT_ENTRIES; Index++) {\r
     XenGrantTablePutFreeEntry ((grant_ref_t)Index);\r
   }\r
 \r
-  GrantTable = (VOID*)(UINTN) Dev->XenIo->GrantTableAddress;\r
+  GrantTable = (VOID *)(UINTN)Dev->XenIo->GrantTableAddress;\r
   for (Index = 0; Index < NR_GRANT_FRAMES; Index++) {\r
     Parameters.domid = DOMID_SELF;\r
-    Parameters.idx = Index;\r
+    Parameters.idx   = Index;\r
     Parameters.space = XENMAPSPACE_grant_table;\r
-    Parameters.gpfn = (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT) + Index;\r
-    ReturnCode = XenHypercallMemoryOp (XENMEM_add_to_physmap, &Parameters);\r
+    Parameters.gpfn  = (xen_pfn_t)((UINTN)GrantTable >> EFI_PAGE_SHIFT) + Index;\r
+    ReturnCode       = XenHypercallMemoryOp (XENMEM_add_to_physmap, &Parameters);\r
     if (ReturnCode != 0) {\r
-      DEBUG ((DEBUG_ERROR,\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
         "Xen GrantTable, add_to_physmap hypercall error: %Ld\n",\r
-        (INT64)ReturnCode));\r
+        (INT64)ReturnCode\r
+        ));\r
     }\r
   }\r
 }\r
 \r
 VOID\r
 XenGrantTableDeinit (\r
-  XENBUS_DEVICE *Dev\r
+  XENBUS_DEVICE  *Dev\r
   )\r
 {\r
-  INTN ReturnCode, Index;\r
-  xen_remove_from_physmap_t Parameters;\r
+  INTN                       ReturnCode, Index;\r
+  xen_remove_from_physmap_t  Parameters;\r
 \r
   if (GrantTable == NULL) {\r
     return;\r
@@ -163,27 +167,33 @@ XenGrantTableDeinit (
 \r
   for (Index = NR_GRANT_FRAMES - 1; Index >= 0; Index--) {\r
     Parameters.domid = DOMID_SELF;\r
-    Parameters.gpfn = (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT) + Index;\r
-    DEBUG ((DEBUG_INFO, "Xen GrantTable, removing %Lx\n",\r
-      (UINT64)Parameters.gpfn));\r
+    Parameters.gpfn  = (xen_pfn_t)((UINTN)GrantTable >> EFI_PAGE_SHIFT) + Index;\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "Xen GrantTable, removing %Lx\n",\r
+      (UINT64)Parameters.gpfn\r
+      ));\r
     ReturnCode = XenHypercallMemoryOp (XENMEM_remove_from_physmap, &Parameters);\r
     if (ReturnCode != 0) {\r
-      DEBUG ((DEBUG_ERROR,\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
         "Xen GrantTable, remove_from_physmap hypercall error: %Ld\n",\r
-        (INT64)ReturnCode));\r
+        (INT64)ReturnCode\r
+        ));\r
     }\r
   }\r
+\r
   GrantTable = NULL;\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 XenBusGrantAccess (\r
-  IN  XENBUS_PROTOCOL *This,\r
-  IN  domid_t         DomainId,\r
-  IN  UINTN           Frame, // MFN\r
-  IN  BOOLEAN         ReadOnly,\r
-  OUT grant_ref_t     *RefPtr\r
+  IN  XENBUS_PROTOCOL  *This,\r
+  IN  domid_t          DomainId,\r
+  IN  UINTN            Frame, // MFN\r
+  IN  BOOLEAN          ReadOnly,\r
+  OUT grant_ref_t      *RefPtr\r
   )\r
 {\r
   *RefPtr = XenGrantTableGrantAccess (DomainId, Frame, ReadOnly);\r
index 0c1e076337e6879b09740788df13fdb3074abf15..3d5c98e85dfdae1ea8c2a05aa4ae8fc6b2c8adbb 100644 (file)
@@ -9,6 +9,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
+\r
 #ifndef __GNTTAB_H__\r
 #define __GNTTAB_H__\r
 \r
@@ -46,11 +47,11 @@ XenGrantTableDeinit (
 EFI_STATUS\r
 EFIAPI\r
 XenBusGrantAccess (\r
-  IN  XENBUS_PROTOCOL *This,\r
-  IN  domid_t         DomainId,\r
-  IN  UINTN           Frame, // MFN\r
-  IN  BOOLEAN         ReadOnly,\r
-  OUT grant_ref_t     *RefPtr\r
+  IN  XENBUS_PROTOCOL  *This,\r
+  IN  domid_t          DomainId,\r
+  IN  UINTN            Frame, // MFN\r
+  IN  BOOLEAN          ReadOnly,\r
+  OUT grant_ref_t      *RefPtr\r
   );\r
 \r
 /**\r
index b22f9c5b0d22b3a792a71c9e0dc9ecc001f804c2..753ac107fa3bb220492cc9a1545ad0f15dc3dd81 100644 (file)
@@ -1,8 +1,8 @@
 #include "XenBusDxe.h"\r
 \r
-CHAR8*\r
+CHAR8 *\r
 AsciiStrDup (\r
-  IN CONST CHAR8Str\r
+  IN CONST CHAR8  *Str\r
   )\r
 {\r
   return AllocateCopyPool (AsciiStrSize (Str), Str);\r
index 989ab7035829e8d69db7caecbe5cb60084c71523..4d51064718f9793a740ca68c32bdb72a384df89d 100644 (file)
 INT32\r
 EFIAPI\r
 TestAndClearBit (\r
-  IN INT32            Bit,\r
-  IN VOID             *Address\r
+  IN INT32  Bit,\r
+  IN VOID   *Address\r
   )\r
 {\r
-  UINT16    Word, Read;\r
-  UINT16    Mask;\r
+  UINT16  Word, Read;\r
+  UINT16  Mask;\r
 \r
   //\r
   // Calculate the effective address relative to 'Address' based on the\r
@@ -27,14 +27,15 @@ TestAndClearBit (
   // ensure we round towards -Inf, and end up with a positive shift in\r
   // 'Bit', even if 'Bit' itself is negative.\r
   //\r
-  Address = (VOID*)((UINT8*) Address + ((Bit >> 4) * sizeof(UINT16)));\r
-  Mask = 1U << (Bit & 15);\r
+  Address = (VOID *)((UINT8 *)Address + ((Bit >> 4) * sizeof (UINT16)));\r
+  Mask    = 1U << (Bit & 15);\r
 \r
-  for (Word = *(UINT16 *) Address; Word & Mask; Word = Read) {\r
+  for (Word = *(UINT16 *)Address; Word &Mask; Word = Read) {\r
     Read = InterlockedCompareExchange16 (Address, Word, Word & ~Mask);\r
     if (Read == Word) {\r
       return 1;\r
     }\r
   }\r
+\r
   return 0;\r
 }\r
index f8a41b6d363203e33ec15588c3096c7532504357..7b67670ccb13b2c40f3319d9c91785aadb75e748 100644 (file)
 \r
 #include <IndustryStandard/Xen/io/xenbus.h>\r
 \r
-STATIC XENBUS_PRIVATE_DATA gXenBusPrivateData;\r
+STATIC XENBUS_PRIVATE_DATA  gXenBusPrivateData;\r
 \r
-STATIC XENBUS_DEVICE_PATH gXenBusDevicePathTemplate = {\r
+STATIC XENBUS_DEVICE_PATH  gXenBusDevicePathTemplate = {\r
   {                                                 // Vendor\r
     {                                               // Vendor.Header\r
       HARDWARE_DEVICE_PATH,                         // Vendor.Header.Type\r
       HW_VENDOR_DP,                                 // Vendor.Header.SubType\r
       {\r
-        (UINT8) (sizeof (XENBUS_DEVICE_PATH)),      // Vendor.Header.Length[0]\r
-        (UINT8) (sizeof (XENBUS_DEVICE_PATH) >> 8), // Vendor.Header.Length[1]\r
+        (UINT8)(sizeof (XENBUS_DEVICE_PATH)),       // Vendor.Header.Length[0]\r
+        (UINT8)(sizeof (XENBUS_DEVICE_PATH) >> 8),  // Vendor.Header.Length[1]\r
       }\r
     },\r
     XENBUS_PROTOCOL_GUID,                           // Vendor.Guid\r
@@ -44,7 +44,6 @@ STATIC XENBUS_DEVICE_PATH gXenBusDevicePathTemplate = {
   0                                                 // DeviceId\r
 };\r
 \r
-\r
 /**\r
   Search our internal record of configured devices (not the XenStore) to\r
   determine if the XenBus device indicated by Node is known to the system.\r
@@ -57,13 +56,13 @@ STATIC XENBUS_DEVICE_PATH gXenBusDevicePathTemplate = {
 STATIC\r
 XENBUS_PRIVATE_DATA *\r
 XenBusDeviceInitialized (\r
-  IN XENBUS_DEVICE *Dev,\r
-  IN CONST CHAR8 *Node\r
+  IN XENBUS_DEVICE  *Dev,\r
+  IN CONST CHAR8    *Node\r
   )\r
 {\r
-  LIST_ENTRY *Entry;\r
-  XENBUS_PRIVATE_DATA *Child;\r
-  XENBUS_PRIVATE_DATA *Result;\r
+  LIST_ENTRY           *Entry;\r
+  XENBUS_PRIVATE_DATA  *Child;\r
+  XENBUS_PRIVATE_DATA  *Result;\r
 \r
   if (IsListEmpty (&Dev->ChildList)) {\r
     return NULL;\r
@@ -72,7 +71,8 @@ XenBusDeviceInitialized (
   Result = NULL;\r
   for (Entry = GetFirstNode (&Dev->ChildList);\r
        !IsNodeAtEnd (&Dev->ChildList, Entry);\r
-       Entry = GetNextNode (&Dev->ChildList, Entry)) {\r
+       Entry = GetNextNode (&Dev->ChildList, Entry))\r
+  {\r
     Child = XENBUS_PRIVATE_DATA_FROM_LINK (Entry);\r
     if (!AsciiStrCmp (Child->XenBusIo.Node, Node)) {\r
       Result = Child;\r
@@ -86,12 +86,12 @@ XenBusDeviceInitialized (
 STATIC\r
 XenbusState\r
 XenBusReadDriverState (\r
-  IN CONST CHAR8 *Path\r
+  IN CONST CHAR8  *Path\r
   )\r
 {\r
-  XenbusState State;\r
-  CHAR8 *Ptr = NULL;\r
-  XENSTORE_STATUS Status;\r
+  XenbusState      State;\r
+  CHAR8            *Ptr = NULL;\r
+  XENSTORE_STATUS  Status;\r
 \r
   Status = XenStoreRead (XST_NIL, Path, "state", NULL, (VOID **)&Ptr);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
@@ -113,24 +113,30 @@ XenBusReadDriverState (
 STATIC\r
 EFI_STATUS\r
 XenBusAddDevice (\r
-  XENBUS_DEVICE *Dev,\r
-  CONST CHAR8 *Type,\r
-  CONST CHAR8 *Id)\r
+  XENBUS_DEVICE  *Dev,\r
+  CONST CHAR8    *Type,\r
+  CONST CHAR8    *Id\r
+  )\r
 {\r
-  CHAR8 DevicePath[XENSTORE_ABS_PATH_MAX];\r
-  XENSTORE_STATUS StatusXenStore;\r
-  XENBUS_PRIVATE_DATA *Private;\r
-  EFI_STATUS Status;\r
-  XENBUS_DEVICE_PATH *TempXenBusPath;\r
-  VOID *ChildXenIo;\r
-\r
-  AsciiSPrint (DevicePath, sizeof (DevicePath),\r
-               "device/%a/%a", Type, Id);\r
+  CHAR8                DevicePath[XENSTORE_ABS_PATH_MAX];\r
+  XENSTORE_STATUS      StatusXenStore;\r
+  XENBUS_PRIVATE_DATA  *Private;\r
+  EFI_STATUS           Status;\r
+  XENBUS_DEVICE_PATH   *TempXenBusPath;\r
+  VOID                 *ChildXenIo;\r
+\r
+  AsciiSPrint (\r
+    DevicePath,\r
+    sizeof (DevicePath),\r
+    "device/%a/%a",\r
+    Type,\r
+    Id\r
+    );\r
 \r
   if (XenStorePathExists (XST_NIL, DevicePath, "")) {\r
-    XENBUS_PRIVATE_DATA *Child;\r
-    enum xenbus_state State;\r
-    CHAR8 *BackendPath;\r
+    XENBUS_PRIVATE_DATA  *Child;\r
+    enum xenbus_state    State;\r
+    CHAR8                *BackendPath;\r
 \r
     Child = XenBusDeviceInitialized (Dev, DevicePath);\r
     if (Child != NULL) {\r
@@ -148,57 +154,80 @@ XenBusAddDevice (
        * happen if a device is going away after\r
        * switching to Closed.\r
        */\r
-      DEBUG ((DEBUG_INFO, "XenBus: Device %a ignored. "\r
-              "State %d\n", DevicePath, State));\r
+      DEBUG ((\r
+        DEBUG_INFO,\r
+        "XenBus: Device %a ignored. "\r
+        "State %d\n",\r
+        DevicePath,\r
+        State\r
+        ));\r
       Status = EFI_SUCCESS;\r
       goto out;\r
     }\r
 \r
-    StatusXenStore = XenStoreRead (XST_NIL, DevicePath, "backend",\r
-                                   NULL, (VOID **) &BackendPath);\r
+    StatusXenStore = XenStoreRead (\r
+                       XST_NIL,\r
+                       DevicePath,\r
+                       "backend",\r
+                       NULL,\r
+                       (VOID **)&BackendPath\r
+                       );\r
     if (StatusXenStore != XENSTORE_STATUS_SUCCESS) {\r
       DEBUG ((DEBUG_ERROR, "xenbus: %a no backend path.\n", DevicePath));\r
       Status = EFI_NOT_FOUND;\r
       goto out;\r
     }\r
 \r
-    Private = AllocateCopyPool (sizeof (*Private), &gXenBusPrivateData);\r
-    Private->XenBusIo.Type = AsciiStrDup (Type);\r
-    Private->XenBusIo.Node = AsciiStrDup (DevicePath);\r
-    Private->XenBusIo.Backend = BackendPath;\r
+    Private                    = AllocateCopyPool (sizeof (*Private), &gXenBusPrivateData);\r
+    Private->XenBusIo.Type     = AsciiStrDup (Type);\r
+    Private->XenBusIo.Node     = AsciiStrDup (DevicePath);\r
+    Private->XenBusIo.Backend  = BackendPath;\r
     Private->XenBusIo.DeviceId = (UINT16)AsciiStrDecimalToUintn (Id);\r
-    Private->Dev = Dev;\r
+    Private->Dev               = Dev;\r
 \r
-    TempXenBusPath = AllocateCopyPool (sizeof (XENBUS_DEVICE_PATH),\r
-                                       &gXenBusDevicePathTemplate);\r
+    TempXenBusPath = AllocateCopyPool (\r
+                       sizeof (XENBUS_DEVICE_PATH),\r
+                       &gXenBusDevicePathTemplate\r
+                       );\r
     if (!AsciiStrCmp (Private->XenBusIo.Type, "vbd")) {\r
       TempXenBusPath->Type = XENBUS_DEVICE_PATH_TYPE_VBD;\r
     }\r
+\r
     TempXenBusPath->DeviceId = Private->XenBusIo.DeviceId;\r
-    Private->DevicePath = (XENBUS_DEVICE_PATH *)AppendDevicePathNode (\r
-                            Dev->DevicePath,\r
-                            &TempXenBusPath->Vendor.Header);\r
+    Private->DevicePath      = (XENBUS_DEVICE_PATH *)AppendDevicePathNode (\r
+                                                       Dev->DevicePath,\r
+                                                       &TempXenBusPath->Vendor.Header\r
+                                                       );\r
     FreePool (TempXenBusPath);\r
 \r
     InsertTailList (&Dev->ChildList, &Private->Link);\r
 \r
     Status = gBS->InstallMultipleProtocolInterfaces (\r
-               &Private->Handle,\r
-               &gEfiDevicePathProtocolGuid, Private->DevicePath,\r
-               &gXenBusProtocolGuid, &Private->XenBusIo,\r
-               NULL);\r
+                    &Private->Handle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    Private->DevicePath,\r
+                    &gXenBusProtocolGuid,\r
+                    &Private->XenBusIo,\r
+                    NULL\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       goto ErrorInstallProtocol;\r
     }\r
 \r
-    Status = gBS->OpenProtocol (Dev->ControllerHandle,\r
-               &gXenIoProtocolGuid,\r
-               &ChildXenIo, Dev->This->DriverBindingHandle,\r
-               Private->Handle,\r
-               EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER);\r
+    Status = gBS->OpenProtocol (\r
+                    Dev->ControllerHandle,\r
+                    &gXenIoProtocolGuid,\r
+                    &ChildXenIo,\r
+                    Dev->This->DriverBindingHandle,\r
+                    Private->Handle,\r
+                    EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "open by child controller fail (%r)\n",\r
-              Status));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "open by child controller fail (%r)\n",\r
+        Status\r
+        ));\r
       goto ErrorOpenProtocolByChild;\r
     }\r
   } else {\r
@@ -210,16 +239,19 @@ XenBusAddDevice (
 \r
 ErrorOpenProtocolByChild:\r
   gBS->UninstallMultipleProtocolInterfaces (\r
-    Private->Handle,\r
-    &gEfiDevicePathProtocolGuid, Private->DevicePath,\r
-    &gXenBusProtocolGuid, &Private->XenBusIo,\r
-    NULL);\r
+         Private->Handle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         Private->DevicePath,\r
+         &gXenBusProtocolGuid,\r
+         &Private->XenBusIo,\r
+         NULL\r
+         );\r
 ErrorInstallProtocol:\r
   RemoveEntryList (&Private->Link);\r
   FreePool (Private->DevicePath);\r
-  FreePool ((VOID *) Private->XenBusIo.Backend);\r
-  FreePool ((VOID *) Private->XenBusIo.Node);\r
-  FreePool ((VOID *) Private->XenBusIo.Type);\r
+  FreePool ((VOID *)Private->XenBusIo.Backend);\r
+  FreePool ((VOID *)Private->XenBusIo.Node);\r
+  FreePool ((VOID *)Private->XenBusIo.Type);\r
   FreePool (Private);\r
 out:\r
   return Status;\r
@@ -239,29 +271,33 @@ out:
 STATIC\r
 VOID\r
 XenBusEnumerateDeviceType (\r
-  XENBUS_DEVICE *Dev,\r
-  CONST CHAR8 *Type\r
+  XENBUS_DEVICE  *Dev,\r
+  CONST CHAR8    *Type\r
   )\r
 {\r
-  CONST CHAR8 **Directory;\r
-  UINTN Index;\r
-  UINT32 Count;\r
-  XENSTORE_STATUS Status;\r
-\r
-  Status = XenStoreListDirectory (XST_NIL,\r
-                                  "device", Type,\r
-                                  &Count, &Directory);\r
+  CONST CHAR8      **Directory;\r
+  UINTN            Index;\r
+  UINT32           Count;\r
+  XENSTORE_STATUS  Status;\r
+\r
+  Status = XenStoreListDirectory (\r
+             XST_NIL,\r
+             "device",\r
+             Type,\r
+             &Count,\r
+             &Directory\r
+             );\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     return;\r
   }\r
+\r
   for (Index = 0; Index < Count; Index++) {\r
     XenBusAddDevice (Dev, Type, Directory[Index]);\r
   }\r
 \r
-  FreePool ((VOID*)Directory);\r
+  FreePool ((VOID *)Directory);\r
 }\r
 \r
-\r
 /**\r
   Enumerate the devices on a XenBus bus and install a XenBus Protocol instance.\r
 \r
@@ -275,17 +311,21 @@ XenBusEnumerateDeviceType (
  */\r
 XENSTORE_STATUS\r
 XenBusEnumerateBus (\r
-  XENBUS_DEVICE *Dev\r
+  XENBUS_DEVICE  *Dev\r
   )\r
 {\r
-  CONST CHAR8 **Types;\r
-  UINTN Index;\r
-  UINT32 Count;\r
-  XENSTORE_STATUS Status;\r
-\r
-  Status = XenStoreListDirectory (XST_NIL,\r
-                                  "device", "",\r
-                                  &Count, &Types);\r
+  CONST CHAR8      **Types;\r
+  UINTN            Index;\r
+  UINT32           Count;\r
+  XENSTORE_STATUS  Status;\r
+\r
+  Status = XenStoreListDirectory (\r
+             XST_NIL,\r
+             "device",\r
+             "",\r
+             &Count,\r
+             &Types\r
+             );\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     return Status;\r
   }\r
@@ -294,7 +334,7 @@ XenBusEnumerateBus (
     XenBusEnumerateDeviceType (Dev, Types[Index]);\r
   }\r
 \r
-  FreePool ((VOID*)Types);\r
+  FreePool ((VOID *)Types);\r
 \r
   return XENSTORE_STATUS_SUCCESS;\r
 }\r
@@ -303,14 +343,14 @@ STATIC
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusSetState (\r
-  IN XENBUS_PROTOCOL      *This,\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN enum xenbus_state    NewState\r
+  IN XENBUS_PROTOCOL             *This,\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN enum xenbus_state           NewState\r
   )\r
 {\r
-  enum xenbus_state CurrentState;\r
-  XENSTORE_STATUS Status;\r
-  CHAR8 *Temp;\r
+  enum xenbus_state  CurrentState;\r
+  XENSTORE_STATUS    Status;\r
+  CHAR8              *Temp;\r
 \r
   DEBUG ((DEBUG_INFO, "XenBus: Set state to %d\n", NewState));\r
 \r
@@ -318,6 +358,7 @@ XenBusSetState (
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     goto Out;\r
   }\r
+\r
   CurrentState = AsciiStrDecimalToUintn (Temp);\r
   FreePool (Temp);\r
   if (CurrentState == NewState) {\r
@@ -327,17 +368,19 @@ XenBusSetState (
   do {\r
     Status = XenStoreSPrint (Transaction, This->Node, "state", "%d", NewState);\r
   } while (Status == XENSTORE_STATUS_EAGAIN);\r
+\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     DEBUG ((DEBUG_ERROR, "XenBus: failed to write new state\n"));\r
     goto Out;\r
   }\r
+\r
   DEBUG ((DEBUG_INFO, "XenBus: Set state to %d, done\n", NewState));\r
 \r
 Out:\r
   return Status;\r
 }\r
 \r
-STATIC XENBUS_PRIVATE_DATA gXenBusPrivateData = {\r
+STATIC XENBUS_PRIVATE_DATA  gXenBusPrivateData = {\r
   XENBUS_PRIVATE_DATA_SIGNATURE,    // Signature\r
   { NULL, NULL },                   // Link\r
   NULL,                             // Handle\r
index c85ca99465649e48106cb8638c9081212e11fafd..36aff470195cbe18e5714fb079fb5e9f58d140a0 100644 (file)
@@ -6,19 +6,19 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
+\r
 #ifndef _XEN_XENBUS_XENBUSB_H\r
 #define _XEN_XENBUS_XENBUSB_H\r
 \r
 #include "XenBusDxe.h"\r
 \r
-#define XENBUS_DEVICE_PATH_TYPE_VBD 0x1\r
+#define XENBUS_DEVICE_PATH_TYPE_VBD  0x1\r
 struct _XENBUS_DEVICE_PATH {\r
-  VENDOR_DEVICE_PATH  Vendor;\r
-  UINT8               Type;\r
-  UINT16              DeviceId;\r
+  VENDOR_DEVICE_PATH    Vendor;\r
+  UINT8                 Type;\r
+  UINT16                DeviceId;\r
 };\r
 \r
-\r
 /**\r
   Perform XenBus bus enumeration and install protocol for children.\r
 \r
@@ -32,7 +32,7 @@ struct _XENBUS_DEVICE_PATH {
 **/\r
 XENSTORE_STATUS\r
 XenBusEnumerateBus (\r
-  XENBUS_DEVICE *Dev\r
+  XENBUS_DEVICE  *Dev\r
   );\r
 \r
 #endif /* _XEN_XENBUS_XENBUSB_H */\r
index 1f5628ad83426ffe67ad5bc4c16794ea44a6ac8b..132f43a72b5a13001e6a05c51064f40263e0b1d5 100644 (file)
@@ -32,7 +32,7 @@
 ///\r
 /// Driver Binding Protocol instance\r
 ///\r
-EFI_DRIVER_BINDING_PROTOCOL gXenBusDxeDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gXenBusDxeDriverBinding = {\r
   XenBusDxeDriverBindingSupported,\r
   XenBusDxeDriverBindingStart,\r
   XenBusDxeDriverBindingStop,\r
@@ -41,9 +41,8 @@ EFI_DRIVER_BINDING_PROTOCOL gXenBusDxeDriverBinding = {
   NULL\r
 };\r
 \r
-\r
 STATIC EFI_LOCK       mMyDeviceLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_CALLBACK);\r
-STATIC XENBUS_DEVICE *mMyDevice = NULL;\r
+STATIC XENBUS_DEVICE  *mMyDevice    = NULL;\r
 \r
 /**\r
   Map the shared_info_t page into memory.\r
@@ -58,16 +57,16 @@ STATIC XENBUS_DEVICE *mMyDevice = NULL;
 STATIC\r
 EFI_STATUS\r
 XenGetSharedInfoPage (\r
-  IN OUT XENBUS_DEVICE *Dev\r
+  IN OUT XENBUS_DEVICE  *Dev\r
   )\r
 {\r
-  xen_add_to_physmap_t Parameter;\r
+  xen_add_to_physmap_t  Parameter;\r
 \r
   ASSERT (Dev->SharedInfo == NULL);\r
 \r
   Parameter.domid = DOMID_SELF;\r
   Parameter.space = XENMAPSPACE_shared_info;\r
-  Parameter.idx = 0;\r
+  Parameter.idx   = 0;\r
 \r
   //\r
   // using reserved page because the page is not released when Linux is\r
@@ -75,7 +74,7 @@ XenGetSharedInfoPage (
   // page, and fail because it have no right to do so (segv).\r
   //\r
   Dev->SharedInfo = AllocateReservedPages (1);\r
-  Parameter.gpfn = (UINTN) Dev->SharedInfo >> EFI_PAGE_SHIFT;\r
+  Parameter.gpfn  = (UINTN)Dev->SharedInfo >> EFI_PAGE_SHIFT;\r
   if (XenHypercallMemoryOp (XENMEM_add_to_physmap, &Parameter) != 0) {\r
     FreePages (Dev->SharedInfo, 1);\r
     Dev->SharedInfo = NULL;\r
@@ -132,15 +131,17 @@ XenBusDxeUnload (
   //\r
   FreePool (HandleBuffer);\r
 \r
-\r
   //\r
   // Uninstall protocols installed in the driver entry point\r
   //\r
   Status = gBS->UninstallMultipleProtocolInterfaces (\r
                   ImageHandle,\r
-                  &gEfiDriverBindingProtocolGuid, &gXenBusDxeDriverBinding,\r
-                  &gEfiComponentNameProtocolGuid,  &gXenBusDxeComponentName,\r
-                  &gEfiComponentName2ProtocolGuid, &gXenBusDxeComponentName2,\r
+                  &gEfiDriverBindingProtocolGuid,\r
+                  &gXenBusDxeDriverBinding,\r
+                  &gEfiComponentNameProtocolGuid,\r
+                  &gXenBusDxeComponentName,\r
+                  &gEfiComponentName2ProtocolGuid,\r
+                  &gXenBusDxeComponentName2,\r
                   NULL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
@@ -171,7 +172,7 @@ XenBusDxeDriverEntryPoint (
 {\r
   EFI_STATUS  Status;\r
 \r
-  if (! XenHypercallIsAvailable ()) {\r
+  if (!XenHypercallIsAvailable ()) {\r
     return EFI_ABORTED;\r
   }\r
 \r
@@ -188,11 +189,9 @@ XenBusDxeDriverEntryPoint (
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Tests to see if this driver supports a given controller. If a child device is provided,\r
   it further tests to see if this driver supports creating a handle for the specified child device.\r
@@ -229,24 +228,28 @@ XenBusDxeDriverBindingSupported (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  XENIO_PROTOCOL      *XenIo;\r
+  EFI_STATUS      Status;\r
+  XENIO_PROTOCOL  *XenIo;\r
 \r
   Status = gBS->OpenProtocol (\r
-                     ControllerHandle,\r
-                     &gXenIoProtocolGuid,\r
-                     (VOID **)&XenIo,\r
-                     This->DriverBindingHandle,\r
-                     ControllerHandle,\r
-                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
-                     );\r
+                  ControllerHandle,\r
+                  &gXenIoProtocolGuid,\r
+                  (VOID **)&XenIo,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
 \r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  gBS->CloseProtocol (ControllerHandle, &gXenIoProtocolGuid,\r
-         This->DriverBindingHandle, ControllerHandle);\r
+  gBS->CloseProtocol (\r
+         ControllerHandle,\r
+         &gXenIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
 \r
   return Status;\r
 }\r
@@ -254,14 +257,17 @@ XenBusDxeDriverBindingSupported (
 VOID\r
 EFIAPI\r
 NotifyExitBoot (\r
-  IN EFI_EVENT Event,\r
-  IN VOID *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  XENBUS_DEVICE *Dev = Context;\r
+  XENBUS_DEVICE  *Dev = Context;\r
 \r
-  gBS->DisconnectController(Dev->ControllerHandle,\r
-                            Dev->This->DriverBindingHandle, NULL);\r
+  gBS->DisconnectController (\r
+         Dev->ControllerHandle,\r
+         Dev->This->DriverBindingHandle,\r
+         NULL\r
+         );\r
 }\r
 \r
 /**\r
@@ -309,19 +315,19 @@ XenBusDxeDriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  XENBUS_DEVICE *Dev;\r
-  XENIO_PROTOCOL *XenIo;\r
-  EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+  EFI_STATUS                Status;\r
+  XENBUS_DEVICE             *Dev;\r
+  XENIO_PROTOCOL            *XenIo;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r
   Status = gBS->OpenProtocol (\r
-                     ControllerHandle,\r
-                     &gXenIoProtocolGuid,\r
-                     (VOID**)&XenIo,\r
-                     This->DriverBindingHandle,\r
-                     ControllerHandle,\r
-                     EFI_OPEN_PROTOCOL_BY_DRIVER\r
-                     );\r
+                  ControllerHandle,\r
+                  &gXenIoProtocolGuid,\r
+                  (VOID **)&XenIo,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
 \r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -330,7 +336,7 @@ XenBusDxeDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &DevicePath,\r
+                  (VOID **)&DevicePath,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -340,12 +346,12 @@ XenBusDxeDriverBindingStart (
     goto ErrorOpenningProtocol;\r
   }\r
 \r
-  Dev = AllocateZeroPool (sizeof (*Dev));\r
-  Dev->Signature = XENBUS_DEVICE_SIGNATURE;\r
-  Dev->This = This;\r
+  Dev                   = AllocateZeroPool (sizeof (*Dev));\r
+  Dev->Signature        = XENBUS_DEVICE_SIGNATURE;\r
+  Dev->This             = This;\r
   Dev->ControllerHandle = ControllerHandle;\r
-  Dev->XenIo = XenIo;\r
-  Dev->DevicePath = DevicePath;\r
+  Dev->XenIo            = XenIo;\r
+  Dev->DevicePath       = DevicePath;\r
   InitializeListHead (&Dev->ChildList);\r
 \r
   EfiAcquireLock (&mMyDeviceLock);\r
@@ -357,6 +363,7 @@ XenBusDxeDriverBindingStart (
     Status = EFI_ALREADY_STARTED;\r
     goto ErrorAllocated;\r
   }\r
+\r
   mMyDevice = Dev;\r
   EfiReleaseLock (&mMyDeviceLock);\r
 \r
@@ -374,21 +381,32 @@ XenBusDxeDriverBindingStart (
 \r
   XenBusEnumerateBus (Dev);\r
 \r
-  Status = gBS->CreateEvent (EVT_SIGNAL_EXIT_BOOT_SERVICES, TPL_CALLBACK,\r
-                             NotifyExitBoot,\r
-                             (VOID*) Dev,\r
-                             &Dev->ExitBootEvent);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+                  TPL_CALLBACK,\r
+                  NotifyExitBoot,\r
+                  (VOID *)Dev,\r
+                  &Dev->ExitBootEvent\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return EFI_SUCCESS;\r
 \r
 ErrorAllocated:\r
   FreePool (Dev);\r
-  gBS->CloseProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid,\r
-                      This->DriverBindingHandle, ControllerHandle);\r
+  gBS->CloseProtocol (\r
+         ControllerHandle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
 ErrorOpenningProtocol:\r
-  gBS->CloseProtocol (ControllerHandle, &gXenIoProtocolGuid,\r
-                      This->DriverBindingHandle, ControllerHandle);\r
+  gBS->CloseProtocol (\r
+         ControllerHandle,\r
+         &gXenIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
   return Status;\r
 }\r
 \r
@@ -427,44 +445,54 @@ XenBusDxeDriverBindingStop (
   IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  UINTN Index;\r
-  XENBUS_PROTOCOL *XenBusIo;\r
-  XENBUS_PRIVATE_DATA *ChildData;\r
-  EFI_STATUS Status;\r
-  XENBUS_DEVICE *Dev = mMyDevice;\r
+  UINTN                Index;\r
+  XENBUS_PROTOCOL      *XenBusIo;\r
+  XENBUS_PRIVATE_DATA  *ChildData;\r
+  EFI_STATUS           Status;\r
+  XENBUS_DEVICE        *Dev = mMyDevice;\r
 \r
   for (Index = 0; Index < NumberOfChildren; Index++) {\r
     Status = gBS->OpenProtocol (\r
-               ChildHandleBuffer[Index],\r
-               &gXenBusProtocolGuid,\r
-               (VOID **) &XenBusIo,\r
-               This->DriverBindingHandle,\r
-               ControllerHandle,\r
-               EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+                    ChildHandleBuffer[Index],\r
+                    &gXenBusProtocolGuid,\r
+                    (VOID **)&XenBusIo,\r
+                    This->DriverBindingHandle,\r
+                    ControllerHandle,\r
+                    EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "XenBusDxe: get children protocol failed: %r\n", Status));\r
       continue;\r
     }\r
+\r
     ChildData = XENBUS_PRIVATE_DATA_FROM_THIS (XenBusIo);\r
 \r
-    Status = gBS->CloseProtocol (Dev->ControllerHandle, &gXenIoProtocolGuid,\r
-                    Dev->This->DriverBindingHandle, ChildData->Handle);\r
+    Status = gBS->CloseProtocol (\r
+                    Dev->ControllerHandle,\r
+                    &gXenIoProtocolGuid,\r
+                    Dev->This->DriverBindingHandle,\r
+                    ChildData->Handle\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
-               ChildData->Handle,\r
-               &gEfiDevicePathProtocolGuid, ChildData->DevicePath,\r
-               &gXenBusProtocolGuid, &ChildData->XenBusIo,\r
-               NULL);\r
+                    ChildData->Handle,\r
+                    &gEfiDevicePathProtocolGuid,\r
+                    ChildData->DevicePath,\r
+                    &gXenBusProtocolGuid,\r
+                    &ChildData->XenBusIo,\r
+                    NULL\r
+                    );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
-    FreePool ((VOID*)ChildData->XenBusIo.Type);\r
-    FreePool ((VOID*)ChildData->XenBusIo.Node);\r
-    FreePool ((VOID*)ChildData->XenBusIo.Backend);\r
+    FreePool ((VOID *)ChildData->XenBusIo.Type);\r
+    FreePool ((VOID *)ChildData->XenBusIo.Node);\r
+    FreePool ((VOID *)ChildData->XenBusIo.Backend);\r
     FreePool (ChildData->DevicePath);\r
     RemoveEntryList (&ChildData->Link);\r
     FreePool (ChildData);\r
   }\r
+\r
   if (NumberOfChildren > 0) {\r
     return EFI_SUCCESS;\r
   }\r
@@ -473,10 +501,18 @@ XenBusDxeDriverBindingStop (
   XenStoreDeinit (Dev);\r
   XenGrantTableDeinit (Dev);\r
 \r
-  gBS->CloseProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid,\r
-         This->DriverBindingHandle, ControllerHandle);\r
-  gBS->CloseProtocol (ControllerHandle, &gXenIoProtocolGuid,\r
-         This->DriverBindingHandle, ControllerHandle);\r
+  gBS->CloseProtocol (\r
+         ControllerHandle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
+  gBS->CloseProtocol (\r
+         ControllerHandle,\r
+         &gXenIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
 \r
   mMyDevice = NULL;\r
   FreePool (Dev);\r
index b1dcc3549c77793d9f20c82b98c381ab4bc6e5f2..8b32505cb09c6a7c426ae55d48ca0c66111ef3de 100644 (file)
 #include <Library/DebugLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
-\r
 //\r
 // UEFI Driver Model Protocols\r
 //\r
 #include <Protocol/DriverBinding.h>\r
 \r
-\r
 //\r
 // Consumed Protocols\r
 //\r
 #include <Protocol/XenIo.h>\r
 \r
-\r
 //\r
 // Produced Protocols\r
 //\r
 #include <Protocol/XenBus.h>\r
 \r
-\r
 //\r
 // Driver Version\r
 //\r
 #define XENBUS_DXE_VERSION  0x00000010\r
 \r
-\r
 //\r
 // Protocol instances\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL  gXenBusDxeDriverBinding;\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gXenBusDxeDriverBinding;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL  gXenBusDxeComponentName2;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gXenBusDxeComponentName;\r
-\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gXenBusDxeComponentName;\r
 \r
 //\r
 // Include files with function prototypes\r
@@ -68,32 +62,32 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gXenBusDxeComponentName;
 //\r
 #include <IndustryStandard/Xen/xen.h>\r
 \r
-typedef struct _XENBUS_DEVICE_PATH XENBUS_DEVICE_PATH;\r
-typedef struct _XENBUS_DEVICE XENBUS_DEVICE;\r
+typedef struct _XENBUS_DEVICE_PATH  XENBUS_DEVICE_PATH;\r
+typedef struct _XENBUS_DEVICE       XENBUS_DEVICE;\r
 \r
 // Have the state of the driver.\r
-#define XENBUS_DEVICE_SIGNATURE SIGNATURE_32 ('X','B','s','t')\r
+#define XENBUS_DEVICE_SIGNATURE  SIGNATURE_32 ('X','B','s','t')\r
 struct _XENBUS_DEVICE {\r
-  UINT32                        Signature;\r
-  EFI_DRIVER_BINDING_PROTOCOL   *This;\r
-  EFI_HANDLE                    ControllerHandle;\r
-  XENIO_PROTOCOL                *XenIo;\r
-  EFI_EVENT                     ExitBootEvent;\r
-  EFI_DEVICE_PATH_PROTOCOL      *DevicePath;\r
-  LIST_ENTRY                    ChildList;\r
-\r
-  shared_info_t                 *SharedInfo;\r
+  UINT32                         Signature;\r
+  EFI_DRIVER_BINDING_PROTOCOL    *This;\r
+  EFI_HANDLE                     ControllerHandle;\r
+  XENIO_PROTOCOL                 *XenIo;\r
+  EFI_EVENT                      ExitBootEvent;\r
+  EFI_DEVICE_PATH_PROTOCOL       *DevicePath;\r
+  LIST_ENTRY                     ChildList;\r
+\r
+  shared_info_t                  *SharedInfo;\r
 };\r
 \r
 // There is one of this struct allocated for every child.\r
-#define XENBUS_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('X', 'B', 'p', 'd')\r
+#define XENBUS_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('X', 'B', 'p', 'd')\r
 typedef struct {\r
-    UINTN Signature;\r
-    LIST_ENTRY Link;\r
-    EFI_HANDLE Handle;\r
-    XENBUS_PROTOCOL XenBusIo;\r
-    XENBUS_DEVICE *Dev;\r
-    XENBUS_DEVICE_PATH *DevicePath;\r
+  UINTN                 Signature;\r
+  LIST_ENTRY            Link;\r
+  EFI_HANDLE            Handle;\r
+  XENBUS_PROTOCOL       XenBusIo;\r
+  XENBUS_DEVICE         *Dev;\r
+  XENBUS_DEVICE_PATH    *DevicePath;\r
 } XENBUS_PRIVATE_DATA;\r
 \r
 #define XENBUS_PRIVATE_DATA_FROM_THIS(a) \\r
@@ -116,13 +110,13 @@ typedef struct {
 INT32\r
 EFIAPI\r
 TestAndClearBit (\r
-  IN INT32 Bit,\r
-  IN VOID  *Address\r
+  IN INT32  Bit,\r
+  IN VOID   *Address\r
   );\r
 \r
-CHAR8*\r
+CHAR8 *\r
 AsciiStrDup (\r
-  IN CONST CHAR8Str\r
+  IN CONST CHAR8  *Str\r
   );\r
 \r
 #endif\r
index e5cca108e06b3d39223c25d108f47d1df7250daf..0241cfda489b8091bdb55a10326ba47ad25fddb6 100644 (file)
 //\r
 \r
 typedef struct {\r
-  CONST VOID  *Data;\r
-  UINT32      Len;\r
+  CONST VOID    *Data;\r
+  UINT32        Len;\r
 } WRITE_REQUEST;\r
 \r
 /* Register callback to watch subtree (node) in the XenStore. */\r
-#define XENSTORE_WATCH_SIGNATURE SIGNATURE_32 ('X','S','w','a')\r
-struct _XENSTORE_WATCH\r
-{\r
-  UINT32      Signature;\r
-  LIST_ENTRY  Link;\r
+#define XENSTORE_WATCH_SIGNATURE  SIGNATURE_32 ('X','S','w','a')\r
+struct _XENSTORE_WATCH {\r
+  UINT32        Signature;\r
+  LIST_ENTRY    Link;\r
 \r
   /* Path being watched. */\r
-  CHAR8       *Node;\r
+  CHAR8         *Node;\r
 };\r
 \r
 #define XENSTORE_WATCH_FROM_LINK(l) \\r
   CR (l, XENSTORE_WATCH, Link, XENSTORE_WATCH_SIGNATURE)\r
 \r
-\r
 /**\r
  * Structure capturing messages received from the XenStore service.\r
  */\r
-#define XENSTORE_MESSAGE_SIGNATURE SIGNATURE_32 ('X', 'S', 's', 'm')\r
+#define XENSTORE_MESSAGE_SIGNATURE  SIGNATURE_32 ('X', 'S', 's', 'm')\r
 typedef struct {\r
-  UINT32 Signature;\r
-  LIST_ENTRY Link;\r
+  UINT32                Signature;\r
+  LIST_ENTRY            Link;\r
 \r
-  struct xsd_sockmsg Header;\r
+  struct xsd_sockmsg    Header;\r
 \r
   union {\r
     /* Queued replies. */\r
     struct {\r
-      CHAR8 *Body;\r
+      CHAR8    *Body;\r
     } Reply;\r
 \r
     /* Queued watch events. */\r
     struct {\r
-      XENSTORE_WATCH *Handle;\r
-      CONST CHAR8 **Vector;\r
-      UINT32 VectorSize;\r
+      XENSTORE_WATCH    *Handle;\r
+      CONST CHAR8       **Vector;\r
+      UINT32            VectorSize;\r
     } Watch;\r
   } u;\r
 } XENSTORE_MESSAGE;\r
@@ -106,9 +104,9 @@ typedef struct {
    * Pointer to shared memory communication structures allowing us\r
    * to communicate with the XenStore service.\r
    */\r
-  struct xenstore_domain_interface *XenStore;\r
+  struct xenstore_domain_interface    *XenStore;\r
 \r
-  XENBUS_DEVICE *Dev;\r
+  XENBUS_DEVICE                       *Dev;\r
 \r
   /**\r
    * A list of replies to our requests.\r
@@ -120,42 +118,41 @@ typedef struct {
    *\r
    * /note Only one requesting context can be active at a time.\r
    */\r
-  LIST_ENTRY ReplyList;\r
+  LIST_ENTRY       ReplyList;\r
 \r
   /** Lock protecting the reply list. */\r
-  EFI_LOCK ReplyLock;\r
+  EFI_LOCK         ReplyLock;\r
 \r
   /**\r
    * List of registered watches.\r
    */\r
-  LIST_ENTRY RegisteredWatches;\r
+  LIST_ENTRY       RegisteredWatches;\r
 \r
   /** Lock protecting the registered watches list. */\r
-  EFI_LOCK RegisteredWatchesLock;\r
+  EFI_LOCK         RegisteredWatchesLock;\r
 \r
   /**\r
    * List of pending watch callback events.\r
    */\r
-  LIST_ENTRY WatchEvents;\r
+  LIST_ENTRY       WatchEvents;\r
 \r
   /** Lock protecting the watch callback list. */\r
-  EFI_LOCK WatchEventsLock;\r
+  EFI_LOCK         WatchEventsLock;\r
 \r
   /**\r
    * The event channel for communicating with the\r
    * XenStore service.\r
    */\r
-  evtchn_port_t EventChannel;\r
+  evtchn_port_t    EventChannel;\r
 \r
   /** Handle for XenStore events. */\r
-  EFI_EVENT EventChannelEvent;\r
+  EFI_EVENT        EventChannelEvent;\r
 } XENSTORE_PRIVATE;\r
 \r
 //\r
 // Global Data\r
 //\r
-static XENSTORE_PRIVATE xs;\r
-\r
+static XENSTORE_PRIVATE  xs;\r
 \r
 //\r
 // Private Utility Functions\r
@@ -174,18 +171,19 @@ static XENSTORE_PRIVATE xs;
 STATIC\r
 UINT32\r
 ExtractStrings (\r
-  IN  CONST CHAR8 *Strings,\r
-  IN  UINTN       Len,\r
-  OUT CONST CHAR8 **Dst OPTIONAL\r
+  IN  CONST CHAR8  *Strings,\r
+  IN  UINTN        Len,\r
+  OUT CONST CHAR8  **Dst OPTIONAL\r
   )\r
 {\r
-  UINT32 Num = 0;\r
-  CONST CHAR8 *Ptr;\r
+  UINT32       Num = 0;\r
+  CONST CHAR8  *Ptr;\r
 \r
   for (Ptr = Strings; Ptr < Strings + Len; Ptr += AsciiStrSize (Ptr)) {\r
     if (Dst != NULL) {\r
       *Dst++ = Ptr;\r
     }\r
+\r
     Num++;\r
   }\r
 \r
@@ -217,10 +215,10 @@ Split (
   OUT UINT32  *NumPtr\r
   )\r
 {\r
-  CONST CHAR8 **Dst;\r
+  CONST CHAR8  **Dst;\r
 \r
-  ASSERT(NumPtr != NULL);\r
-  ASSERT(Strings != NULL);\r
+  ASSERT (NumPtr != NULL);\r
+  ASSERT (Strings != NULL);\r
 \r
   /* Protect against unterminated buffers. */\r
   if (Len > 0) {\r
@@ -232,11 +230,11 @@ Split (
 \r
   /* Transfer to one big alloc for easy freeing by the caller. */\r
   Dst = AllocatePool (*NumPtr * sizeof (CHAR8 *) + Len);\r
-  CopyMem ((VOID*)&Dst[*NumPtr], Strings, Len);\r
+  CopyMem ((VOID *)&Dst[*NumPtr], Strings, Len);\r
   FreePool (Strings);\r
 \r
   /* Extract pointers to newly allocated array. */\r
-  Strings = (CHAR8 *) &Dst[*NumPtr];\r
+  Strings = (CHAR8 *)&Dst[*NumPtr];\r
   ExtractStrings (Strings, Len, Dst);\r
 \r
   return (Dst);\r
@@ -253,23 +251,26 @@ Split (
 STATIC\r
 XENSTORE_WATCH *\r
 XenStoreFindWatch (\r
-  IN CONST CHAR8 *Token\r
+  IN CONST CHAR8  *Token\r
   )\r
 {\r
-  XENSTORE_WATCH *Watch, *WantedWatch;\r
-  LIST_ENTRY *Entry;\r
+  XENSTORE_WATCH  *Watch, *WantedWatch;\r
+  LIST_ENTRY      *Entry;\r
 \r
-  WantedWatch = (VOID *) AsciiStrHexToUintn (Token);\r
+  WantedWatch = (VOID *)AsciiStrHexToUintn (Token);\r
 \r
   if (IsListEmpty (&xs.RegisteredWatches)) {\r
     return NULL;\r
   }\r
+\r
   for (Entry = GetFirstNode (&xs.RegisteredWatches);\r
        !IsNull (&xs.RegisteredWatches, Entry);\r
-       Entry = GetNextNode (&xs.RegisteredWatches, Entry)) {\r
+       Entry = GetNextNode (&xs.RegisteredWatches, Entry))\r
+  {\r
     Watch = XENSTORE_WATCH_FROM_LINK (Entry);\r
-    if (Watch == WantedWatch)\r
+    if (Watch == WantedWatch) {\r
       return Watch;\r
+    }\r
   }\r
 \r
   return NULL;\r
@@ -282,16 +283,16 @@ XenStoreFindWatch (
 \r
 CHAR8 *\r
 XenStoreJoin (\r
-  IN CONST CHAR8 *DirectoryPath,\r
-  IN CONST CHAR8 *Node\r
+  IN CONST CHAR8  *DirectoryPath,\r
+  IN CONST CHAR8  *Node\r
   )\r
 {\r
-  CHAR8 *Buf;\r
-  UINTN BufSize;\r
+  CHAR8  *Buf;\r
+  UINTN  BufSize;\r
 \r
   /* +1 for '/' and +1 for '\0' */\r
   BufSize = AsciiStrLen (DirectoryPath) + AsciiStrLen (Node) + 2;\r
-  Buf = AllocatePool (BufSize);\r
+  Buf     = AllocatePool (BufSize);\r
   ASSERT (Buf != NULL);\r
 \r
   if (Node[0] == '\0') {\r
@@ -322,8 +323,8 @@ XenStoreJoin (
 STATIC\r
 BOOLEAN\r
 XenStoreCheckIndexes (\r
-  XENSTORE_RING_IDX Cons,\r
-  XENSTORE_RING_IDX Prod\r
+  XENSTORE_RING_IDX  Cons,\r
+  XENSTORE_RING_IDX  Prod\r
   )\r
 {\r
   return ((Prod - Cons) <= XENSTORE_RING_SIZE);\r
@@ -343,17 +344,19 @@ XenStoreCheckIndexes (
 STATIC\r
 VOID *\r
 XenStoreGetOutputChunk (\r
-  IN  XENSTORE_RING_IDX Cons,\r
-  IN  XENSTORE_RING_IDX Prod,\r
-  IN  CHAR8             *Buffer,\r
-  OUT UINT32            *LenPtr\r
+  IN  XENSTORE_RING_IDX  Cons,\r
+  IN  XENSTORE_RING_IDX  Prod,\r
+  IN  CHAR8              *Buffer,\r
+  OUT UINT32             *LenPtr\r
   )\r
 {\r
-  UINT32 Len;\r
+  UINT32  Len;\r
+\r
   Len = XENSTORE_RING_SIZE - MASK_XENSTORE_IDX (Prod);\r
   if ((XENSTORE_RING_SIZE - (Prod - Cons)) < Len) {\r
     Len = XENSTORE_RING_SIZE - (Prod - Cons);\r
   }\r
+\r
   *LenPtr = Len;\r
   return (Buffer + MASK_XENSTORE_IDX (Prod));\r
 }\r
@@ -372,18 +375,19 @@ XenStoreGetOutputChunk (
 STATIC\r
 CONST VOID *\r
 XenStoreGetInputChunk (\r
-  IN  XENSTORE_RING_IDX Cons,\r
-  IN  XENSTORE_RING_IDX Prod,\r
-  IN  CONST CHAR8       *Buffer,\r
-  OUT UINT32            *LenPtr\r
+  IN  XENSTORE_RING_IDX  Cons,\r
+  IN  XENSTORE_RING_IDX  Prod,\r
+  IN  CONST CHAR8        *Buffer,\r
+  OUT UINT32             *LenPtr\r
   )\r
 {\r
-  UINT32 Len;\r
+  UINT32  Len;\r
 \r
   Len = XENSTORE_RING_SIZE - MASK_XENSTORE_IDX (Cons);\r
   if ((Prod - Cons) < Len) {\r
     Len = Prod - Cons;\r
   }\r
+\r
   *LenPtr = Len;\r
   return (Buffer + MASK_XENSTORE_IDX (Cons));\r
 }\r
@@ -401,26 +405,27 @@ XenStoreGetInputChunk (
 STATIC\r
 EFI_STATUS\r
 XenStoreWaitForEvent (\r
-  IN EFI_EVENT Event,\r
-  IN UINT64    Timeout\r
+  IN EFI_EVENT  Event,\r
+  IN UINT64     Timeout\r
   )\r
 {\r
-  UINTN Index;\r
-  EFI_STATUS Status;\r
-  EFI_EVENT TimerEvent;\r
-  EFI_EVENT WaitList[2];\r
+  UINTN       Index;\r
+  EFI_STATUS  Status;\r
+  EFI_EVENT   TimerEvent;\r
+  EFI_EVENT   WaitList[2];\r
 \r
   gBS->CreateEvent (EVT_TIMER, 0, NULL, NULL, &TimerEvent);\r
   gBS->SetTimer (TimerEvent, TimerRelative, Timeout);\r
 \r
   WaitList[0] = xs.EventChannelEvent;\r
   WaitList[1] = TimerEvent;\r
-  Status = gBS->WaitForEvent (2, WaitList, &Index);\r
+  Status      = gBS->WaitForEvent (2, WaitList, &Index);\r
   ASSERT (Status != EFI_INVALID_PARAMETER);\r
   gBS->CloseEvent (TimerEvent);\r
   if (Status == EFI_UNSUPPORTED) {\r
     return EFI_SUCCESS;\r
   }\r
+\r
   if (Index == 1) {\r
     return EFI_TIMEOUT;\r
   } else {\r
@@ -442,16 +447,16 @@ XenStoreWaitForEvent (
 STATIC\r
 XENSTORE_STATUS\r
 XenStoreWriteStore (\r
-  IN CONST VOID *DataPtr,\r
-  IN UINT32     Len\r
+  IN CONST VOID  *DataPtr,\r
+  IN UINT32      Len\r
   )\r
 {\r
-  XENSTORE_RING_IDX Cons, Prod;\r
-  CONST CHAR8 *Data = (CONST CHAR8 *)DataPtr;\r
+  XENSTORE_RING_IDX  Cons, Prod;\r
+  CONST CHAR8        *Data = (CONST CHAR8 *)DataPtr;\r
 \r
   while (Len != 0) {\r
-    void *Dest;\r
-    UINT32 Available;\r
+    void    *Dest;\r
+    UINT32  Available;\r
 \r
     Cons = xs.XenStore->req_cons;\r
     Prod = xs.XenStore->req_prod;\r
@@ -462,13 +467,16 @@ XenStoreWriteStore (
        * Note that the events from both queues are combined, so being woken\r
        * does not guarantee that data exist in the read ring.\r
        */\r
-      EFI_STATUS Status;\r
+      EFI_STATUS  Status;\r
 \r
-      Status = XenStoreWaitForEvent (xs.EventChannelEvent,\r
-                                     EFI_TIMER_PERIOD_SECONDS (1));\r
+      Status = XenStoreWaitForEvent (\r
+                 xs.EventChannelEvent,\r
+                 EFI_TIMER_PERIOD_SECONDS (1)\r
+                 );\r
       if (Status == EFI_TIMEOUT) {\r
         DEBUG ((DEBUG_WARN, "XenStore Write, waiting for a ring event.\n"));\r
       }\r
+\r
       continue;\r
     }\r
 \r
@@ -485,7 +493,7 @@ XenStoreWriteStore (
 \r
     CopyMem (Dest, Data, Available);\r
     Data += Available;\r
-    Len -= Available;\r
+    Len  -= Available;\r
 \r
     /*\r
      * The store to the producer index, which indicates\r
@@ -521,16 +529,16 @@ XenStoreWriteStore (
 STATIC\r
 XENSTORE_STATUS\r
 XenStoreReadStore (\r
-  OUT VOID *DataPtr,\r
-  IN  UINT32 Len\r
+  OUT VOID    *DataPtr,\r
+  IN  UINT32  Len\r
   )\r
 {\r
-  XENSTORE_RING_IDX Cons, Prod;\r
-  CHAR8 *Data = (CHAR8 *) DataPtr;\r
+  XENSTORE_RING_IDX  Cons, Prod;\r
+  CHAR8              *Data = (CHAR8 *)DataPtr;\r
 \r
   while (Len != 0) {\r
-    UINT32 Available;\r
-    CONST CHAR8 *Src;\r
+    UINT32       Available;\r
+    CONST CHAR8  *Src;\r
 \r
     Cons = xs.XenStore->rsp_cons;\r
     Prod = xs.XenStore->rsp_prod;\r
@@ -541,13 +549,16 @@ XenStoreReadStore (
        * Note that the events from both queues are combined, so being woken\r
        * does not guarantee that data exist in the read ring.\r
        */\r
-      EFI_STATUS Status;\r
+      EFI_STATUS  Status;\r
 \r
-      Status = XenStoreWaitForEvent (xs.EventChannelEvent,\r
-                                     EFI_TIMER_PERIOD_SECONDS (1));\r
+      Status = XenStoreWaitForEvent (\r
+                 xs.EventChannelEvent,\r
+                 EFI_TIMER_PERIOD_SECONDS (1)\r
+                 );\r
       if (Status == EFI_TIMEOUT) {\r
         DEBUG ((DEBUG_WARN, "XenStore Read, waiting for a ring event.\n"));\r
       }\r
+\r
       continue;\r
     }\r
 \r
@@ -570,7 +581,7 @@ XenStoreReadStore (
 \r
     CopyMem (Data, Src, Available);\r
     Data += Available;\r
-    Len -= Available;\r
+    Len  -= Available;\r
 \r
     /*\r
      * Insure that the producer of this ring does not see\r
@@ -608,20 +619,20 @@ XenStoreProcessMessage (
   VOID\r
   )\r
 {\r
-  XENSTORE_MESSAGE *Message;\r
-  CHAR8 *Body;\r
-  XENSTORE_STATUS Status;\r
+  XENSTORE_MESSAGE  *Message;\r
+  CHAR8             *Body;\r
+  XENSTORE_STATUS   Status;\r
 \r
-  Message = AllocateZeroPool (sizeof (XENSTORE_MESSAGE));\r
+  Message            = AllocateZeroPool (sizeof (XENSTORE_MESSAGE));\r
   Message->Signature = XENSTORE_MESSAGE_SIGNATURE;\r
-  Status = XenStoreReadStore (&Message->Header, sizeof (Message->Header));\r
+  Status             = XenStoreReadStore (&Message->Header, sizeof (Message->Header));\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     FreePool (Message);\r
     DEBUG ((DEBUG_ERROR, "XenStore: Error read store (%d)\n", Status));\r
     return Status;\r
   }\r
 \r
-  Body = AllocatePool (Message->Header.len + 1);\r
+  Body   = AllocatePool (Message->Header.len + 1);\r
   Status = XenStoreReadStore (Body, Message->Header.len);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     FreePool (Body);\r
@@ -629,27 +640,38 @@ XenStoreProcessMessage (
     DEBUG ((DEBUG_ERROR, "XenStore: Error read store (%d)\n", Status));\r
     return Status;\r
   }\r
+\r
   Body[Message->Header.len] = '\0';\r
 \r
   if (Message->Header.type == XS_WATCH_EVENT) {\r
-    Message->u.Watch.Vector = Split(Body, Message->Header.len,\r
-                                    &Message->u.Watch.VectorSize);\r
+    Message->u.Watch.Vector = Split (\r
+                                Body,\r
+                                Message->Header.len,\r
+                                &Message->u.Watch.VectorSize\r
+                                );\r
 \r
     EfiAcquireLock (&xs.RegisteredWatchesLock);\r
     Message->u.Watch.Handle =\r
       XenStoreFindWatch (Message->u.Watch.Vector[XS_WATCH_TOKEN]);\r
-    DEBUG ((DEBUG_INFO, "XenStore: Watch event %a\n",\r
-            Message->u.Watch.Vector[XS_WATCH_TOKEN]));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "XenStore: Watch event %a\n",\r
+      Message->u.Watch.Vector[XS_WATCH_TOKEN]\r
+      ));\r
     if (Message->u.Watch.Handle != NULL) {\r
       EfiAcquireLock (&xs.WatchEventsLock);\r
       InsertHeadList (&xs.WatchEvents, &Message->Link);\r
       EfiReleaseLock (&xs.WatchEventsLock);\r
     } else {\r
-      DEBUG ((DEBUG_WARN, "XenStore: Watch handle %a not found\n",\r
-              Message->u.Watch.Vector[XS_WATCH_TOKEN]));\r
-      FreePool((VOID*)Message->u.Watch.Vector);\r
-      FreePool(Message);\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "XenStore: Watch handle %a not found\n",\r
+        Message->u.Watch.Vector[XS_WATCH_TOKEN]\r
+        ));\r
+      FreePool ((VOID *)Message->u.Watch.Vector);\r
+      FreePool (Message);\r
     }\r
+\r
     EfiReleaseLock (&xs.RegisteredWatchesLock);\r
   } else {\r
     Message->u.Reply.Body = Body;\r
@@ -676,41 +698,42 @@ XenStoreProcessMessage (
 \r
 **/\r
 typedef struct {\r
-  XENSTORE_STATUS Status;\r
-  CONST CHAR8 *ErrorStr;\r
+  XENSTORE_STATUS    Status;\r
+  CONST CHAR8        *ErrorStr;\r
 } XenStoreErrors;\r
 \r
-static XenStoreErrors gXenStoreErrors[] = {\r
-  { XENSTORE_STATUS_EINVAL, "EINVAL" },\r
-  { XENSTORE_STATUS_EACCES, "EACCES" },\r
-  { XENSTORE_STATUS_EEXIST, "EEXIST" },\r
-  { XENSTORE_STATUS_EISDIR, "EISDIR" },\r
-  { XENSTORE_STATUS_ENOENT, "ENOENT" },\r
-  { XENSTORE_STATUS_ENOMEM, "ENOMEM" },\r
-  { XENSTORE_STATUS_ENOSPC, "ENOSPC" },\r
-  { XENSTORE_STATUS_EIO, "EIO" },\r
+static XenStoreErrors  gXenStoreErrors[] = {\r
+  { XENSTORE_STATUS_EINVAL,    "EINVAL"    },\r
+  { XENSTORE_STATUS_EACCES,    "EACCES"    },\r
+  { XENSTORE_STATUS_EEXIST,    "EEXIST"    },\r
+  { XENSTORE_STATUS_EISDIR,    "EISDIR"    },\r
+  { XENSTORE_STATUS_ENOENT,    "ENOENT"    },\r
+  { XENSTORE_STATUS_ENOMEM,    "ENOMEM"    },\r
+  { XENSTORE_STATUS_ENOSPC,    "ENOSPC"    },\r
+  { XENSTORE_STATUS_EIO,       "EIO"       },\r
   { XENSTORE_STATUS_ENOTEMPTY, "ENOTEMPTY" },\r
-  { XENSTORE_STATUS_ENOSYS, "ENOSYS" },\r
-  { XENSTORE_STATUS_EROFS, "EROFS" },\r
-  { XENSTORE_STATUS_EBUSY, "EBUSY" },\r
-  { XENSTORE_STATUS_EAGAIN, "EAGAIN" },\r
-  { XENSTORE_STATUS_EISCONN, "EISCONN" },\r
-  { XENSTORE_STATUS_E2BIG, "E2BIG" }\r
+  { XENSTORE_STATUS_ENOSYS,    "ENOSYS"    },\r
+  { XENSTORE_STATUS_EROFS,     "EROFS"     },\r
+  { XENSTORE_STATUS_EBUSY,     "EBUSY"     },\r
+  { XENSTORE_STATUS_EAGAIN,    "EAGAIN"    },\r
+  { XENSTORE_STATUS_EISCONN,   "EISCONN"   },\r
+  { XENSTORE_STATUS_E2BIG,     "E2BIG"     }\r
 };\r
 \r
 STATIC\r
 XENSTORE_STATUS\r
 XenStoreGetError (\r
-  CONST CHAR8 *ErrorStr\r
+  CONST CHAR8  *ErrorStr\r
   )\r
 {\r
-  UINT32 Index;\r
+  UINT32  Index;\r
 \r
-  for (Index = 0; Index < ARRAY_SIZE(gXenStoreErrors); Index++) {\r
+  for (Index = 0; Index < ARRAY_SIZE (gXenStoreErrors); Index++) {\r
     if (!AsciiStrCmp (ErrorStr, gXenStoreErrors[Index].ErrorStr)) {\r
       return gXenStoreErrors[Index].Status;\r
     }\r
   }\r
+\r
   DEBUG ((DEBUG_WARN, "XenStore gave unknown error %a\n", ErrorStr));\r
   return XENSTORE_STATUS_EINVAL;\r
 }\r
@@ -725,26 +748,30 @@ XenStoreGetError (
 STATIC\r
 XENSTORE_STATUS\r
 XenStoreReadReply (\r
-  OUT enum xsd_sockmsg_type *TypePtr,\r
-  OUT UINT32 *LenPtr OPTIONAL,\r
-  OUT VOID **Result\r
+  OUT enum xsd_sockmsg_type  *TypePtr,\r
+  OUT UINT32                 *LenPtr OPTIONAL,\r
+  OUT VOID                   **Result\r
   )\r
 {\r
-  XENSTORE_MESSAGE *Message;\r
-  LIST_ENTRY *Entry;\r
-  CHAR8 *Body;\r
+  XENSTORE_MESSAGE  *Message;\r
+  LIST_ENTRY        *Entry;\r
+  CHAR8             *Body;\r
 \r
   while (IsListEmpty (&xs.ReplyList)) {\r
-    XENSTORE_STATUS Status;\r
+    XENSTORE_STATUS  Status;\r
     Status = XenStoreProcessMessage ();\r
-    if (Status != XENSTORE_STATUS_SUCCESS && Status != XENSTORE_STATUS_EAGAIN) {\r
-      DEBUG ((DEBUG_ERROR, "XenStore, error while reading the ring (%d).",\r
-              Status));\r
+    if ((Status != XENSTORE_STATUS_SUCCESS) && (Status != XENSTORE_STATUS_EAGAIN)) {\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "XenStore, error while reading the ring (%d).",\r
+        Status\r
+        ));\r
       return Status;\r
     }\r
   }\r
+\r
   EfiAcquireLock (&xs.ReplyLock);\r
-  Entry = GetFirstNode (&xs.ReplyList);\r
+  Entry   = GetFirstNode (&xs.ReplyList);\r
   Message = XENSTORE_MESSAGE_FROM_LINK (Entry);\r
   RemoveEntryList (Entry);\r
   EfiReleaseLock (&xs.ReplyLock);\r
@@ -753,6 +780,7 @@ XenStoreReadReply (
   if (LenPtr != NULL) {\r
     *LenPtr = Message->Header.len;\r
   }\r
+\r
   Body = Message->u.Reply.Body;\r
 \r
   FreePool (Message);\r
@@ -776,27 +804,28 @@ XenStoreReadReply (
 STATIC\r
 XENSTORE_STATUS\r
 XenStoreTalkv (\r
-  IN  CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN  enum xsd_sockmsg_type   RequestType,\r
-  IN  CONST WRITE_REQUEST     *WriteRequest,\r
-  IN  UINT32                  NumRequests,\r
-  OUT UINT32                  *LenPtr OPTIONAL,\r
-  OUT VOID                    **ResultPtr OPTIONAL\r
+  IN  CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN  enum xsd_sockmsg_type       RequestType,\r
+  IN  CONST WRITE_REQUEST         *WriteRequest,\r
+  IN  UINT32                      NumRequests,\r
+  OUT UINT32                      *LenPtr OPTIONAL,\r
+  OUT VOID                        **ResultPtr OPTIONAL\r
   )\r
 {\r
-  struct xsd_sockmsg Message;\r
-  void *Return = NULL;\r
-  UINT32 Index;\r
-  XENSTORE_STATUS Status;\r
+  struct xsd_sockmsg  Message;\r
+  void                *Return = NULL;\r
+  UINT32              Index;\r
+  XENSTORE_STATUS     Status;\r
 \r
   if (Transaction == XST_NIL) {\r
     Message.tx_id = 0;\r
   } else {\r
     Message.tx_id = Transaction->Id;\r
   }\r
+\r
   Message.req_id = 0;\r
-  Message.type = RequestType;\r
-  Message.len = 0;\r
+  Message.type   = RequestType;\r
+  Message.len    = 0;\r
   for (Index = 0; Index < NumRequests; Index++) {\r
     Message.len += WriteRequest[Index].Len;\r
   }\r
@@ -859,20 +888,26 @@ Error:
 STATIC\r
 XENSTORE_STATUS\r
 XenStoreSingle (\r
-  IN  CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN  enum xsd_sockmsg_type   RequestType,\r
-  IN  CONST CHAR8             *Body,\r
-  OUT UINT32                  *LenPtr OPTIONAL,\r
-  OUT VOID                    **Result OPTIONAL\r
+  IN  CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN  enum xsd_sockmsg_type       RequestType,\r
+  IN  CONST CHAR8                 *Body,\r
+  OUT UINT32                      *LenPtr OPTIONAL,\r
+  OUT VOID                        **Result OPTIONAL\r
   )\r
 {\r
-  WRITE_REQUEST WriteRequest;\r
-\r
-  WriteRequest.Data = (VOID *) Body;\r
-  WriteRequest.Len = (UINT32)AsciiStrSize (Body);\r
-\r
-  return XenStoreTalkv (Transaction, RequestType, &WriteRequest, 1,\r
-                        LenPtr, Result);\r
+  WRITE_REQUEST  WriteRequest;\r
+\r
+  WriteRequest.Data = (VOID *)Body;\r
+  WriteRequest.Len  = (UINT32)AsciiStrSize (Body);\r
+\r
+  return XenStoreTalkv (\r
+           Transaction,\r
+           RequestType,\r
+           &WriteRequest,\r
+           1,\r
+           LenPtr,\r
+           Result\r
+           );\r
 }\r
 \r
 //\r
@@ -891,16 +926,16 @@ XenStoreSingle (
 STATIC\r
 XENSTORE_STATUS\r
 XenStoreWatch (\r
-  CONST CHAR8 *Path,\r
-  CONST CHAR8 *Token\r
+  CONST CHAR8  *Path,\r
+  CONST CHAR8  *Token\r
   )\r
 {\r
-  WRITE_REQUEST WriteRequest[2];\r
+  WRITE_REQUEST  WriteRequest[2];\r
 \r
-  WriteRequest[0].Data = (VOID *) Path;\r
-  WriteRequest[0].Len = (UINT32)AsciiStrSize (Path);\r
-  WriteRequest[1].Data = (VOID *) Token;\r
-  WriteRequest[1].Len = (UINT32)AsciiStrSize (Token);\r
+  WriteRequest[0].Data = (VOID *)Path;\r
+  WriteRequest[0].Len  = (UINT32)AsciiStrSize (Path);\r
+  WriteRequest[1].Data = (VOID *)Token;\r
+  WriteRequest[1].Len  = (UINT32)AsciiStrSize (Token);\r
 \r
   return XenStoreTalkv (XST_NIL, XS_WATCH, WriteRequest, 2, NULL, NULL);\r
 }\r
@@ -917,16 +952,16 @@ XenStoreWatch (
 STATIC\r
 XENSTORE_STATUS\r
 XenStoreUnwatch (\r
-  CONST CHAR8 *Path,\r
-  CONST CHAR8 *Token\r
+  CONST CHAR8  *Path,\r
+  CONST CHAR8  *Token\r
   )\r
 {\r
-  WRITE_REQUEST WriteRequest[2];\r
+  WRITE_REQUEST  WriteRequest[2];\r
 \r
-  WriteRequest[0].Data = (VOID *) Path;\r
-  WriteRequest[0].Len = (UINT32)AsciiStrSize (Path);\r
-  WriteRequest[1].Data = (VOID *) Token;\r
-  WriteRequest[1].Len = (UINT32)AsciiStrSize (Token);\r
+  WriteRequest[0].Data = (VOID *)Path;\r
+  WriteRequest[0].Len  = (UINT32)AsciiStrSize (Path);\r
+  WriteRequest[1].Data = (VOID *)Token;\r
+  WriteRequest[1].Len  = (UINT32)AsciiStrSize (Token);\r
 \r
   return XenStoreTalkv (XST_NIL, XS_UNWATCH, WriteRequest, 2, NULL, NULL);\r
 }\r
@@ -934,38 +969,42 @@ XenStoreUnwatch (
 STATIC\r
 XENSTORE_STATUS\r
 XenStoreWaitWatch (\r
-  VOID *Token\r
+  VOID  *Token\r
   )\r
 {\r
-  XENSTORE_MESSAGE *Message;\r
-  LIST_ENTRY *Entry = NULL;\r
-  LIST_ENTRY *Last = NULL;\r
-  XENSTORE_STATUS Status;\r
+  XENSTORE_MESSAGE  *Message;\r
+  LIST_ENTRY        *Entry = NULL;\r
+  LIST_ENTRY        *Last  = NULL;\r
+  XENSTORE_STATUS   Status;\r
 \r
   while (TRUE) {\r
     EfiAcquireLock (&xs.WatchEventsLock);\r
     if (IsListEmpty (&xs.WatchEvents) ||\r
-        Last == GetFirstNode (&xs.WatchEvents)) {\r
+        (Last == GetFirstNode (&xs.WatchEvents)))\r
+    {\r
       EfiReleaseLock (&xs.WatchEventsLock);\r
       Status = XenStoreProcessMessage ();\r
-      if (Status != XENSTORE_STATUS_SUCCESS && Status != XENSTORE_STATUS_EAGAIN) {\r
+      if ((Status != XENSTORE_STATUS_SUCCESS) && (Status != XENSTORE_STATUS_EAGAIN)) {\r
         return Status;\r
       }\r
+\r
       continue;\r
     }\r
 \r
     for (Entry = GetFirstNode (&xs.WatchEvents);\r
          Entry != Last && !IsNull (&xs.WatchEvents, Entry);\r
-         Entry = GetNextNode (&xs.WatchEvents, Entry)) {\r
+         Entry = GetNextNode (&xs.WatchEvents, Entry))\r
+    {\r
       Message = XENSTORE_MESSAGE_FROM_LINK (Entry);\r
       if (Message->u.Watch.Handle == Token) {\r
         RemoveEntryList (Entry);\r
         EfiReleaseLock (&xs.WatchEventsLock);\r
-        FreePool((VOID*)Message->u.Watch.Vector);\r
-        FreePool(Message);\r
+        FreePool ((VOID *)Message->u.Watch.Vector);\r
+        FreePool (Message);\r
         return XENSTORE_STATUS_SUCCESS;\r
       }\r
     }\r
+\r
     Last = GetFirstNode (&xs.WatchEvents);\r
     EfiReleaseLock (&xs.WatchEventsLock);\r
   }\r
@@ -974,11 +1013,12 @@ XenStoreWaitWatch (
 VOID\r
 EFIAPI\r
 NotifyEventChannelCheckForEvent (\r
-  IN EFI_EVENT Event,\r
-  IN VOID *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  XENSTORE_PRIVATE *xsp;\r
+  XENSTORE_PRIVATE  *xsp;\r
+\r
   xsp = (XENSTORE_PRIVATE *)Context;\r
   if (TestAndClearBit (xsp->EventChannel, xsp->Dev->SharedInfo->evtchn_pending)) {\r
     gBS->SignalEvent (Event);\r
@@ -993,30 +1033,42 @@ NotifyEventChannelCheckForEvent (
 STATIC\r
 EFI_STATUS\r
 XenStoreInitComms (\r
-  XENSTORE_PRIVATE *xsp\r
+  XENSTORE_PRIVATE  *xsp\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  EFI_EVENT TimerEvent;\r
-  struct xenstore_domain_interface *XenStore = xsp->XenStore;\r
+  EFI_STATUS                        Status;\r
+  EFI_EVENT                         TimerEvent;\r
+  struct xenstore_domain_interface  *XenStore = xsp->XenStore;\r
 \r
   Status = gBS->CreateEvent (EVT_TIMER, 0, NULL, NULL, &TimerEvent);\r
-  Status = gBS->SetTimer (TimerEvent, TimerRelative,\r
-                          EFI_TIMER_PERIOD_SECONDS (5));\r
+  Status = gBS->SetTimer (\r
+                  TimerEvent,\r
+                  TimerRelative,\r
+                  EFI_TIMER_PERIOD_SECONDS (5)\r
+                  );\r
   while (XenStore->rsp_prod != XenStore->rsp_cons) {\r
     Status = gBS->CheckEvent (TimerEvent);\r
     if (!EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_WARN, "XENSTORE response ring is not quiescent "\r
-              "(%08x:%08x): fixing up\n",\r
-              XenStore->rsp_cons, XenStore->rsp_prod));\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "XENSTORE response ring is not quiescent "\r
+        "(%08x:%08x): fixing up\n",\r
+        XenStore->rsp_cons,\r
+        XenStore->rsp_prod\r
+        ));\r
       XenStore->rsp_cons = XenStore->rsp_prod;\r
     }\r
   }\r
+\r
   gBS->CloseEvent (TimerEvent);\r
 \r
-  Status = gBS->CreateEvent (EVT_NOTIFY_WAIT, TPL_NOTIFY,\r
-                             NotifyEventChannelCheckForEvent, xsp,\r
-                             &xsp->EventChannelEvent);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_NOTIFY_WAIT,\r
+                  TPL_NOTIFY,\r
+                  NotifyEventChannelCheckForEvent,\r
+                  xsp,\r
+                  &xsp->EventChannelEvent\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r
@@ -1031,23 +1083,28 @@ XenStoreInitComms (
 **/\r
 EFI_STATUS\r
 XenStoreInit (\r
-  XENBUS_DEVICE *Dev\r
+  XENBUS_DEVICE  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
+\r
   /**\r
    * The HVM guest pseudo-physical frame number.  This is Xen's mapping\r
    * of the true machine frame number into our "physical address space".\r
    */\r
-  UINTN XenStoreGpfn;\r
+  UINTN  XenStoreGpfn;\r
 \r
   xs.Dev = Dev;\r
 \r
   xs.EventChannel = (evtchn_port_t)XenHypercallHvmGetParam (HVM_PARAM_STORE_EVTCHN);\r
-  XenStoreGpfn = (UINTN)XenHypercallHvmGetParam (HVM_PARAM_STORE_PFN);\r
-  xs.XenStore = (VOID *) (XenStoreGpfn << EFI_PAGE_SHIFT);\r
-  DEBUG ((DEBUG_INFO, "XenBusInit: XenBus rings @%p, event channel %x\n",\r
-          xs.XenStore, xs.EventChannel));\r
+  XenStoreGpfn    = (UINTN)XenHypercallHvmGetParam (HVM_PARAM_STORE_PFN);\r
+  xs.XenStore     = (VOID *)(XenStoreGpfn << EFI_PAGE_SHIFT);\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "XenBusInit: XenBus rings @%p, event channel %x\n",\r
+    xs.XenStore,\r
+    xs.EventChannel\r
+    ));\r
 \r
   InitializeListHead (&xs.ReplyList);\r
   InitializeListHead (&xs.WatchEvents);\r
@@ -1065,7 +1122,7 @@ XenStoreInit (
 \r
 VOID\r
 XenStoreDeinit (\r
-  IN XENBUS_DEVICE *Dev\r
+  IN XENBUS_DEVICE  *Dev\r
   )\r
 {\r
   //\r
@@ -1074,8 +1131,8 @@ XenStoreDeinit (
   // it is stopped.\r
   //\r
   if (!IsListEmpty (&xs.RegisteredWatches)) {\r
-    XENSTORE_WATCH *Watch;\r
-    LIST_ENTRY *Entry;\r
+    XENSTORE_WATCH  *Watch;\r
+    LIST_ENTRY      *Entry;\r
     DEBUG ((DEBUG_WARN, "XenStore: RegisteredWatches is not empty, cleaning up..."));\r
     Entry = GetFirstNode (&xs.RegisteredWatches);\r
     while (!IsNull (&xs.RegisteredWatches, Entry)) {\r
@@ -1091,25 +1148,25 @@ XenStoreDeinit (
   // having cleanup the list RegisteredWatches.\r
   //\r
   if (!IsListEmpty (&xs.WatchEvents)) {\r
-    LIST_ENTRY *Entry;\r
+    LIST_ENTRY  *Entry;\r
     DEBUG ((DEBUG_WARN, "XenStore: WatchEvents is not empty, cleaning up..."));\r
     Entry = GetFirstNode (&xs.WatchEvents);\r
     while (!IsNull (&xs.WatchEvents, Entry)) {\r
-      XENSTORE_MESSAGE *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);\r
+      XENSTORE_MESSAGE  *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);\r
       Entry = GetNextNode (&xs.WatchEvents, Entry);\r
       RemoveEntryList (&Message->Link);\r
-      FreePool ((VOID*)Message->u.Watch.Vector);\r
+      FreePool ((VOID *)Message->u.Watch.Vector);\r
       FreePool (Message);\r
     }\r
   }\r
 \r
   if (!IsListEmpty (&xs.ReplyList)) {\r
-    XENSTORE_MESSAGE *Message;\r
-    LIST_ENTRY *Entry;\r
+    XENSTORE_MESSAGE  *Message;\r
+    LIST_ENTRY        *Entry;\r
     Entry = GetFirstNode (&xs.ReplyList);\r
     while (!IsNull (&xs.ReplyList, Entry)) {\r
       Message = XENSTORE_MESSAGE_FROM_LINK (Entry);\r
-      Entry = GetNextNode (&xs.ReplyList, Entry);\r
+      Entry   = GetNextNode (&xs.ReplyList, Entry);\r
       RemoveEntryList (&Message->Link);\r
       FreePool (Message->u.Reply.Body);\r
       FreePool (Message);\r
@@ -1121,7 +1178,7 @@ XenStoreDeinit (
   if (xs.XenStore->server_features & XENSTORE_SERVER_FEATURE_RECONNECTION) {\r
     xs.XenStore->connection = XENSTORE_RECONNECT;\r
     XenEventChannelNotify (xs.Dev, xs.EventChannel);\r
-    while (*(volatile UINT32*)&xs.XenStore->connection == XENSTORE_RECONNECT) {\r
+    while (*(volatile UINT32 *)&xs.XenStore->connection == XENSTORE_RECONNECT) {\r
       XenStoreWaitForEvent (xs.EventChannelEvent, EFI_TIMER_PERIOD_MILLISECONDS (100));\r
     }\r
   } else {\r
@@ -1134,6 +1191,7 @@ XenStoreDeinit (
     xs.XenStore->req_cons = xs.XenStore->req_prod = 0;\r
     xs.XenStore->rsp_cons = xs.XenStore->rsp_prod = 0;\r
   }\r
+\r
   xs.XenStore = NULL;\r
 }\r
 \r
@@ -1144,21 +1202,26 @@ XenStoreDeinit (
 \r
 XENSTORE_STATUS\r
 XenStoreListDirectory (\r
-  IN  CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN  CONST CHAR8           *DirectoryPath,\r
-  IN  CONST CHAR8           *Node,\r
-  OUT UINT32                *DirectoryCountPtr,\r
-  OUT CONST CHAR8           ***DirectoryListPtr\r
+  IN  CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN  CONST CHAR8                 *DirectoryPath,\r
+  IN  CONST CHAR8                 *Node,\r
+  OUT UINT32                      *DirectoryCountPtr,\r
+  OUT CONST CHAR8                 ***DirectoryListPtr\r
   )\r
 {\r
-  CHAR8 *Path;\r
-  CHAR8 *TempStr;\r
-  UINT32 Len = 0;\r
-  XENSTORE_STATUS Status;\r
-\r
-  Path = XenStoreJoin (DirectoryPath, Node);\r
-  Status = XenStoreSingle (Transaction, XS_DIRECTORY, Path, &Len,\r
-                           (VOID **) &TempStr);\r
+  CHAR8            *Path;\r
+  CHAR8            *TempStr;\r
+  UINT32           Len = 0;\r
+  XENSTORE_STATUS  Status;\r
+\r
+  Path   = XenStoreJoin (DirectoryPath, Node);\r
+  Status = XenStoreSingle (\r
+             Transaction,\r
+             XS_DIRECTORY,\r
+             Path,\r
+             &Len,\r
+             (VOID **)&TempStr\r
+             );\r
   FreePool (Path);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     return Status;\r
@@ -1171,38 +1234,44 @@ XenStoreListDirectory (
 \r
 BOOLEAN\r
 XenStorePathExists (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8           *Directory,\r
-  IN CONST CHAR8           *Node\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *Directory,\r
+  IN CONST CHAR8                 *Node\r
   )\r
 {\r
-  CONST CHAR8 **TempStr;\r
-  XENSTORE_STATUS Status;\r
-  UINT32 TempNum;\r
-\r
-  Status = XenStoreListDirectory (Transaction, Directory, Node,\r
-                                  &TempNum, &TempStr);\r
+  CONST CHAR8      **TempStr;\r
+  XENSTORE_STATUS  Status;\r
+  UINT32           TempNum;\r
+\r
+  Status = XenStoreListDirectory (\r
+             Transaction,\r
+             Directory,\r
+             Node,\r
+             &TempNum,\r
+             &TempStr\r
+             );\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     return FALSE;\r
   }\r
-  FreePool ((VOID*)TempStr);\r
+\r
+  FreePool ((VOID *)TempStr);\r
   return TRUE;\r
 }\r
 \r
 XENSTORE_STATUS\r
 XenStoreRead (\r
-  IN  CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN  CONST CHAR8             *DirectoryPath,\r
-  IN  CONST CHAR8             *Node,\r
-  OUT UINT32                  *LenPtr OPTIONAL,\r
-  OUT VOID                    **Result\r
+  IN  CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN  CONST CHAR8                 *DirectoryPath,\r
+  IN  CONST CHAR8                 *Node,\r
+  OUT UINT32                      *LenPtr OPTIONAL,\r
+  OUT VOID                        **Result\r
   )\r
 {\r
-  CHAR8 *Path;\r
-  VOID *Value;\r
-  XENSTORE_STATUS Status;\r
+  CHAR8            *Path;\r
+  VOID             *Value;\r
+  XENSTORE_STATUS  Status;\r
 \r
-  Path = XenStoreJoin (DirectoryPath, Node);\r
+  Path   = XenStoreJoin (DirectoryPath, Node);\r
   Status = XenStoreSingle (Transaction, XS_READ, Path, LenPtr, &Value);\r
   FreePool (Path);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
@@ -1215,22 +1284,22 @@ XenStoreRead (
 \r
 XENSTORE_STATUS\r
 XenStoreWrite (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8           *DirectoryPath,\r
-  IN CONST CHAR8           *Node,\r
-  IN CONST CHAR8           *Str\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *DirectoryPath,\r
+  IN CONST CHAR8                 *Node,\r
+  IN CONST CHAR8                 *Str\r
   )\r
 {\r
-  CHAR8 *Path;\r
-  WRITE_REQUEST WriteRequest[2];\r
-  XENSTORE_STATUS Status;\r
+  CHAR8            *Path;\r
+  WRITE_REQUEST    WriteRequest[2];\r
+  XENSTORE_STATUS  Status;\r
 \r
   Path = XenStoreJoin (DirectoryPath, Node);\r
 \r
-  WriteRequest[0].Data = (VOID *) Path;\r
-  WriteRequest[0].Len = (UINT32)AsciiStrSize (Path);\r
-  WriteRequest[1].Data = (VOID *) Str;\r
-  WriteRequest[1].Len = (UINT32)AsciiStrLen (Str);\r
+  WriteRequest[0].Data = (VOID *)Path;\r
+  WriteRequest[0].Len  = (UINT32)AsciiStrSize (Path);\r
+  WriteRequest[1].Data = (VOID *)Str;\r
+  WriteRequest[1].Len  = (UINT32)AsciiStrLen (Str);\r
 \r
   Status = XenStoreTalkv (Transaction, XS_WRITE, WriteRequest, 2, NULL, NULL);\r
   FreePool (Path);\r
@@ -1240,15 +1309,15 @@ XenStoreWrite (
 \r
 XENSTORE_STATUS\r
 XenStoreRemove (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8            *DirectoryPath,\r
-  IN CONST CHAR8            *Node\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *DirectoryPath,\r
+  IN CONST CHAR8                 *Node\r
   )\r
 {\r
-  CHAR8 *Path;\r
-  XENSTORE_STATUS Status;\r
+  CHAR8            *Path;\r
+  XENSTORE_STATUS  Status;\r
 \r
-  Path = XenStoreJoin (DirectoryPath, Node);\r
+  Path   = XenStoreJoin (DirectoryPath, Node);\r
   Status = XenStoreSingle (Transaction, XS_RM, Path, NULL, NULL);\r
   FreePool (Path);\r
 \r
@@ -1260,11 +1329,16 @@ XenStoreTransactionStart (
   OUT XENSTORE_TRANSACTION  *Transaction\r
   )\r
 {\r
-  CHAR8 *IdStr;\r
-  XENSTORE_STATUS Status;\r
-\r
-  Status = XenStoreSingle (XST_NIL, XS_TRANSACTION_START, "", NULL,\r
-                           (VOID **) &IdStr);\r
+  CHAR8            *IdStr;\r
+  XENSTORE_STATUS  Status;\r
+\r
+  Status = XenStoreSingle (\r
+             XST_NIL,\r
+             XS_TRANSACTION_START,\r
+             "",\r
+             NULL,\r
+             (VOID **)&IdStr\r
+             );\r
   if (Status == XENSTORE_STATUS_SUCCESS) {\r
     Transaction->Id = (UINT32)AsciiStrDecimalToUintn (IdStr);\r
     FreePool (IdStr);\r
@@ -1275,11 +1349,11 @@ XenStoreTransactionStart (
 \r
 XENSTORE_STATUS\r
 XenStoreTransactionEnd (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN BOOLEAN                Abort\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN BOOLEAN                     Abort\r
   )\r
 {\r
-  CHAR8 AbortStr[2];\r
+  CHAR8  AbortStr[2];\r
 \r
   AbortStr[0] = Abort ? 'F' : 'T';\r
   AbortStr[1] = '\0';\r
@@ -1290,17 +1364,17 @@ XenStoreTransactionEnd (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenStoreVSPrint (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8           *DirectoryPath,\r
-  IN CONST CHAR8           *Node,\r
-  IN CONST CHAR8           *FormatString,\r
-  IN VA_LIST               Marker\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *DirectoryPath,\r
+  IN CONST CHAR8                 *Node,\r
+  IN CONST CHAR8                 *FormatString,\r
+  IN VA_LIST                     Marker\r
   )\r
 {\r
-  CHAR8 *Buf;\r
-  XENSTORE_STATUS Status;\r
-  UINTN BufSize;\r
-  VA_LIST Marker2;\r
+  CHAR8            *Buf;\r
+  XENSTORE_STATUS  Status;\r
+  UINTN            BufSize;\r
+  VA_LIST          Marker2;\r
 \r
   VA_COPY (Marker2, Marker);\r
   BufSize = SPrintLengthAsciiFormat (FormatString, Marker2) + 1;\r
@@ -1316,15 +1390,15 @@ XenStoreVSPrint (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenStoreSPrint (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8            *DirectoryPath,\r
-  IN CONST CHAR8            *Node,\r
-  IN CONST CHAR8            *FormatString,\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *DirectoryPath,\r
+  IN CONST CHAR8                 *Node,\r
+  IN CONST CHAR8                 *FormatString,\r
   ...\r
   )\r
 {\r
-  VA_LIST Marker;\r
-  XENSTORE_STATUS Status;\r
+  VA_LIST          Marker;\r
+  XENSTORE_STATUS  Status;\r
 \r
   VA_START (Marker, FormatString);\r
   Status = XenStoreVSPrint (Transaction, DirectoryPath, Node, FormatString, Marker);\r
@@ -1341,19 +1415,19 @@ XenStoreRegisterWatch (
   )\r
 {\r
   /* Pointer in ascii is the token. */\r
-  CHAR8 Token[sizeof (XENSTORE_WATCH) * 2 + 1];\r
-  XENSTORE_STATUS Status;\r
-  XENSTORE_WATCH *Watch;\r
+  CHAR8            Token[sizeof (XENSTORE_WATCH) * 2 + 1];\r
+  XENSTORE_STATUS  Status;\r
+  XENSTORE_WATCH   *Watch;\r
 \r
-  Watch = AllocateZeroPool (sizeof (XENSTORE_WATCH));\r
+  Watch            = AllocateZeroPool (sizeof (XENSTORE_WATCH));\r
   Watch->Signature = XENSTORE_WATCH_SIGNATURE;\r
-  Watch->Node = XenStoreJoin (DirectoryPath, Node);\r
+  Watch->Node      = XenStoreJoin (DirectoryPath, Node);\r
 \r
   EfiAcquireLock (&xs.RegisteredWatchesLock);\r
   InsertTailList (&xs.RegisteredWatches, &Watch->Link);\r
   EfiReleaseLock (&xs.RegisteredWatchesLock);\r
 \r
-  AsciiSPrint (Token, sizeof (Token), "%p", (VOID*) Watch);\r
+  AsciiSPrint (Token, sizeof (Token), "%p", (VOID *)Watch);\r
   Status = XenStoreWatch (Watch->Node, Token);\r
 \r
   /* Ignore errors due to multiple registration. */\r
@@ -1376,15 +1450,15 @@ XenStoreRegisterWatch (
 \r
 VOID\r
 XenStoreUnregisterWatch (\r
-  IN XENSTORE_WATCH *Watch\r
+  IN XENSTORE_WATCH  *Watch\r
   )\r
 {\r
-  CHAR8 Token[sizeof (Watch) * 2 + 1];\r
-  LIST_ENTRY *Entry;\r
+  CHAR8       Token[sizeof (Watch) * 2 + 1];\r
+  LIST_ENTRY  *Entry;\r
 \r
   ASSERT (Watch->Signature == XENSTORE_WATCH_SIGNATURE);\r
 \r
-  AsciiSPrint (Token, sizeof (Token), "%p", (VOID *) Watch);\r
+  AsciiSPrint (Token, sizeof (Token), "%p", (VOID *)Watch);\r
   if (XenStoreFindWatch (Token) == NULL) {\r
     return;\r
   }\r
@@ -1399,21 +1473,21 @@ XenStoreUnregisterWatch (
   EfiAcquireLock (&xs.WatchEventsLock);\r
   Entry = GetFirstNode (&xs.WatchEvents);\r
   while (!IsNull (&xs.WatchEvents, Entry)) {\r
-    XENSTORE_MESSAGE *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);\r
+    XENSTORE_MESSAGE  *Message = XENSTORE_MESSAGE_FROM_LINK (Entry);\r
     Entry = GetNextNode (&xs.WatchEvents, Entry);\r
     if (Message->u.Watch.Handle == Watch) {\r
       RemoveEntryList (&Message->Link);\r
-      FreePool ((VOID*)Message->u.Watch.Vector);\r
+      FreePool ((VOID *)Message->u.Watch.Vector);\r
       FreePool (Message);\r
     }\r
   }\r
+\r
   EfiReleaseLock (&xs.WatchEventsLock);\r
 \r
   FreePool (Watch->Node);\r
   FreePool (Watch);\r
 }\r
 \r
-\r
 //\r
 // XENBUS protocol\r
 //\r
@@ -1421,8 +1495,8 @@ XenStoreUnregisterWatch (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusWaitForWatch (\r
-  IN XENBUS_PROTOCOL *This,\r
-  IN VOID *Token\r
+  IN XENBUS_PROTOCOL  *This,\r
+  IN VOID             *Token\r
   )\r
 {\r
   return XenStoreWaitWatch (Token);\r
@@ -1431,10 +1505,10 @@ XenBusWaitForWatch (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusXenStoreRead (\r
-  IN  XENBUS_PROTOCOL       *This,\r
-  IN  CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN  CONST CHAR8           *Node,\r
-  OUT VOID                  **Value\r
+  IN  XENBUS_PROTOCOL             *This,\r
+  IN  CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN  CONST CHAR8                 *Node,\r
+  OUT VOID                        **Value\r
   )\r
 {\r
   return XenStoreRead (Transaction, This->Node, Node, NULL, Value);\r
@@ -1443,10 +1517,10 @@ XenBusXenStoreRead (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusXenStoreBackendRead (\r
-  IN  XENBUS_PROTOCOL       *This,\r
-  IN  CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN  CONST CHAR8           *Node,\r
-  OUT VOID                  **Value\r
+  IN  XENBUS_PROTOCOL             *This,\r
+  IN  CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN  CONST CHAR8                 *Node,\r
+  OUT VOID                        **Value\r
   )\r
 {\r
   return XenStoreRead (Transaction, This->Backend, Node, NULL, Value);\r
@@ -1455,9 +1529,9 @@ XenBusXenStoreBackendRead (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusXenStoreRemove (\r
-  IN XENBUS_PROTOCOL        *This,\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN const char             *Node\r
+  IN XENBUS_PROTOCOL             *This,\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN const char                  *Node\r
   )\r
 {\r
   return XenStoreRemove (Transaction, This->Node, Node);\r
@@ -1476,9 +1550,9 @@ XenBusXenStoreTransactionStart (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusXenStoreTransactionEnd (\r
-  IN XENBUS_PROTOCOL        *This,\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN BOOLEAN                Abort\r
+  IN XENBUS_PROTOCOL             *This,\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN BOOLEAN                     Abort\r
   )\r
 {\r
   return XenStoreTransactionEnd (Transaction, Abort);\r
@@ -1487,16 +1561,16 @@ XenBusXenStoreTransactionEnd (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusXenStoreSPrint (\r
-  IN XENBUS_PROTOCOL        *This,\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8            *DirectoryPath,\r
-  IN CONST CHAR8            *Node,\r
-  IN CONST CHAR8            *FormatString,\r
+  IN XENBUS_PROTOCOL             *This,\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *DirectoryPath,\r
+  IN CONST CHAR8                 *Node,\r
+  IN CONST CHAR8                 *FormatString,\r
   ...\r
   )\r
 {\r
-  VA_LIST Marker;\r
-  XENSTORE_STATUS Status;\r
+  VA_LIST          Marker;\r
+  XENSTORE_STATUS  Status;\r
 \r
   VA_START (Marker, FormatString);\r
   Status = XenStoreVSPrint (Transaction, DirectoryPath, Node, FormatString, Marker);\r
@@ -1508,23 +1582,23 @@ XenBusXenStoreSPrint (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusRegisterWatch (\r
-  IN  XENBUS_PROTOCOL *This,\r
-  IN  CONST CHAR8     *Node,\r
-  OUT VOID            **Token\r
+  IN  XENBUS_PROTOCOL  *This,\r
+  IN  CONST CHAR8      *Node,\r
+  OUT VOID             **Token\r
   )\r
 {\r
-  return XenStoreRegisterWatch (This->Node, Node, (XENSTORE_WATCH **) Token);\r
+  return XenStoreRegisterWatch (This->Node, Node, (XENSTORE_WATCH **)Token);\r
 }\r
 \r
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusRegisterWatchBackend (\r
-  IN  XENBUS_PROTOCOL *This,\r
-  IN  CONST CHAR8     *Node,\r
-  OUT VOID            **Token\r
+  IN  XENBUS_PROTOCOL  *This,\r
+  IN  CONST CHAR8      *Node,\r
+  OUT VOID             **Token\r
   )\r
 {\r
-  return XenStoreRegisterWatch (This->Backend, Node, (XENSTORE_WATCH **) Token);\r
+  return XenStoreRegisterWatch (This->Backend, Node, (XENSTORE_WATCH **)Token);\r
 }\r
 \r
 VOID\r
@@ -1534,5 +1608,5 @@ XenBusUnregisterWatch (
   IN VOID             *Token\r
   )\r
 {\r
-  XenStoreUnregisterWatch ((XENSTORE_WATCH *) Token);\r
+  XenStoreUnregisterWatch ((XENSTORE_WATCH *)Token);\r
 }\r
index effaad73367d32f8f93226b569bda880a0588407..b2ae8055243e363ea94a4be19ba45fc083cdd2f4 100644 (file)
@@ -38,11 +38,11 @@ typedef struct _XENSTORE_WATCH XENSTORE_WATCH;
 **/\r
 XENSTORE_STATUS\r
 XenStoreListDirectory (\r
-  IN  CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN  CONST CHAR8           *DirectoryPath,\r
-  IN  CONST CHAR8           *Node,\r
-  OUT UINT32                *DirectoryCountPtr,\r
-  OUT CONST CHAR8           ***DirectoryListPtr\r
+  IN  CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN  CONST CHAR8                 *DirectoryPath,\r
+  IN  CONST CHAR8                 *Node,\r
+  OUT UINT32                      *DirectoryCountPtr,\r
+  OUT CONST CHAR8                 ***DirectoryListPtr\r
   );\r
 \r
 /**\r
@@ -58,9 +58,9 @@ XenStoreListDirectory (
 **/\r
 BOOLEAN\r
 XenStorePathExists (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8 *Directory,\r
-  IN CONST CHAR8 *Node\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *Directory,\r
+  IN CONST CHAR8                 *Node\r
   );\r
 \r
 /**\r
@@ -82,11 +82,11 @@ XenStorePathExists (
 **/\r
 XENSTORE_STATUS\r
 XenStoreRead (\r
-  IN  CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN  CONST CHAR8             *DirectoryPath,\r
-  IN  CONST CHAR8             *Node,\r
-  OUT UINT32                  *LenPtr OPTIONAL,\r
-  OUT VOID                    **Result\r
+  IN  CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN  CONST CHAR8                 *DirectoryPath,\r
+  IN  CONST CHAR8                 *Node,\r
+  OUT UINT32                      *LenPtr OPTIONAL,\r
+  OUT VOID                        **Result\r
   );\r
 \r
 /**\r
@@ -102,10 +102,10 @@ XenStoreRead (
 **/\r
 XENSTORE_STATUS\r
 XenStoreWrite (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8           *DirectoryPath,\r
-  IN CONST CHAR8           *Node,\r
-  IN CONST CHAR8           *Str\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *DirectoryPath,\r
+  IN CONST CHAR8                 *Node,\r
+  IN CONST CHAR8                 *Str\r
   );\r
 \r
 /**\r
@@ -120,9 +120,9 @@ XenStoreWrite (
 **/\r
 XENSTORE_STATUS\r
 XenStoreRemove (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8            *DirectoryPath,\r
-  IN CONST CHAR8            *Node\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *DirectoryPath,\r
+  IN CONST CHAR8                 *Node\r
   );\r
 \r
 /**\r
@@ -139,7 +139,7 @@ XenStoreRemove (
 **/\r
 XENSTORE_STATUS\r
 XenStoreTransactionStart (\r
-  OUT XENSTORE_TRANSACTION *Transaction\r
+  OUT XENSTORE_TRANSACTION  *Transaction\r
   );\r
 \r
 /**\r
@@ -154,8 +154,8 @@ XenStoreTransactionStart (
 **/\r
 XENSTORE_STATUS\r
 XenStoreTransactionEnd (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN BOOLEAN                Abort\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN BOOLEAN                     Abort\r
   );\r
 \r
 /**\r
@@ -173,10 +173,10 @@ XenStoreTransactionEnd (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenStoreSPrint (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8            *DirectoryPath,\r
-  IN CONST CHAR8            *Node,\r
-  IN CONST CHAR8            *FormatString,\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *DirectoryPath,\r
+  IN CONST CHAR8                 *Node,\r
+  IN CONST CHAR8                 *FormatString,\r
   ...\r
   );\r
 \r
@@ -195,11 +195,11 @@ XenStoreSPrint (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenStoreVSPrint (\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8           *DirectoryPath,\r
-  IN CONST CHAR8           *Node,\r
-  IN CONST CHAR8           *FormatString,\r
-  IN VA_LIST               Marker\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *DirectoryPath,\r
+  IN CONST CHAR8                 *Node,\r
+  IN CONST CHAR8                 *FormatString,\r
+  IN VA_LIST                     Marker\r
   );\r
 \r
 /**\r
@@ -232,7 +232,7 @@ XenStoreRegisterWatch (
 **/\r
 VOID\r
 XenStoreUnregisterWatch (\r
-  IN XENSTORE_WATCH *Watch\r
+  IN XENSTORE_WATCH  *Watch\r
   );\r
 \r
 /**\r
@@ -240,18 +240,17 @@ XenStoreUnregisterWatch (
   is the NUL string, the returned value contains the path string\r
   <DirectoryPath>.\r
 \r
-  @param DirectoryPath The NUL terminated directory prefix for new path.\r
+  @param DirectoryPath  The NUL terminated directory prefix for new path.\r
   @param Node           The NUL terminated basename for the new path.\r
 \r
   @return  A buffer containing the joined path.\r
  */\r
 CHAR8 *\r
 XenStoreJoin (\r
-  IN CONST CHAR8 *DirectoryPath,\r
-  IN CONST CHAR8 *Node\r
+  IN CONST CHAR8  *DirectoryPath,\r
+  IN CONST CHAR8  *Node\r
   );\r
 \r
-\r
 /**\r
   Initialize the XenStore states and rings.\r
 \r
@@ -261,7 +260,7 @@ XenStoreJoin (
 **/\r
 EFI_STATUS\r
 XenStoreInit (\r
-  XENBUS_DEVICE *Dev\r
+  XENBUS_DEVICE  *Dev\r
   );\r
 \r
 /**\r
@@ -271,10 +270,9 @@ XenStoreInit (
 **/\r
 VOID\r
 XenStoreDeinit (\r
-  IN XENBUS_DEVICE *Dev\r
+  IN XENBUS_DEVICE  *Dev\r
   );\r
 \r
-\r
 //\r
 // XENBUS protocol\r
 //\r
@@ -282,34 +280,34 @@ XenStoreDeinit (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusWaitForWatch (\r
-  IN XENBUS_PROTOCOL *This,\r
-  IN VOID *Token\r
+  IN XENBUS_PROTOCOL  *This,\r
+  IN VOID             *Token\r
   );\r
 \r
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusXenStoreRead (\r
-  IN  XENBUS_PROTOCOL       *This,\r
-  IN  CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN  CONST CHAR8           *Node,\r
-  OUT VOID                  **Value\r
+  IN  XENBUS_PROTOCOL             *This,\r
+  IN  CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN  CONST CHAR8                 *Node,\r
+  OUT VOID                        **Value\r
   );\r
 \r
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusXenStoreBackendRead (\r
-  IN  XENBUS_PROTOCOL       *This,\r
-  IN  CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN  CONST CHAR8           *Node,\r
-  OUT VOID                  **Value\r
+  IN  XENBUS_PROTOCOL             *This,\r
+  IN  CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN  CONST CHAR8                 *Node,\r
+  OUT VOID                        **Value\r
   );\r
 \r
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusXenStoreRemove (\r
-  IN XENBUS_PROTOCOL        *This,\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8            *Node\r
+  IN XENBUS_PROTOCOL             *This,\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *Node\r
   );\r
 \r
 XENSTORE_STATUS\r
@@ -322,36 +320,36 @@ XenBusXenStoreTransactionStart (
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusXenStoreTransactionEnd (\r
-  IN XENBUS_PROTOCOL        *This,\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN BOOLEAN                Abort\r
+  IN XENBUS_PROTOCOL             *This,\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN BOOLEAN                     Abort\r
   );\r
 \r
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusXenStoreSPrint (\r
-  IN XENBUS_PROTOCOL        *This,\r
-  IN CONST XENSTORE_TRANSACTION *Transaction,\r
-  IN CONST CHAR8            *DirectoryPath,\r
-  IN CONST CHAR8            *Node,\r
-  IN CONST CHAR8            *FormatString,\r
+  IN XENBUS_PROTOCOL             *This,\r
+  IN CONST XENSTORE_TRANSACTION  *Transaction,\r
+  IN CONST CHAR8                 *DirectoryPath,\r
+  IN CONST CHAR8                 *Node,\r
+  IN CONST CHAR8                 *FormatString,\r
   ...\r
   );\r
 \r
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusRegisterWatch (\r
-  IN  XENBUS_PROTOCOL *This,\r
-  IN  CONST CHAR8     *Node,\r
-  OUT VOID            **Token\r
+  IN  XENBUS_PROTOCOL  *This,\r
+  IN  CONST CHAR8      *Node,\r
+  OUT VOID             **Token\r
   );\r
 \r
 XENSTORE_STATUS\r
 EFIAPI\r
 XenBusRegisterWatchBackend (\r
-  IN  XENBUS_PROTOCOL *This,\r
-  IN  CONST CHAR8     *Node,\r
-  OUT VOID            **Token\r
+  IN  XENBUS_PROTOCOL  *This,\r
+  IN  CONST CHAR8      *Node,\r
+  OUT VOID             **Token\r
   );\r
 \r
 VOID\r
index 0b3fd03e08d3dc3f0399e03bb9bff1baf93f727a..caf2c42b1e08f1a7c55bcfeeb334a78de24e8837 100644 (file)
@@ -22,8 +22,8 @@
 #include <Protocol/PciIo.h>\r
 #include <Protocol/XenIo.h>\r
 \r
-#define PCI_VENDOR_ID_XEN                0x5853\r
-#define PCI_DEVICE_ID_XEN_PLATFORM       0x0001\r
+#define PCI_VENDOR_ID_XEN           0x5853\r
+#define PCI_DEVICE_ID_XEN_PLATFORM  0x0001\r
 \r
 /**\r
 \r
@@ -53,14 +53,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 XenIoPciDeviceBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE00          Pci;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
 \r
   //\r
   // Attempt to open the device with the PciIo set of interfaces. On success,\r
@@ -96,7 +96,8 @@ XenIoPciDeviceBindingSupported (
 \r
   if (Status == EFI_SUCCESS) {\r
     if ((Pci.Hdr.VendorId == PCI_VENDOR_ID_XEN) &&\r
-        (Pci.Hdr.DeviceId == PCI_DEVICE_ID_XEN_PLATFORM)) {\r
+        (Pci.Hdr.DeviceId == PCI_DEVICE_ID_XEN_PLATFORM))\r
+    {\r
       Status = EFI_SUCCESS;\r
     } else {\r
       Status = EFI_UNSUPPORTED;\r
@@ -107,8 +108,12 @@ XenIoPciDeviceBindingSupported (
   // We needed PCI IO access only transitorily, to see whether we support the\r
   // device or not.\r
   //\r
-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
   return Status;\r
 }\r
@@ -143,24 +148,29 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 XenIoPciDeviceBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  XENIO_PROTOCOL                    *XenIo;\r
-  EFI_PCI_IO_PROTOCOL               *PciIo;\r
-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *BarDesc;\r
+  EFI_STATUS                         Status;\r
+  XENIO_PROTOCOL                     *XenIo;\r
+  EFI_PCI_IO_PROTOCOL                *PciIo;\r
+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *BarDesc;\r
 \r
-  XenIo = (XENIO_PROTOCOL *) AllocateZeroPool (sizeof *XenIo);\r
+  XenIo = (XENIO_PROTOCOL *)AllocateZeroPool (sizeof *XenIo);\r
   if (XenIo == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->OpenProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-                  (VOID **)&PciIo, This->DriverBindingHandle,\r
-                  DeviceHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);\r
+  Status = gBS->OpenProtocol (\r
+                  DeviceHandle,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  (VOID **)&PciIo,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeXenIo;\r
   }\r
@@ -170,7 +180,7 @@ XenIoPciDeviceBindingStart (
   // look like MMIO. The address space of the BAR1 will be used to map the\r
   // Grant Table.\r
   //\r
-  Status = PciIo->GetBarAttributes (PciIo, PCI_BAR_IDX1, NULL, (VOID**) &BarDesc);\r
+  Status = PciIo->GetBarAttributes (PciIo, PCI_BAR_IDX1, NULL, (VOID **)&BarDesc);\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (BarDesc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM);\r
 \r
@@ -179,15 +189,23 @@ XenIoPciDeviceBindingStart (
   XenIo->GrantTableAddress = BarDesc->AddrRangeMin;\r
   FreePool (BarDesc);\r
 \r
-  Status = gBS->InstallProtocolInterface (&DeviceHandle,\r
-             &gXenIoProtocolGuid, EFI_NATIVE_INTERFACE, XenIo);\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &DeviceHandle,\r
+                  &gXenIoProtocolGuid,\r
+                  EFI_NATIVE_INTERFACE,\r
+                  XenIo\r
+                  );\r
 \r
   if (!EFI_ERROR (Status)) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  gBS->CloseProtocol (\r
+         DeviceHandle,\r
+         &gEfiPciIoProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         DeviceHandle\r
+         );\r
 \r
 FreeXenIo:\r
   FreePool (XenIo);\r
@@ -224,14 +242,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 XenIoPciDeviceBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  DeviceHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   DeviceHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  XENIO_PROTOCOL           *XenIo;\r
+  EFI_STATUS      Status;\r
+  XENIO_PROTOCOL  *XenIo;\r
 \r
   Status = gBS->OpenProtocol (\r
                   DeviceHandle,                  // candidate device\r
@@ -248,27 +266,33 @@ XenIoPciDeviceBindingStop (
   //\r
   // Handle Stop() requests for in-use driver instances gracefully.\r
   //\r
-  Status = gBS->UninstallProtocolInterface (DeviceHandle,\r
-                  &gXenIoProtocolGuid, XenIo);\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  DeviceHandle,\r
+                  &gXenIoProtocolGuid,\r
+                  XenIo\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r
-         This->DriverBindingHandle, DeviceHandle);\r
+  Status = gBS->CloseProtocol (\r
+                  DeviceHandle,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  This->DriverBindingHandle,\r
+                  DeviceHandle\r
+                  );\r
 \r
   FreePool (XenIo);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 //\r
 // The static object that groups the Supported() (ie. probe), Start() and\r
 // Stop() functions of the driver together. Refer to UEFI Spec 2.3.1 + Errata\r
 // C, 10.1 EFI Driver Binding Protocol.\r
 //\r
-STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {\r
+STATIC EFI_DRIVER_BINDING_PROTOCOL  gDriverBinding = {\r
   &XenIoPciDeviceBindingSupported,\r
   &XenIoPciDeviceBindingStart,\r
   &XenIoPciDeviceBindingStop,\r
@@ -278,7 +302,6 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
   NULL  // DriverBindingHandle, ditto\r
 };\r
 \r
-\r
 //\r
 // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL and\r
 // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's name\r
@@ -287,20 +310,20 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
 // Guide for UEFI 2.3.1 v1.01, 11 UEFI Driver and Controller Names.\r
 //\r
 STATIC\r
-EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "eng;en", L"XenIo PCI Driver" },\r
   { NULL,     NULL                }\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName;\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 XenIoPciGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -315,39 +338,38 @@ XenIoPciGetDriverName (
 EFI_STATUS\r
 EFIAPI\r
 XenIoPciGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME_PROTOCOL gComponentName = {\r
+EFI_COMPONENT_NAME_PROTOCOL  gComponentName = {\r
   &XenIoPciGetDriverName,\r
   &XenIoPciGetDeviceName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
 STATIC\r
-EFI_COMPONENT_NAME2_PROTOCOL gComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &XenIoPciGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &XenIoPciGetDeviceName,\r
+EFI_COMPONENT_NAME2_PROTOCOL  gComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&XenIoPciGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&XenIoPciGetDeviceName,\r
   "en" // SupportedLanguages, RFC 4646 language codes\r
 };\r
 \r
-\r
 //\r
 // Entry point of this driver.\r
 //\r
 EFI_STATUS\r
 EFIAPI\r
 XenIoPciDeviceEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r
index 9264a85df1d552fac85d5108db70d24ad14f46c3..f76564b2f23a8a84bccca7cf29f666a92c3799be 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 InitializeXenIoPvhDxe (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  VOID          *Allocation;\r
-  EFI_STATUS    Status;\r
-  EFI_HANDLE    XenIoHandle;\r
+  VOID        *Allocation;\r
+  EFI_STATUS  Status;\r
+  EFI_HANDLE  XenIoHandle;\r
 \r
-  Allocation = NULL;\r
+  Allocation  = NULL;\r
   XenIoHandle = NULL;\r
 \r
   if (!XenPvhDetected ()) {\r
@@ -39,7 +39,7 @@ InitializeXenIoPvhDxe (
     goto Error;\r
   }\r
 \r
-  Status = XenIoMmioInstall (&XenIoHandle, (UINTN) Allocation);\r
+  Status = XenIoMmioInstall (&XenIoHandle, (UINTN)Allocation);\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r
@@ -50,5 +50,6 @@ Error:
   if (Allocation != NULL) {\r
     FreePages (Allocation, FixedPcdGet32 (PcdXenGrantFrames));\r
   }\r
+\r
   return Status;\r
 }\r
index 4ed448632ae2b831a2a0fc72f61f7ae6dc4db4e9..3b79c1837fafa641bfe91b4b232c59d7931ab902 100644 (file)
@@ -28,8 +28,8 @@ AmdSevInitialize (
   VOID\r
   )\r
 {\r
-  UINT64                            EncryptionMask;\r
-  RETURN_STATUS                     PcdStatus;\r
+  UINT64         EncryptionMask;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   //\r
   // Check if SEV is enabled\r
@@ -42,7 +42,7 @@ AmdSevInitialize (
   // Set Memory Encryption Mask PCD\r
   //\r
   EncryptionMask = MemEncryptSevGetEncryptionMask ();\r
-  PcdStatus = PcdSet64S (PcdPteMemoryEncryptionAddressOrMask, EncryptionMask);\r
+  PcdStatus      = PcdSet64S (PcdPteMemoryEncryptionAddressOrMask, EncryptionMask);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   DEBUG ((DEBUG_INFO, "SEV is enabled (mask 0x%lx)\n", EncryptionMask));\r
index fab53633a91792fa84f325ca6f620c7893ac171e..71e63ab8687195a88ede2d80ce98d849635d11f1 100644 (file)
@@ -30,7 +30,7 @@ STATIC
 VOID\r
 EFIAPI\r
 ClearCache (\r
-  IN OUT VOID *WorkSpace\r
+  IN OUT VOID  *WorkSpace\r
   )\r
 {\r
   WriteBackInvalidateDataCache ();\r
@@ -57,8 +57,8 @@ ClearCacheOnMpServicesAvailable (
   IN VOID                       *Ppi\r
   )\r
 {\r
-  EFI_PEI_MP_SERVICES_PPI *MpServices;\r
-  EFI_STATUS              Status;\r
+  EFI_PEI_MP_SERVICES_PPI  *MpServices;\r
+  EFI_STATUS               Status;\r
 \r
   DEBUG ((DEBUG_INFO, "%a: %a\n", gEfiCallerBaseName, __FUNCTION__));\r
 \r
@@ -66,15 +66,15 @@ ClearCacheOnMpServicesAvailable (
   // Clear cache on all the APs in parallel.\r
   //\r
   MpServices = Ppi;\r
-  Status = MpServices->StartupAllAPs (\r
-                         (CONST EFI_PEI_SERVICES **)PeiServices,\r
-                         MpServices,\r
-                         ClearCache,          // Procedure\r
-                         FALSE,               // SingleThread\r
-                         0,                   // TimeoutInMicroSeconds: inf.\r
-                         NULL                 // ProcedureArgument\r
-                         );\r
-  if (EFI_ERROR (Status) && Status != EFI_NOT_STARTED) {\r
+  Status     = MpServices->StartupAllAPs (\r
+                             (CONST EFI_PEI_SERVICES **)PeiServices,\r
+                             MpServices,\r
+                             ClearCache,      // Procedure\r
+                             FALSE,           // SingleThread\r
+                             0,               // TimeoutInMicroSeconds: inf.\r
+                             NULL             // ProcedureArgument\r
+                             );\r
+  if (EFI_ERROR (Status) && (Status != EFI_NOT_STARTED)) {\r
     DEBUG ((DEBUG_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status));\r
     return Status;\r
   }\r
@@ -90,7 +90,7 @@ ClearCacheOnMpServicesAvailable (
 // Notification object for registering the callback, for when\r
 // EFI_PEI_MP_SERVICES_PPI becomes available.\r
 //\r
-STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mMpServicesNotify = {\r
+STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR  mMpServicesNotify = {\r
   EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | // Flags\r
   EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
   &gEfiPeiMpServicesPpiGuid,               // Guid\r
@@ -102,11 +102,15 @@ InstallClearCacheCallback (
   VOID\r
   )\r
 {\r
-  EFI_STATUS           Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = PeiServicesNotifyPpi (&mMpServicesNotify);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: failed to set up MP Services callback: %r\n",\r
-      __FUNCTION__, Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: failed to set up MP Services callback: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
   }\r
 }\r
index 5d9ee67cd851818fbf005f24ff0bbb8631e45ddc..9b5993a43a6169680a386085d4deead788a7f8d5 100644 (file)
@@ -8,7 +8,6 @@
 \r
 **/\r
 \r
-\r
 #include "Cmos.h"\r
 #include "Library/IoLib.h"\r
 \r
 UINT8\r
 EFIAPI\r
 CmosRead8 (\r
-  IN      UINTN                     Index\r
+  IN      UINTN  Index\r
   )\r
 {\r
-  IoWrite8 (0x70, (UINT8) Index);\r
+  IoWrite8 (0x70, (UINT8)Index);\r
   return IoRead8 (0x71);\r
 }\r
 \r
-\r
 /**\r
   Writes 8-bits of CMOS data.\r
 \r
@@ -49,12 +47,11 @@ CmosRead8 (
 UINT8\r
 EFIAPI\r
 CmosWrite8 (\r
-  IN      UINTN                     Index,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Index,\r
+  IN      UINT8  Value\r
   )\r
 {\r
-  IoWrite8 (0x70, (UINT8) Index);\r
+  IoWrite8 (0x70, (UINT8)Index);\r
   IoWrite8 (0x71, Value);\r
   return Value;\r
 }\r
-\r
index 80ffcb002f937afb49c71d0d77311515b572b339..8fca4866b41029fd2a0c7ebdbd65ecb1fa1fe31c 100644 (file)
@@ -25,7 +25,7 @@
 UINT8\r
 EFIAPI\r
 CmosRead8 (\r
-  IN      UINTN                     Index\r
+  IN      UINTN  Index\r
   );\r
 \r
 /**\r
@@ -43,10 +43,8 @@ CmosRead8 (
 UINT8\r
 EFIAPI\r
 CmosWrite8 (\r
-  IN      UINTN                     Index,\r
-  IN      UINT8                     Value\r
+  IN      UINTN  Index,\r
+  IN      UINT8  Value\r
   );\r
 \r
-\r
 #endif\r
-\r
index 70e9b527002f6473df9fe2b4cb3c3b915889bd59..871a2c1c5ba28b857a3c87fbdd6336d73a00caeb 100644 (file)
@@ -15,7 +15,6 @@
 #include <Library/PeiServicesLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
-\r
 /**\r
   Publish PEI & DXE (Decompressed) Memory based FVs to let PEI\r
   and DXE know about them.\r
@@ -65,7 +64,7 @@ PeiFvInitialization (
   //\r
   PeiServicesInstallFvInfoPpi (\r
     NULL,\r
-    (VOID *)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase),\r
+    (VOID *)(UINTN)PcdGet32 (PcdOvmfDxeMemFvBase),\r
     PcdGet32 (PcdOvmfDxeMemFvSize),\r
     NULL,\r
     NULL\r
@@ -73,4 +72,3 @@ PeiFvInitialization (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
index fa1be888d6ba6d864dc93077b6e1b931bbab4428..d412d1f4db6f5fc98ecfdc1fd5a063684f6dd4af 100644 (file)
@@ -34,20 +34,20 @@ Module Name:
 #include "Platform.h"\r
 #include "Cmos.h"\r
 \r
-UINT8 mPhysMemAddressWidth;\r
+UINT8  mPhysMemAddressWidth;\r
 \r
-STATIC UINT32 mS3AcpiReservedMemoryBase;\r
-STATIC UINT32 mS3AcpiReservedMemorySize;\r
+STATIC UINT32  mS3AcpiReservedMemoryBase;\r
+STATIC UINT32  mS3AcpiReservedMemorySize;\r
 \r
-STATIC UINT16 mQ35TsegMbytes;\r
+STATIC UINT16  mQ35TsegMbytes;\r
 \r
 VOID\r
 Q35TsegMbytesInitialization (\r
   VOID\r
   )\r
 {\r
-  UINT16        ExtendedTsegMbytes;\r
-  RETURN_STATUS PcdStatus;\r
+  UINT16         ExtendedTsegMbytes;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   if (mHostBridgeDevId != INTEL_Q35_MCH_DEVICE_ID) {\r
     DEBUG ((\r
@@ -99,16 +99,16 @@ Q35TsegMbytesInitialization (
 STATIC\r
 UINT64\r
 GetHighestSystemMemoryAddress (\r
-  BOOLEAN       Below4gb\r
+  BOOLEAN  Below4gb\r
   )\r
 {\r
-  EFI_E820_ENTRY64    *E820Map;\r
-  UINT32              E820EntriesCount;\r
-  EFI_E820_ENTRY64    *Entry;\r
-  EFI_STATUS          Status;\r
-  UINT32              Loop;\r
-  UINT64              HighestAddress;\r
-  UINT64              EntryEnd;\r
+  EFI_E820_ENTRY64  *E820Map;\r
+  UINT32            E820EntriesCount;\r
+  EFI_E820_ENTRY64  *Entry;\r
+  EFI_STATUS        Status;\r
+  UINT32            Loop;\r
+  UINT64            HighestAddress;\r
+  UINT64            EntryEnd;\r
 \r
   HighestAddress = 0;\r
 \r
@@ -116,12 +116,12 @@ GetHighestSystemMemoryAddress (
   ASSERT_EFI_ERROR (Status);\r
 \r
   for (Loop = 0; Loop < E820EntriesCount; Loop++) {\r
-    Entry = E820Map + Loop;\r
+    Entry    = E820Map + Loop;\r
     EntryEnd = Entry->BaseAddr + Entry->Length;\r
 \r
-    if (Entry->Type == EfiAcpiAddressRangeMemory &&\r
-        EntryEnd > HighestAddress) {\r
-\r
+    if ((Entry->Type == EfiAcpiAddressRangeMemory) &&\r
+        (EntryEnd > HighestAddress))\r
+    {\r
       if (Below4gb && (EntryEnd <= BASE_4GB)) {\r
         HighestAddress = EntryEnd;\r
       } else if (!Below4gb && (EntryEnd >= BASE_4GB)) {\r
@@ -141,8 +141,8 @@ GetSystemMemorySizeBelow4gb (
   VOID\r
   )\r
 {\r
-  UINT8 Cmos0x34;\r
-  UINT8 Cmos0x35;\r
+  UINT8  Cmos0x34;\r
+  UINT8  Cmos0x35;\r
 \r
   //\r
   // In PVH case, there is no CMOS, we have to calculate the memory size\r
@@ -166,10 +166,10 @@ GetSystemMemorySizeBelow4gb (
   //   into the calculation to get the total memory size.\r
   //\r
 \r
-  Cmos0x34 = (UINT8) CmosRead8 (0x34);\r
-  Cmos0x35 = (UINT8) CmosRead8 (0x35);\r
+  Cmos0x34 = (UINT8)CmosRead8 (0x34);\r
+  Cmos0x35 = (UINT8)CmosRead8 (0x35);\r
 \r
-  return (UINT32) (((UINTN)((Cmos0x35 << 8) + Cmos0x34) << 16) + SIZE_16MB);\r
+  return (UINT32)(((UINTN)((Cmos0x35 << 8) + Cmos0x34) << 16) + SIZE_16MB);\r
 }\r
 \r
 /**\r
@@ -180,12 +180,12 @@ AddressWidthInitialization (
   VOID\r
   )\r
 {\r
-  UINT32 RegEax;\r
+  UINT32  RegEax;\r
 \r
   AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL);\r
   if (RegEax >= 0x80000008) {\r
     AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL);\r
-    mPhysMemAddressWidth = (UINT8) RegEax;\r
+    mPhysMemAddressWidth = (UINT8)RegEax;\r
   } else {\r
     mPhysMemAddressWidth = 36;\r
   }\r
@@ -208,21 +208,22 @@ GetPeiMemoryCap (
   VOID\r
   )\r
 {\r
-  BOOLEAN Page1GSupport;\r
-  UINT32  RegEax;\r
-  UINT32  RegEdx;\r
-  UINT32  Pml4Entries;\r
-  UINT32  PdpEntries;\r
-  UINTN   TotalPages;\r
+  BOOLEAN  Page1GSupport;\r
+  UINT32   RegEax;\r
+  UINT32   RegEdx;\r
+  UINT32   Pml4Entries;\r
+  UINT32   PdpEntries;\r
+  UINTN    TotalPages;\r
 \r
   //\r
   // If DXE is 32-bit, then just return the traditional 64 MB cap.\r
   //\r
-#ifdef MDE_CPU_IA32\r
+ #ifdef MDE_CPU_IA32\r
   if (!FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {\r
     return SIZE_64MB;\r
   }\r
-#endif\r
+\r
+ #endif\r
 \r
   //\r
   // Dependent on physical address width, PEI memory allocations can be\r
@@ -243,7 +244,7 @@ GetPeiMemoryCap (
 \r
   if (mPhysMemAddressWidth <= 39) {\r
     Pml4Entries = 1;\r
-    PdpEntries = 1 << (mPhysMemAddressWidth - 30);\r
+    PdpEntries  = 1 << (mPhysMemAddressWidth - 30);\r
     ASSERT (PdpEntries <= 0x200);\r
   } else {\r
     Pml4Entries = 1 << (mPhysMemAddressWidth - 39);\r
@@ -252,7 +253,7 @@ GetPeiMemoryCap (
   }\r
 \r
   TotalPages = Page1GSupport ? Pml4Entries + 1 :\r
-                               (PdpEntries + 1) * Pml4Entries + 1;\r
+               (PdpEntries + 1) * Pml4Entries + 1;\r
   ASSERT (TotalPages <= 0x40201);\r
 \r
   //\r
@@ -263,7 +264,6 @@ GetPeiMemoryCap (
   return (UINT32)(EFI_PAGES_TO_SIZE (TotalPages) + SIZE_64MB);\r
 }\r
 \r
-\r
 /**\r
   Publish PEI core memory\r
 \r
@@ -275,11 +275,11 @@ PublishPeiMemory (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase;\r
-  UINT64                      MemorySize;\r
-  UINT32                      LowerMemorySize;\r
-  UINT32                      PeiMemoryCap;\r
+  EFI_STATUS            Status;\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase;\r
+  UINT64                MemorySize;\r
+  UINT32                LowerMemorySize;\r
+  UINT32                PeiMemoryCap;\r
 \r
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
 \r
@@ -288,8 +288,13 @@ PublishPeiMemory (
     MemorySize = mS3AcpiReservedMemorySize;\r
   } else {\r
     PeiMemoryCap = GetPeiMemoryCap ();\r
-    DEBUG ((DEBUG_INFO, "%a: mPhysMemAddressWidth=%d PeiMemoryCap=%u KB\n",\r
-      __FUNCTION__, mPhysMemAddressWidth, PeiMemoryCap >> 10));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "%a: mPhysMemAddressWidth=%d PeiMemoryCap=%u KB\n",\r
+      __FUNCTION__,\r
+      mPhysMemAddressWidth,\r
+      PeiMemoryCap >> 10\r
+      ));\r
 \r
     //\r
     // Determine the range of memory to use during PEI\r
@@ -306,13 +311,12 @@ PublishPeiMemory (
   //\r
   // Publish this memory to the PEI Core\r
   //\r
-  Status = PublishSystemMemory(MemoryBase, MemorySize);\r
+  Status = PublishSystemMemory (MemoryBase, MemorySize);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Publish system RAM and reserve memory regions\r
 \r
@@ -336,12 +340,12 @@ InitializeRamRegions (
     // such that they would overlap the LockBox storage.\r
     //\r
     ZeroMem (\r
-      (VOID*)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageBase),\r
-      (UINTN) PcdGet32 (PcdOvmfLockBoxStorageSize)\r
+      (VOID *)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageBase),\r
+      (UINTN)PcdGet32 (PcdOvmfLockBoxStorageSize)\r
       );\r
     BuildMemoryAllocationHob (\r
-      (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageBase),\r
-      (UINT64)(UINTN) PcdGet32 (PcdOvmfLockBoxStorageSize),\r
+      (EFI_PHYSICAL_ADDRESS)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageBase),\r
+      (UINT64)(UINTN)PcdGet32 (PcdOvmfLockBoxStorageSize),\r
       EfiBootServicesData\r
       );\r
   }\r
index e60478fdb493b3e5909107e5b46bb1c8cb92cb34..2d97a41ca78e5d7be4b18f82f105febb4037cba4 100644 (file)
@@ -36,7 +36,7 @@
 #include "Platform.h"\r
 #include "Cmos.h"\r
 \r
-EFI_MEMORY_TYPE_INFORMATION mDefaultMemoryTypeInformation[] = {\r
+EFI_MEMORY_TYPE_INFORMATION  mDefaultMemoryTypeInformation[] = {\r
   { EfiACPIMemoryNVS,       0x004 },\r
   { EfiACPIReclaimMemory,   0x008 },\r
   { EfiReservedMemoryType,  0x004 },\r
@@ -47,8 +47,7 @@ EFI_MEMORY_TYPE_INFORMATION mDefaultMemoryTypeInformation[] = {
   { EfiMaxMemoryType,       0x000 }\r
 };\r
 \r
-\r
-EFI_PEI_PPI_DESCRIPTOR   mPpiBootMode[] = {\r
+EFI_PEI_PPI_DESCRIPTOR  mPpiBootMode[] = {\r
   {\r
     EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
     &gEfiPeiMasterBootModePpiGuid,\r
@@ -56,24 +55,22 @@ EFI_PEI_PPI_DESCRIPTOR   mPpiBootMode[] = {
   }\r
 };\r
 \r
+UINT16  mHostBridgeDevId;\r
 \r
-UINT16 mHostBridgeDevId;\r
-\r
-EFI_BOOT_MODE mBootMode = BOOT_WITH_FULL_CONFIGURATION;\r
-\r
+EFI_BOOT_MODE  mBootMode = BOOT_WITH_FULL_CONFIGURATION;\r
 \r
 VOID\r
 AddIoMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   )\r
 {\r
   BuildResourceDescriptorHob (\r
     EFI_RESOURCE_MEMORY_MAPPED_IO,\r
-      EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
-      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
-      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_TESTED,\r
+    EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
+    EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+    EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_TESTED,\r
     MemoryBase,\r
     MemorySize\r
     );\r
@@ -81,23 +78,23 @@ AddIoMemoryBaseSizeHob (
 \r
 VOID\r
 AddReservedMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize,\r
-  BOOLEAN                     Cacheable\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize,\r
+  BOOLEAN               Cacheable\r
   )\r
 {\r
   BuildResourceDescriptorHob (\r
     EFI_RESOURCE_MEMORY_RESERVED,\r
-      EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
-      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
-      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
-      (Cacheable ?\r
-       EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
-       EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
-       EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE :\r
-       0\r
-       ) |\r
-      EFI_RESOURCE_ATTRIBUTE_TESTED,\r
+    EFI_RESOURCE_ATTRIBUTE_PRESENT     |\r
+    EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+    EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+    (Cacheable ?\r
+     EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
+     EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
+     EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE :\r
+     0\r
+    ) |\r
+    EFI_RESOURCE_ATTRIBUTE_TESTED,\r
     MemoryBase,\r
     MemorySize\r
     );\r
@@ -105,64 +102,64 @@ AddReservedMemoryBaseSizeHob (
 \r
 VOID\r
 AddReservedMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit,\r
-  BOOLEAN                     Cacheable\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit,\r
+  BOOLEAN               Cacheable\r
   )\r
 {\r
-  AddReservedMemoryBaseSizeHob (MemoryBase,\r
-    (UINT64)(MemoryLimit - MemoryBase), Cacheable);\r
+  AddReservedMemoryBaseSizeHob (\r
+    MemoryBase,\r
+    (UINT64)(MemoryLimit - MemoryBase),\r
+    Cacheable\r
+    );\r
 }\r
 \r
 VOID\r
 AddIoMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   )\r
 {\r
   AddIoMemoryBaseSizeHob (MemoryBase, (UINT64)(MemoryLimit - MemoryBase));\r
 }\r
 \r
-\r
 VOID\r
 AddMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   )\r
 {\r
   BuildResourceDescriptorHob (\r
     EFI_RESOURCE_SYSTEM_MEMORY,\r
-      EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
-      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
-      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_TESTED,\r
+    EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
+    EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+    EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |\r
+    EFI_RESOURCE_ATTRIBUTE_TESTED,\r
     MemoryBase,\r
     MemorySize\r
     );\r
 }\r
 \r
-\r
 VOID\r
 AddMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   )\r
 {\r
   AddMemoryBaseSizeHob (MemoryBase, (UINT64)(MemoryLimit - MemoryBase));\r
 }\r
 \r
-\r
 VOID\r
 MemMapInitialization (\r
   VOID\r
   )\r
 {\r
-  UINT64        PciIoBase;\r
-  UINT64        PciIoSize;\r
-  RETURN_STATUS PcdStatus;\r
+  UINT64         PciIoBase;\r
+  UINT64         PciIoSize;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   PciIoBase = 0xC000;\r
   PciIoSize = 0x4000;\r
@@ -173,7 +170,7 @@ MemMapInitialization (
   BuildGuidDataHob (\r
     &gEfiMemoryTypeInformationGuid,\r
     mDefaultMemoryTypeInformation,\r
-    sizeof(mDefaultMemoryTypeInformation)\r
+    sizeof (mDefaultMemoryTypeInformation)\r
     );\r
 \r
   //\r
@@ -203,8 +200,8 @@ PciExBarInitialization (
   )\r
 {\r
   union {\r
-    UINT64 Uint64;\r
-    UINT32 Uint32[2];\r
+    UINT64    Uint64;\r
+    UINT32    Uint32[2];\r
   } PciExBarBase;\r
 \r
   //\r
@@ -243,13 +240,13 @@ MiscInitialization (
   VOID\r
   )\r
 {\r
-  UINTN         PmCmd;\r
-  UINTN         Pmba;\r
-  UINT32        PmbaAndVal;\r
-  UINT32        PmbaOrVal;\r
-  UINTN         AcpiCtlReg;\r
-  UINT8         AcpiEnBit;\r
-  RETURN_STATUS PcdStatus;\r
+  UINTN          PmCmd;\r
+  UINTN          Pmba;\r
+  UINT32         PmbaAndVal;\r
+  UINT32         PmbaOrVal;\r
+  UINTN          AcpiCtlReg;\r
+  UINT8          AcpiEnBit;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   //\r
   // Disable A20 Mask\r
@@ -290,11 +287,17 @@ MiscInitialization (
         //\r
         return;\r
       }\r
-      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
-        __FUNCTION__, mHostBridgeDevId));\r
+\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+        __FUNCTION__,\r
+        mHostBridgeDevId\r
+        ));\r
       ASSERT (FALSE);\r
       return;\r
   }\r
+\r
   PcdStatus = PcdSet16S (PcdOvmfHostBridgePciDevId, mHostBridgeDevId);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
@@ -337,17 +340,17 @@ MiscInitialization (
   }\r
 }\r
 \r
-\r
 VOID\r
 BootModeInitialization (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (CmosRead8 (0xF) == 0xFE) {\r
     mBootMode = BOOT_ON_S3_RESUME;\r
   }\r
+\r
   CmosWrite8 (0xF, 0x00);\r
 \r
   Status = PeiServicesSetBootMode (mBootMode);\r
@@ -357,13 +360,12 @@ BootModeInitialization (
   ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
-\r
 VOID\r
 ReserveEmuVariableNvStore (\r
   )\r
 {\r
-  EFI_PHYSICAL_ADDRESS VariableStore;\r
-  RETURN_STATUS        PcdStatus;\r
+  EFI_PHYSICAL_ADDRESS  VariableStore;\r
+  RETURN_STATUS         PcdStatus;\r
 \r
   //\r
   // Allocate storage for NV variables early on so it will be\r
@@ -373,25 +375,25 @@ ReserveEmuVariableNvStore (
   //\r
   VariableStore =\r
     (EFI_PHYSICAL_ADDRESS)(UINTN)\r
-      AllocateRuntimePages (\r
-        EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize))\r
-        );\r
-  DEBUG ((DEBUG_INFO,\r
-          "Reserved variable store memory: 0x%lX; size: %dkb\n",\r
-          VariableStore,\r
-          (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024\r
-        ));\r
+    AllocateRuntimePages (\r
+      EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize))\r
+      );\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "Reserved variable store memory: 0x%lX; size: %dkb\n",\r
+    VariableStore,\r
+    (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024\r
+    ));\r
   PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 }\r
 \r
-\r
 VOID\r
 DebugDumpCmos (\r
   VOID\r
   )\r
 {\r
-  UINT32 Loop;\r
+  UINT32  Loop;\r
 \r
   DEBUG ((DEBUG_INFO, "CMOS:\n"));\r
 \r
@@ -399,6 +401,7 @@ DebugDumpCmos (
     if ((Loop % 0x10) == 0) {\r
       DEBUG ((DEBUG_INFO, "%02x:", Loop));\r
     }\r
+\r
     DEBUG ((DEBUG_INFO, " %02x", CmosRead8 (Loop)));\r
     if ((Loop % 0x10) == 0xf) {\r
       DEBUG ((DEBUG_INFO, "\n"));\r
@@ -406,8 +409,6 @@ DebugDumpCmos (
   }\r
 }\r
 \r
-\r
-\r
 /**\r
   Perform Platform PEI initialization.\r
 \r
@@ -424,7 +425,7 @@ InitializeXenPlatform (
   IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   DEBUG ((DEBUG_INFO, "Platform PEIM Loaded\n"));\r
 \r
index 67887c9c4cd90fc4e30374b8915a7d07fd5c07fb..039af50ffa32ae2ded6908d652d63d35c8764952 100644 (file)
 \r
 VOID\r
 AddIoMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   );\r
 \r
 VOID\r
 AddIoMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   );\r
 \r
 VOID\r
 AddMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize\r
   );\r
 \r
 VOID\r
 AddMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit\r
   );\r
 \r
 VOID\r
 AddReservedMemoryBaseSizeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  UINT64                      MemorySize,\r
-  BOOLEAN                     Cacheable\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  UINT64                MemorySize,\r
+  BOOLEAN               Cacheable\r
   );\r
 \r
 VOID\r
 AddReservedMemoryRangeHob (\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase,\r
-  EFI_PHYSICAL_ADDRESS        MemoryLimit,\r
-  BOOLEAN                     Cacheable\r
+  EFI_PHYSICAL_ADDRESS  MemoryBase,\r
+  EFI_PHYSICAL_ADDRESS  MemoryLimit,\r
+  BOOLEAN               Cacheable\r
   );\r
 \r
 VOID\r
@@ -118,13 +118,13 @@ XenPublishRamRegions (
 \r
 EFI_STATUS\r
 XenGetE820Map (\r
-  EFI_E820_ENTRY64 **Entries,\r
-  UINT32 *Count\r
+  EFI_E820_ENTRY64  **Entries,\r
+  UINT32            *Count\r
   );\r
 \r
 EFI_STATUS\r
 PhysicalAddressIdentityMapping (\r
-  IN EFI_PHYSICAL_ADDRESS AddressToMap\r
+  IN EFI_PHYSICAL_ADDRESS  AddressToMap\r
   );\r
 \r
 VOID\r
@@ -132,10 +132,10 @@ CalibrateLapicTimer (
   VOID\r
   );\r
 \r
-extern EFI_BOOT_MODE mBootMode;\r
+extern EFI_BOOT_MODE  mBootMode;\r
 \r
-extern UINT8 mPhysMemAddressWidth;\r
+extern UINT8  mPhysMemAddressWidth;\r
 \r
-extern UINT16 mHostBridgeDevId;\r
+extern UINT16  mHostBridgeDevId;\r
 \r
 #endif // _PLATFORM_PEI_H_INCLUDED_\r
index 9c66418959709a287f71e1b8ed2af31b930a959c..7f00eef11e8faf6e86407b175ad76395bb488d43 100644 (file)
 #include "Platform.h"\r
 #include "Xen.h"\r
 \r
-STATIC UINT32 mXenLeaf = 0;\r
+STATIC UINT32  mXenLeaf = 0;\r
 \r
-EFI_XEN_INFO mXenInfo;\r
+EFI_XEN_INFO  mXenInfo;\r
 \r
 //\r
 // Location of the firmware info struct setup by hvmloader.\r
 // Only the E820 table is used by OVMF.\r
 //\r
-EFI_XEN_OVMF_INFO *mXenHvmloaderInfo;\r
-STATIC EFI_E820_ENTRY64 mE820Entries[128];\r
-STATIC UINT32 mE820EntriesCount;\r
+EFI_XEN_OVMF_INFO        *mXenHvmloaderInfo;\r
+STATIC EFI_E820_ENTRY64  mE820Entries[128];\r
+STATIC UINT32            mE820EntriesCount;\r
 \r
 /**\r
   Returns E820 map provided by Xen\r
@@ -59,23 +59,23 @@ STATIC UINT32 mE820EntriesCount;
 **/\r
 EFI_STATUS\r
 XenGetE820Map (\r
-  EFI_E820_ENTRY64 **Entries,\r
-  UINT32 *Count\r
+  EFI_E820_ENTRY64  **Entries,\r
+  UINT32            *Count\r
   )\r
 {\r
-  INTN ReturnCode;\r
-  xen_memory_map_t Parameters;\r
-  UINTN LoopIndex;\r
-  UINTN Index;\r
-  EFI_E820_ENTRY64 TmpEntry;\r
+  INTN              ReturnCode;\r
+  xen_memory_map_t  Parameters;\r
+  UINTN             LoopIndex;\r
+  UINTN             Index;\r
+  EFI_E820_ENTRY64  TmpEntry;\r
 \r
   //\r
   // Get E820 produced by hvmloader\r
   //\r
   if (mXenHvmloaderInfo != NULL) {\r
     ASSERT (mXenHvmloaderInfo->E820 < MAX_ADDRESS);\r
-    *Entries = (EFI_E820_ENTRY64 *)(UINTN) mXenHvmloaderInfo->E820;\r
-    *Count = mXenHvmloaderInfo->E820EntriesCount;\r
+    *Entries = (EFI_E820_ENTRY64 *)(UINTN)mXenHvmloaderInfo->E820;\r
+    *Count   = mXenHvmloaderInfo->E820EntriesCount;\r
 \r
     return EFI_SUCCESS;\r
   }\r
@@ -86,7 +86,7 @@ XenGetE820Map (
 \r
   if (mE820EntriesCount > 0) {\r
     *Entries = mE820Entries;\r
-    *Count = mE820EntriesCount;\r
+    *Count   = mE820EntriesCount;\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -105,14 +105,14 @@ XenGetE820Map (
   for (LoopIndex = 1; LoopIndex < mE820EntriesCount; LoopIndex++) {\r
     for (Index = LoopIndex; Index < mE820EntriesCount; Index++) {\r
       if (mE820Entries[Index - 1].BaseAddr > mE820Entries[Index].BaseAddr) {\r
-        TmpEntry = mE820Entries[Index];\r
-        mE820Entries[Index] = mE820Entries[Index - 1];\r
+        TmpEntry                = mE820Entries[Index];\r
+        mE820Entries[Index]     = mE820Entries[Index - 1];\r
         mE820Entries[Index - 1] = TmpEntry;\r
       }\r
     }\r
   }\r
 \r
-  *Count = mE820EntriesCount;\r
+  *Count   = mE820EntriesCount;\r
   *Entries = mE820Entries;\r
 \r
   return EFI_SUCCESS;\r
@@ -128,14 +128,14 @@ EFI_STATUS
 XenConnect (\r
   )\r
 {\r
-  UINT32 Index;\r
-  UINT32 TransferReg;\r
-  UINT32 TransferPages;\r
-  UINT32 XenVersion;\r
-  EFI_XEN_OVMF_INFO *Info;\r
-  CHAR8 Sig[sizeof (Info->Signature) + 1];\r
-  UINT32 *PVHResetVectorData;\r
-  RETURN_STATUS Status;\r
+  UINT32             Index;\r
+  UINT32             TransferReg;\r
+  UINT32             TransferPages;\r
+  UINT32             XenVersion;\r
+  EFI_XEN_OVMF_INFO  *Info;\r
+  CHAR8              Sig[sizeof (Info->Signature) + 1];\r
+  UINT32             *PVHResetVectorData;\r
+  RETURN_STATUS      Status;\r
 \r
   ASSERT (mXenLeaf != 0);\r
 \r
@@ -150,9 +150,11 @@ XenConnect (
   }\r
 \r
   for (Index = 0; Index < TransferPages; Index++) {\r
-    AsmWriteMsr64 (TransferReg,\r
-                   (UINTN) mXenInfo.HyperPages +\r
-                   (Index << EFI_PAGE_SHIFT) + Index);\r
+    AsmWriteMsr64 (\r
+      TransferReg,\r
+      (UINTN)mXenInfo.HyperPages +\r
+      (Index << EFI_PAGE_SHIFT) + Index\r
+      );\r
   }\r
 \r
   //\r
@@ -160,8 +162,12 @@ XenConnect (
   //\r
 \r
   AsmCpuid (mXenLeaf + 1, &XenVersion, NULL, NULL, NULL);\r
-  DEBUG ((DEBUG_ERROR, "Detected Xen version %d.%d\n",\r
-          XenVersion >> 16, XenVersion & 0xFFFF));\r
+  DEBUG ((\r
+    DEBUG_ERROR,\r
+    "Detected Xen version %d.%d\n",\r
+    XenVersion >> 16,\r
+    XenVersion & 0xFFFF\r
+    ));\r
   mXenInfo.VersionMajor = (UINT16)(XenVersion >> 16);\r
   mXenInfo.VersionMinor = (UINT16)(XenVersion & 0xFFFF);\r
 \r
@@ -169,12 +175,16 @@ XenConnect (
   // Check if there are information left by hvmloader\r
   //\r
 \r
-  Info = (EFI_XEN_OVMF_INFO *)(UINTN) OVMF_INFO_PHYSICAL_ADDRESS;\r
+  Info = (EFI_XEN_OVMF_INFO *)(UINTN)OVMF_INFO_PHYSICAL_ADDRESS;\r
   //\r
   // Copy the signature, and make it null-terminated.\r
   //\r
-  AsciiStrnCpyS (Sig, sizeof (Sig), (CHAR8 *) &Info->Signature,\r
-    sizeof (Info->Signature));\r
+  AsciiStrnCpyS (\r
+    Sig,\r
+    sizeof (Sig),\r
+    (CHAR8 *)&Info->Signature,\r
+    sizeof (Info->Signature)\r
+    );\r
   if (AsciiStrCmp (Sig, "XenHVMOVMF") == 0) {\r
     mXenHvmloaderInfo = Info;\r
   } else {\r
@@ -188,14 +198,14 @@ XenConnect (
   // booted via the PVH entry point.\r
   //\r
 \r
-  PVHResetVectorData = (VOID *)(UINTN) PcdGet32 (PcdXenPvhStartOfDayStructPtr);\r
+  PVHResetVectorData = (VOID *)(UINTN)PcdGet32 (PcdXenPvhStartOfDayStructPtr);\r
   //\r
   // That magic value is written in XenResetVector/Ia32/XenPVHMain.asm\r
   //\r
   if (PVHResetVectorData[1] == SIGNATURE_32 ('X', 'P', 'V', 'H')) {\r
-    struct hvm_start_info *HVMStartInfo;\r
+    struct hvm_start_info  *HVMStartInfo;\r
 \r
-    HVMStartInfo = (VOID *)(UINTN) PVHResetVectorData[0];\r
+    HVMStartInfo = (VOID *)(UINTN)PVHResetVectorData[0];\r
     if (HVMStartInfo->magic == XEN_HVM_START_MAGIC_VALUE) {\r
       ASSERT (HVMStartInfo->rsdp_paddr != 0);\r
       if (HVMStartInfo->rsdp_paddr != 0) {\r
@@ -207,7 +217,7 @@ XenConnect (
   BuildGuidDataHob (\r
     &gEfiXenInfoGuid,\r
     &mXenInfo,\r
-    sizeof(mXenInfo)\r
+    sizeof (mXenInfo)\r
     );\r
 \r
   //\r
@@ -232,7 +242,7 @@ XenDetect (
   VOID\r
   )\r
 {\r
-  UINT8 Signature[13];\r
+  UINT8  Signature[13];\r
 \r
   if (mXenLeaf != 0) {\r
     return TRUE;\r
@@ -240,13 +250,15 @@ XenDetect (
 \r
   Signature[12] = '\0';\r
   for (mXenLeaf = 0x40000000; mXenLeaf < 0x40010000; mXenLeaf += 0x100) {\r
-    AsmCpuid (mXenLeaf,\r
-              NULL,\r
-              (UINT32 *) &Signature[0],\r
-              (UINT32 *) &Signature[4],\r
-              (UINT32 *) &Signature[8]);\r
-\r
-    if (!AsciiStrCmp ((CHAR8 *) Signature, "XenVMMXenVMM")) {\r
+    AsmCpuid (\r
+      mXenLeaf,\r
+      NULL,\r
+      (UINT32 *)&Signature[0],\r
+      (UINT32 *)&Signature[4],\r
+      (UINT32 *)&Signature[8]\r
+      );\r
+\r
+    if (!AsciiStrCmp ((CHAR8 *)Signature, "XenVMMXenVMM")) {\r
       return TRUE;\r
     }\r
   }\r
@@ -281,14 +293,13 @@ XenPublishRamRegions (
   VOID\r
   )\r
 {\r
-  EFI_E820_ENTRY64      *E820Map;\r
-  UINT32                E820EntriesCount;\r
-  EFI_STATUS            Status;\r
-  EFI_E820_ENTRY64      *Entry;\r
-  UINTN                 Index;\r
-  UINT64                LapicBase;\r
-  UINT64                LapicEnd;\r
-\r
+  EFI_E820_ENTRY64  *E820Map;\r
+  UINT32            E820EntriesCount;\r
+  EFI_STATUS        Status;\r
+  EFI_E820_ENTRY64  *Entry;\r
+  UINTN             Index;\r
+  UINT64            LapicBase;\r
+  UINT64            LapicEnd;\r
 \r
   DEBUG ((DEBUG_INFO, "Using memory map provided by Xen\n"));\r
 \r
@@ -296,7 +307,7 @@ XenPublishRamRegions (
   // Parse RAM in E820 map\r
   //\r
   E820EntriesCount = 0;\r
-  Status = XenGetE820Map (&E820Map, &E820EntriesCount);\r
+  Status           = XenGetE820Map (&E820Map, &E820EntriesCount);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   AddMemoryBaseSizeHob (0, 0xA0000);\r
@@ -306,14 +317,14 @@ XenPublishRamRegions (
   AddReservedMemoryBaseSizeHob (0xA0000, BASE_1MB - 0xA0000, TRUE);\r
 \r
   LapicBase = PcdGet32 (PcdCpuLocalApicBaseAddress);\r
-  LapicEnd = LapicBase + SIZE_1MB;\r
+  LapicEnd  = LapicBase + SIZE_1MB;\r
   AddIoMemoryRangeHob (LapicBase, LapicEnd);\r
 \r
   for (Index = 0; Index < E820EntriesCount; Index++) {\r
-    UINT64 Base;\r
-    UINT64 End;\r
-    UINT64 ReservedBase;\r
-    UINT64 ReservedEnd;\r
+    UINT64  Base;\r
+    UINT64  End;\r
+    UINT64  ReservedBase;\r
+    UINT64  ReservedEnd;\r
 \r
     Entry = &E820Map[Index];\r
 \r
@@ -321,7 +332,7 @@ XenPublishRamRegions (
     // Round up the start address, and round down the end address.\r
     //\r
     Base = ALIGN_VALUE (Entry->BaseAddr, (UINT64)EFI_PAGE_SIZE);\r
-    End = (Entry->BaseAddr + Entry->Length) & ~(UINT64)EFI_PAGE_MASK;\r
+    End  = (Entry->BaseAddr + Entry->Length) & ~(UINT64)EFI_PAGE_MASK;\r
 \r
     //\r
     // Ignore the first 1MB, this is handled before the loop.\r
@@ -329,52 +340,53 @@ XenPublishRamRegions (
     if (Base < BASE_1MB) {\r
       Base = BASE_1MB;\r
     }\r
+\r
     if (Base >= End) {\r
       continue;\r
     }\r
 \r
     switch (Entry->Type) {\r
-    case EfiAcpiAddressRangeMemory:\r
-      AddMemoryRangeHob (Base, End);\r
-      break;\r
-    case EfiAcpiAddressRangeACPI:\r
-      AddReservedMemoryRangeHob (Base, End, FALSE);\r
-      break;\r
-    case EfiAcpiAddressRangeReserved:\r
-      //\r
-      // hvmloader marks a range that overlaps with the local APIC memory\r
-      // mapped region as reserved, but CpuDxe wants it as mapped IO. We\r
-      // have already added it as mapped IO, so skip it here.\r
-      //\r
-\r
-      //\r
-      // add LAPIC predecessor range, if any\r
-      //\r
-      ReservedBase = Base;\r
-      ReservedEnd = MIN (End, LapicBase);\r
-      if (ReservedBase < ReservedEnd) {\r
-        AddReservedMemoryRangeHob (ReservedBase, ReservedEnd, FALSE);\r
-      }\r
-\r
-      //\r
-      // add LAPIC successor range, if any\r
-      //\r
-      ReservedBase = MAX (Base, LapicEnd);\r
-      ReservedEnd = End;\r
-      if (ReservedBase < ReservedEnd) {\r
-        AddReservedMemoryRangeHob (ReservedBase, ReservedEnd, FALSE);\r
-      }\r
-      break;\r
-    default:\r
-      break;\r
+      case EfiAcpiAddressRangeMemory:\r
+        AddMemoryRangeHob (Base, End);\r
+        break;\r
+      case EfiAcpiAddressRangeACPI:\r
+        AddReservedMemoryRangeHob (Base, End, FALSE);\r
+        break;\r
+      case EfiAcpiAddressRangeReserved:\r
+        //\r
+        // hvmloader marks a range that overlaps with the local APIC memory\r
+        // mapped region as reserved, but CpuDxe wants it as mapped IO. We\r
+        // have already added it as mapped IO, so skip it here.\r
+        //\r
+\r
+        //\r
+        // add LAPIC predecessor range, if any\r
+        //\r
+        ReservedBase = Base;\r
+        ReservedEnd  = MIN (End, LapicBase);\r
+        if (ReservedBase < ReservedEnd) {\r
+          AddReservedMemoryRangeHob (ReservedBase, ReservedEnd, FALSE);\r
+        }\r
+\r
+        //\r
+        // add LAPIC successor range, if any\r
+        //\r
+        ReservedBase = MAX (Base, LapicEnd);\r
+        ReservedEnd  = End;\r
+        if (ReservedBase < ReservedEnd) {\r
+          AddReservedMemoryRangeHob (ReservedBase, ReservedEnd, FALSE);\r
+        }\r
+\r
+        break;\r
+      default:\r
+        break;\r
     }\r
   }\r
 }\r
 \r
-\r
 EFI_STATUS\r
 PhysicalAddressIdentityMapping (\r
-  IN EFI_PHYSICAL_ADDRESS   AddressToMap\r
+  IN EFI_PHYSICAL_ADDRESS  AddressToMap\r
   )\r
 {\r
   INTN                            Index;\r
@@ -385,7 +397,7 @@ PhysicalAddressIdentityMapping (
 \r
   // L4 / Top level Page Directory Pointers\r
 \r
-  L4 = (VOID*)(UINTN)PcdGet32 (PcdOvmfSecPageTablesBase);\r
+  L4    = (VOID *)(UINTN)PcdGet32 (PcdOvmfSecPageTablesBase);\r
   Index = PML4_OFFSET (AddressToMap);\r
 \r
   if (!L4[Index].Bits.Present) {\r
@@ -396,15 +408,15 @@ PhysicalAddressIdentityMapping (
 \r
     ZeroMem (L3, EFI_PAGE_SIZE);\r
 \r
-    L4[Index].Bits.ReadWrite = 1;\r
-    L4[Index].Bits.Accessed = 1;\r
+    L4[Index].Bits.ReadWrite            = 1;\r
+    L4[Index].Bits.Accessed             = 1;\r
     L4[Index].Bits.PageTableBaseAddress = (EFI_PHYSICAL_ADDRESS)L3 >> 12;\r
-    L4[Index].Bits.Present = 1;\r
+    L4[Index].Bits.Present              = 1;\r
   }\r
 \r
   // L3 / Next level Page Directory Pointers\r
 \r
-  L3 = (VOID*)(EFI_PHYSICAL_ADDRESS)(L4[Index].Bits.PageTableBaseAddress << 12);\r
+  L3    = (VOID *)(EFI_PHYSICAL_ADDRESS)(L4[Index].Bits.PageTableBaseAddress << 12);\r
   Index = PDP_OFFSET (AddressToMap);\r
 \r
   if (!L3[Index].Bits.Present) {\r
@@ -415,24 +427,24 @@ PhysicalAddressIdentityMapping (
 \r
     ZeroMem (PageTable, EFI_PAGE_SIZE);\r
 \r
-    L3[Index].Bits.ReadWrite = 1;\r
-    L3[Index].Bits.Accessed = 1;\r
+    L3[Index].Bits.ReadWrite            = 1;\r
+    L3[Index].Bits.Accessed             = 1;\r
     L3[Index].Bits.PageTableBaseAddress = (EFI_PHYSICAL_ADDRESS)PageTable >> 12;\r
-    L3[Index].Bits.Present = 1;\r
+    L3[Index].Bits.Present              = 1;\r
   }\r
 \r
   // L2 / Page Table Entries\r
 \r
-  PageTable = (VOID*)(EFI_PHYSICAL_ADDRESS)(L3[Index].Bits.PageTableBaseAddress << 12);\r
-  Index = PDE_OFFSET (AddressToMap);\r
+  PageTable = (VOID *)(EFI_PHYSICAL_ADDRESS)(L3[Index].Bits.PageTableBaseAddress << 12);\r
+  Index     = PDE_OFFSET (AddressToMap);\r
 \r
   if (!PageTable[Index].Bits.Present) {\r
-    PageTable[Index].Bits.ReadWrite = 1;\r
-    PageTable[Index].Bits.Accessed = 1;\r
-    PageTable[Index].Bits.Dirty = 1;\r
-    PageTable[Index].Bits.MustBe1 = 1;\r
+    PageTable[Index].Bits.ReadWrite            = 1;\r
+    PageTable[Index].Bits.Accessed             = 1;\r
+    PageTable[Index].Bits.Dirty                = 1;\r
+    PageTable[Index].Bits.MustBe1              = 1;\r
     PageTable[Index].Bits.PageTableBaseAddress = AddressToMap >> 21;\r
-    PageTable[Index].Bits.Present = 1;\r
+    PageTable[Index].Bits.Present              = 1;\r
   }\r
 \r
   CpuFlushTlb ();\r
@@ -443,7 +455,7 @@ PhysicalAddressIdentityMapping (
 STATIC\r
 EFI_STATUS\r
 MapSharedInfoPage (\r
-  IN VOID *PagePtr\r
+  IN VOID  *PagePtr\r
   )\r
 {\r
   xen_add_to_physmap_t  Parameters;\r
@@ -451,81 +463,85 @@ MapSharedInfoPage (
 \r
   Parameters.domid = DOMID_SELF;\r
   Parameters.space = XENMAPSPACE_shared_info;\r
-  Parameters.idx = 0;\r
-  Parameters.gpfn = (UINTN)PagePtr >> EFI_PAGE_SHIFT;\r
-  ReturnCode = XenHypercallMemoryOp (XENMEM_add_to_physmap, &Parameters);\r
+  Parameters.idx   = 0;\r
+  Parameters.gpfn  = (UINTN)PagePtr >> EFI_PAGE_SHIFT;\r
+  ReturnCode       = XenHypercallMemoryOp (XENMEM_add_to_physmap, &Parameters);\r
   if (ReturnCode != 0) {\r
     return EFI_NO_MAPPING;\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
 STATIC\r
 VOID\r
 UnmapXenPage (\r
-  IN VOID *PagePtr\r
+  IN VOID  *PagePtr\r
   )\r
 {\r
-  xen_remove_from_physmap_t Parameters;\r
-  INTN                      ReturnCode;\r
+  xen_remove_from_physmap_t  Parameters;\r
+  INTN                       ReturnCode;\r
 \r
   Parameters.domid = DOMID_SELF;\r
-  Parameters.gpfn = (UINTN)PagePtr >> EFI_PAGE_SHIFT;\r
-  ReturnCode = XenHypercallMemoryOp (XENMEM_remove_from_physmap, &Parameters);\r
+  Parameters.gpfn  = (UINTN)PagePtr >> EFI_PAGE_SHIFT;\r
+  ReturnCode       = XenHypercallMemoryOp (XENMEM_remove_from_physmap, &Parameters);\r
   ASSERT (ReturnCode == 0);\r
 }\r
 \r
-\r
 STATIC\r
 UINT64\r
 GetCpuFreq (\r
-  IN XEN_VCPU_TIME_INFO *VcpuTime\r
+  IN XEN_VCPU_TIME_INFO  *VcpuTime\r
   )\r
 {\r
-  UINT32 Version;\r
-  UINT32 TscToSystemMultiplier;\r
-  INT8   TscShift;\r
-  UINT64 CpuFreq;\r
+  UINT32  Version;\r
+  UINT32  TscToSystemMultiplier;\r
+  INT8    TscShift;\r
+  UINT64  CpuFreq;\r
 \r
   do {\r
     Version = VcpuTime->Version;\r
     MemoryFence ();\r
     TscToSystemMultiplier = VcpuTime->TscToSystemMultiplier;\r
-    TscShift = VcpuTime->TscShift;\r
+    TscShift              = VcpuTime->TscShift;\r
     MemoryFence ();\r
   } while (((Version & 1) != 0) && (Version != VcpuTime->Version));\r
 \r
   CpuFreq = DivU64x32 (LShiftU64 (1000000000ULL, 32), TscToSystemMultiplier);\r
   if (TscShift >= 0) {\r
-      CpuFreq = RShiftU64 (CpuFreq, TscShift);\r
+    CpuFreq = RShiftU64 (CpuFreq, TscShift);\r
   } else {\r
-      CpuFreq = LShiftU64 (CpuFreq, -TscShift);\r
+    CpuFreq = LShiftU64 (CpuFreq, -TscShift);\r
   }\r
+\r
   return CpuFreq;\r
 }\r
 \r
 STATIC\r
 VOID\r
 XenDelay (\r
-  IN XEN_VCPU_TIME_INFO *VcpuTimeInfo,\r
-  IN UINT64             DelayNs\r
+  IN XEN_VCPU_TIME_INFO  *VcpuTimeInfo,\r
+  IN UINT64              DelayNs\r
   )\r
 {\r
-  UINT64        Tick;\r
-  UINT64        CpuFreq;\r
-  UINT64        Delay;\r
-  UINT64        DelayTick;\r
-  UINT64        NewTick;\r
-  RETURN_STATUS Status;\r
+  UINT64         Tick;\r
+  UINT64         CpuFreq;\r
+  UINT64         Delay;\r
+  UINT64         DelayTick;\r
+  UINT64         NewTick;\r
+  RETURN_STATUS  Status;\r
 \r
   Tick = AsmReadTsc ();\r
 \r
   CpuFreq = GetCpuFreq (VcpuTimeInfo);\r
-  Status = SafeUint64Mult (DelayNs, CpuFreq, &Delay);\r
+  Status  = SafeUint64Mult (DelayNs, CpuFreq, &Delay);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "XenDelay (%lu ns): delay too big in relation to CPU freq %lu Hz\n",\r
-      DelayNs, CpuFreq));\r
+      DelayNs,\r
+      CpuFreq\r
+      ));\r
     ASSERT_EFI_ERROR (Status);\r
     CpuDeadLoop ();\r
   }\r
@@ -551,7 +567,6 @@ XenDelay (
   }\r
 }\r
 \r
-\r
 /**\r
   Calculate the frequency of the Local Apic Timer\r
 **/\r
@@ -560,29 +575,33 @@ CalibrateLapicTimer (
   VOID\r
   )\r
 {\r
-  XEN_SHARED_INFO       *SharedInfo;\r
-  XEN_VCPU_TIME_INFO    *VcpuTimeInfo;\r
-  UINT32                TimerTick, TimerTick2, DiffTimer;\r
-  UINT64                TscTick, TscTick2;\r
-  UINT64                Freq;\r
-  UINT64                Dividend;\r
-  EFI_STATUS            Status;\r
-\r
-\r
-  SharedInfo = (VOID*)((UINTN)PcdGet32 (PcdCpuLocalApicBaseAddress) + SIZE_1MB);\r
-  Status = PhysicalAddressIdentityMapping ((EFI_PHYSICAL_ADDRESS)SharedInfo);\r
+  XEN_SHARED_INFO     *SharedInfo;\r
+  XEN_VCPU_TIME_INFO  *VcpuTimeInfo;\r
+  UINT32              TimerTick, TimerTick2, DiffTimer;\r
+  UINT64              TscTick, TscTick2;\r
+  UINT64              Freq;\r
+  UINT64              Dividend;\r
+  EFI_STATUS          Status;\r
+\r
+  SharedInfo = (VOID *)((UINTN)PcdGet32 (PcdCpuLocalApicBaseAddress) + SIZE_1MB);\r
+  Status     = PhysicalAddressIdentityMapping ((EFI_PHYSICAL_ADDRESS)SharedInfo);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR,\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "Failed to add page table entry for Xen shared info page: %r\n",\r
-      Status));\r
+      Status\r
+      ));\r
     ASSERT_EFI_ERROR (Status);\r
     return;\r
   }\r
 \r
   Status = MapSharedInfoPage (SharedInfo);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "Failed to map Xen's shared info page: %r\n",\r
-      Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "Failed to map Xen's shared info page: %r\n",\r
+      Status\r
+      ));\r
     ASSERT_EFI_ERROR (Status);\r
     return;\r
   }\r
@@ -593,18 +612,21 @@ CalibrateLapicTimer (
   DisableApicTimerInterrupt ();\r
 \r
   TimerTick = GetApicTimerCurrentCount ();\r
-  TscTick = AsmReadTsc ();\r
+  TscTick   = AsmReadTsc ();\r
   XenDelay (VcpuTimeInfo, 1000000ULL);\r
   TimerTick2 = GetApicTimerCurrentCount ();\r
-  TscTick2 = AsmReadTsc ();\r
-\r
+  TscTick2   = AsmReadTsc ();\r
 \r
   DiffTimer = TimerTick - TimerTick2;\r
-  Status = SafeUint64Mult (GetCpuFreq (VcpuTimeInfo), DiffTimer, &Dividend);\r
+  Status    = SafeUint64Mult (GetCpuFreq (VcpuTimeInfo), DiffTimer, &Dividend);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "overflow while calculating APIC frequency\n"));\r
-    DEBUG ((DEBUG_ERROR, "CPU freq: %lu Hz; APIC timer tick count for 1 ms: %u\n",\r
-      GetCpuFreq (VcpuTimeInfo), DiffTimer));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "CPU freq: %lu Hz; APIC timer tick count for 1 ms: %u\n",\r
+      GetCpuFreq (VcpuTimeInfo),\r
+      DiffTimer\r
+      ));\r
     ASSERT_EFI_ERROR (Status);\r
     CpuDeadLoop ();\r
   }\r
index 2605481280c0421de395640cd1ccc03b68997024..58d1f054846ab446a6770a747bc5aa5efa1e053c 100644 (file)
@@ -13,26 +13,26 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <PiPei.h>\r
 \r
 // Physical address of OVMF info\r
-#define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000\r
+#define OVMF_INFO_PHYSICAL_ADDRESS  0x00001000\r
 \r
 // This structure must match the definition on Xen side\r
 #pragma pack(1)\r
 typedef struct {\r
-  CHAR8 Signature[14]; // XenHVMOVMF\0\r
-  UINT8 Length;        // Length of this structure\r
-  UINT8 Checksum;      // Set such that the sum over bytes 0..length == 0\r
+  CHAR8                   Signature[14]; // XenHVMOVMF\0\r
+  UINT8                   Length;        // Length of this structure\r
+  UINT8                   Checksum;      // Set such that the sum over bytes 0..length == 0\r
   //\r
   // Physical address of an array of TablesCount elements.\r
   //\r
   // Each element contains the physical address of a BIOS table.\r
   //\r
-  EFI_PHYSICAL_ADDRESS Tables;\r
-  UINT32 TablesCount;\r
+  EFI_PHYSICAL_ADDRESS    Tables;\r
+  UINT32                  TablesCount;\r
   //\r
   // Physical address of the E820 table, contains E820EntriesCount entries.\r
   //\r
-  EFI_PHYSICAL_ADDRESS E820;\r
-  UINT32 E820EntriesCount;\r
+  EFI_PHYSICAL_ADDRESS    E820;\r
+  UINT32                  E820EntriesCount;\r
 } EFI_XEN_OVMF_INFO;\r
 #pragma pack()\r
 \r
index 14f9cc85b3ec7f21584faebf2cf0edb2763c0c3f..7aa5ef044be02f8422e1834766f884b4f8a52e4a 100644 (file)
 STATIC\r
 XENSTORE_STATUS\r
 XenBusReadUint64 (\r
-  IN  XENBUS_PROTOCOL *This,\r
-  IN  CONST CHAR8     *Node,\r
-  IN  BOOLEAN         FromBackend,\r
-  OUT UINT64          *ValuePtr\r
+  IN  XENBUS_PROTOCOL  *This,\r
+  IN  CONST CHAR8      *Node,\r
+  IN  BOOLEAN          FromBackend,\r
+  OUT UINT64           *ValuePtr\r
   )\r
 {\r
-  XENSTORE_STATUS Status;\r
-  CHAR8 *Ptr;\r
+  XENSTORE_STATUS  Status;\r
+  CHAR8            *Ptr;\r
 \r
   if (!FromBackend) {\r
-    Status = This->XsRead (This, XST_NIL, Node, (VOID**)&Ptr);\r
+    Status = This->XsRead (This, XST_NIL, Node, (VOID **)&Ptr);\r
   } else {\r
-    Status = This->XsBackendRead (This, XST_NIL, Node, (VOID**)&Ptr);\r
+    Status = This->XsBackendRead (This, XST_NIL, Node, (VOID **)&Ptr);\r
   }\r
+\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     return Status;\r
   }\r
+\r
   // AsciiStrDecimalToUint64 will ASSERT if Ptr overflow UINT64.\r
   *ValuePtr = AsciiStrDecimalToUint64 (Ptr);\r
   FreePool (Ptr);\r
@@ -65,20 +67,23 @@ XenBusReadUint64 (
 STATIC\r
 VOID\r
 XenPvBlockFree (\r
-  IN XEN_BLOCK_FRONT_DEVICE *Dev\r
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev\r
   )\r
 {\r
-  XENBUS_PROTOCOL *XenBusIo = Dev->XenBusIo;\r
+  XENBUS_PROTOCOL  *XenBusIo = Dev->XenBusIo;\r
 \r
   if (Dev->RingRef != 0) {\r
     XenBusIo->GrantEndAccess (XenBusIo, Dev->RingRef);\r
   }\r
+\r
   if (Dev->Ring.sring != NULL) {\r
     FreePages (Dev->Ring.sring, 1);\r
   }\r
+\r
   if (Dev->EventChannel != 0) {\r
     XenBusIo->EventChannelClose (XenBusIo, Dev->EventChannel);\r
   }\r
+\r
   FreePool (Dev);\r
 }\r
 \r
@@ -95,27 +100,29 @@ XenPvBlockFree (
 STATIC\r
 XENSTORE_STATUS\r
 XenPvBlkWaitForBackendState (\r
-  IN  XEN_BLOCK_FRONT_DEVICE *Dev,\r
-  IN  XenbusState            ExpectedState,\r
-  OUT XenbusState            *LastStatePtr OPTIONAL\r
+  IN  XEN_BLOCK_FRONT_DEVICE  *Dev,\r
+  IN  XenbusState             ExpectedState,\r
+  OUT XenbusState             *LastStatePtr OPTIONAL\r
   )\r
 {\r
-  XENBUS_PROTOCOL *XenBusIo = Dev->XenBusIo;\r
-  XenbusState State;\r
-  UINT64 Value;\r
-  XENSTORE_STATUS Status = XENSTORE_STATUS_SUCCESS;\r
+  XENBUS_PROTOCOL  *XenBusIo = Dev->XenBusIo;\r
+  XenbusState      State;\r
+  UINT64           Value;\r
+  XENSTORE_STATUS  Status = XENSTORE_STATUS_SUCCESS;\r
 \r
   while (TRUE) {\r
     Status = XenBusReadUint64 (XenBusIo, "state", TRUE, &Value);\r
     if (Status != XENSTORE_STATUS_SUCCESS) {\r
       return Status;\r
     }\r
+\r
     if (Value > XenbusStateReconfigured) {\r
       //\r
       // Value is not a State value.\r
       //\r
       return XENSTORE_STATUS_EIO;\r
     }\r
+\r
     State = Value;\r
     if (State == ExpectedState) {\r
       break;\r
@@ -123,9 +130,13 @@ XenPvBlkWaitForBackendState (
       Status = XENSTORE_STATUS_FAIL;\r
       break;\r
     }\r
-    DEBUG ((DEBUG_INFO,\r
-            "XenPvBlk: waiting backend state %d, current: %d\n",\r
-            ExpectedState, State));\r
+\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "XenPvBlk: waiting backend state %d, current: %d\n",\r
+      ExpectedState,\r
+      State\r
+      ));\r
     XenBusIo->WaitForWatch (XenBusIo, Dev->StateWatchToken);\r
   }\r
 \r
@@ -143,14 +154,14 @@ XenPvBlockFrontInitialization (
   OUT XEN_BLOCK_FRONT_DEVICE  **DevPtr\r
   )\r
 {\r
-  XENSTORE_TRANSACTION Transaction;\r
-  CHAR8 *DeviceType;\r
-  blkif_sring_t *SharedRing;\r
-  XENSTORE_STATUS Status;\r
-  XEN_BLOCK_FRONT_DEVICE *Dev;\r
-  XenbusState State;\r
-  UINT64 Value;\r
-  CHAR8 *Params;\r
+  XENSTORE_TRANSACTION    Transaction;\r
+  CHAR8                   *DeviceType;\r
+  blkif_sring_t           *SharedRing;\r
+  XENSTORE_STATUS         Status;\r
+  XEN_BLOCK_FRONT_DEVICE  *Dev;\r
+  XenbusState             State;\r
+  UINT64                  Value;\r
+  CHAR8                   *Params;\r
 \r
   ASSERT (NodeName != NULL);\r
 \r
@@ -160,49 +171,58 @@ XenPvBlockFrontInitialization (
   }\r
 \r
   Dev->Signature = XEN_BLOCK_FRONT_SIGNATURE;\r
-  Dev->NodeName = NodeName;\r
-  Dev->XenBusIo = XenBusIo;\r
-  Dev->DeviceId = XenBusIo->DeviceId;\r
+  Dev->NodeName  = NodeName;\r
+  Dev->XenBusIo  = XenBusIo;\r
+  Dev->DeviceId  = XenBusIo->DeviceId;\r
 \r
-  XenBusIo->XsRead (XenBusIo, XST_NIL, "device-type", (VOID**)&DeviceType);\r
+  XenBusIo->XsRead (XenBusIo, XST_NIL, "device-type", (VOID **)&DeviceType);\r
   if (AsciiStrCmp (DeviceType, "cdrom") == 0) {\r
     Dev->MediaInfo.CdRom = TRUE;\r
   } else {\r
     Dev->MediaInfo.CdRom = FALSE;\r
   }\r
+\r
   FreePool (DeviceType);\r
 \r
   if (Dev->MediaInfo.CdRom) {\r
-    Status = XenBusIo->XsBackendRead (XenBusIo, XST_NIL, "params", (VOID**)&Params);\r
+    Status = XenBusIo->XsBackendRead (XenBusIo, XST_NIL, "params", (VOID **)&Params);\r
     if (Status != XENSTORE_STATUS_SUCCESS) {\r
       DEBUG ((DEBUG_ERROR, "%a: Failed to read params (%d)\n", __FUNCTION__, Status));\r
       goto Error;\r
     }\r
-    if (AsciiStrLen (Params) == 0 || AsciiStrCmp (Params, "aio:") == 0) {\r
+\r
+    if ((AsciiStrLen (Params) == 0) || (AsciiStrCmp (Params, "aio:") == 0)) {\r
       FreePool (Params);\r
       DEBUG ((DEBUG_INFO, "%a: Empty cdrom\n", __FUNCTION__));\r
       goto Error;\r
     }\r
+\r
     FreePool (Params);\r
   }\r
 \r
   Status = XenBusReadUint64 (XenBusIo, "backend-id", FALSE, &Value);\r
-  if (Status != XENSTORE_STATUS_SUCCESS || Value > MAX_UINT16) {\r
-    DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to get backend-id (%d)\n",\r
-            Status));\r
+  if ((Status != XENSTORE_STATUS_SUCCESS) || (Value > MAX_UINT16)) {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenPvBlk: Failed to get backend-id (%d)\n",\r
+      Status\r
+      ));\r
     goto Error;\r
   }\r
+\r
   Dev->DomainId = (domid_t)Value;\r
   XenBusIo->EventChannelAllocate (XenBusIo, Dev->DomainId, &Dev->EventChannel);\r
 \r
-  SharedRing = (blkif_sring_t*) AllocatePages (1);\r
+  SharedRing = (blkif_sring_t *)AllocatePages (1);\r
   SHARED_RING_INIT (SharedRing);\r
   FRONT_RING_INIT (&Dev->Ring, SharedRing, EFI_PAGE_SIZE);\r
-  XenBusIo->GrantAccess (XenBusIo,\r
-                         Dev->DomainId,\r
-                         (INTN) SharedRing >> EFI_PAGE_SHIFT,\r
-                         FALSE,\r
-                         &Dev->RingRef);\r
+  XenBusIo->GrantAccess (\r
+              XenBusIo,\r
+              Dev->DomainId,\r
+              (INTN)SharedRing >> EFI_PAGE_SHIFT,\r
+              FALSE,\r
+              &Dev->RingRef\r
+              );\r
 \r
 Again:\r
   Status = XenBusIo->XsTransactionStart (XenBusIo, &Transaction);\r
@@ -211,20 +231,40 @@ Again:
     goto Error;\r
   }\r
 \r
-  Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName, "ring-ref", "%d",\r
-                               Dev->RingRef);\r
+  Status = XenBusIo->XsPrintf (\r
+                       XenBusIo,\r
+                       &Transaction,\r
+                       NodeName,\r
+                       "ring-ref",\r
+                       "%d",\r
+                       Dev->RingRef\r
+                       );\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to write ring-ref.\n"));\r
     goto AbortTransaction;\r
   }\r
-  Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName,\r
-                               "event-channel", "%d", Dev->EventChannel);\r
+\r
+  Status = XenBusIo->XsPrintf (\r
+                       XenBusIo,\r
+                       &Transaction,\r
+                       NodeName,\r
+                       "event-channel",\r
+                       "%d",\r
+                       Dev->EventChannel\r
+                       );\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to write event-channel.\n"));\r
     goto AbortTransaction;\r
   }\r
-  Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName,\r
-                               "protocol", "%a", XEN_IO_PROTO_ABI_NATIVE);\r
+\r
+  Status = XenBusIo->XsPrintf (\r
+                       XenBusIo,\r
+                       &Transaction,\r
+                       NodeName,\r
+                       "protocol",\r
+                       "%a",\r
+                       XEN_IO_PROTO_ABI_NATIVE\r
+                       );\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
     DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to write protocol.\n"));\r
     goto AbortTransaction;\r
@@ -248,16 +288,22 @@ Again:
   //\r
   Status = XenPvBlkWaitForBackendState (Dev, XenbusStateConnected, &State);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
-    DEBUG ((DEBUG_ERROR,\r
-            "XenPvBlk: backend for %a/%d not available, rc=%d state=%d\n",\r
-            XenBusIo->Type, XenBusIo->DeviceId, Status, State));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenPvBlk: backend for %a/%d not available, rc=%d state=%d\n",\r
+      XenBusIo->Type,\r
+      XenBusIo->DeviceId,\r
+      Status,\r
+      State\r
+      ));\r
     goto Error2;\r
   }\r
 \r
   Status = XenBusReadUint64 (XenBusIo, "info", TRUE, &Value);\r
-  if (Status != XENSTORE_STATUS_SUCCESS || Value > MAX_UINT32) {\r
+  if ((Status != XENSTORE_STATUS_SUCCESS) || (Value > MAX_UINT32)) {\r
     goto Error2;\r
   }\r
+\r
   Dev->MediaInfo.VDiskInfo = (UINT32)Value;\r
   if (Dev->MediaInfo.VDiskInfo & VDISK_READONLY) {\r
     Dev->MediaInfo.ReadWrite = FALSE;\r
@@ -271,17 +317,23 @@ Again:
   }\r
 \r
   Status = XenBusReadUint64 (XenBusIo, "sector-size", TRUE, &Value);\r
-  if (Status != XENSTORE_STATUS_SUCCESS || Value > MAX_UINT32) {\r
+  if ((Status != XENSTORE_STATUS_SUCCESS) || (Value > MAX_UINT32)) {\r
     goto Error2;\r
   }\r
+\r
   if ((UINT32)Value % 512 != 0) {\r
     //\r
     // This is not supported by the driver.\r
     //\r
-    DEBUG ((DEBUG_ERROR, "XenPvBlk: Unsupported sector-size value %Lu, "\r
-            "it must be a multiple of 512\n", Value));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenPvBlk: Unsupported sector-size value %Lu, "\r
+      "it must be a multiple of 512\n",\r
+      Value\r
+      ));\r
     goto Error2;\r
   }\r
+\r
   Dev->MediaInfo.SectorSize = (UINT32)Value;\r
 \r
   // Default value\r
@@ -302,8 +354,12 @@ Again:
     Dev->MediaInfo.FeatureFlushCache = FALSE;\r
   }\r
 \r
-  DEBUG ((DEBUG_INFO, "XenPvBlk: New disk with %ld sectors of %d bytes\n",\r
-          Dev->MediaInfo.Sectors, Dev->MediaInfo.SectorSize));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "XenPvBlk: New disk with %ld sectors of %d bytes\n",\r
+    Dev->MediaInfo.Sectors,\r
+    Dev->MediaInfo.SectorSize\r
+    ));\r
 \r
   *DevPtr = Dev;\r
   return EFI_SUCCESS;\r
@@ -323,69 +379,86 @@ Error:
 \r
 VOID\r
 XenPvBlockFrontShutdown (\r
-  IN XEN_BLOCK_FRONT_DEVICE *Dev\r
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev\r
   )\r
 {\r
-  XENBUS_PROTOCOL *XenBusIo = Dev->XenBusIo;\r
-  XENSTORE_STATUS Status;\r
-  UINT64 Value;\r
+  XENBUS_PROTOCOL  *XenBusIo = Dev->XenBusIo;\r
+  XENSTORE_STATUS  Status;\r
+  UINT64           Value;\r
 \r
   XenPvBlockSync (Dev);\r
 \r
   Status = XenBusIo->SetState (XenBusIo, XST_NIL, XenbusStateClosing);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
-    DEBUG ((DEBUG_ERROR,\r
-            "XenPvBlk: error while changing state to Closing: %d\n",\r
-            Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenPvBlk: error while changing state to Closing: %d\n",\r
+      Status\r
+      ));\r
     goto Close;\r
   }\r
 \r
   Status = XenPvBlkWaitForBackendState (Dev, XenbusStateClosing, NULL);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
-    DEBUG ((DEBUG_ERROR,\r
-            "XenPvBlk: error while waiting for closing backend state: %d\n",\r
-            Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenPvBlk: error while waiting for closing backend state: %d\n",\r
+      Status\r
+      ));\r
     goto Close;\r
   }\r
 \r
   Status = XenBusIo->SetState (XenBusIo, XST_NIL, XenbusStateClosed);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
-    DEBUG ((DEBUG_ERROR,\r
-            "XenPvBlk: error while changing state to Closed: %d\n",\r
-            Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenPvBlk: error while changing state to Closed: %d\n",\r
+      Status\r
+      ));\r
     goto Close;\r
   }\r
 \r
   Status = XenPvBlkWaitForBackendState (Dev, XenbusStateClosed, NULL);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
-    DEBUG ((DEBUG_ERROR,\r
-            "XenPvBlk: error while waiting for closed backend state: %d\n",\r
-            Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenPvBlk: error while waiting for closed backend state: %d\n",\r
+      Status\r
+      ));\r
     goto Close;\r
   }\r
 \r
   Status = XenBusIo->SetState (XenBusIo, XST_NIL, XenbusStateInitialising);\r
   if (Status != XENSTORE_STATUS_SUCCESS) {\r
-    DEBUG ((DEBUG_ERROR,\r
-            "XenPvBlk: error while changing state to initialising: %d\n",\r
-            Status));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenPvBlk: error while changing state to initialising: %d\n",\r
+      Status\r
+      ));\r
     goto Close;\r
   }\r
 \r
   while (TRUE) {\r
     Status = XenBusReadUint64 (XenBusIo, "state", TRUE, &Value);\r
     if (Status != XENSTORE_STATUS_SUCCESS) {\r
-      DEBUG ((DEBUG_ERROR,\r
-              "XenPvBlk: error while waiting for new backend state: %d\n",\r
-              Status));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "XenPvBlk: error while waiting for new backend state: %d\n",\r
+        Status\r
+        ));\r
       goto Close;\r
     }\r
-    if (Value <= XenbusStateInitWait || Value >= XenbusStateClosed) {\r
+\r
+    if ((Value <= XenbusStateInitWait) || (Value >= XenbusStateClosed)) {\r
       break;\r
     }\r
-    DEBUG ((DEBUG_INFO,\r
-            "XenPvBlk: waiting backend state %d, current: %Lu\n",\r
-            XenbusStateInitWait, Value));\r
+\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "XenPvBlk: waiting backend state %d, current: %Lu\n",\r
+      XenbusStateInitWait,\r
+      Value\r
+      ));\r
     XenBusIo->WaitForWatch (XenBusIo, Dev->StateWatchToken);\r
   }\r
 \r
@@ -401,7 +474,7 @@ Close:
 STATIC\r
 VOID\r
 XenPvBlockWaitSlot (\r
-  IN XEN_BLOCK_FRONT_DEVICE *Dev\r
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev\r
   )\r
 {\r
   /* Wait for a slot */\r
@@ -411,6 +484,7 @@ XenPvBlockWaitSlot (
       if (!RING_FULL (&Dev->Ring)) {\r
         break;\r
       }\r
+\r
       /* Really no slot, could wait for an event on Dev->EventChannel. */\r
     }\r
   }\r
@@ -418,53 +492,58 @@ XenPvBlockWaitSlot (
 \r
 VOID\r
 XenPvBlockAsyncIo (\r
-  IN OUT XEN_BLOCK_FRONT_IO *IoData,\r
-  IN     BOOLEAN            IsWrite\r
+  IN OUT XEN_BLOCK_FRONT_IO  *IoData,\r
+  IN     BOOLEAN             IsWrite\r
   )\r
 {\r
-  XEN_BLOCK_FRONT_DEVICE *Dev = IoData->Dev;\r
-  XENBUS_PROTOCOL *XenBusIo = Dev->XenBusIo;\r
-  blkif_request_t *Request;\r
-  RING_IDX RingIndex;\r
-  BOOLEAN Notify;\r
-  INT32 NumSegments, Index;\r
-  UINTN Start, End;\r
+  XEN_BLOCK_FRONT_DEVICE  *Dev      = IoData->Dev;\r
+  XENBUS_PROTOCOL         *XenBusIo = Dev->XenBusIo;\r
+  blkif_request_t         *Request;\r
+  RING_IDX                RingIndex;\r
+  BOOLEAN                 Notify;\r
+  INT32                   NumSegments, Index;\r
+  UINTN                   Start, End;\r
 \r
   // Can't io at non-sector-aligned location\r
-  ASSERT(!(IoData->Sector & ((Dev->MediaInfo.SectorSize / 512) - 1)));\r
+  ASSERT (!(IoData->Sector & ((Dev->MediaInfo.SectorSize / 512) - 1)));\r
   // Can't io non-sector-sized amounts\r
-  ASSERT(!(IoData->Size & (Dev->MediaInfo.SectorSize - 1)));\r
+  ASSERT (!(IoData->Size & (Dev->MediaInfo.SectorSize - 1)));\r
   // Can't io non-sector-aligned buffer\r
-  ASSERT(!((UINTN) IoData->Buffer & (Dev->MediaInfo.SectorSize - 1)));\r
+  ASSERT (!((UINTN)IoData->Buffer & (Dev->MediaInfo.SectorSize - 1)));\r
 \r
-  Start = (UINTN) IoData->Buffer & ~EFI_PAGE_MASK;\r
-  End = ((UINTN) IoData->Buffer + IoData->Size + EFI_PAGE_SIZE - 1) & ~EFI_PAGE_MASK;\r
+  Start          = (UINTN)IoData->Buffer & ~EFI_PAGE_MASK;\r
+  End            = ((UINTN)IoData->Buffer + IoData->Size + EFI_PAGE_SIZE - 1) & ~EFI_PAGE_MASK;\r
   IoData->NumRef = NumSegments = (INT32)((End - Start) / EFI_PAGE_SIZE);\r
 \r
   ASSERT (NumSegments <= BLKIF_MAX_SEGMENTS_PER_REQUEST);\r
 \r
   XenPvBlockWaitSlot (Dev);\r
   RingIndex = Dev->Ring.req_prod_pvt;\r
-  Request = RING_GET_REQUEST (&Dev->Ring, RingIndex);\r
+  Request   = RING_GET_REQUEST (&Dev->Ring, RingIndex);\r
 \r
-  Request->operation = IsWrite ? BLKIF_OP_WRITE : BLKIF_OP_READ;\r
-  Request->nr_segments = (UINT8)NumSegments;\r
-  Request->handle = Dev->DeviceId;\r
-  Request->id = (UINTN) IoData;\r
+  Request->operation     = IsWrite ? BLKIF_OP_WRITE : BLKIF_OP_READ;\r
+  Request->nr_segments   = (UINT8)NumSegments;\r
+  Request->handle        = Dev->DeviceId;\r
+  Request->id            = (UINTN)IoData;\r
   Request->sector_number = IoData->Sector;\r
 \r
   for (Index = 0; Index < NumSegments; Index++) {\r
     Request->seg[Index].first_sect = 0;\r
-    Request->seg[Index].last_sect = EFI_PAGE_SIZE / 512 - 1;\r
+    Request->seg[Index].last_sect  = EFI_PAGE_SIZE / 512 - 1;\r
   }\r
-  Request->seg[0].first_sect = (UINT8)(((UINTN) IoData->Buffer & EFI_PAGE_MASK) / 512);\r
+\r
+  Request->seg[0].first_sect              = (UINT8)(((UINTN)IoData->Buffer & EFI_PAGE_MASK) / 512);\r
   Request->seg[NumSegments - 1].last_sect =\r
-      (UINT8)((((UINTN) IoData->Buffer + IoData->Size - 1) & EFI_PAGE_MASK) / 512);\r
+    (UINT8)((((UINTN)IoData->Buffer + IoData->Size - 1) & EFI_PAGE_MASK) / 512);\r
   for (Index = 0; Index < NumSegments; Index++) {\r
-    UINTN Data = Start + Index * EFI_PAGE_SIZE;\r
-    XenBusIo->GrantAccess (XenBusIo, Dev->DomainId,\r
-                           Data >> EFI_PAGE_SHIFT, IsWrite,\r
-                           &Request->seg[Index].gref);\r
+    UINTN  Data = Start + Index * EFI_PAGE_SIZE;\r
+    XenBusIo->GrantAccess (\r
+                XenBusIo,\r
+                Dev->DomainId,\r
+                Data >> EFI_PAGE_SHIFT,\r
+                IsWrite,\r
+                &Request->seg[Index].gref\r
+                );\r
     IoData->GrantRef[Index] = Request->seg[Index].gref;\r
   }\r
 \r
@@ -474,20 +553,22 @@ XenPvBlockAsyncIo (
   RING_PUSH_REQUESTS_AND_CHECK_NOTIFY (&Dev->Ring, Notify);\r
 \r
   if (Notify) {\r
-    UINT32 ReturnCode;\r
+    UINT32  ReturnCode;\r
     ReturnCode = XenBusIo->EventChannelNotify (XenBusIo, Dev->EventChannel);\r
     if (ReturnCode != 0) {\r
-      DEBUG ((DEBUG_ERROR,\r
-              "XenPvBlk: Unexpected return value from EventChannelNotify: %d\n",\r
-              ReturnCode));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "XenPvBlk: Unexpected return value from EventChannelNotify: %d\n",\r
+        ReturnCode\r
+        ));\r
     }\r
   }\r
 }\r
 \r
 EFI_STATUS\r
 XenPvBlockIo (\r
-  IN OUT XEN_BLOCK_FRONT_IO *IoData,\r
-  IN     BOOLEAN            IsWrite\r
+  IN OUT XEN_BLOCK_FRONT_IO  *IoData,\r
+  IN     BOOLEAN             IsWrite\r
   )\r
 {\r
   //\r
@@ -506,42 +587,44 @@ XenPvBlockIo (
 STATIC\r
 VOID\r
 XenPvBlockPushOperation (\r
-  IN XEN_BLOCK_FRONT_DEVICE *Dev,\r
-  IN UINT8                  Operation,\r
-  IN UINT64                 Id\r
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev,\r
+  IN UINT8                   Operation,\r
+  IN UINT64                  Id\r
   )\r
 {\r
-  INT32 Index;\r
-  blkif_request_t *Request;\r
-  BOOLEAN Notify;\r
+  INT32            Index;\r
+  blkif_request_t  *Request;\r
+  BOOLEAN          Notify;\r
 \r
   XenPvBlockWaitSlot (Dev);\r
-  Index = Dev->Ring.req_prod_pvt;\r
-  Request = RING_GET_REQUEST(&Dev->Ring, Index);\r
-  Request->operation = Operation;\r
+  Index                = Dev->Ring.req_prod_pvt;\r
+  Request              = RING_GET_REQUEST (&Dev->Ring, Index);\r
+  Request->operation   = Operation;\r
   Request->nr_segments = 0;\r
-  Request->handle = Dev->DeviceId;\r
-  Request->id = Id;\r
+  Request->handle      = Dev->DeviceId;\r
+  Request->id          = Id;\r
   /* Not needed anyway, but the backend will check it */\r
   Request->sector_number = 0;\r
   Dev->Ring.req_prod_pvt = Index + 1;\r
   MemoryFence ();\r
   RING_PUSH_REQUESTS_AND_CHECK_NOTIFY (&Dev->Ring, Notify);\r
   if (Notify) {\r
-    XENBUS_PROTOCOL *XenBusIo = Dev->XenBusIo;\r
-    UINT32 ReturnCode;\r
+    XENBUS_PROTOCOL  *XenBusIo = Dev->XenBusIo;\r
+    UINT32           ReturnCode;\r
     ReturnCode = XenBusIo->EventChannelNotify (XenBusIo, Dev->EventChannel);\r
     if (ReturnCode != 0) {\r
-      DEBUG ((DEBUG_ERROR,\r
-              "XenPvBlk: Unexpected return value from EventChannelNotify: %d\n",\r
-              ReturnCode));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "XenPvBlk: Unexpected return value from EventChannelNotify: %d\n",\r
+        ReturnCode\r
+        ));\r
     }\r
   }\r
 }\r
 \r
 VOID\r
 XenPvBlockSync (\r
-  IN XEN_BLOCK_FRONT_DEVICE *Dev\r
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev\r
   )\r
 {\r
   if (Dev->MediaInfo.ReadWrite) {\r
@@ -565,12 +648,12 @@ XenPvBlockSync (
 \r
 VOID\r
 XenPvBlockAsyncIoPoll (\r
-  IN XEN_BLOCK_FRONT_DEVICE *Dev\r
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev\r
   )\r
 {\r
-  RING_IDX ProducerIndex, ConsumerIndex;\r
-  blkif_response_t *Response;\r
-  INT32 More;\r
+  RING_IDX          ProducerIndex, ConsumerIndex;\r
+  blkif_response_t  *Response;\r
+  INT32             More;\r
 \r
   do {\r
     ProducerIndex = Dev->Ring.sring->rsp_prod;\r
@@ -579,28 +662,31 @@ XenPvBlockAsyncIoPoll (
     ConsumerIndex = Dev->Ring.rsp_cons;\r
 \r
     while (ConsumerIndex != ProducerIndex) {\r
-      XEN_BLOCK_FRONT_IO *IoData = NULL;\r
-      INT16 Status;\r
+      XEN_BLOCK_FRONT_IO  *IoData = NULL;\r
+      INT16               Status;\r
 \r
       Response = RING_GET_RESPONSE (&Dev->Ring, ConsumerIndex);\r
 \r
-      IoData = (VOID *) (UINTN) Response->id;\r
+      IoData = (VOID *)(UINTN)Response->id;\r
       Status = Response->status;\r
 \r
       switch (Response->operation) {\r
-      case BLKIF_OP_READ:\r
-      case BLKIF_OP_WRITE:\r
+        case BLKIF_OP_READ:\r
+        case BLKIF_OP_WRITE:\r
         {\r
-          INT32 Index;\r
+          INT32  Index;\r
 \r
           if (Status != BLKIF_RSP_OKAY) {\r
-            DEBUG ((DEBUG_ERROR,\r
-                    "XenPvBlk: "\r
-                    "%a error %d on %a at sector %Lx, num bytes %Lx\n",\r
-                    Response->operation == BLKIF_OP_READ ? "read" : "write",\r
-                    Status, IoData->Dev->NodeName,\r
-                    (UINT64)IoData->Sector,\r
-                    (UINT64)IoData->Size));\r
+            DEBUG ((\r
+              DEBUG_ERROR,\r
+              "XenPvBlk: "\r
+              "%a error %d on %a at sector %Lx, num bytes %Lx\n",\r
+              Response->operation == BLKIF_OP_READ ? "read" : "write",\r
+              Status,\r
+              IoData->Dev->NodeName,\r
+              (UINT64)IoData->Sector,\r
+              (UINT64)IoData->Size\r
+              ));\r
           }\r
 \r
           for (Index = 0; Index < IoData->NumRef; Index++) {\r
@@ -610,28 +696,34 @@ XenPvBlockAsyncIoPoll (
           break;\r
         }\r
 \r
-      case BLKIF_OP_WRITE_BARRIER:\r
-        if (Status != BLKIF_RSP_OKAY) {\r
-          DEBUG ((DEBUG_ERROR, "XenPvBlk: write barrier error %d\n", Status));\r
-        }\r
-        break;\r
-      case BLKIF_OP_FLUSH_DISKCACHE:\r
-        if (Status != BLKIF_RSP_OKAY) {\r
-          DEBUG ((DEBUG_ERROR, "XenPvBlk: flush error %d\n", Status));\r
-        }\r
-        break;\r
+        case BLKIF_OP_WRITE_BARRIER:\r
+          if (Status != BLKIF_RSP_OKAY) {\r
+            DEBUG ((DEBUG_ERROR, "XenPvBlk: write barrier error %d\n", Status));\r
+          }\r
 \r
-      default:\r
-        DEBUG ((DEBUG_ERROR,\r
-                "XenPvBlk: unrecognized block operation %d response (status %d)\n",\r
-                Response->operation, Status));\r
-        break;\r
+          break;\r
+        case BLKIF_OP_FLUSH_DISKCACHE:\r
+          if (Status != BLKIF_RSP_OKAY) {\r
+            DEBUG ((DEBUG_ERROR, "XenPvBlk: flush error %d\n", Status));\r
+          }\r
+\r
+          break;\r
+\r
+        default:\r
+          DEBUG ((\r
+            DEBUG_ERROR,\r
+            "XenPvBlk: unrecognized block operation %d response (status %d)\n",\r
+            Response->operation,\r
+            Status\r
+            ));\r
+          break;\r
       }\r
 \r
       Dev->Ring.rsp_cons = ++ConsumerIndex;\r
       if (IoData != NULL) {\r
         IoData->Status = Status ? EFI_DEVICE_ERROR : EFI_SUCCESS;\r
       }\r
+\r
       if (Dev->Ring.rsp_cons != ConsumerIndex) {\r
         /* We reentered, we must not continue here */\r
         break;\r
index 7c2d7f2c9ecb06e7ec49d2beafae88a3f78427e4..3651a6c8cdb99e341345cd4dd3f6e411c32ca90a 100644 (file)
 #include <IndustryStandard/Xen/event_channel.h>\r
 #include <IndustryStandard/Xen/io/blkif.h>\r
 \r
-typedef struct _XEN_BLOCK_FRONT_DEVICE XEN_BLOCK_FRONT_DEVICE;\r
-typedef struct _XEN_BLOCK_FRONT_IO XEN_BLOCK_FRONT_IO;\r
+typedef struct _XEN_BLOCK_FRONT_DEVICE  XEN_BLOCK_FRONT_DEVICE;\r
+typedef struct _XEN_BLOCK_FRONT_IO      XEN_BLOCK_FRONT_IO;\r
 \r
-struct _XEN_BLOCK_FRONT_IO\r
-{\r
-  XEN_BLOCK_FRONT_DEVICE  *Dev;\r
-  UINT8                   *Buffer;\r
-  UINTN                   Size;\r
-  UINTN                   Sector; ///< 512 bytes sector.\r
+struct _XEN_BLOCK_FRONT_IO {\r
+  XEN_BLOCK_FRONT_DEVICE    *Dev;\r
+  UINT8                     *Buffer;\r
+  UINTN                     Size;\r
+  UINTN                     Sector; ///< 512 bytes sector.\r
 \r
-  grant_ref_t             GrantRef[BLKIF_MAX_SEGMENTS_PER_REQUEST];\r
-  INT32                   NumRef;\r
+  grant_ref_t               GrantRef[BLKIF_MAX_SEGMENTS_PER_REQUEST];\r
+  INT32                     NumRef;\r
 \r
-  EFI_STATUS              Status;\r
+  EFI_STATUS                Status;\r
 };\r
 \r
-typedef struct\r
-{\r
-  UINT64    Sectors;\r
-  UINT32    SectorSize;\r
-  UINT32    VDiskInfo;\r
-  BOOLEAN   ReadWrite;\r
-  BOOLEAN   CdRom;\r
-  BOOLEAN   FeatureBarrier;\r
-  BOOLEAN   FeatureFlushCache;\r
+typedef struct {\r
+  UINT64     Sectors;\r
+  UINT32     SectorSize;\r
+  UINT32     VDiskInfo;\r
+  BOOLEAN    ReadWrite;\r
+  BOOLEAN    CdRom;\r
+  BOOLEAN    FeatureBarrier;\r
+  BOOLEAN    FeatureFlushCache;\r
 } XEN_BLOCK_FRONT_MEDIA_INFO;\r
 \r
-#define XEN_BLOCK_FRONT_SIGNATURE SIGNATURE_32 ('X', 'p', 'v', 'B')\r
+#define XEN_BLOCK_FRONT_SIGNATURE  SIGNATURE_32 ('X', 'p', 'v', 'B')\r
 struct _XEN_BLOCK_FRONT_DEVICE {\r
-  UINT32                      Signature;\r
-  EFI_BLOCK_IO_PROTOCOL       BlockIo;\r
-  domid_t                     DomainId;\r
+  UINT32                        Signature;\r
+  EFI_BLOCK_IO_PROTOCOL         BlockIo;\r
+  domid_t                       DomainId;\r
 \r
-  blkif_front_ring_t          Ring;\r
-  grant_ref_t                 RingRef;\r
-  evtchn_port_t               EventChannel;\r
-  blkif_vdev_t                DeviceId;\r
+  blkif_front_ring_t            Ring;\r
+  grant_ref_t                   RingRef;\r
+  evtchn_port_t                 EventChannel;\r
+  blkif_vdev_t                  DeviceId;\r
 \r
-  CONST CHAR8                 *NodeName;\r
-  XEN_BLOCK_FRONT_MEDIA_INFO  MediaInfo;\r
+  CONST CHAR8                   *NodeName;\r
+  XEN_BLOCK_FRONT_MEDIA_INFO    MediaInfo;\r
 \r
-  VOID                        *StateWatchToken;\r
+  VOID                          *StateWatchToken;\r
 \r
-  XENBUS_PROTOCOL             *XenBusIo;\r
+  XENBUS_PROTOCOL               *XenBusIo;\r
 };\r
 \r
 #define XEN_BLOCK_FRONT_FROM_BLOCK_IO(b) \\r
@@ -62,34 +60,34 @@ struct _XEN_BLOCK_FRONT_DEVICE {
 \r
 EFI_STATUS\r
 XenPvBlockFrontInitialization (\r
-  IN  XENBUS_PROTOCOL  *XenBusIo,\r
-  IN  CONST CHAR8      *NodeName,\r
-  OUT XEN_BLOCK_FRONT_DEVICE **DevPtr\r
+  IN  XENBUS_PROTOCOL         *XenBusIo,\r
+  IN  CONST CHAR8             *NodeName,\r
+  OUT XEN_BLOCK_FRONT_DEVICE  **DevPtr\r
   );\r
 \r
 VOID\r
 XenPvBlockFrontShutdown (\r
-  IN XEN_BLOCK_FRONT_DEVICE *Dev\r
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev\r
   );\r
 \r
 VOID\r
 XenPvBlockAsyncIo (\r
-  IN OUT XEN_BLOCK_FRONT_IO *IoData,\r
-  IN     BOOLEAN            IsWrite\r
+  IN OUT XEN_BLOCK_FRONT_IO  *IoData,\r
+  IN     BOOLEAN             IsWrite\r
   );\r
 \r
 EFI_STATUS\r
 XenPvBlockIo (\r
-  IN OUT XEN_BLOCK_FRONT_IO *IoData,\r
-  IN     BOOLEAN            IsWrite\r
+  IN OUT XEN_BLOCK_FRONT_IO  *IoData,\r
+  IN     BOOLEAN             IsWrite\r
   );\r
 \r
 VOID\r
 XenPvBlockAsyncIoPoll (\r
-  IN XEN_BLOCK_FRONT_DEVICE *Dev\r
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev\r
   );\r
 \r
 VOID\r
 XenPvBlockSync (\r
-  IN XEN_BLOCK_FRONT_DEVICE *Dev\r
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev\r
   );\r
index c013fc80f0126660d31dd49a94e0d6e54b456233..63914751cfd9c909ed52fc37fb448d959f4a08af 100644 (file)
@@ -46,9 +46,6 @@ EFI_BLOCK_IO_PROTOCOL  gXenPvBlkDxeBlockIo = {
   XenPvBlkDxeBlockIoFlushBlocks             // FlushBlocks\r
 };\r
 \r
-\r
-\r
-\r
 /**\r
   Read/Write BufferSize bytes from Lba into Buffer.\r
 \r
@@ -76,29 +73,38 @@ XenPvBlkDxeBlockIoReadWriteBlocks (
   IN     BOOLEAN                IsWrite\r
   )\r
 {\r
-  XEN_BLOCK_FRONT_IO IoData;\r
-  EFI_BLOCK_IO_MEDIA *Media = This->Media;\r
-  UINTN Sector;\r
-  EFI_STATUS Status;\r
+  XEN_BLOCK_FRONT_IO  IoData;\r
+  EFI_BLOCK_IO_MEDIA  *Media = This->Media;\r
+  UINTN               Sector;\r
+  EFI_STATUS          Status;\r
 \r
   if (Buffer == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   if (BufferSize == 0) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
   if (BufferSize % Media->BlockSize != 0) {\r
-    DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%Lx\n",\r
-      (UINT64)BufferSize));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "XenPvBlkDxe: Bad buffer size: 0x%Lx\n",\r
+      (UINT64)BufferSize\r
+      ));\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  if (Lba > Media->LastBlock ||\r
-      (BufferSize / Media->BlockSize) - 1 > Media->LastBlock - Lba) {\r
-    DEBUG ((DEBUG_ERROR,\r
+  if ((Lba > Media->LastBlock) ||\r
+      ((BufferSize / Media->BlockSize) - 1 > Media->LastBlock - Lba))\r
+  {\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
       "XenPvBlkDxe: %a with invalid LBA: 0x%Lx, size: 0x%Lx\n",\r
-      IsWrite ? "Write" : "Read", Lba, (UINT64)BufferSize));\r
+      IsWrite ? "Write" : "Read",\r
+      Lba,\r
+      (UINT64)BufferSize\r
+      ));\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -111,54 +117,74 @@ XenPvBlkDxeBlockIoReadWriteBlocks (
     // Grub2 does not appear to respect IoAlign of 512, so reallocate the\r
     // buffer here.\r
     //\r
-    VOID *NewBuffer;\r
+    VOID  *NewBuffer;\r
 \r
     //\r
     // Try again with a properly aligned buffer.\r
     //\r
-    NewBuffer = AllocateAlignedPages((BufferSize + EFI_PAGE_SIZE) / EFI_PAGE_SIZE,\r
-                                     Media->IoAlign);\r
+    NewBuffer = AllocateAlignedPages (\r
+                  (BufferSize + EFI_PAGE_SIZE) / EFI_PAGE_SIZE,\r
+                  Media->IoAlign\r
+                  );\r
     if (!IsWrite) {\r
-      Status = XenPvBlkDxeBlockIoReadBlocks (This, MediaId,\r
-                                             Lba, BufferSize, NewBuffer);\r
+      Status = XenPvBlkDxeBlockIoReadBlocks (\r
+                 This,\r
+                 MediaId,\r
+                 Lba,\r
+                 BufferSize,\r
+                 NewBuffer\r
+                 );\r
       CopyMem (Buffer, NewBuffer, BufferSize);\r
     } else {\r
       CopyMem (NewBuffer, Buffer, BufferSize);\r
-      Status = XenPvBlkDxeBlockIoWriteBlocks (This, MediaId,\r
-                                              Lba, BufferSize, NewBuffer);\r
+      Status = XenPvBlkDxeBlockIoWriteBlocks (\r
+                 This,\r
+                 MediaId,\r
+                 Lba,\r
+                 BufferSize,\r
+                 NewBuffer\r
+                 );\r
     }\r
+\r
     FreeAlignedPages (NewBuffer, (BufferSize + EFI_PAGE_SIZE) / EFI_PAGE_SIZE);\r
     return Status;\r
   }\r
 \r
   IoData.Dev = XEN_BLOCK_FRONT_FROM_BLOCK_IO (This);\r
-  Sector = (UINTN)MultU64x32 (Lba, Media->BlockSize / 512);\r
+  Sector     = (UINTN)MultU64x32 (Lba, Media->BlockSize / 512);\r
 \r
   while (BufferSize > 0) {\r
     if (((UINTN)Buffer & EFI_PAGE_MASK) == 0) {\r
-      IoData.Size = MIN (BLKIF_MAX_SEGMENTS_PER_REQUEST * EFI_PAGE_SIZE,\r
-                         BufferSize);\r
+      IoData.Size = MIN (\r
+                      BLKIF_MAX_SEGMENTS_PER_REQUEST * EFI_PAGE_SIZE,\r
+                      BufferSize\r
+                      );\r
     } else {\r
-      IoData.Size = MIN ((BLKIF_MAX_SEGMENTS_PER_REQUEST - 1) * EFI_PAGE_SIZE,\r
-                         BufferSize);\r
+      IoData.Size = MIN (\r
+                      (BLKIF_MAX_SEGMENTS_PER_REQUEST - 1) * EFI_PAGE_SIZE,\r
+                      BufferSize\r
+                      );\r
     }\r
 \r
     IoData.Buffer = Buffer;\r
     IoData.Sector = Sector;\r
-    BufferSize -= IoData.Size;\r
-    Buffer = (VOID*) ((UINTN) Buffer + IoData.Size);\r
-    Sector += IoData.Size / 512;\r
-    Status = XenPvBlockIo (&IoData, IsWrite);\r
+    BufferSize   -= IoData.Size;\r
+    Buffer        = (VOID *)((UINTN)Buffer + IoData.Size);\r
+    Sector       += IoData.Size / 512;\r
+    Status        = XenPvBlockIo (&IoData, IsWrite);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: Error during %a operation.\n",\r
-              IsWrite ? "write" : "read"));\r
+      DEBUG ((\r
+        DEBUG_ERROR,\r
+        "XenPvBlkDxe: Error during %a operation.\n",\r
+        IsWrite ? "write" : "read"\r
+        ));\r
       return Status;\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Read BufferSize bytes from Lba into Buffer.\r
 \r
@@ -181,15 +207,21 @@ XenPvBlkDxeBlockIoReadWriteBlocks (
 EFI_STATUS\r
 EFIAPI\r
 XenPvBlkDxeBlockIoReadBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL         *This,\r
-  IN  UINT32                        MediaId,\r
-  IN  EFI_LBA                       Lba,\r
-  IN  UINTN                         BufferSize,\r
-  OUT VOID                          *Buffer\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  UINT32                 MediaId,\r
+  IN  EFI_LBA                Lba,\r
+  IN  UINTN                  BufferSize,\r
+  OUT VOID                   *Buffer\r
   )\r
 {\r
-  return XenPvBlkDxeBlockIoReadWriteBlocks (This,\r
-      MediaId, Lba, BufferSize, Buffer, FALSE);\r
+  return XenPvBlkDxeBlockIoReadWriteBlocks (\r
+           This,\r
+           MediaId,\r
+           Lba,\r
+           BufferSize,\r
+           Buffer,\r
+           FALSE\r
+           );\r
 }\r
 \r
 /**\r
@@ -215,15 +247,21 @@ XenPvBlkDxeBlockIoReadBlocks (
 EFI_STATUS\r
 EFIAPI\r
 XenPvBlkDxeBlockIoWriteBlocks (\r
-  IN EFI_BLOCK_IO_PROTOCOL          *This,\r
-  IN UINT32                         MediaId,\r
-  IN EFI_LBA                        Lba,\r
-  IN UINTN                          BufferSize,\r
-  IN VOID                           *Buffer\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN UINT32                 MediaId,\r
+  IN EFI_LBA                Lba,\r
+  IN UINTN                  BufferSize,\r
+  IN VOID                   *Buffer\r
   )\r
 {\r
-  return XenPvBlkDxeBlockIoReadWriteBlocks (This,\r
-      MediaId, Lba, BufferSize, Buffer, TRUE);\r
+  return XenPvBlkDxeBlockIoReadWriteBlocks (\r
+           This,\r
+           MediaId,\r
+           Lba,\r
+           BufferSize,\r
+           Buffer,\r
+           TRUE\r
+           );\r
 }\r
 \r
 /**\r
@@ -258,8 +296,8 @@ XenPvBlkDxeBlockIoFlushBlocks (
 EFI_STATUS\r
 EFIAPI\r
 XenPvBlkDxeBlockIoReset (\r
-  IN EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN BOOLEAN                 ExtendedVerification\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN BOOLEAN                ExtendedVerification\r
   )\r
 {\r
   //\r
index 1100791183d2ac04c2db20e6748a1de3a573310f..1aaae8b754c3b442d3f81872d35b2d7631fe358f 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 XenPvBlkDxeBlockIoReadBlocks (\r
-  IN EFI_BLOCK_IO_PROTOCOL          *This,\r
-  IN UINT32                         MediaId,\r
-  IN EFI_LBA                        Lba,\r
-  IN UINTN                          BufferSize,\r
-  OUT VOID                          *Buffer\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN UINT32                 MediaId,\r
+  IN EFI_LBA                Lba,\r
+  IN UINTN                  BufferSize,\r
+  OUT VOID                  *Buffer\r
   );\r
 \r
 /**\r
@@ -59,11 +59,11 @@ XenPvBlkDxeBlockIoReadBlocks (
 EFI_STATUS\r
 EFIAPI\r
 XenPvBlkDxeBlockIoWriteBlocks (\r
-  IN EFI_BLOCK_IO_PROTOCOL          *This,\r
-  IN UINT32                         MediaId,\r
-  IN EFI_LBA                        Lba,\r
-  IN UINTN                          BufferSize,\r
-  IN VOID                           *Buffer\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN UINT32                 MediaId,\r
+  IN EFI_LBA                Lba,\r
+  IN UINTN                  BufferSize,\r
+  IN VOID                   *Buffer\r
   );\r
 \r
 /**\r
@@ -94,9 +94,9 @@ XenPvBlkDxeBlockIoFlushBlocks (
 EFI_STATUS\r
 EFIAPI\r
 XenPvBlkDxeBlockIoReset (\r
-  IN EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN BOOLEAN                 ExtendedVerification\r
+  IN EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN BOOLEAN                ExtendedVerification\r
   );\r
 \r
-extern EFI_BLOCK_IO_MEDIA  gXenPvBlkDxeBlockIoMedia;\r
+extern EFI_BLOCK_IO_MEDIA     gXenPvBlkDxeBlockIoMedia;\r
 extern EFI_BLOCK_IO_PROTOCOL  gXenPvBlkDxeBlockIo;\r
index 8ab6628a9f2f018c37237f1948018d3583c0ee7e..6a27822749aab7e61226d4724c80dd7e75be2bb2 100644 (file)
@@ -14,7 +14,7 @@
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
 EFI_COMPONENT_NAME_PROTOCOL  gXenPvBlkDxeComponentName = {\r
-  (EFI_COMPONENT_NAME_GET_DRIVER_NAME)    XenPvBlkDxeComponentNameGetDriverName,\r
+  (EFI_COMPONENT_NAME_GET_DRIVER_NAME)XenPvBlkDxeComponentNameGetDriverName,\r
   (EFI_COMPONENT_NAME_GET_CONTROLLER_NAME)XenPvBlkDxeComponentNameGetControllerName,\r
   "eng"\r
 };\r
@@ -33,18 +33,18 @@ EFI_COMPONENT_NAME2_PROTOCOL  gXenPvBlkDxeComponentName2 = {
 /// Table of driver names\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_UNICODE_STRING_TABLE mXenPvBlkDxeDriverNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mXenPvBlkDxeDriverNameTable[] = {\r
   { "eng;en", (CHAR16 *)L"Xen PV Block Driver" },\r
-  { NULL, NULL }\r
+  { NULL,     NULL                             }\r
 };\r
 \r
 ///\r
 /// Table of controller names\r
 ///\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_UNICODE_STRING_TABLE mXenPvBlkDxeControllerNameTable[] = {\r
+EFI_UNICODE_STRING_TABLE  mXenPvBlkDxeControllerNameTable[] = {\r
   { "eng;en", (CHAR16 *)L"Xen PV Block Device" },\r
-  { NULL, NULL }\r
+  { NULL,     NULL                             }\r
 };\r
 \r
 /**\r
index fa2983644ce970db043dc326eb335187beba1eb6..1d38f76e279c8030a8e76a80c38f7a58d7c46fd5 100644 (file)
@@ -1,4 +1,3 @@
-\r
 /** @file\r
   Driver Binding functions declaration for XenPvBlk driver.\r
 \r
index 1440e1d23b66fdebdd82483bb0281be8cc99b2c2..dfc40bffaada14f97bfb870e6c8603d6668a67c1 100644 (file)
 \r
 #include "BlockFront.h"\r
 \r
-\r
 ///\r
 /// Driver Binding Protocol instance\r
 ///\r
-EFI_DRIVER_BINDING_PROTOCOL gXenPvBlkDxeDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gXenPvBlkDxeDriverBinding = {\r
   XenPvBlkDxeDriverBindingSupported,\r
   XenPvBlkDxeDriverBindingStart,\r
   XenPvBlkDxeDriverBindingStop,\r
@@ -29,7 +28,6 @@ EFI_DRIVER_BINDING_PROTOCOL gXenPvBlkDxeDriverBinding = {
   NULL\r
 };\r
 \r
-\r
 /**\r
   Unloads an image.\r
 \r
@@ -51,7 +49,6 @@ XenPvBlkDxeUnload (
   UINTN       HandleCount;\r
   UINTN       Index;\r
 \r
-\r
   //\r
   // Retrieve array of all handles in the handle database\r
   //\r
@@ -78,15 +75,17 @@ XenPvBlkDxeUnload (
   //\r
   FreePool (HandleBuffer);\r
 \r
-\r
   //\r
   // Uninstall protocols installed in the driver entry point\r
   //\r
   Status = gBS->UninstallMultipleProtocolInterfaces (\r
                   ImageHandle,\r
-                  &gEfiDriverBindingProtocolGuid, &gXenPvBlkDxeDriverBinding,\r
-                  &gEfiComponentNameProtocolGuid,  &gXenPvBlkDxeComponentName,\r
-                  &gEfiComponentName2ProtocolGuid, &gXenPvBlkDxeComponentName2,\r
+                  &gEfiDriverBindingProtocolGuid,\r
+                  &gXenPvBlkDxeDriverBinding,\r
+                  &gEfiComponentNameProtocolGuid,\r
+                  &gXenPvBlkDxeComponentName,\r
+                  &gEfiComponentName2ProtocolGuid,\r
+                  &gXenPvBlkDxeComponentName2,\r
                   NULL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
@@ -132,7 +131,6 @@ XenPvBlkDxeDriverEntryPoint (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Tests to see if this driver supports a given controller. If a child device is provided,\r
   it further tests to see if this driver supports creating a handle for the specified child device.\r
@@ -183,28 +181,33 @@ XenPvBlkDxeDriverBindingSupported (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  XENBUS_PROTOCOL *XenBusIo;\r
+  EFI_STATUS       Status;\r
+  XENBUS_PROTOCOL  *XenBusIo;\r
 \r
   Status = gBS->OpenProtocol (\r
-                ControllerHandle,\r
-                &gXenBusProtocolGuid,\r
-                (VOID **)&XenBusIo,\r
-                This->DriverBindingHandle,\r
-                ControllerHandle,\r
-                EFI_OPEN_PROTOCOL_BY_DRIVER\r
-                );\r
+                  ControllerHandle,\r
+                  &gXenBusProtocolGuid,\r
+                  (VOID **)&XenBusIo,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   if (AsciiStrCmp (XenBusIo->Type, "vbd") == 0) {\r
     Status = EFI_SUCCESS;\r
   } else {\r
     Status = EFI_UNSUPPORTED;\r
   }\r
 \r
-  gBS->CloseProtocol (ControllerHandle, &gXenBusProtocolGuid,\r
-                      This->DriverBindingHandle, ControllerHandle);\r
+  gBS->CloseProtocol (\r
+         ControllerHandle,\r
+         &gXenBusProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
 \r
   return Status;\r
 }\r
@@ -252,19 +255,19 @@ XenPvBlkDxeDriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  XENBUS_PROTOCOL *XenBusIo;\r
-  XEN_BLOCK_FRONT_DEVICE *Dev;\r
-  EFI_BLOCK_IO_MEDIA *Media;\r
+  EFI_STATUS              Status;\r
+  XENBUS_PROTOCOL         *XenBusIo;\r
+  XEN_BLOCK_FRONT_DEVICE  *Dev;\r
+  EFI_BLOCK_IO_MEDIA      *Media;\r
 \r
   Status = gBS->OpenProtocol (\r
-                ControllerHandle,\r
-                &gXenBusProtocolGuid,\r
-                (VOID **)&XenBusIo,\r
-                This->DriverBindingHandle,\r
-                ControllerHandle,\r
-                EFI_OPEN_PROTOCOL_BY_DRIVER\r
-                );\r
+                  ControllerHandle,\r
+                  &gXenBusProtocolGuid,\r
+                  (VOID **)&XenBusIo,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -275,13 +278,16 @@ XenPvBlkDxeDriverBindingStart (
   }\r
 \r
   CopyMem (&Dev->BlockIo, &gXenPvBlkDxeBlockIo, sizeof (EFI_BLOCK_IO_PROTOCOL));\r
-  Media = AllocateCopyPool (sizeof (EFI_BLOCK_IO_MEDIA),\r
-                            &gXenPvBlkDxeBlockIoMedia);\r
+  Media = AllocateCopyPool (\r
+            sizeof (EFI_BLOCK_IO_MEDIA),\r
+            &gXenPvBlkDxeBlockIoMedia\r
+            );\r
   if (Dev->MediaInfo.VDiskInfo & VDISK_REMOVABLE) {\r
     Media->RemovableMedia = TRUE;\r
   }\r
+\r
   Media->MediaPresent = TRUE;\r
-  Media->ReadOnly = !Dev->MediaInfo.ReadWrite;\r
+  Media->ReadOnly     = !Dev->MediaInfo.ReadWrite;\r
   if (Dev->MediaInfo.CdRom) {\r
     //\r
     // If it's a cdrom, the blocksize value need to be 2048 for OVMF to\r
@@ -289,20 +295,24 @@ XenPvBlkDxeDriverBindingStart (
     //    MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c\r
     //\r
     Media->BlockSize = 2048;\r
-    Media->LastBlock = DivU64x32 (Dev->MediaInfo.Sectors,\r
-                                  Media->BlockSize / Dev->MediaInfo.SectorSize) - 1;\r
+    Media->LastBlock = DivU64x32 (\r
+                         Dev->MediaInfo.Sectors,\r
+                         Media->BlockSize / Dev->MediaInfo.SectorSize\r
+                         ) - 1;\r
   } else {\r
     Media->BlockSize = Dev->MediaInfo.SectorSize;\r
     Media->LastBlock = Dev->MediaInfo.Sectors - 1;\r
   }\r
+\r
   ASSERT (Media->BlockSize % 512 == 0);\r
   Dev->BlockIo.Media = Media;\r
 \r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
-                    &ControllerHandle,\r
-                    &gEfiBlockIoProtocolGuid, &Dev->BlockIo,\r
-                    NULL\r
-                    );\r
+                  &ControllerHandle,\r
+                  &gEfiBlockIoProtocolGuid,\r
+                  &Dev->BlockIo,\r
+                  NULL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XenPvBlk: install protocol fail: %r\n", Status));\r
     goto UninitBlockFront;\r
@@ -314,8 +324,12 @@ UninitBlockFront:
   FreePool (Media);\r
   XenPvBlockFrontShutdown (Dev);\r
 CloseProtocol:\r
-  gBS->CloseProtocol (ControllerHandle, &gXenBusProtocolGuid,\r
-                      This->DriverBindingHandle, ControllerHandle);\r
+  gBS->CloseProtocol (\r
+         ControllerHandle,\r
+         &gXenBusProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
   return Status;\r
 }\r
 \r
@@ -354,35 +368,44 @@ XenPvBlkDxeDriverBindingStop (
   IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
-  XEN_BLOCK_FRONT_DEVICE *Dev;\r
-  EFI_BLOCK_IO_MEDIA *Media;\r
-  EFI_STATUS Status;\r
+  EFI_BLOCK_IO_PROTOCOL   *BlockIo;\r
+  XEN_BLOCK_FRONT_DEVICE  *Dev;\r
+  EFI_BLOCK_IO_MEDIA      *Media;\r
+  EFI_STATUS              Status;\r
 \r
   Status = gBS->OpenProtocol (\r
-                  ControllerHandle, &gEfiBlockIoProtocolGuid,\r
+                  ControllerHandle,\r
+                  &gEfiBlockIoProtocolGuid,\r
                   (VOID **)&BlockIo,\r
-                  This->DriverBindingHandle, ControllerHandle,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = gBS->UninstallProtocolInterface (ControllerHandle,\r
-                  &gEfiBlockIoProtocolGuid, BlockIo);\r
+  Status = gBS->UninstallProtocolInterface (\r
+                  ControllerHandle,\r
+                  &gEfiBlockIoProtocolGuid,\r
+                  BlockIo\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   Media = BlockIo->Media;\r
-  Dev = XEN_BLOCK_FRONT_FROM_BLOCK_IO (BlockIo);\r
+  Dev   = XEN_BLOCK_FRONT_FROM_BLOCK_IO (BlockIo);\r
   XenPvBlockFrontShutdown (Dev);\r
 \r
   FreePool (Media);\r
 \r
-  gBS->CloseProtocol (ControllerHandle, &gXenBusProtocolGuid,\r
-         This->DriverBindingHandle, ControllerHandle);\r
+  gBS->CloseProtocol (\r
+         ControllerHandle,\r
+         &gXenBusProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
 \r
   return EFI_SUCCESS;\r
 }\r
index 78c103deb0dab6f2d215d35775b804096699f05e..350b7bd309c09d67a7c79ab69d51d3f768e2fc11 100644 (file)
@@ -12,9 +12,9 @@
 \r
 #include <Uefi.h>\r
 \r
-#define xen_mb() MemoryFence()\r
-#define xen_rmb() MemoryFence()\r
-#define xen_wmb() MemoryFence()\r
+#define xen_mb()   MemoryFence()\r
+#define xen_rmb()  MemoryFence()\r
+#define xen_wmb()  MemoryFence()\r
 \r
 //\r
 // Libraries\r
@@ -27,7 +27,6 @@
 #include <Library/DevicePathLib.h>\r
 #include <Library/DebugLib.h>\r
 \r
-\r
 //\r
 // UEFI Driver Model Protocols\r
 //\r
 #include <Protocol/ComponentName2.h>\r
 #include <Protocol/ComponentName.h>\r
 \r
-\r
 //\r
 // Consumed Protocols\r
 //\r
 #include <Protocol/XenBus.h>\r
 \r
-\r
 //\r
 // Produced Protocols\r
 //\r
 #include <Protocol/BlockIo.h>\r
 \r
-\r
 //\r
 // Driver Version\r
 //\r
 #define XEN_PV_BLK_DXE_VERSION  0x00000010\r
 \r
-\r
 //\r
 // Protocol instances\r
 //\r
-extern EFI_DRIVER_BINDING_PROTOCOL  gXenPvBlkDxeDriverBinding;\r
+extern EFI_DRIVER_BINDING_PROTOCOL   gXenPvBlkDxeDriverBinding;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL  gXenPvBlkDxeComponentName2;\r
-extern EFI_COMPONENT_NAME_PROTOCOL  gXenPvBlkDxeComponentName;\r
-\r
+extern EFI_COMPONENT_NAME_PROTOCOL   gXenPvBlkDxeComponentName;\r
 \r
 //\r
 // Include files with function prototypes\r
@@ -69,5 +63,4 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gXenPvBlkDxeComponentName;
 #include "ComponentName.h"\r
 #include "BlockIo.h"\r
 \r
-\r
 #endif\r
index 19fa17a29fb424ab7dd2623beab95a766d8daee2..bbd964eb7ad93eba561a9ef894fe4cf672ee74fb 100644 (file)
@@ -13,12 +13,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // The handle onto which the Timer Architectural Protocol will be installed\r
 //\r
-EFI_HANDLE                mTimerHandle = NULL;\r
+EFI_HANDLE  mTimerHandle = NULL;\r
 \r
 //\r
 // The Timer Architectural Protocol that this driver produces\r
 //\r
-EFI_TIMER_ARCH_PROTOCOL   mTimer = {\r
+EFI_TIMER_ARCH_PROTOCOL  mTimer = {\r
   TimerDriverRegisterHandler,\r
   TimerDriverSetTimerPeriod,\r
   TimerDriverGetTimerPeriod,\r
@@ -28,22 +28,23 @@ EFI_TIMER_ARCH_PROTOCOL   mTimer = {
 //\r
 // Pointer to the CPU Architectural Protocol instance\r
 //\r
-EFI_CPU_ARCH_PROTOCOL     *mCpu;\r
+EFI_CPU_ARCH_PROTOCOL  *mCpu;\r
 \r
 //\r
 // The notification function to call on every timer interrupt.\r
 // A bug in the compiler prevents us from initializing this here.\r
 //\r
-EFI_TIMER_NOTIFY mTimerNotifyFunction;\r
+EFI_TIMER_NOTIFY  mTimerNotifyFunction;\r
 \r
 //\r
 // The current period of the timer interrupt\r
 //\r
-volatile UINT64           mTimerPeriod = 0;\r
+volatile UINT64  mTimerPeriod = 0;\r
 \r
 //\r
 // Worker Functions\r
 //\r
+\r
 /**\r
   Interrupt Handler.\r
 \r
@@ -53,11 +54,11 @@ volatile UINT64           mTimerPeriod = 0;
 VOID\r
 EFIAPI\r
 TimerInterruptHandler (\r
-  IN EFI_EXCEPTION_TYPE   InterruptType,\r
-  IN EFI_SYSTEM_CONTEXT   SystemContext\r
+  IN EFI_EXCEPTION_TYPE  InterruptType,\r
+  IN EFI_SYSTEM_CONTEXT  SystemContext\r
   )\r
 {\r
-  EFI_TPL OriginalTPL;\r
+  EFI_TPL  OriginalTPL;\r
 \r
   OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL);\r
 \r
@@ -115,11 +116,11 @@ TimerDriverRegisterHandler (
   //\r
   // Check for invalid parameters\r
   //\r
-  if (NotifyFunction == NULL && mTimerNotifyFunction == NULL) {\r
+  if ((NotifyFunction == NULL) && (mTimerNotifyFunction == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (NotifyFunction != NULL && mTimerNotifyFunction != NULL) {\r
+  if ((NotifyFunction != NULL) && (mTimerNotifyFunction != NULL)) {\r
     return EFI_ALREADY_STARTED;\r
   }\r
 \r
@@ -171,17 +172,19 @@ TimerDriverSetTimerPeriod (
     //\r
     // Disable timer interrupt for a TimerPeriod of 0\r
     //\r
-    DisableApicTimerInterrupt();\r
+    DisableApicTimerInterrupt ();\r
   } else {\r
-    TimerFrequency = PcdGet32(PcdFSBClock) / DivideValue;\r
+    TimerFrequency = PcdGet32 (PcdFSBClock) / DivideValue;\r
 \r
     //\r
     // Convert TimerPeriod into local APIC counts\r
     //\r
     // TimerPeriod is in 100ns\r
     // TimerPeriod/10000000 will be in seconds.\r
-    TimerCount = DivU64x32 (MultU64x32 (TimerPeriod, TimerFrequency),\r
-                            10000000);\r
+    TimerCount = DivU64x32 (\r
+                   MultU64x32 (TimerPeriod, TimerFrequency),\r
+                   10000000\r
+                   );\r
 \r
     // Check for overflow\r
     if (TimerCount > MAX_UINT32) {\r
@@ -193,13 +196,14 @@ TimerDriverSetTimerPeriod (
     //\r
     // Program the timer with the new count value\r
     //\r
-    InitializeApicTimer(DivideValue, (UINT32)TimerCount, TRUE, LOCAL_APIC_TIMER_VECTOR);\r
+    InitializeApicTimer (DivideValue, (UINT32)TimerCount, TRUE, LOCAL_APIC_TIMER_VECTOR);\r
 \r
     //\r
     // Enable timer interrupt\r
     //\r
-    EnableApicTimerInterrupt();\r
+    EnableApicTimerInterrupt ();\r
   }\r
+\r
   //\r
   // Save the new timer period\r
   //\r
@@ -227,8 +231,8 @@ TimerDriverSetTimerPeriod (
 EFI_STATUS\r
 EFIAPI\r
 TimerDriverGetTimerPeriod (\r
-  IN EFI_TIMER_ARCH_PROTOCOL   *This,\r
-  OUT UINT64                   *TimerPeriod\r
+  IN EFI_TIMER_ARCH_PROTOCOL  *This,\r
+  OUT UINT64                  *TimerPeriod\r
   )\r
 {\r
   if (TimerPeriod == NULL) {\r
@@ -263,9 +267,9 @@ TimerDriverGenerateSoftInterrupt (
   IN EFI_TIMER_ARCH_PROTOCOL  *This\r
   )\r
 {\r
-  EFI_TPL     OriginalTPL;\r
+  EFI_TPL  OriginalTPL;\r
 \r
-  if (GetApicTimerInterruptState()) {\r
+  if (GetApicTimerInterruptState ()) {\r
     //\r
     // Invoke the registered handler\r
     //\r
@@ -319,7 +323,7 @@ TimerDriverInitialize (
   //\r
   // Find the CPU architectural protocol.\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **) &mCpu);\r
+  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&mCpu);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -331,8 +335,11 @@ TimerDriverInitialize (
   //\r
   // Install interrupt handler for Local APIC Timer\r
   //\r
-  Status = mCpu->RegisterInterruptHandler (mCpu, LOCAL_APIC_TIMER_VECTOR,\r
-                                           TimerInterruptHandler);\r
+  Status = mCpu->RegisterInterruptHandler (\r
+                   mCpu,\r
+                   LOCAL_APIC_TIMER_VECTOR,\r
+                   TimerInterruptHandler\r
+                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -346,11 +353,11 @@ TimerDriverInitialize (
   //\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &mTimerHandle,\r
-                  &gEfiTimerArchProtocolGuid, &mTimer,\r
+                  &gEfiTimerArchProtocolGuid,\r
+                  &mTimer,\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r
 }\r
-\r
index e0a3d95fd063af82864d93d0030c490bd950ac7b..b55ece0d941e65018b803cb7b28f7fc5242ae1d6 100644 (file)
@@ -25,16 +25,17 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 // The default timer tick duration is set to 10 ms = 100000 100 ns units\r
 //\r
-#define DEFAULT_TIMER_TICK_DURATION 100000\r
+#define DEFAULT_TIMER_TICK_DURATION  100000\r
 \r
 //\r
 // The Timer Vector use for interrupt\r
 //\r
-#define LOCAL_APIC_TIMER_VECTOR 32\r
+#define LOCAL_APIC_TIMER_VECTOR  32\r
 \r
 //\r
 // Function Prototypes\r
 //\r
+\r
 /**\r
   Initialize the Timer Architectural Protocol driver\r
 \r
@@ -145,8 +146,8 @@ TimerDriverSetTimerPeriod (
 EFI_STATUS\r
 EFIAPI\r
 TimerDriverGetTimerPeriod (\r
-  IN EFI_TIMER_ARCH_PROTOCOL   *This,\r
-  OUT UINT64                   *TimerPeriod\r
+  IN EFI_TIMER_ARCH_PROTOCOL  *This,\r
+  OUT UINT64                  *TimerPeriod\r
   )\r
 ;\r
 \r