From ed9ec043eb6b0fe3ac70b580fa4cd1b259519087 Mon Sep 17 00:00:00 2001
From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 29 Jun 2006 02:19:49 +0000
Subject: [PATCH] merged the last changes in new schema

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@654 6f19259b-4bc3-4df7-8a09-765794883524
---
 Tools/XMLSchema/FrameworkDataAttributes.xsd |  4 +++-
 Tools/XMLSchema/FrameworkDataElements.xsd   |  4 +++-
 Tools/XMLSchema/FrameworkDataTypes.xsd      |  4 ++++
 Tools/XMLSchema/SurfaceArea.xsd             | 15 +++++++++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index 288d12f309..2210d9faf4 100644
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -104,7 +104,7 @@
         <!-- Make Usage REQUIRED in final -->
         <xs:attribute name="Usage" type="EventUsage" use="optional"/>
         <!-- Make EventGroup Required in final -->
-        <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>
+        <xs:attribute name="EventGuidCName" type="C_NameType" use="optional"/>        
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
         <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
         <!-- DO NOT USE remove Arch from use, use SupArchList instead -->
@@ -115,6 +115,7 @@
         <xs:attribute name="Guid" type="GuidType" use="optional"/>
         <!-- DO NOT USE remove OverrideID from use -->
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+        <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>
     </xs:attributeGroup>
     <xs:attributeGroup name="ExternAttributes">
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
@@ -192,6 +193,7 @@
     <xs:attributeGroup name="HobAttributes">
         <!-- USAGE is required in final -->
         <xs:attribute name="Usage" type="HobUsage" use="optional"/>
+        <xs:attribute name="HobGuidCName" type="C_NameType" use="optional"/>        
         <xs:attribute name="HobType" type="HobTypes" use="required"/>
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
         <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index d43cd96bbd..4bf1ee177b 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1302,6 +1302,7 @@
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuidCName" type="C_NameType"/>                            
                             <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
                         </xs:sequence>
@@ -1325,7 +1326,8 @@
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>
-                            <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuidCName" type="C_NameType"/>                            
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>
diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 7cf160294a..33145ef18b 100644
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -136,6 +136,10 @@
     </xs:simpleType>
     <xs:simpleType name="EventTypes">
         <xs:restriction base="NameConvention">
+            <xs:enumeration value="EVENT_GROUP_GUID"/>
+            <xs:enumeration value="EVENT_TYPE_PERIODIC_TIMER"/>
+            <xs:enumeration value="EVENT_TYPE_RELATIVE_TIMER"/>
+            <!-- DON'T USE! TO BE REMOVED -->
             <xs:enumeration value="EVENT_GROUP_EXIT_BOOT_SERVICES"/>
             <xs:enumeration value="EVENT_GROUP_VIRTUAL_ADDRESS_CHANGE"/>
             <xs:enumeration value="EVENT_GROUP_MEMORY_MAP_CHANGE"/>
diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index c5de6b3082..b9157f525d 100644
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -47,6 +47,21 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="PlatformSurfaceArea">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>
+                <!-- This section will be for new definitions of how we put together the Framework Binary Images -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDefinitions"/>
+                <!-- The Flash section is the legacy implementation of Flash -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FrameworkModules"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="DynamicPcdBuildDefinitions"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>    
     <xs:annotation>
         <xs:documentation xml:lang="en">DO NOT USE removing all Library Module files - PUT IN PLATFORM DESCRIPTION FILE, FPD</xs:documentation>
     </xs:annotation>
-- 
2.39.2