X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=OvmfPkg%2FInclude%2FIndustryStandard%2FQemuFwCfg.h;h=9adf158c22a5904130d0b53cbfc989e4e3d90405;hb=HEAD;hp=776bfe88ae2b14187ea45906f047d65b1d3d182c;hpb=21ca2f28e6c5e006820956d7d56150184faeef85;p=mirror_edk2.git

diff --git a/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h b/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h
index 776bfe88ae..9adf158c22 100644
--- a/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h
+++ b/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h
@@ -6,13 +6,7 @@
   Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>
   Copyright (C) 2013 - 2017, Red Hat, Inc.
 
-  This program and the accompanying materials are licensed and made available
-  under the terms and conditions of the BSD License which accompanies this
-  distribution. The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
-  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #ifndef __FW_CFG_H__
@@ -24,67 +18,68 @@
 // The size, in bytes, of names of firmware configuration files, including at
 // least one terminating NUL byte.
 //
-#define QEMU_FW_CFG_FNAME_SIZE 56
+#define QEMU_FW_CFG_FNAME_SIZE  56
 
 //
 // If the following bit is set in the UINT32 fw_cfg revision / feature bitmap
 // -- read from key 0x0001 with the basic IO Port or MMIO method --, then the
 // DMA interface is available.
 //
-#define FW_CFG_F_DMA BIT1
+#define FW_CFG_F_DMA  BIT1
 
 //
 // Macros for the FW_CFG_DMA_ACCESS.Control bitmap (in native encoding).
 //
-#define FW_CFG_DMA_CTL_ERROR  BIT0
-#define FW_CFG_DMA_CTL_READ   BIT1
-#define FW_CFG_DMA_CTL_SKIP   BIT2
-#define FW_CFG_DMA_CTL_SELECT BIT3
-#define FW_CFG_DMA_CTL_WRITE  BIT4
+#define FW_CFG_DMA_CTL_ERROR   BIT0
+#define FW_CFG_DMA_CTL_READ    BIT1
+#define FW_CFG_DMA_CTL_SKIP    BIT2
+#define FW_CFG_DMA_CTL_SELECT  BIT3
+#define FW_CFG_DMA_CTL_WRITE   BIT4
 
 //
 // The fw_cfg registers can be found at these IO Ports, on the IO-mapped
 // platforms (Ia32 and X64).
 //
-#define FW_CFG_IO_SELECTOR    0x510
+#define FW_CFG_IO_SELECTOR     0x510
+#define FW_CFG_IO_DATA         0x511
+#define FW_CFG_IO_DMA_ADDRESS  0x514
 
 //
 // Numerically defined keys.
 //
 typedef enum {
-  QemuFwCfgItemSignature            = 0x0000,
-  QemuFwCfgItemInterfaceVersion     = 0x0001,
-  QemuFwCfgItemSystemUuid           = 0x0002,
-  QemuFwCfgItemRamSize              = 0x0003,
-  QemuFwCfgItemGraphicsEnabled      = 0x0004,
-  QemuFwCfgItemSmpCpuCount          = 0x0005,
-  QemuFwCfgItemMachineId            = 0x0006,
-  QemuFwCfgItemKernelAddress        = 0x0007,
-  QemuFwCfgItemKernelSize           = 0x0008,
-  QemuFwCfgItemKernelCommandLine    = 0x0009,
-  QemuFwCfgItemInitrdAddress        = 0x000a,
-  QemuFwCfgItemInitrdSize           = 0x000b,
-  QemuFwCfgItemBootDevice           = 0x000c,
-  QemuFwCfgItemNumaData             = 0x000d,
-  QemuFwCfgItemBootMenu             = 0x000e,
-  QemuFwCfgItemMaximumCpuCount      = 0x000f,
-  QemuFwCfgItemKernelEntry          = 0x0010,
-  QemuFwCfgItemKernelData           = 0x0011,
-  QemuFwCfgItemInitrdData           = 0x0012,
-  QemuFwCfgItemCommandLineAddress   = 0x0013,
-  QemuFwCfgItemCommandLineSize      = 0x0014,
-  QemuFwCfgItemCommandLineData      = 0x0015,
-  QemuFwCfgItemKernelSetupAddress   = 0x0016,
-  QemuFwCfgItemKernelSetupSize      = 0x0017,
-  QemuFwCfgItemKernelSetupData      = 0x0018,
-  QemuFwCfgItemFileDir              = 0x0019,
-
-  QemuFwCfgItemX86AcpiTables        = 0x8000,
-  QemuFwCfgItemX86SmbiosTables      = 0x8001,
-  QemuFwCfgItemX86Irq0Override      = 0x8002,
-  QemuFwCfgItemX86E820Table         = 0x8003,
-  QemuFwCfgItemX86HpetData          = 0x8004,
+  QemuFwCfgItemSignature          = 0x0000,
+  QemuFwCfgItemInterfaceVersion   = 0x0001,
+  QemuFwCfgItemSystemUuid         = 0x0002,
+  QemuFwCfgItemRamSize            = 0x0003,
+  QemuFwCfgItemGraphicsEnabled    = 0x0004,
+  QemuFwCfgItemSmpCpuCount        = 0x0005,
+  QemuFwCfgItemMachineId          = 0x0006,
+  QemuFwCfgItemKernelAddress      = 0x0007,
+  QemuFwCfgItemKernelSize         = 0x0008,
+  QemuFwCfgItemKernelCommandLine  = 0x0009,
+  QemuFwCfgItemInitrdAddress      = 0x000a,
+  QemuFwCfgItemInitrdSize         = 0x000b,
+  QemuFwCfgItemBootDevice         = 0x000c,
+  QemuFwCfgItemNumaData           = 0x000d,
+  QemuFwCfgItemBootMenu           = 0x000e,
+  QemuFwCfgItemMaximumCpuCount    = 0x000f,
+  QemuFwCfgItemKernelEntry        = 0x0010,
+  QemuFwCfgItemKernelData         = 0x0011,
+  QemuFwCfgItemInitrdData         = 0x0012,
+  QemuFwCfgItemCommandLineAddress = 0x0013,
+  QemuFwCfgItemCommandLineSize    = 0x0014,
+  QemuFwCfgItemCommandLineData    = 0x0015,
+  QemuFwCfgItemKernelSetupAddress = 0x0016,
+  QemuFwCfgItemKernelSetupSize    = 0x0017,
+  QemuFwCfgItemKernelSetupData    = 0x0018,
+  QemuFwCfgItemFileDir            = 0x0019,
 
+  QemuFwCfgItemX86AcpiTables   = 0x8000,
+  QemuFwCfgItemX86SmbiosTables = 0x8001,
+  QemuFwCfgItemX86Irq0Override = 0x8002,
+  QemuFwCfgItemX86E820Table    = 0x8003,
+  QemuFwCfgItemX86HpetData     = 0x8004,
 } FIRMWARE_CONFIG_ITEM;
 
 //
@@ -93,9 +88,9 @@ typedef enum {
 //
 #pragma pack (1)
 typedef struct {
-  UINT32 Control;
-  UINT32 Length;
-  UINT64 Address;
+  UINT32    Control;
+  UINT32    Length;
+  UINT64    Address;
 } FW_CFG_DMA_ACCESS;
 #pragma pack ()