Added some attributes (changed comments to be before items to be deleted) Added a...

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

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index eccb3611289deb190db304af50ba49dad6cceffc..cf95629f5c144ade49796f37f2178bb23f1d6a08 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -22,261 +22,289 @@
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="BootModeAttributes">\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="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>\r
         <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>\r

-        <xs:attribute name="Usage" type="BootModeUsage" use="required"/>\r
-        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r

         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="BootModeUsage" use="required"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="ConvertAttributeString">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ConvertAttributeString">\r

+        <xs:attribute name="OutputFilename" type="FileNameConvention" use="optional"/>\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="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: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="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="DataHubUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\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: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="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Usage" type="EventUsage" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="EventUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="ExternAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ExternAttributes">\r

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Usage" type="ExternUsage" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="ExternUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="FilenameAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="FilenameAttributes">\r

-        <xs:attribute name="Usage" type="FileNameUsage" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
+        <!-- LAH Does a Filename need to have FeatureFlag Attribute? -->\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="FileType" type="xs:string" use="optional"/>\r

         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Path" type="DirectoryNamingConvention" 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="ToolChain" type="ToolChains" use="optional"/>\r

-        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
-        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
-        <xs:attribute name="ArchType" use="optional">\r
-            <xs:simpleType>\r
-                <xs:list itemType="SupportedArchitectures"/>\r
-            </xs:simpleType>\r
-        </xs:attribute>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Usage" type="FileNameUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="FormsetAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="FormsetAttributes">\r

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Usage" type="FormSetUsage" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="FormSetUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="GuidAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="GuidAttributes">\r

-        <xs:attribute name="Usage" type="GuidUsage" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Usage" type="GuidUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="HobAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="HobAttributes">\r

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\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="HobType" type="HobTypes" use="required"/>\r
         <xs:attribute default="true" name="HobEnabled" type="xs:boolean" use="optional"/>\r

-        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
-        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Usage" type="HobUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="IncludeAttributes">\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="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute name="Class" type="BaseNameConvention" use="optional"/>\r
         <xs:attribute name="Class" type="BaseNameConvention" use="optional"/>\r

-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r

+        <!-- LAH Does a Include need to have FeatureFlag Attribute? -->\r

         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

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

         <xs:attribute name="ModuleType" type="ModuleTypeDef" use="optional"/>\r
         <xs:attribute name="ModuleType" type="ModuleTypeDef" use="optional"/>\r

+        <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>\r
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
+        <!-- DO NOT USE remove OverrideID from use -->\r
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="LibraryAttributes">\r
         <!-- LibraryAttributes is used for Libraries -> Library elements in FPD files -->\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="LibraryAttributes">\r
         <!-- LibraryAttributes is used for Libraries -> Library elements in FPD files -->\r

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
+        <!-- LAH Does a LibraryInstance need to have FeatureFlag Attribute? -->\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <!-- DO NOT USE remove Guid from use, Start using ModuleGuid instead -->\r

         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r

-        <!-- DO NOT USE remove Guid from use, Start using LibraryGuid instead -->\r
+        <!-- DO NOT USE remove ClassGuid from use, Start using LibraryClassGuid instead -->\r
+        <xs:attribute name="ClassGuid" type="GuidType" use="optional"/>\r
+        <!-- DO NOT USE remove LibraryGuid from use, Start using ModuleGuid instead -->\r

         <xs:attribute name="LibraryGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="LibraryGuid" type="GuidType" use="optional"/>\r

-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
-        <!-- DO NOT USE remove Version from use, Start using LibraryVersion instead -->\r
-        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>\r

         <xs:attribute name="LibraryClass" type="BaseNameConvention" use="optional"/>\r
         <xs:attribute name="LibraryClass" type="BaseNameConvention" use="optional"/>\r

-        <xs:attribute name="ClassGuid" type="GuidType" 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="LibraryClassGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>\r

         <!-- DO NOT USE remove Package from use, Start using PackageName instead -->\r
         <!-- DO NOT USE remove Package from use, Start using PackageName instead -->\r

+        <xs:attribute name="Package" type="xs:string" use="optional"/>\r
+        <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r

         <xs:attribute name="PackageName" type="BaseNameConvention" use="optional"/>\r
         <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>\r
         <xs:attribute name="PackageName" type="BaseNameConvention" use="optional"/>\r
         <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>\r

