merged the last changes in new schema

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@654 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jwang36 2006-06-29 02:19:49 +00:00
parent 0b8c16e472
commit ed9ec043eb
4 changed files with 25 additions and 2 deletions

View File

@ -104,7 +104,7 @@
<!-- Make Usage REQUIRED in final -->
<xs:attribute name="Usage" type="EventUsage" use="optional"/>
<!-- Make EventGroup Required in final -->
<xs:attribute name="EventGroup" type="EventTypes" use="optional"/>
<xs:attribute name="EventGuidCName" type="C_NameType" use="optional"/>
<xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
<xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>
<!-- DO NOT USE remove Arch from use, use SupArchList instead -->
@ -115,6 +115,7 @@
<xs:attribute name="Guid" type="GuidType" use="optional"/>
<!-- DO NOT USE remove OverrideID from use -->
<xs:attribute name="OverrideID" type="xs:int" use="optional"/>
<xs:attribute name="EventGroup" type="EventTypes" use="optional"/>
</xs:attributeGroup>
<xs:attributeGroup name="ExternAttributes">
<xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
@ -192,6 +193,7 @@
<xs:attributeGroup name="HobAttributes">
<!-- USAGE is required in final -->
<xs:attribute name="Usage" type="HobUsage" use="optional"/>
<xs:attribute name="HobGuidCName" type="C_NameType" use="optional"/>
<xs:attribute name="HobType" type="HobTypes" use="required"/>
<xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
<xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>

View File

@ -1302,6 +1302,7 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
<xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuidCName" type="C_NameType"/>
<xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>
<xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
</xs:sequence>
@ -1325,7 +1326,8 @@
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="C_Name" type="C_NameType"/>
<xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>
<xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
<xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuidCName" type="C_NameType"/>
<xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
<xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
<xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>
<xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValueType"/>

View File

@ -136,6 +136,10 @@
</xs:simpleType>
<xs:simpleType name="EventTypes">
<xs:restriction base="NameConvention">
<xs:enumeration value="EVENT_GROUP_GUID"/>
<xs:enumeration value="EVENT_TYPE_PERIODIC_TIMER"/>
<xs:enumeration value="EVENT_TYPE_RELATIVE_TIMER"/>
<!-- DON'T USE! TO BE REMOVED -->
<xs:enumeration value="EVENT_GROUP_EXIT_BOOT_SERVICES"/>
<xs:enumeration value="EVENT_GROUP_VIRTUAL_ADDRESS_CHANGE"/>
<xs:enumeration value="EVENT_GROUP_MEMORY_MAP_CHANGE"/>

View File

@ -47,6 +47,21 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="PlatformSurfaceArea">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>
<!-- This section will be for new definitions of how we put together the Framework Binary Images -->
<xs:element minOccurs="0" maxOccurs="1" ref="PlatformDefinitions"/>
<!-- The Flash section is the legacy implementation of Flash -->
<xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>
<xs:element minOccurs="0" maxOccurs="1" ref="FrameworkModules"/>
<xs:element minOccurs="0" maxOccurs="1" ref="DynamicPcdBuildDefinitions"/>
<xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:annotation>
<xs:documentation xml:lang="en">DO NOT USE removing all Library Module files - PUT IN PLATFORM DESCRIPTION FILE, FPD</xs:documentation>
</xs:annotation>