From: Yonghong Zhu <yonghong.zhu@intel.com>
To: edk2-devel@lists.01.org
Cc: Liming Gao <liming.gao@intel.com>,
Michael Kinney <michael.d.kinney@intel.com>,
Kevin W Shaw <kevin.w.shaw@intel.com>
Subject: [Patch] DSC Spec: limit the VOID* PCD max size to UINT16
Date: Fri, 3 Aug 2018 14:12:21 +0800 [thread overview]
Message-ID: <1533276741-13044-1-git-send-email-yonghong.zhu@intel.com> (raw)
current the max size of VOID* PCD in the spec is a number that doesn't
no limitation, now this patch update to limit the max size to UINT16,
besides, also update some typo to make sure the format in chapter 2
and chapter 3 are align.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
2_dsc_overview/29_pcd_sections.md | 6 +++---
3_edk_ii_dsc_file_format/310_pcd_sections.md | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/2_dsc_overview/29_pcd_sections.md b/2_dsc_overview/29_pcd_sections.md
index 6547656..b33026c 100644
--- a/2_dsc_overview/29_pcd_sections.md
+++ b/2_dsc_overview/29_pcd_sections.md
@@ -1,9 +1,9 @@
<!--- @file
2.9 PCD Sections
- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
Redistribution and use in source (original document form) and 'compiled'
forms (converted to PDF, epub, HTML and other formats) with or without
modification, are permitted provided that the following conditions are met:
@@ -112,11 +112,11 @@ The following are typical examples of the `[PcdsFixedAtBuild]` section tag (the
[PcdsFixedAtBuild.$(arch).$(SkuIdentifier)]
```
Format of a point (VOID*) entry in this section is:
-`PcdTokenSpaceGuidCName.PcdCName|Value[|DatumType|MaximumDatumSize]]`
+`PcdTokenSpaceGuidCName.PcdCName|Value[|DatumType|MaximumDatumSize]`
Format for Boolean and numeric entries in this section is:
`PcdTokenSpaceGuidCName.PcdCName|Value`
@@ -157,11 +157,11 @@ The following are typical examples of the `[PcdsPatchableInModule]` section tag
[PcdsPatchableInModule.$(arch).$(SkuIdentifier)]
```
Format of an entry in this section is:
-`PcdTokenSpaceGuidCName.PcdCName|Value[|DatumType[|MaximumDatumSize]]`
+`PcdTokenSpaceGuidCName.PcdCName|Value[|DatumType|MaximumDatumSize]`
#### Example
```ini
[PcdsPatchableInModule.common]
diff --git a/3_edk_ii_dsc_file_format/310_pcd_sections.md b/3_edk_ii_dsc_file_format/310_pcd_sections.md
index 607c479..1879923 100644
--- a/3_edk_ii_dsc_file_format/310_pcd_sections.md
+++ b/3_edk_ii_dsc_file_format/310_pcd_sections.md
@@ -233,11 +233,11 @@ fields that are separated by the pipe character, "|".
{<NumValUint32>} {<Expression>}
elif (pcddatumtype == "UINT64"):
{<NumValUint64>} {<Expression>}
else:
<StringValue> [<MaxSize>]
-<MaxSize> ::= <FS> "VOID*" <FS> {<Number>} {<Expression>}
+<MaxSize> ::= <FS> "VOID*" <FS> {<IntNum>} {<UINT16>}
<StringValue> ::= {<StringVal>} {<MACROVAL>} {<Expression>}
```
#### Parameters
@@ -341,11 +341,11 @@ of the DSC file.
{<NumValUint32>} {<Expression>}
elif (pcddatumtype == "UINT64"):
{<NumValUint64>} {<Expression>}
else:
<StringValue> [<MaxSize>]
-<MaxSize> ::= <FS> {<Number>} {<Expression>}
+<MaxSize> ::= <FS> "VOID*" <FS> {<IntNum>} {<UINT16>}
<StringValue> ::= {<StringVal>} {<MACROVAL>} {<Expression>}
```
#### Parameters
@@ -480,11 +480,11 @@ sections of the DSC file.
elif (pcddatumtype == "UINT64"):
{<NumValUint64>} {<Expression>}
else:
<StringValue> [<MaxSize>]
<MaxSize> ::= <FS> "VOID*" [<FS> <SizeValue>]
-<SizeValue> ::= {<Number>} {<Expression>}
+<SizeValue> ::= {<IntNum>} {<UINT16>}
<StringValue> ::= {<StringVal>} {<MACROVAL>} {<Expression>}
<VpdEntry> ::= <PcdName> <FS> <VpdOffset> [<FS> <VpdData>] <EOL>
<VpdOffset> ::= {<Number>} {"*"}
<VpdData> ::= if (pcddatumtype == "BOOLEAN"):
{<BoolType>} {<Expression>}
@@ -496,11 +496,11 @@ sections of the DSC file.
{<NumValUint32>} {<Expression>}
elif(pcddatumtype == "UINT64"):
{<NumValUint64>} {<Expression>}
else:
<VpdMaxSize>
-<VpdMaxSize> ::= {<LongNum>} {<UINT32>} [<FS> <StringValue>]
+<VpdMaxSize> ::= {<IntNum>} {<UINT16>} [<FS> <StringValue>]
<HiiEntry> ::= <PcdName> <FS> <HiiString> <Field2> <EOL>
<HiiString> ::= {<CArray>} {<UnicodeString>}
<Field2> ::= <FS> <VariableGuid> <FS> <VariableOffset> [<ValueField>]
<VariableGuid> ::= <CName>
<ValueField> ::= <FS> <DefaultValue> [<FS> <HiiAttrs>]
--
2.6.1.windows.1
next reply other threads:[~2018-08-03 6:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-03 6:12 Yonghong Zhu [this message]
2018-08-07 3:44 ` [Patch] DSC Spec: limit the VOID* PCD max size to UINT16 Gao, Liming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1533276741-13044-1-git-send-email-yonghong.zhu@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox