summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
0aa050f)
Added Alignment optional attribute to the <Section> tag
Changed the UserExtension Identifier from int to string
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2303
6f19259b-4bc3-4df7-8a09-
765794883524
<xs:attribute name="Compressible" type="xs:boolean" default="true" use="optional"/>\r
<xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>\r
<xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>\r
<xs:attribute name="Compressible" type="xs:boolean" default="true" use="optional"/>\r
<xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>\r
<xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>\r
+ <xs:attribute name="Alignment" type="xs:string" use="optional"/>\r
<xs:attribute name="ToolName" type="xs:string" use="optional"/>\r
<xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
<xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
<xs:attribute name="ToolName" type="xs:string" use="optional"/>\r
<xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
<xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>\r
</xs:sequence>\r
<xs:attribute name="UserID" type="xs:NCName" use="required"/>\r
<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>\r
</xs:sequence>\r
<xs:attribute name="UserID" type="xs:NCName" use="required"/>\r
- <xs:attribute name="Identifier" type="xs:nonNegativeInteger" use="required"/>\r
+ <xs:attribute name="Identifier" type="xs:string" use="required"/>\r
</xs:complexType>\r
</xs:element>\r
<xs:element name="Variables">\r
</xs:complexType>\r
</xs:element>\r
<xs:element name="Variables">\r
</xs:simpleType>\r
<xs:simpleType name="BlockNameType">\r
<xs:restriction base="UCNameType">\r
</xs:simpleType>\r
<xs:simpleType name="BlockNameType">\r
<xs:restriction base="UCNameType">\r
- <xs:pattern value="BLOCK[A-F0-9]{2}"/>\r
+ <xs:pattern value="\s*BLOCK[A-F0-9]{2}\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="BootModeNames">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="BootModeNames">\r
</xs:simpleType>\r
<xs:simpleType name="DatumSizeLimitation">\r
<xs:restriction base="xs:nonNegativeInteger">\r
</xs:simpleType>\r
<xs:simpleType name="DatumSizeLimitation">\r
<xs:restriction base="xs:nonNegativeInteger">\r
- <xs:minExclusive value="0"/>\r
<xs:maxExclusive value="13777216"/>\r
<xs:pattern value="(\s)*[1-9][0-9]*(\s)*"/>\r
</xs:restriction>\r
<xs:maxExclusive value="13777216"/>\r
<xs:pattern value="(\s)*[1-9][0-9]*(\s)*"/>\r
</xs:restriction>\r
<xs:simpleType name="HexByteArrayListType">\r
<xs:restriction base="xs:normalizedString">\r
<xs:minLength value="4"/>\r
<xs:simpleType name="HexByteArrayListType">\r
<xs:restriction base="xs:normalizedString">\r
<xs:minLength value="4"/>\r
- <xs:pattern value="((( )?0x[a-fA-F0-9]{2})(,)?)+( )?"/>\r
+ <xs:pattern value="\s*((( )?0x[a-fA-F0-9]{2})(,)?)+( )?"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexByteArrayType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexByteArrayType">\r
</xs:simpleType>\r
<xs:simpleType name="Md5sumType">\r
<xs:restriction base="xs:normalizedString">\r
</xs:simpleType>\r
<xs:simpleType name="Md5sumType">\r
<xs:restriction base="xs:normalizedString">\r
- <xs:pattern value="[a-fA-F0-9]{32}"/>\r
+ <xs:pattern value="\s*[a-fA-F0-9]{32}\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="PrimaryModuleListType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="PrimaryModuleListType">\r
<xs:simpleType name="SkuListType">\r
<xs:restriction base="xs:normalizedString">\r
<xs:minLength value="1"/>\r
<xs:simpleType name="SkuListType">\r
<xs:restriction base="xs:normalizedString">\r
<xs:minLength value="1"/>\r
- <xs:pattern value="(\d)+((,)?(\s)*(\d)+)*"/>\r
+ <xs:pattern value="\s*(\d)+((,)?(\s)*(\d)+)*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="SupportedArchitectures">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="SupportedArchitectures">\r
<xs:simpleType name="VariableOffsetValues">\r
<xs:restriction base="xs:string">\r
<xs:minLength value="1"/>\r
<xs:simpleType name="VariableOffsetValues">\r
<xs:restriction base="xs:string">\r
<xs:minLength value="1"/>\r
- <xs:pattern value="\d+(:)?\d*"/>\r
+ <xs:pattern value="\s*\d+(:)?\d*\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="VariableUsage">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="VariableUsage">\r
</xs:simpleType>\r
<xs:simpleType name="FfsDataAlignmentType">\r
<xs:restriction base="xs:nonNegativeInteger">\r
</xs:simpleType>\r
<xs:simpleType name="FfsDataAlignmentType">\r
<xs:restriction base="xs:nonNegativeInteger">\r
- <xs:pattern value="[0-7]{1}"/>\r
+ <xs:pattern value="\s*[0-7]{1}\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="FfsNameType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="FfsNameType">\r
<xs:documentation xml:lang="en"> This defines what an FFS Name can consist of.</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en"> This defines what an FFS Name can consist of.</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="[a-zA-Z][_\-a-zA-Z0-9]*(\.)?[a-zA-Z0-9]*"/>\r
+ <xs:pattern value="\s*[a-zA-Z][_\-a-zA-Z0-9]*(\.)?[a-zA-Z0-9]*\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="FlashSize">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="FlashSize">\r
<xs:documentation xml:lang="en"> C_Names must start with either an underscore (_) character followed by one or more alpha characters, followed by any combination of underscore or alphanumeric characters.</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en"> C_Names must start with either an underscore (_) character followed by one or more alpha characters, followed by any combination of underscore or alphanumeric characters.</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="(_)*[a-zA-Z]+((_)*[a-zA-Z0-9]*)*"/>\r
+ <xs:pattern value="\s*(_)*[a-zA-Z]+((_)*[a-zA-Z0-9]*)*\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="FileNameConvention">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="FileNameConvention">\r
<xs:documentation xml:lang="en"> This defines what a Filename is: Alphanumeric characters and optional underscore (_) or dash (-) characters, followed by a optional dot and more alphanumeric characters. </xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en"> This defines what a Filename is: Alphanumeric characters and optional underscore (_) or dash (-) characters, followed by a optional dot and more alphanumeric characters. </xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="[a-zA-Z](\.?[-_a-zA-Z0-9]+)*"/>\r
+ <xs:pattern value="\s*[a-zA-Z](\.?[\-_a-zA-Z0-9]+)*\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="GuidType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="GuidType">\r
<xs:documentation xml:lang="en"> This defines the minimum specification for a GUID Array which is 8 Hex Digits - 4 Hex Digits - 4 Hex Digits - 8 Hex Bytes, the last 16 Hex Digits can be enclosed in sqiggle {} brackets.</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en"> This defines the minimum specification for a GUID Array which is 8 Hex Digits - 4 Hex Digits - 4 Hex Digits - 8 Hex Bytes, the last 16 Hex Digits can be enclosed in sqiggle {} brackets.</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="0x[a-fA-F0-9]{1,8},( )*0x[a-fA-F0-9]{1,4},( )*0x[a-fA-F0-9]{1,4}(,( )*\{)?(,?( )*0x[a-fA-F0-9]{1,2}){8}( )*(\})?"/>\r
+ <xs:pattern value="\s*0x[a-fA-F0-9]{1,8},( )*0x[a-fA-F0-9]{1,4},( )*0x[a-fA-F0-9]{1,4}(,( )*\{)?(,?( )*0x[a-fA-F0-9]{1,2}){8}( )*(\})?\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="GuidType2">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="GuidType2">\r
<xs:documentation xml:lang="en"> A GUID must contain five different Hexadecimal character sets that are separated by a dash (-) character. </xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en"> A GUID must contain five different Hexadecimal character sets that are separated by a dash (-) character. </xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"/>\r
+ <xs:pattern value="\s*[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="Hex64BitDataType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="Hex64BitDataType">\r
<xs:documentation xml:lang="en">Define a Hex 64 Bit Value to be 0x[a-f0-9]{16}</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en">Define a Hex 64 Bit Value to be 0x[a-f0-9]{16}</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="(0x)?[a-fA-F0-9]{1,16}"/>\r
+ <xs:pattern value="\s*(0x)?[a-fA-F0-9]{1,16}\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexAddressType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexAddressType">\r
<xs:documentation xml:lang="en">Define a Hex Address, 0x[a-fA-F0-9]{1,16}</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en">Define a Hex Address, 0x[a-fA-F0-9]{1,16}</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="0x[a-fA-F0-9]{1,16}"/>\r
+ <xs:pattern value="\s*0x[a-fA-F0-9]{1,16}\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexByteDataType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexByteDataType">\r
<xs:documentation xml:lang="en">Define a Hex Byte Value to be 0x[a-f0-9]{2}</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en">Define a Hex Byte Value to be 0x[a-f0-9]{2}</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="(0x)?[a-fA-F0-9]{1,2}"/>\r
+ <xs:pattern value="\s*(0x)?[a-fA-F0-9]{1,2}\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexDataType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexDataType">\r
<xs:documentation xml:lang="en">Define a Hex Value to be 0x[a-f0-9]+</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en">Define a Hex Value to be 0x[a-f0-9]+</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="0x[a-fA-F0-9]+"/>\r
+ <xs:pattern value="\s*0x[a-fA-F0-9]+\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexDigitType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexDigitType">\r
<xs:documentation xml:lang="en">Define a Hex Diget to be 0x[a-f0-9]</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en">Define a Hex Diget to be 0x[a-f0-9]</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="[a-fA-F0-9]{1}"/>\r
+ <xs:pattern value="\s*[a-fA-F0-9]{1}\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexDoubleWordDataType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexDoubleWordDataType">\r
<xs:documentation xml:lang="en">Define a Hex Double Word Value to be 0x[a-f0-9]{8}</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en">Define a Hex Double Word Value to be 0x[a-f0-9]{8}</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="0x[a-fA-F0-9]{1,8}"/>\r
+ <xs:pattern value="\s*0x[a-fA-F0-9]{1,8}\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexWordDataType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="HexWordDataType">\r
<xs:documentation xml:lang="en">Define a Hex Word Value to be 0x[a-f0-9]{4}</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en">Define a Hex Word Value to be 0x[a-f0-9]{4}</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="0x[a-fA-F0-9]{1,4}"/>\r
+ <xs:pattern value="\s*0x[a-fA-F0-9]{1,4}\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="KeywordList">\r
<xs:restriction base="xs:string">\r
<xs:minLength value="1"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="KeywordList">\r
<xs:restriction base="xs:string">\r
<xs:minLength value="1"/>\r
- <xs:pattern value="[a-zA-Z]+(\ *_*[a-zA-Z0-9]*)*"/>\r
+ <xs:pattern value="\s*[a-zA-Z]+(\ *_*[a-zA-Z0-9]*)*\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="KeywordType">\r
<xs:restriction base="xs:normalizedString">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="KeywordType">\r
<xs:restriction base="xs:normalizedString">\r
- <xs:pattern value="[a-zA-Z]+(_*[a-zA-Z0-9]*)*"/>\r
+ <xs:pattern value="\s*[a-zA-Z]+(_*[a-zA-Z0-9]*)*\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="Paragraph">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="Paragraph">\r
<xs:documentation xml:lang="en">Limit Polarity vaild values to 0 and 1</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:int">\r
<xs:documentation xml:lang="en">Limit Polarity vaild values to 0 and 1</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:int">\r
- <xs:pattern value="0|1"/>\r
+ <xs:pattern value="\s*0|1\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="Sentence">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="Sentence">\r
<xs:documentation xml:lang="en"> This data type requires two or more words </xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:normalizedString">\r
<xs:documentation xml:lang="en"> This data type requires two or more words </xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:normalizedString">\r
- <xs:pattern value="(\w+\W*)+( )+(\W*\w*\W*\s*)*"/>\r
+ <xs:pattern value="\s*(\w+\W*)+( )+(\W*\w*\W*\s*)*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="ToolsNameConvention">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="ToolsNameConvention">\r
<xs:documentation xml:lang="en">This data type is used for ToolCommand, ToolChainFamily and TagName.</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:NCName">\r
<xs:documentation xml:lang="en">This data type is used for ToolCommand, ToolChainFamily and TagName.</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:NCName">\r
- <xs:pattern value="[a-zA-Z][a-zA-Z0-9]*"/>\r
+ <xs:pattern value="\s*[a-zA-Z][a-zA-Z0-9]*\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="UCNameType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="UCNameType">\r
<xs:documentation xml:lang="en"> Definition of a UpperCase Name, which can be any combination of upper case characters followed by zero or more underscore and/or uppercase alphanumeric characters </xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
<xs:documentation xml:lang="en"> Definition of a UpperCase Name, which can be any combination of upper case characters followed by zero or more underscore and/or uppercase alphanumeric characters </xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="[A-Z]+(_*[A-Z0-9]*)*"/>\r
+ <xs:pattern value="\s*[A-Z]+(_*[A-Z0-9]*)*\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="VersionDataType">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="VersionDataType">\r
</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
</xs:documentation>\r
</xs:annotation>\r
<xs:restriction base="xs:string">\r
- <xs:pattern value="\d+(\.\d+)*"/>\r
+ <xs:pattern value="\s*\d+(\.\d+)*\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="Zero">\r
</xs:restriction>\r
</xs:simpleType>\r
<xs:simpleType name="Zero">\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: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"/>\r
+ <xs:pattern value="\s*0\s*"/>\r
</xs:restriction>\r
</xs:simpleType>\r
</xs:schema>\r
</xs:restriction>\r
</xs:simpleType>\r
</xs:schema>\r