From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <liming.gao@intel.com>
Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
 client-ip=134.134.136.24; helo=mga09.intel.com;
 envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org 
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by ml01.01.org (Postfix) with ESMTPS id DE4E2211D507C
 for <edk2-devel@lists.01.org>; Wed,  6 Mar 2019 00:40:23 -0800 (PST)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga003.jf.intel.com ([10.7.209.27])
 by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
 06 Mar 2019 00:40:22 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.58,447,1544515200"; d="scan'208";a="131654342"
Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205])
 by orsmga003.jf.intel.com with ESMTP; 06 Mar 2019 00:40:20 -0800
Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by
 fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS)
 id 14.3.408.0; Wed, 6 Mar 2019 00:40:20 -0800
Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by
 FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS)
 id 14.3.408.0; Wed, 6 Mar 2019 00:40:20 -0800
Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.74]) by
 shsmsx102.ccr.corp.intel.com ([169.254.2.163]) with mapi id 14.03.0415.000;
 Wed, 6 Mar 2019 16:40:18 +0800
From: "Gao, Liming" <liming.gao@intel.com>
To: "Feng, Bob C" <bob.c.feng@intel.com>, "edk2-devel@lists.01.org"
 <edk2-devel@lists.01.org>
Thread-Topic: [Patch] Document: Add PCD flexible format value EBNF in Fdf.
Thread-Index: AQHU0yupwbURA1rtjE24i++VTd5fjaX+ShWw
Date: Wed, 6 Mar 2019 08:40:17 +0000
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3FC496@SHSMSX104.ccr.corp.intel.com>
References: <20190305081542.24744-1-bob.c.feng@intel.com>
In-Reply-To: <20190305081542.24744-1-bob.c.feng@intel.com>
Accept-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-ctpclassification: CTP_NT
x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYmY0OTk4ZmItY2M2Yi00MDQ0LTlmYWMtZjMwOTYyYTkyMWVjIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiR2t1dzNvWkRiU1NRc2hxYXFcL21pZHhTRDhvaTl6aHMzQ3YrUkt0OCtOVUNXcW40YXplcnNGNnJWOWRBeDRyZysifQ==
dlp-product: dlpe-windows
dlp-version: 11.0.400.15
dlp-reaction: no-action
x-originating-ip: [10.239.127.40]
MIME-Version: 1.0
Subject: Re: [Patch] Document: Add PCD flexible format value EBNF in Fdf.
X-BeenThere: edk2-devel@lists.01.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: EDK II Development  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Mar 2019 08:40:24 -0000
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Feng, Bob C
> Sent: Tuesday, March 5, 2019 12:16 AM
> To: edk2-devel@lists.01.org
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com=
>; Zhu, Yonghong <yonghong.zhu@intel.com>
> Subject: [Patch] Document: Add PCD flexible format value EBNF in Fdf.
>=20
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D541
>=20
> This patch is to add flexible PCD value format EBNF into Fdf spec.
>=20
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  3_edk_ii_fdf_file_format/32_fdf_definition.md | 25 ++++++++++++++++---
>  3_edk_ii_fdf_file_format/35_[fd]_sections.md  |  4 +--
>  3_edk_ii_fdf_file_format/36_[fv]_sections.md  |  4 +--
>  .../37_[capsule]_sections.md                  |  4 +--
>  4 files changed, 27 insertions(+), 10 deletions(-)
>=20
> diff --git a/3_edk_ii_fdf_file_format/32_fdf_definition.md b/3_edk_ii_fdf=
_file_format/32_fdf_definition.md
> index db098cf..2b044ab 100644
> --- a/3_edk_ii_fdf_file_format/32_fdf_definition.md
> +++ b/3_edk_ii_fdf_file_format/32_fdf_definition.md
> @@ -1,9 +1,9 @@
>  <!--- @file
>    3.2 FDF Definition
>=20
> -  Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2006-2019, Intel Corporation. All rights reserved.<BR>
>=20
>    Redistribution and use in source (original document form) and 'compile=
d'
>    forms (converted to PDF, epub, HTML and other formats) with or without
>    modification, are permitted provided that the following conditions are=
 met:
