merged part of new changes in new schema, and changed genbuild code accordingly

[mirror_edk2.git] / Tools / XMLSchema / FrameworkDataElements.xsd

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index d07712a66303c4de9288ad97ba3138e5915c6e2c..d43cd96bbd4cbb1c7f03ed4c3592f7c2c88421ce 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -76,6 +76,9 @@
             <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
                 <xs:element name="BootMode">\r
                     <xs:complexType>\r
+                        <xs:sequence minOccurs="0">\r
+                            <xs:element name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
                         <xs:attributeGroup ref="BootModeAttributes"/>\r
                     </xs:complexType>\r
                 </xs:element>\r
@@ -213,12 +216,12 @@
         <xs:complexType>\r
             <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
                 <xs:element name="DataHubRecord">\r
-                    <xs:complexType>\r
-                        <xs:simpleContent>\r
-                            <xs:extension base="C_NameType">\r
-                                <xs:attributeGroup ref="DataHubAttributes"/>\r
-                            </xs:extension>\r
-                        </xs:simpleContent>\r
+                    <xs:complexType mixed="true">\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="DataHubCName" type="C_NameType"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <xs:attributeGroup ref="DataHubAttributes"/>\r
                     </xs:complexType>\r
                 </xs:element>\r
                 <!-- Remove Arch and use Arch Attribute for DataHubRecord instead. -->\r
@@ -282,7 +285,16 @@
                 <xs:element minOccurs="0" maxOccurs="1" name="CreateEvents">\r
                     <xs:complexType>\r
                         <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
-                            <xs:element name="Event">\r
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="EventTypes">\r
+                                <xs:complexType>\r
+                                    <xs:sequence>\r
+                                        <xs:element minOccurs="1" maxOccurs="1" name="EventType" type="EventTypes"/>\r
+                                        <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                                    </xs:sequence>\r
+                                    <xs:attributeGroup ref="EventAttributes"/>\r
+                                </xs:complexType>\r
+                            </xs:element>                            \r
+                            <xs:element minOccurs="0" name="Event">\r
                                 <xs:complexType>\r
                                     <xs:sequence>\r
                                         <xs:choice>\r
@@ -328,7 +340,16 @@
                     </xs:annotation>\r
                     <xs:complexType>\r
                         <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
-                            <xs:element name="Event">\r
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="EventTypes">\r
+                                <xs:complexType>\r
+                                    <xs:sequence>\r
+                                        <xs:element minOccurs="1" maxOccurs="1" name="EventType" type="EventTypes"/>\r
+                                        <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                                    </xs:sequence>\r
+                                    <xs:attributeGroup ref="EventAttributes"/>\r
+                                </xs:complexType>\r
+                            </xs:element>                            \r
+                            <xs:element minOccurs="0" name="Event">\r
                                 <xs:complexType>\r
                                     <xs:sequence>\r
                                         <xs:choice>\r
@@ -589,19 +610,19 @@
     <xs:element name="Guids">\r
         <xs:complexType>\r
             <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
-                <xs:element minOccurs="0" maxOccurs="unbounded" name="GuidCName">\r
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="GuidCNames">\r
                     <xs:annotation>\r
                         <xs:documentation xml:lang="en">Describe the valid content of a GUID element in and MSA file.</xs:documentation>\r
                     </xs:annotation>\r
                     <xs:complexType>\r
-                        <xs:simpleContent>\r
-                            <xs:extension base="C_NameType">\r
-                                <xs:attributeGroup ref="GuidAttributes"/>\r
-                            </xs:extension>\r
-                        </xs:simpleContent>\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="GuidCName" type="C_NameType"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <xs:attributeGroup ref="GuidAttributes"/>\r
                     </xs:complexType>\r
-                </xs:element>                \r
-                <xs:element name="GuidEntry">\r
+                </xs:element>\r
+                <xs:element minOccurs="0" name="GuidEntry">\r
                     <xs:annotation>\r
                         <xs:documentation xml:lang="en">Describe the valid content of a GUID element in and MSA file.</xs:documentation>\r
                     </xs:annotation>\r
@@ -659,12 +680,12 @@
         <xs:complexType>\r
             <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
                 <xs:element name="HiiPackage">\r
-                    <xs:complexType>\r
-                        <xs:simpleContent>\r
-                            <xs:extension base="C_NameType">\r
-                                <xs:attributeGroup ref="HiiPackageAttributes"/>\r
-                            </xs:extension>\r
-                        </xs:simpleContent>\r
+                    <xs:complexType mixed="true">\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HiiCName" type="C_NameType"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <xs:attributeGroup ref="HiiPackageAttributes"/>\r
                     </xs:complexType>\r
                 </xs:element>\r
             </xs:sequence>\r
@@ -673,7 +694,16 @@
     <xs:element name="Hobs">\r
         <xs:complexType>\r
             <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
-                <xs:element name="Hob">\r
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="HobTypes">\r
+                    <xs:complexType>\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="HobType" type="HobTypes"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <xs:attributeGroup ref="HobAttributes"/>\r
+                    </xs:complexType>\r
+                </xs:element>                \r
+                <xs:element minOccurs="0" name="Hob">\r
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:choice>\r
@@ -806,12 +836,12 @@
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Used in MSA files. This defines what class of library is being supported = produced (library module) or consumed by a module.</xs:documentation>\r
         </xs:annotation>\r
