Yes Star thanks for catching the merge issue. Will fix it before check-in.

Thanks,
-Giri

> -----Original Message-----
> From: Zeng, Star
> Sent: Thursday, October 13, 2016 9:25 PM
> To: Mudusuru, Giri P <giri.p.mudus...@intel.com>; edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kin...@intel.com>; Yao, Jiewen
> <jiewen....@intel.com>; Zeng, Star <star.z...@intel.com>
> Subject: RE: [edk2] [PATCH] IntelSiliconPkg: Add Intel Firmware Version Info
> (FVI) definitions
> 
> Shouldn't
> +#include SmBios.h
> be
> +#include <IndustryStandard/SmBios.h>
> ?
> 
> Thanks,
> Star
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Giri P
> Mudusuru
> Sent: Thursday, October 13, 2016 10:11 AM
> To: edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kin...@intel.com>; Yao, Jiewen
> <jiewen....@intel.com>
> Subject: [edk2] [PATCH] IntelSiliconPkg: Add Intel Firmware Version Info (FVI)
> definitions
> 
> Adding Intel Firmware Version Info (FVI) related defines & structures.
> FVI enables reporting the Firmware Versions using SMBIOS OEM Type.
> 
> Cc: Jiewen Yao <jiewen....@intel.com>
> Cc: Michael Kinney <michael.d.kin...@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Giri P Mudusuru <giri.p.mudus...@intel.com>
> ---
>  .../Include/IndustryStandard/FirmwareVersionInfo.h | 60
> ++++++++++++++++++++++
>  1 file changed, 60 insertions(+)
>  create mode 100644
> IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
> 
> diff --git a/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
> b/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
> new file mode 100644
> index 0000000..4ac5e27
> --- /dev/null
> +++ b/IntelSiliconPkg/Include/IndustryStandard/FirmwareVersionInfo.h
> @@ -0,0 +1,60 @@
> +/** @file
> +  Intel Firmware Version Info (FVI) related definitions.
> +
> +  @todo: update document/spec reference
> +
> +  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>  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.
> +
> +@par Specification Reference:
> +  System Management BIOS (SMBIOS) Reference Specification v3.0.0 dated
> +2015-Feb-12
> +
> +http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.0
> +.0.pdf
> +
> +**/
> +
> +#ifndef __FIRMWARE_VERSION_INFO_H__
> +#define __FIRMWARE_VERSION_INFO_H__
> +
> +#include SmBios.h
> +
> +#define INTEL_FIRMWARE_VERSION_INFO_GROUP_NAME    "Firmware
> Version Info"
> +
> +#pragma pack(1)
> +
> +///
> +/// Firmware Version Structure
> +///
> +typedef struct {
> +  UINT8                       MajorVersion;
> +  UINT8                       MinorVersion;
> +  UINT8                       Revision;
> +  UINT16                      BuildNumber;
> +} INTEL_FIRMWARE_VERSION;
> +
> +///
> +/// Firmware Version Info (FVI) Structure /// typedef struct {
> +  SMBIOS_TABLE_STRING         ComponentName;  ///< String Index of
> Component Name
> +  SMBIOS_TABLE_STRING         VersionString;  ///< String Index of Version 
> String
> +  INTEL_FIRMWARE_VERSION      Version;        ///< Firmware version
> +} INTEL_FIRMWARE_VERSION_INFO;
> +
> +///
> +/// SMBIOS OEM Type Intel Firmware Version Info (FVI) Structure ///
> +typedef struct {
> +  SMBIOS_STRUCTURE            Header;         ///< SMBIOS structure header
> +  UINT8                       Count;          ///< Number of FVI entries in 
> this structure
> +  INTEL_FIRMWARE_VERSION_INFO Fvi[1];         ///< FVI structure(s)
> +} SMBIOS_TABLE_TYPE_OEM_INTEL_FVI;
> +
> +#pragma pack()
> +
> +#endif
> --
> 2.9.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to