-        <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="ArchType" use="optional">\r
-            <xs:simpleType>\r
-                <xs:list itemType="SupportedArchitectures"/>\r
-            </xs:simpleType>\r
-        </xs:attribute>\r
-        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
-        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Usage" type="LibraryUsage" use="optional"/>\r
+        <!-- DO NOT USE remove Version from use, Start using ModuleVersion instead -->\r
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="LibraryClassAttributes">\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
+        <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>\r
+        <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="LibraryUsage" use="required"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="ModuleNameAttributes">\r
         <xs:attribute name="Guid" type="GuidType" use="required"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ModuleNameAttributes">\r
         <xs:attribute name="Guid" type="GuidType" use="required"/>\r

+        <!-- DO NOT USE remove Guid from use, Start using ModuleGuid instead -->\r
+        <xs:attribute name="ModuleGuid" type="GuidType" use="required"/>\r
+        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>\r
+        <!-- DO NOT USE remove Version from use, Start using ModuleVersion instead -->\r

         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ModuleNameSaAttributes">\r
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ModuleNameSaAttributes">\r

+        <!-- DO NOT USE remove Guid from use, Start using ModuleGuid instead -->\r

         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r

+        <xs:attribute name="ModuleGuid" type="GuidType" use="required"/>\r

         <xs:attribute name="ModuleName" type="xs:NCName" use="required"/>\r
         <xs:attribute name="ModuleName" type="xs:NCName" use="required"/>\r

+        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>\r
+        <!-- DO NOT USE remove Version from use, Start using ModuleVersion instead -->\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="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="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>\r

         <xs:attribute name="FvBinding" type="xs:string" use="optional"/>\r
         <xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>\r
         <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PackageName" type="BaseNameConvention" use="optional"/>\r
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="FvBinding" type="xs:string" use="optional"/>\r
         <xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>\r
         <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PackageName" type="BaseNameConvention" use="optional"/>\r
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r

-        <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>\r
-        <xs:attribute name="ArchType" use="optional">\r
-            <xs:simpleType>\r
-                <xs:list itemType="SupportedArchitectures"/>\r
-            </xs:simpleType>\r
-        </xs:attribute>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="OptionAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="OptionAttributes">\r

-        <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>\r
-        <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute name="BuildTarget" type="BuildTargets" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="BuildTarget" type="BuildTargets" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r

+        <!-- LAH Does an Option need to have FeatureFlag Attribute? -->\r

         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>\r
+        <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="PackageAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PackageAttributes">\r

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r

-        <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>\r
-        <xs:attribute name="Usage" type="PackageUsage" use="optional"/>\r

         <xs:attribute name="PackageType" type="PackageType" use="optional"/>\r
         <xs:attribute name="PackageType" type="PackageType" use="optional"/>\r

+        <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>\r

         <xs:attribute name="UpdatedDate" type="DateType" use="optional"/>\r
         <xs:attribute name="UpdatedDate" type="DateType" use="optional"/>\r

-        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="Usage" type="PackageUsage" use="optional"/>\r

     </xs:attributeGroup>\r
     <!-- PackageNameAttributres are only used in the Package Dependencies section of an SPD file. -->\r
     <xs:attributeGroup name="PackageNameAttributes">\r
     </xs:attributeGroup>\r
     <!-- PackageNameAttributres are only used in the Package Dependencies section of an SPD file. -->\r
     <xs:attributeGroup name="PackageNameAttributes">\r

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <!-- DO NOT USE remove Guid and start using PackageGuid instead -->\r
         <!-- DO NOT USE remove Guid and start using PackageGuid instead -->\r

+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r

         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PackageGuid" type="GuidType" use="optional"/>\r

-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
-        <!-- DO NOT USE remove Version and start using PackageVersion instead -->\r
-        <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>\r

         <!-- PackageTypeDepencency is used to identify if a SOURCE or BINARY PackageType is required, in case PackageGuid and/or PackageVersion are not tracked. -->\r
         <xs:attribute name="PackageTypeDependency" type="PackageType" use="optional"/>\r
         <!-- PackageTypeDepencency is used to identify if a SOURCE or BINARY PackageType is required, in case PackageGuid and/or PackageVersion are not tracked. -->\r
         <xs:attribute name="PackageTypeDependency" type="PackageType" use="optional"/>\r

-        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="PackageVersion" type="xs:string" use="optional"/>\r
+        <!-- DO NOT USE remove Version and start using PackageVersion instead -->\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: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:documentation xml:lang="en">Only NON FEATURE_FLAG PCDS should have the FeatureFlag attribute set.</xs:documentation>\r

         </xs:annotation>\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="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>\r
+        <xs:attribute name="PcdUsage" type="PcdUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="PlatformAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PlatformAttributes">\r

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <!-- DO NOT USE remove Guid from use -->\r
-        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
-        <xs:attribute name="AlternateName" type="FileNameConvention" use="optional"/>\r

         <!-- DO NOT USE remove AlternateName from use -->\r
         <!-- DO NOT USE remove AlternateName from use -->\r

+        <xs:attribute name="AlternateName" type="FileNameConvention" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <!-- DO NOT USE remove Guid from use -->\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r

         <xs:attribute name="PlatformName" type="PlatformNamingConvention" use="optional"/>\r
         <xs:attribute name="PlatformGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PlatformVersion" type="xs:string" use="optional"/>\r
         <xs:attribute name="PlatformName" type="PlatformNamingConvention" use="optional"/>\r
         <xs:attribute name="PlatformGuid" type="GuidType" use="optional"/>\r
         <xs:attribute name="PlatformVersion" type="xs:string" use="optional"/>\r

+        <!-- DO NOT USE remove Version and start using PlatformVersion instead -->\r
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="PpiAttributes">\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 name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="ArchType" use="optional">\r
-            <xs:simpleType>\r
-                <xs:list itemType="SupportedArchitectures"/>\r
-            </xs:simpleType>\r
-        </xs:attribute>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="PpiUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="PpiNotifyAttributes">\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 name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="ArchType" use="optional">\r
-            <xs:simpleType>\r
-                <xs:list itemType="SupportedArchitectures"/>\r
-            </xs:simpleType>\r
-        </xs:attribute>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="PpiNotifyUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="ProtocolAttributes">\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 name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="ArchType" use="optional">\r
-            <xs:simpleType>\r
-                <xs:list itemType="SupportedArchitectures"/>\r
-            </xs:simpleType>\r
-        </xs:attribute>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="ProtocolUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="ProtocolNotifyAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ProtocolNotifyAttributes">\r

+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r
+        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>\r

-        <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
-        <xs:attribute name="ArchType" use="optional">\r
-            <xs:simpleType>\r
-                <xs:list itemType="SupportedArchitectures"/>\r
-            </xs:simpleType>\r
-        </xs:attribute>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\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: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="BindingOrder" type="xs:int" use="optional"/>\r

+        <xs:attribute default="true" name="Compressible" type="xs:boolean" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r

+        <!-- LAH Does a Section need to have FeatureFlag Attribute? -->\r

         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="SectionsAttributes">\r
         <xs:annotation>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="SectionsAttributes">\r
         <xs:annotation>\r


@@ -285,32 +313,32 @@
         <xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="EncapsulationTag" type="xs:string" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="EncapsulationTag" type="xs:string" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r

+        <!-- LAH Does a Filename need to have FeatureFlag Attribute? -->\r

         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
     <xs:attributeGroup name="SystemTableAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="SystemTableAttributes">\r

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Usage" type="SystemTableUsage" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="SystemTableUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\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:attributeGroup name="VariableAttributes">\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="UrlAttribute">\r
         <xs:attribute name="Url" type="xs:anyURI"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="VariableAttributes">\r

-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
-        <xs:attribute name="Usage" type="VariableUsage" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
+        <xs:attribute name="ArchType" type="ArchList" use="optional"/>\r

         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

-        <xs:attribute name="ArchType" use="optional">\r
-            <xs:simpleType>\r
-                <xs:list itemType="SupportedArchitectures"/>\r
-            </xs:simpleType>\r
-        </xs:attribute>\r
-        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Usage" type="VariableUsage" use="optional"/>\r

         <!-- DO NOT USE remove OverrideID from use -->\r
         <!-- DO NOT USE remove OverrideID from use -->\r

+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r

     </xs:attributeGroup>\r
 </xs:schema>\r
     </xs:attributeGroup>\r
 </xs:schema>\r

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index ffa1e7441f5f95e53cf16ee826b95278d0f11e93..08cbfd939b1da1aef636612183745eda5c9051ac 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -254,7 +254,7 @@
                                     <xs:attributeGroup ref="EventAttributes"/>\r
                                 </xs:complexType>\r
                             </xs:element>\r
                                     <xs:attributeGroup ref="EventAttributes"/>\r
                                 </xs:complexType>\r
                             </xs:element>\r

