diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-06-23 14:41:16 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-06-23 14:41:16 +0000 |
| commit | 4276d5dacfd4812abc1d7a1bd1da995d7002ee9e (patch) | |
| tree | e761b29520a4c86b05082fe2c13ca356f0bedd7a /Tools/Source | |
| parent | e88ea4239b6530720cf2d99ba1798ba9950b5f51 (diff) | |
| download | edk2-platforms-4276d5dacfd4812abc1d7a1bd1da995d7002ee9e.tar.xz | |
1) Add in support to traverse taken space
2) Remove unused import in DynamicTokenValue.java.
3) Support Byte Stream input for Pointer type Dynamic PCD entry in FPD file.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@616 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Tools/Source')
3 files changed, 25 insertions, 4 deletions
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java index cf94885847..f6ea239b38 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java +++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java @@ -1684,7 +1684,14 @@ class PcdDatabase { */
s += tab + tab + String.format("{ %s }", t.skuData.get(i).value.vpdOffset);
} else {
- s += tab + tab + String.format("{ %s }", t.skuData.get(i).value.value);
+ if (t.isByteStreamType()) {
+ //
+ // Byte stream type input has their own "{" "}", so we won't help to insert.
+ //
+ s += tab + tab + String.format(" %s ", t.skuData.get(i).value.value);
+ } else {
+ s += tab + tab + String.format("{ %s }", t.skuData.get(i).value.value);
+ }
}
if (i != t.skuData.size() - 1) {
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java index 54c8957302..65c15a5eb5 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java +++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java @@ -15,10 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
package org.tianocore.build.pcd.entity;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.UUID;
import org.tianocore.build.pcd.exception.EntityException;
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java index 7d1e0191db..46a90cb024 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java +++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java @@ -707,6 +707,23 @@ public class Token { return false;
}
+
+ public boolean isByteStreamType () {
+ String str = getDynamicDefaultValue();
+
+ if (str == null) {
+ return false;
+ }
+
+ if (datumType == Token.DATUM_TYPE.POINTER &&
+ str.startsWith("{") &&
+ str.endsWith("}")) {
+ return true;
+ }
+
+ return false;
+
+ }
public String getStringTypeString () {
return getDefaultSku().value.substring(2, getDefaultSku().value.length() - 1);
|