-        <xs:complexType>\r
-            <xs:simpleContent>\r
-                <xs:extension base="KeywordType">\r
-                    <xs:attributeGroup ref="LibraryClassAttributes"/>\r
-                </xs:extension>\r
-            </xs:simpleContent>\r
+        <xs:complexType mixed="true">\r
+            <xs:sequence>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="Keyword" type="KeywordType"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+            </xs:sequence>            \r
+            <xs:attributeGroup ref="LibraryClassAttributes"/>\r
         </xs:complexType>\r
     </xs:element>\r
     <!-- LAH This is LibraryClassDeclaration FINAL version -->\r
@@ -860,8 +890,8 @@
             <xs:documentation xml:lang="en">This section defines what Classes of Library that this library supports. A Library may belong to multiple different library classes.</xs:documentation>\r
         </xs:annotation>\r
         <xs:complexType>\r
-            <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
-                <xs:element ref="LibraryClass"/>\r
+            <xs:sequence>\r
+                <xs:element ref="LibraryClass" minOccurs="1" maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -1417,21 +1447,21 @@
         <xs:complexType>\r
             <xs:sequence minOccurs="1">\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Ppi">\r
-                    <xs:complexType>\r
-                        <xs:simpleContent>\r
-                            <xs:extension base="C_NameType">\r
-                                <xs:attributeGroup ref="PpiAttributes"/>\r
-                            </xs:extension>\r
-                        </xs:simpleContent>\r
+                    <xs:complexType mixed="true">\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="PpiCName" type="C_NameType"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <xs:attributeGroup ref="PpiAttributes"/>\r
                     </xs:complexType>\r
                 </xs:element>\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="PpiNotify">\r
-                    <xs:complexType>\r
-                        <xs:simpleContent>\r
-                            <xs:extension base="C_NameType">\r
-                                <xs:attributeGroup ref="PpiNotifyAttributes"/>\r
-                            </xs:extension>\r
-                        </xs:simpleContent>\r
+                    <xs:complexType mixed="true">\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="PpiNotifyCName" type="C_NameType"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <xs:attributeGroup ref="PpiNotifyAttributes"/>\r
                     </xs:complexType>\r
                 </xs:element>\r
                 <!-- DO NOT USE Arch element, use Arch Attribute in above instead. -->\r
@@ -1492,21 +1522,21 @@
         <xs:complexType>\r
             <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Protocol">\r
-                    <xs:complexType>\r
-                        <xs:simpleContent>\r
-                            <xs:extension base="C_NameType">\r
-                                <xs:attributeGroup ref="ProtocolAttributes"/>\r
-                            </xs:extension>\r
-                        </xs:simpleContent>\r
+                    <xs:complexType mixed="true">\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="ProtocolCName" type="C_NameType"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <xs:attributeGroup ref="ProtocolAttributes"/>\r
                     </xs:complexType>\r
                 </xs:element>\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="ProtocolNotify">\r
-                    <xs:complexType>\r
-                        <xs:simpleContent>\r
-                            <xs:extension base="C_NameType">\r
-                                <xs:attributeGroup ref="ProtocolNotifyAttributes"/>\r
-                            </xs:extension>\r
-                        </xs:simpleContent>\r
+                    <xs:complexType mixed="true">\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="ProtocolNotifyCName" type="C_NameType"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <xs:attributeGroup ref="ProtocolNotifyAttributes"/>\r
                     </xs:complexType>\r
                 </xs:element>\r
                 <!-- DO NOT USE! removing Arch element, use Arch attribute of Protocol or ProtocolNotify instead. -->\r
@@ -1643,15 +1673,15 @@
                         <xs:attributeGroup ref="SystemTableAttributes"/>\r
                     </xs:complexType>\r
                 </xs:element>\r
-                <xs:element minOccurs="0" maxOccurs="unbounded" name="SystemTableCName">\r
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="SystemTableCNames">\r
                     <xs:complexType>\r
-                        <xs:simpleContent>\r
-                            <xs:extension base="C_NameType">\r
-                                <xs:attributeGroup ref="SystemTableAttributes"/>\r
-                            </xs:extension>\r
-                        </xs:simpleContent>\r
+                        <xs:sequence>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="SystemTableCName" type="C_NameType"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>\r
+                        </xs:sequence>\r
+                        <xs:attributeGroup ref="SystemTableAttributes"/>\r
                     </xs:complexType>\r
-                </xs:element>                \r
+                </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -1705,6 +1735,7 @@
                                 <!-- Make GuidC_Name required -->\r
                                 <xs:element minOccurs="0" maxOccurs="1" name="GuidC_Name" type="C_NameType"/>\r
                             </xs:choice>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>                            \r
                             <!-- DO NOT USE, removiing  ByteOffset, Bit Offset and OffsetBitSize-->\r
                             <xs:element minOccurs="0" maxOccurs="1" name="ByteOffset" type="HexWordDataType">\r
                                 <xs:annotation>\r