>=20
> @@ -122,15 +122,17 @@ The following are common definitions used by multip=
le section types.
>  <AsciiString>          ::=3D [ <TS>* <AsciiChars>* ]*
>  <EmptyString>          ::=3D <DblQuote> <DblQuote>
>  <CFlags>               ::=3D <AsciiString>
>  <PrintChars>           ::=3D {<TS>} {<CChars>}
>  <QuotedString>         ::=3D <DblQuote> <PrintChars>* <DblQuote>
> -<CString>              ::=3D ["L"] <QuotedString>
> +<CString>              ::=3D ["L"] {<QuotedString>} {<SglQuotedString>}
> +<SglQuotedString>      ::=3D <SglQuote> <PrintChars>* <SglQuote>
> +<SglQuote>             ::=3D 0x27
>  <NormalizedString>     ::=3D <DblQuote> [{<Word>} {<Space>}]+ <DblQuote>
>  <GlobalComment>        ::=3D <WS> "#" [<AsciiString>] <EOL>+
>  <Comment>              ::=3D "#" <AsciiString> <EOL>+
> -<UnicodeString>        ::=3D "L" <QuotedString>
> +<UnicodeString>        ::=3D "L" {<QuotedString>} {<SglQuotedString>}
>  <HexDigit>             ::=3D (a-fA-F0-9)
>  <HexByte>              ::=3D {"0x"} {"0X"} [<HexDigit>] <HexDigit>
>  <HexNumber>            ::=3D {"0x"} {"0X"} <HexDigit>+
>  <HexVersion>           ::=3D "0x" [0]* <Major> <Minor>
>  <Major>                ::=3D <HexDigit>? <HexDigit>? <HexDigit>?
> @@ -181,11 +183,11 @@ The following are common definitions used by multip=
le section types.
>  <PcdCName>             ::=3D <CName>
>  <TokenSpaceGuidCName>  ::=3D <CName>
>  <Field>                ::=3D <CName>
>  <PCDVAL>               ::=3D "PCD(" <PcdName> ")"
>  <UINT8>                ::=3D {"0x"} {"0X"} (\x0 - \xFF)
> -<UINT16>               ::=3D "0x"} {"0X"} (\x0 - \xFFFF)
> +<UINT16>               ::=3D {"0x"} {"0X"} (\x0 - \xFFFF)
>  <UINT32>               ::=3D {"0x"} {"0X"} (\x0 - \xFFFFFFFF)
>  <UINT64>               ::=3D {"0x"} {"0X"} (\x0 - \xFFFFFFFFFFFFFFFF)
>  <UINT8z>               ::=3D {"0x"} {"0X"} <HexDigit> <HexDigit>
>  <UINT16z>              ::=3D {"0x"} {"0X"} <HexDigit> <HexDigit> <HexDig=
it>
>                             <HexDigit>
> @@ -233,10 +235,25 @@ The following are common definitions used by multip=
le section types.
>                             {"128M"} {"256M"} {"512M"} {"1G"} {"2G"}
>  <FfsAlignmentValues>   ::=3D {"Auto"} {"8"} {"16"} {"32"} {"64"} {"128"}
>                             {"512"} {"1K"} {"4K"} {"32K"} {"64K"} {"128K"=
}
>                             {"256K"} {"512K"} {"1M"} {"2M"} {"4M"} {"8M"}
>                             {"16M"}
> +<Array>                ::=3D "{" {<Array>} {[<Lable>] <ArrayVal>[<CommaS=
pace> [<Lable>] <ArrayVal>]* } "}"
> +<Lable>                ::=3D "LABEL(" <CName> ")"
> +<OffsetOf>             ::=3D "OFFSET_OF(" <CName> ")"
> +<ArrayVal>             ::=3D {<Num8Array>} {<GuidStr>} {<DevicePath>}   =
 1
