Several changes - add <PcdIsDriver> optional element to <Externs> Changed FlashDeviceInfo Attributes to use the correct one.

Added comments (and wrapped some elements in <xs:choice> for new elements) and minor tweaks.

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

Tools/XMLSchema/FrameworkDataElements.xsd

@@ -322,8 +322,9 @@
             <xs:documentation xml:lang="en">This is a list of Extern statements, right now, only Driver Binding information is provided.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
-            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+            <xs:sequence minOccurs="1">
-                <xs:element name="Extern">
+                <xs:element minOccurs="0" maxOccurs="1" name="PcdIsDriver" type="PcdDriverTypes"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Extern">
                     <xs:complexType>
                         <xs:choice minOccurs="1">
                             <xs:sequence minOccurs="0" maxOccurs="1">
@@ -1082,7 +1083,8 @@
                 </xs:element>
             </xs:choice>
         </xs:complexType>
-    </xs:element> <!-- PcdBuildDeclarations -->
+    </xs:element>
+    <!-- PcdBuildDeclarations -->
     <xs:element name="PcdDynamicBuildDeclarations">
         <xs:annotation>
             <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>
@@ -1216,7 +1218,8 @@
                 </xs:element>
             </xs:sequence>
         </xs:complexType>
-    </xs:element> <!-- PcdDynamicBuildDeclarations -->
+    </xs:element>
+    <!-- PcdDynamicBuildDeclarations -->
     <xs:element name="PcdDefinitions">
         <xs:annotation>
             <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>
@@ -1523,6 +1526,7 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="Updated" type="DateType"/>
+    <xs:element name="UpdatedDate" type="DateType"/>
     <xs:element name="URL" type="xs:anyURI"/>
     <xs:element name="URI" type="xs:anyURI"/>
     <xs:element name="UserDefinedAntTasks">

Tools/XMLSchema/FrameworkDataTypes.xsd

@@ -655,6 +655,12 @@
             </xs:enumeration>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="PcdDriverTypes">
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="PEI_PCD_DRIVER"/>
+            <xs:enumeration value="DXE_PCD_DRIVER"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:simpleType name="PcdDataTypes">
         <xs:restriction base="xs:normalizedString">
             <xs:enumeration value="UINT8"/>

Tools/XMLSchema/FrameworkHeaders.xsd

@@ -20,25 +20,40 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="1" ref="DatabaseName"/>
+                <xs:choice minOccurs="1" maxOccurs="1">
                     <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                    <!-- Guid needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                    <!-- GuidValue needs to be required -->
+                </xs:choice>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                <!-- Version is the version of this file -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>
+                <!-- Path needs to be removed -->
                 <xs:choice minOccurs="1" maxOccurs="1">
                     <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
+                    <!-- Created needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
+                    <!-- CreatedDate needs to be required -->
                 </xs:choice>
+                <xs:choice minOccurs="0">
                     <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
+                    <!-- Updated needs to be removed -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="UpdatedDate"/>
+                </xs:choice>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>
+                <!-- Specificatoin needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>
     <xs:element name="MbdHeader">
+        <!-- MbdHeader needs to be removed -->
         <xs:annotation>
-            <xs:documentation xml:lang="en">This is the header for the Component Module Build Description (MBD) file. NOTE: The GUID may be different from the GUID in the MSA file, as the Guid is updated every time the file is changed, as the Guid may change if the contents of the file are changed.</xs:documentation>
+            <xs:documentation xml:lang="en">DO NOT USE! This is the header for the Component Module Build Description (MBD) file. NOTE: The GUID may be different from the GUID in the MSA file, as the Guid is updated every time the file is changed, as the Guid may change if the contents of the file are changed.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
@@ -60,8 +75,9 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="MbdLibHeader">
+        <!-- MbdLibHeader needs to be removed -->
         <xs:annotation>
