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

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index 288d12f30909df5c58f3937d0d9b618aeae88642..2210d9faf474ab1d7527e763fbe100320e5b50bd 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -104,7 +104,7 @@
         <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="EventUsage" use="optional"/>\r
         <!-- Make EventGroup Required in final -->\r
         <!-- Make Usage REQUIRED in final -->\r
         <xs:attribute name="Usage" type="EventUsage" use="optional"/>\r
         <!-- Make EventGroup Required in final -->\r

-        <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>\r
+        <xs:attribute name="EventGuidCName" type="C_NameType" use="optional"/>        \r

         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
         <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
         <!-- DO NOT USE remove Arch from use, use SupArchList instead -->\r


@@ -115,6 +115,7 @@
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

+        <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="ExternAttributes">\r
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ExternAttributes">\r
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r


@@ -192,6 +193,7 @@
     <xs:attributeGroup name="HobAttributes">\r
         <!-- USAGE is required in final -->\r
         <xs:attribute name="Usage" type="HobUsage" use="optional"/>\r
     <xs:attributeGroup name="HobAttributes">\r
         <!-- USAGE is required in final -->\r
         <xs:attribute name="Usage" type="HobUsage" use="optional"/>\r

+        <xs:attribute name="HobGuidCName" type="C_NameType" use="optional"/>        \r

         <xs:attribute name="HobType" type="HobTypes" use="required"/>\r
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
         <xs:attribute name="HobType" type="HobTypes" use="required"/>\r
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index d43cd96bbd4cbb1c7f03ed4c3592f7c2c88421ce..4bf1ee177bcebc18927788cb008294842aa65e91 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1302,6 +1302,7 @@
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>\r
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>\r

+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuidCName" type="C_NameType"/>                            \r

                             <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
                         </xs:sequence>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
                         </xs:sequence>\r


@@ -1325,7 +1326,8 @@
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>\r

-                            <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuidCName" type="C_NameType"/>                            \r
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r

                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>\r

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 7cf160294a9fa850ccb28fbd14cff7fd49c933bd..33145ef18b7b594a01c51a0c7d6467dda62fcd33 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -136,6 +136,10 @@
     </xs:simpleType>\r
     <xs:simpleType name="EventTypes">\r
         <xs:restriction base="NameConvention">\r
     </xs:simpleType>\r
     <xs:simpleType name="EventTypes">\r
         <xs:restriction base="NameConvention">\r

+            <xs:enumeration value="EVENT_GROUP_GUID"/>\r
+            <xs:enumeration value="EVENT_TYPE_PERIODIC_TIMER"/>\r
+            <xs:enumeration value="EVENT_TYPE_RELATIVE_TIMER"/>\r
+            <!-- DON'T USE! TO BE REMOVED -->\r

             <xs:enumeration value="EVENT_GROUP_EXIT_BOOT_SERVICES"/>\r
             <xs:enumeration value="EVENT_GROUP_VIRTUAL_ADDRESS_CHANGE"/>\r
             <xs:enumeration value="EVENT_GROUP_MEMORY_MAP_CHANGE"/>\r
             <xs:enumeration value="EVENT_GROUP_EXIT_BOOT_SERVICES"/>\r
             <xs:enumeration value="EVENT_GROUP_VIRTUAL_ADDRESS_CHANGE"/>\r
             <xs:enumeration value="EVENT_GROUP_MEMORY_MAP_CHANGE"/>\r

diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index c5de6b308270b5b261da90b74f5a7e6aa0091b46..b9157f525dacbcab8138fac848566180ad75801e 100644 (file)
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -47,6 +47,21 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r

+    <xs:element name="PlatformSurfaceArea">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>\r
+                <!-- This section will be for new definitions of how we put together the Framework Binary Images -->\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDefinitions"/>\r
+                <!-- The Flash section is the legacy implementation of Flash -->\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="FrameworkModules"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="DynamicPcdBuildDefinitions"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>\r
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>    \r

     <xs:annotation>\r
         <xs:documentation xml:lang="en">DO NOT USE removing all Library Module files - PUT IN PLATFORM DESCRIPTION FILE, FPD</xs:documentation>\r
     </xs:annotation>\r
     <xs:annotation>\r
         <xs:documentation xml:lang="en">DO NOT USE removing all Library Module files - PUT IN PLATFORM DESCRIPTION FILE, FPD</xs:documentation>\r
     </xs:annotation>\r