updated several elements and re-organized the layout (moving Attributes to their...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@355 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
new file mode 100644 (file)
index 0000000..63d8823
--- /dev/null
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">\r
+    <!--\r
+    Filename: FrameworkDataAttributes.xsd\r
+    \r
+    Copyright (c) 2006, Intel Corp.\r
+    All rights reserved. This program and the accompanying materials\r
+    are licensed and made available under the terms and conditions of the BSD License\r
+    which may be found at http://opensource.org/licenses/bsd-license.php\r
+    \r
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+    \r
+  -->\r
+    <xs:annotation>\r
+        <xs:documentation xml:lang="en">This schema defines EFI and Framework Attribute. Only attributeGroups are specified in this file. </xs:documentation>\r
+    </xs:annotation>\r
+    <xs:include schemaLocation="NamingConvention.xsd"/>\r
+    <xs:include schemaLocation="FrameworkDataTypes.xsd"/>\r
+    <xs:attributeGroup name="BaseNameAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="BootModeAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>\r
+        <xs:attribute name="Usage" type="BootModeUsage" use="required"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="ConvertAttributeString">\r
+        <xs:attribute name="SourceString" type="xs:string" use="optional"/>\r
+        <xs:attribute default="Unicode" name="OutputFiletype" type="xs:string" use="optional"/>\r
+        <xs:attribute name="OutputFilename" type="FileNameConvention" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="DataHubAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="DataHubUsage" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="DirectoryAttributes">\r
+        <xs:attribute name="Separator" type="ToothPick"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="EventAttributes">\r
+        <xs:attribute name="Usage" type="EventUsage" use="optional"/>\r
+        <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="ExternAttributes">\r
+        <xs:attribute name="Usage" type="ExternUsage" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="FilenameAttributes">\r
+        <xs:attribute name="Usage" type="FileNameUsage" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>\r
+        <xs:attribute name="FileType" type="xs:string" use="optional"/>\r
+        <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="FormsetAttributes">\r
+        <xs:attribute name="Usage" type="FormSetUsage" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="GuidAttributes">\r
+        <xs:attribute name="Usage" type="GuidUsage" use="optional"/>\r
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="HobAttributes">\r
+        <xs:attribute name="Usage" type="HobUsage" use="optional"/>\r
+        <xs:attribute name="HobType" type="HobTypes" use="required"/>\r
+        <xs:attribute default="true" name="HobEnabled" type="xs:boolean" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="IncludeAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>\r
+        <xs:attribute name="Class" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="ModuleType" type="ModuleTypeDef" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="LibraryAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="LibraryClass" type="BaseNameConvention" use="optional"/>\r
+        <xs:attribute name="ClassGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
+        <xs:attribute name="Usage" type="LibraryUsage" use="optional"/>\r
+        <xs:attribute name="Package" type="xs:string" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="ModuleNameAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="MsaAttributes">\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="FvBinding" type="xs:string" use="optional"/>\r
+        <xs:attribute name="ModuleName" type="C_Name" use="optional"/>\r
+        <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="PackageName" type="C_Name" use="optional"/>\r
+        <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="OptionAttributes">\r
+        <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="PackageAttributes">\r
+        <xs:attribute name="Usage" type="PackageUsage" use="optional"/>\r
+        <xs:attribute name="PackageType" type="PackageType" use="optional"/>\r
+        <xs:attribute name="UpdatedDate" type="DateType" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="PackageNameAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="PcdAttributes">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">These attributes are for the Pcds listed in PcdData, PcdEntry and/or PcdBuildData entries.</xs:documentation>\r
+            <xs:documentation xml:lang="en">PcdUsage is only valid for PcdItemTypes = FEATURE_FLAG</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>\r
+        <xs:attribute name="PcdUsage" type="PcdUsage" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="PlatformAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
+        <xs:attribute name="AlternateName" type="FileNameConvention" use="optional"/>\r
+        <xs:attribute name="PlatformName" type="BaseNameConvention" use="optional"/>\r
+        <xs:attribute name="PlatformGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="PlatformVersion" type="xs:string" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="PpiAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="PpiUsage" use="optional"/>\r
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="C_Name" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="PpiNotifyAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="PpiNotifyUsage" use="optional"/>\r
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="C_Name" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="ProtocolAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="ProtocolUsage" use="optional"/>\r
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="C_Name" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="ProtocolNotifyAttributes">\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="SectionAttributes">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">Attributes are either compressable and/or sequence order binding</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>\r
+        <xs:attribute default="true" name="Compressible" type="xs:boolean" use="optional"/>\r
+        <xs:attribute name="BindingOrder" type="xs:int" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="SectionsAttributes">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">Attributes for Sections, EncapsulationTag, EncapsulationType and OverrideID</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="EncapsulationTag" type="xs:string" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="SystemTableAttributes">\r
+        <xs:attribute name="Usage" type="SystemTableUsage" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="VariableAttributes">\r
+        <xs:attribute name="Usage" type="VariableUsage" use="optional"/>\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="UrlAttribute">\r
+        <xs:attribute name="Url" type="xs:anyURI"/>\r
+    </xs:attributeGroup>\r
+</xs:schema>\r

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index f02ec12d673fc548fbf035b5d3c5737b6866b795..1d34b49e13d4b1e19c2b4dbf651f9989704e45e1 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -17,6 +17,7 @@
   </xs:annotation>\r
   <xs:include schemaLocation="NamingConvention.xsd"/>\r
   <xs:include schemaLocation="FrameworkDataTypes.xsd"/>\r
+  <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>\r
   <xs:element name="Abstract">\r
     <xs:annotation>\r
       <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>\r

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 31bd87ea1d2768adc03f878ec53846e8e163a645..38e16395fd51fd0aec92df2ebdf7e71a98694c8c 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -13,7 +13,7 @@
     \r
   -->\r
     <xs:annotation>\r
-        <xs:documentation xml:lang="en">This schema defines EFI and Framework Attribute and Data Types. Only simpleType and attributeGroups are specified in this file. </xs:documentation>\r
+        <xs:documentation xml:lang="en">This schema defines EFI and Framework Data Types. Only simpleType are specified in this file. </xs:documentation>\r
     </xs:annotation>\r
     <xs:include schemaLocation="NamingConvention.xsd"/>\r
     <xs:simpleType name="BlockNameType">\r
@@ -1023,175 +1023,4 @@
             <xs:element name="ToolArgs" type="xs:string"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
-    <xs:attributeGroup name="BaseNameAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="BootModeAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>\r
-        <xs:attribute name="Usage" type="BootModeUsage" use="required"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="ConvertAttributeString">\r
-        <xs:attribute name="SourceString" type="xs:string" use="optional"/>\r
-        <xs:attribute default="Unicode" name="OutputFiletype" type="xs:string" use="optional"/>\r
-        <xs:attribute name="OutputFilename" type="FileNameConvention" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="DataHubAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Usage" type="DataHubUsage" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="DirectoryAttributes">\r
-        <xs:attribute name="Separator" type="ToothPick"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="EventAttributes">\r
-        <xs:attribute name="Usage" type="EventUsage" use="optional"/>\r
-        <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="ExternAttributes">\r
-        <xs:attribute name="Usage" type="ExternUsage" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="FilenameAttributes">\r
-        <xs:attribute name="Usage" type="FileNameUsage" use="optional"/>\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>\r
-        <xs:attribute name="FileType" type="xs:string" use="optional"/>\r
-        <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="FormsetAttributes">\r
-        <xs:attribute name="Usage" type="FormSetUsage" use="optional"/>\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="GuidAttributes">\r
-        <xs:attribute name="Usage" type="GuidUsage" use="optional"/>\r
-        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="HobAttributes">\r
-        <xs:attribute name="Usage" type="HobUsage" use="optional"/>\r
-        <xs:attribute name="HobType" type="HobTypes" use="required"/>\r
-        <xs:attribute default="true" name="HobEnabled" type="xs:boolean" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="IncludeAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>\r
-        <xs:attribute name="Class" type="xs:normalizedString" use="optional"/>\r
-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-        <xs:attribute name="ModuleType" type="ModuleTypeDef" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="LibraryAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="LibraryClass" type="BaseNameConvention" use="optional"/>\r
-        <xs:attribute name="ClassGuid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
-        <xs:attribute name="Usage" type="LibraryUsage" use="optional"/>\r
-        <xs:attribute name="Package" type="xs:string" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="ModuleNameAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="MsaAttributes">\r
-        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
-        <xs:attribute name="FvBinding" type="xs:string" use="optional"/>\r
-        <xs:attribute name="ModuleName" type="C_Name" use="optional"/>\r
-        <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="PackageName" type="C_Name" use="optional"/>\r
-        <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="OptionAttributes">\r
-        <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-        <xs:attribute name="ToolChain" type="ToolChains"  use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="PackageAttributes">\r
-        <xs:attribute name="Usage" type="PackageUsage" use="optional"/>\r
-        <xs:attribute name="PackageType" type="PackageType" use="optional"/>\r
-        <xs:attribute name="UpdatedDate" type="DateType" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="PackageNameAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="PcdAttributes">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">These attributes are for the Pcds listed in PcdData, PcdEntry and/or PcdBuildData entries.</xs:documentation>\r
-            <xs:documentation xml:lang="en">PcdUsage is only valid for PcdItemTypes = FEATURE_FLAG</xs:documentation>\r
-        </xs:annotation>\r
-        <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>\r
-        <xs:attribute name="PcdUsage" type="PcdUsage" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="PlatformAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
-        <xs:attribute name="AlternateName" type="FileNameConvention" use="optional"/>\r
-        <xs:attribute name="PlatformName" type="BaseNameConvention" use="optional"/>\r
-        <xs:attribute name="PlatformGuid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="PlatformVersion" type="xs:string" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="PpiAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Usage" type="PpiUsage" use="optional"/>\r
-        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
-        <xs:attribute name="FeatureFlag" type="C_Name" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="PpiNotifyAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Usage" type="PpiNotifyUsage" use="optional"/>\r
-        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
-        <xs:attribute name="FeatureFlag" type="C_Name" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="ProtocolAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Usage" type="ProtocolUsage" use="optional"/>\r
-        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
-        <xs:attribute name="FeatureFlag" type="C_Name" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="ProtocolNotifyAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="SectionAttributes">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Attributes are either compressable and/or sequence order binding</xs:documentation>\r
-        </xs:annotation>\r
-        <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>\r
-        <xs:attribute default="true" name="Compressible" type="xs:boolean" use="optional"/>\r
-        <xs:attribute name="BindingOrder" type="xs:int" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="SectionsAttributes">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Attributes for Sections, EncapsulationTag, EncapsulationType and OverrideID</xs:documentation>\r
-        </xs:annotation>\r
-        <xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>\r
-        <xs:attribute name="EncapsulationTag" type="xs:string" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="SystemTableAttributes">\r
-        <xs:attribute name="Usage" type="SystemTableUsage" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="VariableAttributes">\r
-        <xs:attribute name="Usage" type="VariableUsage" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
-    </xs:attributeGroup>\r
-    <xs:attributeGroup name="UrlAttribute">\r
-        <xs:attribute name="Url" type="xs:anyURI"/>\r
-    </xs:attributeGroup>\r
 </xs:schema>\r

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index f4c56843c95a53fb301548e476588d2b1db4bf14..348dd0deacb52dbb5b6658f53a411fedc9ed29fa 100644 (file)
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -16,6 +16,7 @@
         <xs:documentation xml:lang="en"> This schema defines EFI and Framework Platform Data Elements that are specific to platform creation.</xs:documentation>\r
     </xs:annotation>\r
     <xs:include schemaLocation="NamingConvention.xsd"/>\r
+    <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>\r
     <xs:include schemaLocation="FrameworkDataTypes.xsd"/>\r
     <xs:include schemaLocation="FrameworkDataElements.xsd"/>\r
     <xs:element name="Capsule">\r
@@ -462,7 +463,7 @@
         <xs:attribute name="Name" type="xs:string" use="required"/>\r
         <xs:attribute name="Size" type="HexAddressType" use="required"/>\r
         <xs:attribute name="BaseAddress" type="HexAddressType" use="required"/>\r
-        <xs:attribute name="ErasePolarity" type="ZeroOrOne" use="required"/>\r
+        <xs:attribute name="ErasePolarity" type="Polarity" use="required"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="RawDataAttributes">\r
         <xs:attribute name="Name" type="xs:string" use="required"/>\r

diff --git a/Tools/XMLSchema/NamingConvention.xsd b/Tools/XMLSchema/NamingConvention.xsd
index 3faf1b923def8d57f6cc611c0ca2bcc83576a970..b44a37e539c63c0115d3f566972b1fbd09327666 100644 (file)
--- a/Tools/XMLSchema/NamingConvention.xsd
+++ b/Tools/XMLSchema/NamingConvention.xsd
@@ -174,6 +174,14 @@
             <xs:pattern value="(([a-zA-Z][a-zA-Z0-9]*)(_)*(.)*)+"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
+    <xs:simpleType name="Polarity">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">Limit Polarity vaild values to -1, 0 and 1</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:restriction base="xs:int">\r
+            <xs:pattern value="-1|0|1"/>\r
+        </xs:restriction>\r
+    </xs:simpleType>\r
     <xs:simpleType name="Sentence">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en"> This data type requires two or more words </xs:documentation>\r
@@ -296,14 +304,6 @@
             <xs:pattern value="0"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
-    <xs:simpleType name="ZeroOrOne">\r
-        <xs:annotation>\r
-            <xs:documentation xml:lang="en">Define Zero as a vaild value</xs:documentation>\r
-        </xs:annotation>\r
-        <xs:restriction base="xs:int">\r
-            <xs:pattern value="0|1"/>\r
-        </xs:restriction>\r
-    </xs:simpleType>\r
     <xs:simpleType name="OldVersionDataType">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en"> Definition of a Version Number, which can be any combination of a number followed by zero or more alphanumeric-dot-alphanumeric characters </xs:documentation>\r