aligning pack schema with specification for version 1.6.0
diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
index 3a050bd..853000d 100644
--- a/ARM.CMSIS.pdsc
+++ b/ARM.CMSIS.pdsc
@@ -247,13 +247,13 @@
<taxonomy>
<description Cclass="Audio">Software components for audio processing</description>
<description Cclass="Board Support">Generic Interfaces for Evaluation and Development Boards</description>
- <description Cclass="Board Part">Drivers that support an external component available on an evaluation board</description>
+ <description Cclass="Board Part">Drivers that support an external component available on an evaluation board</description>
<description Cclass="Compiler">Compiler Software Extensions</description>
<description Cclass="CMSIS" doc="CMSIS/Documentation/General/html/index.html">Cortex Microcontroller Software Interface Components</description>
<description Cclass="CMSIS Driver" doc="CMSIS/Documentation/Driver/html/index.html">Unified Device Drivers compliant to CMSIS-Driver Specifications</description>
<description Cclass="Device" doc="CMSIS/Documentation/Core/html/index.html">Startup, System Setup</description>
<description Cclass="Data Exchange">Data exchange or data formatter</description>
- <description Cclass="Extension Board">Drivers that support an extension boards or shield</description>
+ <description Cclass="Extension Board">Drivers that support an extension board or shield</description>
<description Cclass="File System">File Drive Support and File System</description>
<description Cclass="IoT Client">IoT cloud client connector</description>
<description Cclass="IoT Utility">IoT specific software utility</description>
@@ -3780,7 +3780,7 @@
</files>
</component>
<component Cclass="CMSIS Driver" Cgroup="Ethernet" Csub="Custom" Cversion="2.1.0" Capiversion="2.1.0">
- <description>Access to #include Driver_ETH_PHY.h and Driver_ETH_MAC.h files and code template for custom implementation</description>
+ <description>Access to #include Driver_ETH_PHY/MAC.h files and code templates for custom implementation</description>
<files>
<file category="header" name="CMSIS/Driver/Include/Driver_ETH_MAC.h" />
<file category="header" name="CMSIS/Driver/Include/Driver_ETH_PHY.h" />
diff --git a/CMSIS/Utilities/PACK.xsd b/CMSIS/Utilities/PACK.xsd
index 0ad4714..fbae497 100644
--- a/CMSIS/Utilities/PACK.xsd
+++ b/CMSIS/Utilities/PACK.xsd
@@ -17,7 +17,7 @@
See the License for the specific language governing permissions and
limitations under the License.
- $Date: 25. Februar 2019
+ $Date: 14. March 2019
$Revision: 1.6.0
$Project: Schema File for Package Description File Format Specification
@@ -25,13 +25,16 @@
Package file name convention <vendor>.<name>.<version>.pack
SchemaVersion=1.6.0
- 25. Februar 2019: 1.6.0
- - add processor attribute Dmve, specifying ArmV8.1-M vector extensions support
- - add 'ARMV81MML' to Dcore attribute enumeration
- - add path attribute to file tag, explicitly specifying include path in case of category="Header"
- - add file element attribute category="PreIncludeGlobal" and category="PreIncludeLocal"
- - add component section 'Pre_Include_Global_h' and 'Pre_Include_Local_Component_h'
-
+ 14. March 2019: 1.6.0
+ - added Armv8.1-M MVE processor feature attribute 'Dmve'
+ - added local and global pre-include section Pre_Include_Local_h, Pre_Include_Global_h.
+ - added file categories 'preIncludeLocal' and 'preIncludeGlobal' FileCategoryEnum.
+ - added file attribute 'path' for file category 'header' to add support for relative include paths.
+ - added to package element the possibility to restrict the usage of the with attributes Dvendor, Dname, Dcore, and Tcompiler.
+ - added dominate element to overwrite identical APIs, or components.
+ - added attribute 'condition' to the api element so that an API can be excluded based on a condition.
+ - added new Software Component Cclasses : "Audio", "Board Part", "Data Exchange", "Extension Board", "IoT Client", "IoT Utility", "Security", "Utility".
+
19. July 2018: 1.5.0
- added flash info section required for flash programming via debug sequences
- added debug access functions and global debug variables for flash programming via debug sequences
@@ -1090,6 +1093,7 @@
<xs:attribute name="Cgroup" type="CgroupType" use="required" />
<xs:attribute name="exclusive" type="xs:boolean" use="optional" default="1" />
<xs:attribute name="Capiversion" type="ComponentVersionType" use="optional" />
+ <xs:attribute name="condition" type="xs:string" use="optional" />
</xs:complexType>
<xs:complexType name="ApisType">
@@ -1799,6 +1803,10 @@
</xs:simpleContent>
</xs:complexType>
+ <xs:complexType name="DominateType">
+ <xs:attribute name="info" type="xs:string" use="required"/>
+ </xs:complexType>
+
<!-- package description root point -->
<xs:element name="package" nillable="true">
<xs:complexType>
@@ -1811,6 +1819,8 @@
<xs:element name="description" type="xs:string" minOccurs="1" />
<!-- download location of this PDSC and corresponding package file -->
<xs:element name="url" type="xs:anyURI" minOccurs="1" />
+ <!-- optional tag to override component versions from other packs -->
+ <xs:element name="dominate" type="DominateType" minOccurs="0"/>
<!-- optional: source repository of this pack -->
<xs:element name="repository" type="RepositoryType" minOccurs="0"/>
<!-- optional: e.g. mailto:Support@<vendor>.com or www.<vendor>.com/supportRequest -->
@@ -1980,6 +1990,11 @@
</xs:element>
</xs:all>
<xs:attribute name="schemaVersion" type="SchemaVersionType" use="required" />
+ <!-- optional package level filter attributes -->
+ <xs:attribute name="Dvendor" type="DeviceVendorEnum" use="optional" />
+ <xs:attribute name="Dname" type="xs:string" use="optional" />
+ <xs:attribute name="Dcore" type="DcoreEnum" use="optional" />
+ <xs:attribute name="Tcompiler" type="CompilerEnumType" use="optional" />
</xs:complexType>
</xs:element>
</xs:schema>