From 1583df89314a62e03bf1a1534b809eefffb77feb Mon Sep 17 00:00:00 2001
From: Joachim Krech <joachim.krech@arm.com>
Date: Mon, 26 Sep 2022 15:27:32 +0200
Subject: [PATCH 1/3] Validate define attribute of compile element

---
 schema/PACK.xsd | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/schema/PACK.xsd b/schema/PACK.xsd
index b0033db..dca9818 100644
--- a/schema/PACK.xsd
+++ b/schema/PACK.xsd
@@ -399,6 +399,15 @@
     </xs:restriction>
   </xs:simpleType>
 
+  <!-- DefineType -->
+  <xs:simpleType name="DefineType">
+    <xs:restriction base="xs:string">
+      <xs:minLength value="1" />
+      <xs:maxLength value="128" />
+      <xs:pattern value="\S[a-zA-Z_]{1}[a-zA-Z0-9_\S]*"/>
+    </xs:restriction>
+  </xs:simpleType>
+
   <!-- AccessType (added in 1.4.4) -->
   <xs:simpleType name="AccessType">
     <xs:restriction base="xs:string">
@@ -455,7 +464,7 @@
     <!-- CMSIS-CORE device header file (sets compiler include path) -->
     <xs:attribute name="header" type="xs:string" />
     <!-- Device specific preprocessor define (sets preprocessor define  -->
-    <xs:attribute name="define" type="xs:string" />
+    <xs:attribute name="define" type="defineType" />
     <!-- Processor instance specific preprocessor define (sets preprocessor define on the commandline)  -->
     <xs:attribute name="Pdefine" type="xs:string" />
   </xs:complexType>

From e2a8309febb4f652bceb2c4b99cf4dbf68a15905 Mon Sep 17 00:00:00 2001
From: Joachim Krech <joachim.krech@arm.com>
Date: Mon, 26 Sep 2022 15:30:53 +0200
Subject: [PATCH 2/3] add for Pdefine as well.

---
 schema/PACK.xsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schema/PACK.xsd b/schema/PACK.xsd
index dca9818..ae10138 100644
--- a/schema/PACK.xsd
+++ b/schema/PACK.xsd
@@ -464,9 +464,9 @@
     <!-- CMSIS-CORE device header file (sets compiler include path) -->
     <xs:attribute name="header" type="xs:string" />
     <!-- Device specific preprocessor define (sets preprocessor define  -->
-    <xs:attribute name="define" type="defineType" />
+    <xs:attribute name="define" type="DefineType" />
     <!-- Processor instance specific preprocessor define (sets preprocessor define on the commandline)  -->
-    <xs:attribute name="Pdefine" type="xs:string" />
+    <xs:attribute name="Pdefine" type="DefineType" />
   </xs:complexType>
 
   <!-- DebugVarsType -->

From 027be2e688db0664a0924fb1fb10df95c8a9b080 Mon Sep 17 00:00:00 2001
From: Joachim Krech <joachim.krech@arm.com>
Date: Mon, 26 Sep 2022 16:25:16 +0200
Subject: [PATCH 3/3] fix white spaces

---
 schema/PACK.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schema/PACK.xsd b/schema/PACK.xsd
index ae10138..d339305 100644
--- a/schema/PACK.xsd
+++ b/schema/PACK.xsd
@@ -404,7 +404,7 @@
     <xs:restriction base="xs:string">
       <xs:minLength value="1" />
       <xs:maxLength value="128" />
-      <xs:pattern value="\S[a-zA-Z_]{1}[a-zA-Z0-9_\S]*"/>
+      <xs:pattern value="\S(.[a-zA-Z_]{1}[a-zA-Z0-9_]*)"/>
     </xs:restriction>
   </xs:simpleType>