From cb9f0b9ec317de77ac80130f43754119d23f2249 Mon Sep 17 00:00:00 2001
From: lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 2 Jun 2006 01:53:24 +0000
Subject: Fixed the EdkModulePkg.fpd file to have a package name of EdkModule,
 not MdePkg.  Added optional (will be required) TokenSpaceGuid to Pcd
 sections. Removed some documentation for elements that will be removed
 eventually (the notes are in the comments section)

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@382 6f19259b-4bc3-4df7-8a09-765794883524
---
 Tools/XMLSchema/FrameworkDataElements.xsd |  4 +++
 Tools/XMLSchema/FrameworkHeaders.xsd      | 56 +++++++++----------------------
 2 files changed, 20 insertions(+), 40 deletions(-)

(limited to 'Tools')

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 8579d790b6..f0c34663da 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -879,6 +879,7 @@
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>
@@ -1012,6 +1013,7 @@
                                     </xs:simpleContent>
                                 </xs:complexType>
                             </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes">
                                 <xs:annotation>
                                     <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>
@@ -1147,6 +1149,7 @@
                                     </xs:simpleContent>
                                 </xs:complexType>
                             </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes">
                                 <xs:annotation>
                                     <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>
@@ -1269,6 +1272,7 @@
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="Token" type="Token"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>
diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index 718ce84d60..309a5740d7 100644
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -170,20 +170,12 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="1" maxOccurs="1" name="PlatformName" type="PlatformNamingConvention">
-                    <xs:annotation>
-                        <xs:documentation xml:lang="en">Define the Name of a Platform</xs:documentation>
-                    </xs:annotation>
-                </xs:element>
+                <xs:element minOccurs="1" maxOccurs="1" name="PlatformName" type="PlatformNamingConvention"/>
                 <xs:choice>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid">
-                        <!-- Guid needs to be removed -->
-                        <xs:annotation>
-                            <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
-                    <!-- GuidValue needs to be required -->
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                  <!-- DO NOT USE Guid needs to be removed -->
+                  <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                  <!-- GuidValue needs to be required -->
                 </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Version"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
@@ -191,36 +183,20 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="Copyright"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="License"/>
                 <xs:choice minOccurs="1" maxOccurs="1">
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Created">
-                        <!-- Created needs to be removed -->
-                        <xs:annotation>
-                            <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
-                    <!-- CreatedDate needs to be required -->
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
+                  <!-- DO NOT USE Created needs to be removed -->
+                  <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
+                  <!-- CreatedDate needs to be required -->
                 </xs:choice>
-                <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy">
-                    <!-- CreatedBy needs to be removed -->
-                    <xs:annotation>
-                        <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
-                    </xs:annotation>
-                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy"/>
+                <!-- DO NOT USE CreatedBy needs to be removed -->
                 <xs:choice>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated">
-                        <!-- Updated needs to be removed -->
-                        <xs:annotation>
-                            <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>
+                  <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
+                  <!-- DO NOT USE Updated needs to be removed -->
+                  <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>
                 </xs:choice>
-                <xs:element minOccurs="0" maxOccurs="1" ref="PackageType">
-                    <!-- PackageType needs to be removed -->
-                    <xs:annotation>
-                        <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
-                    </xs:annotation>
-                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageType"/>
+                <!-- DO NOT USE PackageType needs to be removed -->
                 <xs:element minOccurs="0" maxOccurs="1" name="BuildTarget" type="BuildTargets"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>
                 <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->
-- 
cgit v1.2.3