-                            <!-- Remove Arch Section and use Arch Attribute instead in above. -->\r
+                            <!-- Remove Arch Section and use Arch Attribute instead in Event. -->\r

                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">\r
                                 <xs:complexType>\r
                                     <xs:sequence>\r
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">\r
                                 <xs:complexType>\r
                                     <xs:sequence>\r


@@ -295,7 +295,7 @@
                                     <xs:attributeGroup ref="EventAttributes"/>\r
                                 </xs:complexType>\r
                             </xs:element>\r
                                     <xs:attributeGroup ref="EventAttributes"/>\r
                                 </xs:complexType>\r
                             </xs:element>\r

-                            <!-- Remove Arch and use Arch attribute in above -->\r
+                            <!-- Remove Arch and use Arch attribute in Event above -->\r

                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">\r
                                 <xs:complexType>\r
                                     <xs:sequence>\r
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">\r
                                 <xs:complexType>\r
                                     <xs:sequence>\r


@@ -483,6 +483,7 @@
                         </xs:simpleContent>\r
                     </xs:complexType>\r
                 </xs:element>\r
                         </xs:simpleContent>\r
                     </xs:complexType>\r
                 </xs:element>\r

+                <!-- DO NOT USE! removing Arch element, use Arch attribute in Formset instead. -->\r

                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">\r
                     <xs:complexType>\r
                         <xs:sequence>\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">\r
                     <xs:complexType>\r
                         <xs:sequence>\r


@@ -548,8 +549,8 @@
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>\r

+                            <!-- DO NOT USE remove ConditionalExpression and use FeatureFlag instead -->\r

                             <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>\r
                             <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>\r

-                            <!-- DO NOT USE remove and use FeatureFlag instead -->\r

                             <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>\r
                         </xs:sequence>\r
                             <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>\r
                         </xs:sequence>\r


@@ -569,8 +570,8 @@
                                         <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
                                         <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                                         <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>\r
                                         <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
                                         <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                                         <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>\r

+                                        <!-- DO NOT USE remove ConditionalExpression and use FeatureFlag instead -->\r

                                         <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>\r
                                         <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>\r

-                                        <!-- DO NOT USE remove and use FeatureFlag instead -->\r

                                         <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>\r
                                         <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>\r
                                     </xs:sequence>\r
                                         <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>\r
                                         <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>\r
                                     </xs:sequence>\r


@@ -700,9 +701,7 @@
         <xs:complexType>\r
             <xs:simpleContent>\r
                 <xs:extension base="BaseNameConvention">\r
         <xs:complexType>\r
             <xs:simpleContent>\r
                 <xs:extension base="BaseNameConvention">\r

-                    <xs:attribute name="Usage" type="LibraryUsage" use="required"/>\r
-                    <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>\r
-                    <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>\r
+                    <xs:attributeGroup ref="LibraryClassAttributes"/>\r

                 </xs:extension>\r
             </xs:simpleContent>\r
         </xs:complexType>\r
                 </xs:extension>\r
             </xs:simpleContent>\r
         </xs:complexType>\r


@@ -865,6 +864,30 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r

+    <xs:element name="MsaPcdDeclarations">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:complexType>\r
+            <xs:sequence minOccurs="1">\r
+                <xs:element maxOccurs="unbounded" name="PcdEntry">\r
+                    <xs:annotation>\r
+                        <xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>\r
+                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>\r
+                    </xs:annotation>\r
+                    <xs:complexType>\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <!-- MSA file declares a single usage, and must match one of the entries in what the SPD file declares as the set of possible Item Types. -->\r
+                        <xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>\r
+                    </xs:complexType>\r
+                </xs:element>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r

     <xs:element name="OutputDirectory">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Define where we want our output to go. The Attribute, IntermediateDirectories, default MODULE, says that intermediate files will be local to the module, versus a unified directory structure.</xs:documentation>\r
     <xs:element name="OutputDirectory">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Define where we want our output to go. The Attribute, IntermediateDirectories, default MODULE, says that intermediate files will be local to the module, versus a unified directory structure.</xs:documentation>\r


@@ -1286,7 +1309,36 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r

