OvmfPkg: Apply uncrustify changes

[mirror_edk2.git] / OvmfPkg / Include / Library / QemuFwCfgLib.h

diff --git a/OvmfPkg/Include/Library/QemuFwCfgLib.h b/OvmfPkg/Include/Library/QemuFwCfgLib.h
index 40a07456c5308ebc699cf9eddad8485ea0919368..2ad96c02979d4a5e540474a3a4d47ff126126e45 100644 (file)
--- a/OvmfPkg/Include/Library/QemuFwCfgLib.h
+++ b/OvmfPkg/Include/Library/QemuFwCfgLib.h
@@ -4,80 +4,14 @@
   Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>\r
   Copyright (C) 2013, Red Hat, Inc.\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
 #ifndef __FW_CFG_LIB__\r
 #define __FW_CFG_LIB__\r
 \r
-//\r
-// 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
-\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
-\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
-\r
-} FIRMWARE_CONFIG_ITEM;\r
-\r
-//\r
-// Communication structure for the DMA access method. All fields are encoded in\r
-// big endian.\r
-//\r
-#pragma pack (1)\r
-typedef struct {\r
-  UINT32 Control;\r
-  UINT32 Length;\r
-  UINT64 Address;\r
-} FW_CFG_DMA_ACCESS;\r
-#pragma pack ()\r
+#include <IndustryStandard/QemuFwCfg.h>\r
 \r
 /**\r
   Returns a boolean indicating if the firmware configuration interface\r
@@ -95,7 +29,6 @@ QemuFwCfgIsAvailable (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Selects a firmware configuration item for reading.\r
 \r
@@ -108,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
@@ -126,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
@@ -145,10 +76,24 @@ 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
+  Skip bytes in the firmware configuration item.\r
+\r
+  Increase the offset of the firmware configuration item without transferring\r
+  bytes between the item and a caller-provided buffer. Subsequent read, write\r
+  or skip operations will commence at the increased offset.\r
+\r
+  @param[in] Size  Number of bytes to skip.\r
+**/\r
+VOID\r
+EFIAPI\r
+QemuFwCfgSkipBytes (\r
+  IN UINTN  Size\r
+  );\r
 \r
 /**\r
   Reads a UINT8 firmware configuration value\r
@@ -162,7 +107,6 @@ QemuFwCfgRead8 (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Reads a UINT16 firmware configuration value\r
 \r
@@ -175,7 +119,6 @@ QemuFwCfgRead16 (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Reads a UINT32 firmware configuration value\r
 \r
@@ -188,7 +131,6 @@ QemuFwCfgRead32 (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Reads a UINT64 firmware configuration value\r
 \r
@@ -201,7 +143,6 @@ QemuFwCfgRead64 (
   VOID\r
   );\r
 \r
-\r
 /**\r
   Find the configuration item corresponding to the firmware configuration file.\r
 \r
@@ -223,19 +164,4 @@ QemuFwCfgFindFile (
   OUT  UINTN                 *Size\r
   );\r
 \r
-\r
-/**\r
-  Determine if S3 support is explicitly enabled.\r
-\r
-  @retval  TRUE   if S3 support is explicitly enabled.\r
-           FALSE  otherwise. This includes unavailability of the firmware\r
-                  configuration interface.\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-QemuFwCfgS3Enabled (\r
-  VOID\r
-  );\r
-\r
 #endif\r
-\r