-            <xs:documentation xml:lang="en">This is the header for the Library Module Build Description (MBD) file. NOTE: The Guid may be different from the Guid in the MSA file, as the Guid may change when the contents of the file are changed..</xs:documentation>
+            <xs:documentation xml:lang="en">DO NOT USE! This is the header for the Library Module Build Description (MBD) file. NOTE: The Guid may be different from the Guid in the MSA file, as the Guid may change when the contents of the file are changed..</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
@@ -91,8 +107,12 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="BaseName"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="ModuleType"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="ComponentType"/>
+                <xs:choice>
                     <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                    <!-- Guid needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                    <!-- GuidValue needs to be required -->
+                </xs:choice>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
@@ -100,16 +120,24 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
                 <xs:choice minOccurs="1" maxOccurs="1">
                     <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
+                    <!-- Created needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
+                    <!-- CreatedDate needs to be required -->
                 </xs:choice>
+                <xs:choice>
                     <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
+                    <!-- Updated needs to be removed -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>
+                </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>
     <xs:element name="MsaLibHeader">
+        <!-- MsaLibHeader needs to be removed -->
         <xs:annotation>
-            <xs:documentation xml:lang="en">This is the Library Module Surface Area Description Header - a replacement for INF files. The Guid may change when the contents of the file are changed.</xs:documentation>
+            <xs:documentation xml:lang="en">DO NOT USE! This is the Library Module Surface Area Description Header - a replacement for INF files. The Guid may change when the contents of the file are changed.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
@@ -144,11 +172,13 @@
                 </xs:element>
                 <xs:choice>
                     <xs:element minOccurs="0" maxOccurs="1" ref="Guid">
+                        <!-- Guid needs to be removed -->
                         <xs:annotation>
                             <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                    <!-- GuidValue needs to be required -->
                 </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Version"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
@@ -157,19 +187,23 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="License"/>
                 <xs:choice minOccurs="1" maxOccurs="1">
                     <xs:element minOccurs="0" maxOccurs="1" ref="Created">
+                        <!-- Created needs to be removed -->
                         <xs:annotation>
                             <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
                         </xs:annotation>
                     </xs:element>
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
+                    <!-- CreatedDate needs to be required -->
                 </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy">
+                    <!-- CreatedBy needs to be removed -->
                     <xs:annotation>
                         <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
                     </xs:annotation>
                 </xs:element>
                 <xs:choice>
                     <xs:element minOccurs="0" maxOccurs="1" ref="Updated">
+                        <!-- Updated needs to be removed -->
                         <xs:annotation>
                             <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
                         </xs:annotation>
@@ -177,11 +211,13 @@
                     <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>
                 </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageType">
+                    <!-- PackageType needs to be removed -->
                     <xs:annotation>
                         <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>
                     </xs:annotation>
                 </xs:element>
                 <xs:element minOccurs="0" maxOccurs="1" name="BuildTarget">
+                    <!-- BuildTarget needs to be required -->
                     <xs:simpleType>
                         <xs:restriction base="xs:NCName">
                             <xs:enumeration value="DEBUG"/>
@@ -190,6 +226,8 @@
                         </xs:restriction>
                     </xs:simpleType>
                 </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -200,8 +238,11 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageName"/>
+                <xs:choice minOccurs="1" maxOccurs="1">
                     <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                    <!-- Guid needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                </xs:choice>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
@@ -209,6 +250,7 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
                 <xs:choice minOccurs="1" maxOccurs="1">
                     <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
+                    <!-- Created needs to be removed -->
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
                 </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="1" ref="E-Mail"/>
@@ -218,7 +260,9 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="ReadOnly"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="RePackage"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>
+                <!-- OutputDirectory needs to be removed -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>

Tools/XMLSchema/FrameworkPlatformDataElements.xsd

@@ -153,7 +153,7 @@
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
-            <xs:attributeGroup ref="BlockAttributes"/>
+            <xs:attributeGroup ref="FlashDeviceInfoAttributes"/>
         </xs:complexType>
     </xs:element>
     <xs:element name="FlashDeviceOverrideImage">