-    <!-- PcdDynamicBuildDeclarations -->\r
+    <xs:element name="PcdDeclarations">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>\r
+            <xs:documentation xml:lang="en">This permits entering information about a package's PCD information</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:complexType>\r
+            <xs:sequence minOccurs="1">\r
+                <xs:element maxOccurs="unbounded" name="PcdEntry">\r
+                    <xs:annotation>\r
+                        <xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>\r
+                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>\r
+                        <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>\r
+                    </xs:annotation>\r
+                    <xs:complexType>\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="Token"/>\r
+                            <xs:element minOccurs="1" 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="DefaultValue"/>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <xs:attributeGroup ref="PcdAttributes"/>\r
+                    </xs:complexType>\r
+                </xs:element>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <!-- DO NOT USE removing PcdDefinitions, use PcdDeclarations for SPD entries  Use PcdBuildDeclarations for MSA Entires and PcdDynamicBuildDeclarations for FPD Entries -->\r

     <xs:element name="PcdDefinitions">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>\r
     <xs:element name="PcdDefinitions">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>\r


@@ -1478,6 +1530,7 @@
                         </xs:simpleContent>\r
                     </xs:complexType>\r
                 </xs:element>\r
                         </xs:simpleContent>\r
                     </xs:complexType>\r
                 </xs:element>\r

+                <!-- DO NOT USE! removing Arch element, use Arch attribute of Protocol or ProtocolNotify instead. -->\r

                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">\r
                     <xs:complexType>\r
                         <xs:sequence>\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">\r
                     <xs:complexType>\r
                         <xs:sequence>\r


@@ -1557,6 +1610,7 @@
         <xs:complexType>\r
             <xs:sequence minOccurs="1">\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filename"/>\r
         <xs:complexType>\r
             <xs:sequence minOccurs="1">\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filename"/>\r

+                <!-- DO NOT USE! removing Arch element, use Arch Attribute of Filename instead.  -->\r

                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">\r
                     <xs:complexType>\r
                         <xs:sequence minOccurs="1">\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">\r
                     <xs:complexType>\r
                         <xs:sequence minOccurs="1">\r

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 1eb27449ed187c4351fbb75e872b71bbf4586e28..8199df0f6adde3144c8b1b68378cb59ab333aa1f 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -16,6 +16,12 @@
         <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: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="ArchList">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">A list of one or more: IA32, X64, IPF and/or EBC</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:list itemType="SupportedArchitectures"/>\r
+    </xs:simpleType>\r

     <xs:simpleType name="BlockNameType">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">FIRMWARE: Define a block name to be BLOCK[A-F0-9]{2}</xs:documentation>\r
     <xs:simpleType name="BlockNameType">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">FIRMWARE: Define a block name to be BLOCK[A-F0-9]{2}</xs:documentation>\r


@@ -637,6 +643,9 @@
             </xs:enumeration>\r
         </xs:restriction>\r
     </xs:simpleType>\r
             </xs:enumeration>\r
         </xs:restriction>\r
     </xs:simpleType>\r

+    <xs:simpleType name="PcdListType">\r
+        <xs:list itemType="PcdItemTypes"/>\r
+    </xs:simpleType>\r

     <xs:simpleType name="PcdTypes">\r
         <xs:restriction base="NameConvention">\r
             <xs:enumeration value="FIXED_AT_BUILD">\r
     <xs:simpleType name="PcdTypes">\r
         <xs:restriction base="NameConvention">\r
             <xs:enumeration value="FIXED_AT_BUILD">\r


@@ -644,6 +653,7 @@
                     <xs:documentation xml:lang="en">PCD Item is only a build time option and cannot be Dyanmic or Binary patched into the module.</xs:documentation>\r
                 </xs:annotation>\r
             </xs:enumeration>\r
                     <xs:documentation xml:lang="en">PCD Item is only a build time option and cannot be Dyanmic or Binary patched into the module.</xs:documentation>\r
                 </xs:annotation>\r
             </xs:enumeration>\r

+            <xs:enumeration value="FEATURE_FLAG"/>\r

             <xs:enumeration value="PATCHABLE_IN_MODULE">\r
                 <xs:annotation>\r
                     <xs:documentation xml:lang="en">PCD Item is set to a default value at build time and a binary of the module can be patched to update the value.</xs:documentation>\r
             <xs:enumeration value="PATCHABLE_IN_MODULE">\r
                 <xs:annotation>\r
                     <xs:documentation xml:lang="en">PCD Item is set to a default value at build time and a binary of the module can be patched to update the value.</xs:documentation>\r