> +<Num8Array>            ::=3D {<NonNumType>} {<ShortNum>} {<UINT8>}
> +<NonNumType>           ::=3D {<BoolVal>} {<UnicodeString>} {<CString>}{<=
Offset>} {<UintMac>}
> +<ShortNum>             ::=3D (0-255)
> +<UintMac>              ::=3D {<Uint8Mac>} {<Uint16Mac>} {<Uint32Mac>} {<=
Uint64Mac>}
> +<Uint8Mac>             ::=3D "UINT8(" <Num8Array> ")"
> +<Uint16Mac>            ::=3D "UINT16(" <Num16Array> ")"
> +<Uint32Mac>            ::=3D "UINT32(" <Num32Array> ")"
> +<Uint64Mac>            ::=3D "UINT64(" <Num64Array> ")"
> +<Num16Array>           ::=3D {<NonNumType>} {<IntNum>} {<UINT16>}
> +<Num32Array>           ::=3D {<NonNumType>} {<LongNum>} {<UINT32>}
> +<Num64Array>           ::=3D {<NonNumType>} {<LongLongNum>} {<UINT64>}
>  ```
>=20
>  **********
>  **Note:** When using the characters "|" or "||" in an expression, the
>  expression must be encapsulated in open "(" and close ")" parenthesis.
> diff --git a/3_edk_ii_fdf_file_format/35_[fd]_sections.md b/3_edk_ii_fdf_=
file_format/35_[fd]_sections.md
> index e46fd7b..d8fde52 100644
> --- a/3_edk_ii_fdf_file_format/35_[fd]_sections.md
> +++ b/3_edk_ii_fdf_file_format/35_[fd]_sections.md
> @@ -1,9 +1,9 @@
>  <!--- @file
>    3.5 [FD] Sections
>=20
> -  Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2006-2019, Intel Corporation. All rights reserved.<BR>
>=20
>    Redistribution and use in source (original document form) and 'compile=
d'
>    forms (converted to PDF, epub, HTML and other formats) with or without
>    modification, are permitted provided that the following conditions are=
 met:
>=20
> @@ -66,11 +66,11 @@ Conditional statements may be used anywhere within th=
is section.
>  <BlockStatements>  ::=3D <TS> "BlockSize" <Eq> <UINT32> [<SetPcd>]
>                         <EOL>
>                         [<TS> "NumBlocks" <Eq> <UINT32> <EOL>]
>  <SetStatements>    ::=3D <TS> "SET" {<PcdName>} {<PcdFieldName>} <Eq> <V=
ALUE> <EOL>
>  <VALUE>            ::=3D {<Number>} {<Boolean>} {<GUID>} {<CArray>}
> -                       {<CString>} {<UnicodeString>} {<Expression>}
> +                       {<CString>} {<UnicodeString>} {<Expression>}{<Arr=
ay>}{<OffsetOf>}
>  <RegionLayout>     ::=3D <TS> <Offset> <FS> <Size> <EOL>
>                         [<TS> <PcdOffset> [<FS> <PcdSize>] <EOL>]
>                         [<RegionType>]
>  <Offset>           ::=3D {<HexNumber>} {<Expression>}
>  <Size>             ::=3D {<HexNumber>} {<Expression>}
> diff --git a/3_edk_ii_fdf_file_format/36_[fv]_sections.md b/3_edk_ii_fdf_=
file_format/36_[fv]_sections.md
> index 2b21906..7448f3c 100644
> --- a/3_edk_ii_fdf_file_format/36_[fv]_sections.md
> +++ b/3_edk_ii_fdf_file_format/36_[fv]_sections.md
> @@ -1,9 +1,9 @@
>  <!--- @file
>    3.6 [FV] Sections
>=20
> -  Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2006-2019, Intel Corporation. All rights reserved.<BR>
>=20
>    Redistribution and use in source (original document form) and 'compile=
d'
>    forms (converted to PDF, epub, HTML and other formats) with or without
>    modification, are permitted provided that the following conditions are=
 met:
>=20
> @@ -90,11 +90,11 @@ Conditional statements may be used anywhere within th=
is section.
>  <BlockStatements>   ::=3D <FixedBlocks>
>  <FixedBlocks>       ::=3D [<TS> "BlockSize" <Eq> <UINT32> <EOL>]
>                          [<TS> "NumBlocks" <Eq> <UINT32> <EOL>]
>  <SetStatements>     ::=3D <TS> "SET" <MTS> {<PcdName>} {<PcdFieldName>} =
<Eq> <VALUE> <EOL>
>  <VALUE>             ::=3D {<Number>} {<Boolean>} {<GUID>} {<CArray>}
> -                        {<CString>} {<UnicodeString>} {<Expression>}
> +                        {<CString>} {<UnicodeString>} {<Expression>}{<Ar=
ray>}{<OffsetOf>}
>  <FvAlignment>       ::=3D [<TS> "FvBaseAddress" <Eq> <UINT64> <EOL>]
>                          [<TS> "FvForceRebase" <Eq> <TrueFalse> <EOL>]
>                          <TS> "FvAlignment" <Eq>
>                          <FvAlignmentValues> <EOL>
>  <FvAttributes>      ::=3D [<TS> "MEMORY_MAPPED" <Eq> <TrueFalse> <EOL>]
> diff --git a/3_edk_ii_fdf_file_format/37_[capsule]_sections.md b/3_edk_ii=
_fdf_file_format/37_[capsule]_sections.md
> index c20c73a..7dc975d 100644
> --- a/3_edk_ii_fdf_file_format/37_[capsule]_sections.md
> +++ b/3_edk_ii_fdf_file_format/37_[capsule]_sections.md
> @@ -1,9 +1,9 @@
>  <!--- @file
>    3.7 [Capsule] Sections
>=20
> -  Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2006-2019, Intel Corporation. All rights reserved.<BR>
>=20
>    Redistribution and use in source (original document form) and 'compile=
d'
>    forms (converted to PDF, epub, HTML and other formats) with or without
>    modification, are permitted provided that the following conditions are=
 met:
>=20
> @@ -49,11 +49,11 @@ Conditional statements may be used anywhere within th=
is section.
>                          <UefiTokens>
>                          <CapsuleStmts>*
>  <UiCapsuleName>     ::=3D "." <Word>
>  <SetStatements>     ::=3D <TS> "SET" <MTS> {<PcdName>} {<PcdFieldName>} =
<Eq> <VALUE> <EOL>
>  <VALUE>             ::=3D {<Number>} {<Boolean>} {<GUID>} {<CArray>}
> -                        {<CString>} {<UnicodeString>} {<Expression>}
> +                        {<CString>} {<UnicodeString>} {<Expression>}{<Ar=
ray>}{<OffsetOf>}
>  <UefiTokens>        ::=3D <TS> "CAPSULE_GUID" <Eq> <NamedGuidOrPcd> <EOL=
>
>                          [<TS> "CAPSULE_HEADER_SIZE" <Eq> <Bytes> <EOL>] =
[<TS>
>                          "CAPSULE_FLAGS" <Eq> <Flags> <EOL>]
>                          [<TS> "CAPSULE_HEADER_INIT_VERSION" <Eq> <Hex2> =
<EOL>]
>  <CapsuleStmts>      ::=3D {<MacroDefinition>} {<SetStatements>}
> --
> 2.20.1.windows.1