sca: eclair: use MISRA C:2012 Amendment 2

Use MISRA C:2012 Amendment 2 instead of 'MISRA C:2012 Amendment 2' in all configuration files consistently. Also fix a typo in one of the deviations. Signed-off-by: Anas Nashif <anas.nashif@intel.com>
2 weeks ago · 67caf3bb09
10 changed files with 382 additions and 382 deletions
--- a/cmake/sca/eclair/ECL/adopted_deviations.ecl
+++ b/cmake/sca/eclair/ECL/adopted_deviations.ecl
@ -4,14 +4,14 @@
				@@ -4,14 +4,14 @@
 -report_selector+={adopted_report,"all_area(!kind(culprit||evidence)||all_loc(all_exp(adopted||pseudo)))"}

 -doc_begin="Adopted code is not meant to be read, reviewed or modified by human programmers:no developers' confusion is not possible. In addition, adopted code is assumed to work as is. Reports that are fully contained in adopted code are hidden/tagged with the 'adopted' tag."
-config=MC3R1.R7.2,reports+={relied,adopted_report}
-config=MC3R1.R10.3,reports+={relied,adopted_report}
-config=MC3R1.R10.6,reports+={relied,adopted_report}
-config=MC3R1.R12.1,reports+={relied,adopted_report}
+-config=MC3A2.R7.2,reports+={relied,adopted_report}
+-config=MC3A2.R10.3,reports+={relied,adopted_report}
+-config=MC3A2.R10.6,reports+={relied,adopted_report}
+-config=MC3A2.R12.1,reports+={relied,adopted_report}
 -doc_end

 -doc_begin="Macro LOAPIC_BASE_ADDRESS, automatically generated by Autoconf, expands to an implicitly unsigned literal lacking the 'u' or 'U' suffix."
-config=MC3R1.R7.2,reports+={safe,"all_area(all_loc(any_exp(macro(^assert$))))"}
+-config=MC3A2.R7.2,reports+={safe,"all_area(all_loc(any_exp(macro(^assert$))))"}
 -doc_end

 -doc="#include_next is a documented GNU preprocessing directive. See section \"2.7 Wrapper Headers\" of "CPP_MANUAL""
@ -21,23 +21,23 @@
				@@ -21,23 +21,23 @@

 -doc="The declarations in files tagged with api:public define a public API of Zephyr.
 Declarations in these files not necessarily have to be referenced."
-config=MC3R1.R2.3,declarations+={safe,"loc(top(public()))"}
+-config=MC3A2.R2.3,declarations+={safe,"loc(top(public()))"}

 -doc="Library entry points not necessarily have to be referenced."
-config=MC3R1.R2.1,declarations+={safe,"loc(top(public()))"}
+-config=MC3A2.R2.1,declarations+={safe,"loc(top(public()))"}

 -doc="Library entry points not necessarily have to be referenced in more than one translation units."
-config=MC3R1.R8.7,declarations+={safe,"loc(top(public()))"}
+-config=MC3A2.R8.7,declarations+={safe,"loc(top(public()))"}

 -doc="Syscall declarations are automatically generated all with the extern qualifier. For the ones with internal linkage the use of the extern qualifier is a violation of rule 8.8."
-config=MC3R1.R8.8,declarations={relied, "^z_vrfy_.*$||^z_impl_.*$"}
+-config=MC3A2.R8.8,declarations={relied, "^z_vrfy_.*$||^z_impl_.*$"}

 -doc="Function hash, that is automatically generated, does not use the parameter \"len\" in all its definitions."
-config=MC3R1.R2.7,declarations+={relied,"context(^hash\\(const char\\*, size_t\\)$)&&name(len)"}
+-config=MC3A2.R2.7,declarations+={relied,"context(^hash\\(const char\\*, size_t\\)$)&&name(len)"}

 -doc="Function \"z_object_lookup\", that is automatically generated, uses single-statement bodies not enclosed in braces."
-config=MC3R1.R15.6,reports={relied, "all_area(context(^z_object_lookup\\(const char\\*, size_t\\)$))"}
+-config=MC3A2.R15.6,reports={relied, "all_area(context(^z_object_lookup\\(const char\\*, size_t\\)$))"}

 -doc="The following declarations are in generated files: not in all configuration they are implemented.
    Chainging the generators could be dangerous and the advantages in enforcing the rule do not outweight these dangers."
-config=MC3R1.R8.6,declarations+={safe, "loc(top(file(^zephyr/build/zephyr/include/generated/.*$)))"}
+-config=MC3A2.R8.6,declarations+={safe, "loc(top(file(^zephyr/build/zephyr/include/generated/.*$)))"}
--- a/cmake/sca/eclair/ECL/analysis_STU.ecl
+++ b/cmake/sca/eclair/ECL/analysis_STU.ecl
@ -10,106 +10,106 @@
				@@ -10,106 +10,106 @@

 -doc_begin="Selection of guidelines from
 https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
-enable=MC3R1.D4.13
-enable=MC3R1.D4.2
-enable=MC3R1.D4.4
-enable=MC3R1.D4.5
-enable=MC3R1.D4.8
-enable=MC3R1.D4.11
-enable=MC3R1.D4.12
-enable=MC3R1.D4.14
-enable=MC3R1.D4.7
-enable=MC3R1.R10.5
-enable=MC3R1.R10.2
-enable=MC3R1.R10.6
-enable=MC3R1.R10.7
-enable=MC3R1.R10.8
-enable=MC3R1.R1.2
-enable=MC3R1.R1.3
-enable=MC3R1.R12.4
-enable=MC3R1.R12.5
-enable=MC3R1.R12.2
-enable=MC3R1.R13.4
-enable=MC3R1.R13.1
-enable=MC3R1.R13.2
-enable=MC3R1.R13.5
-enable=MC3R1.R13.6
-enable=MC3R1.R18.5
-enable=MC3R1.R18.1
-enable=MC3R1.R18.2
-enable=MC3R1.R18.3
-enable=MC3R1.R18.6
-enable=MC3R1.R18.8
-enable=MC3R1.R21.11
-enable=MC3R1.R21.13
-enable=MC3R1.R21.17
-enable=MC3R1.R21.18
-enable=MC3R1.R21.19
-enable=MC3R1.R21.20
-enable=MC3R1.R2.7
-enable=MC3R1.R2.2
-enable=MC3R1.R4.2
-enable=MC3R1.R4.1
-enable=MC3R1.R17.3
-enable=MC3R1.R17.4
-enable=MC3R1.R17.6
-enable=MC3R1.R17.1
-enable=MC3R1.R17.5
-enable=MC3R1.R19.1
-enable=MC3R1.R22.2
-enable=MC3R1.R22.5
-enable=MC3R1.R22.6
-enable=MC3R1.R9.1
-enable=MC3R1.R9.2
-enable=MC3R1.R9.3
-enable=MC3R1.R9.4
-enable=MC3R1.R9.5
-enable=MC3R1.D2.1
-enable=MC3R1.R11.2
-enable=MC3R1.R11.6
-enable=MC3R1.R11.7
-enable=MC3R1.R11.8
-enable=MC3R1.R11.9
-enable=MC3R1.R14.1
-enable=MC3R1.R14.2
-enable=MC3R1.R14.3
-enable=MC3R1.R15.2
-enable=MC3R1.R15.3
-enable=MC3R1.R15.6
-enable=MC3R1.R15.7
-enable=MC3R1.R16.1
-enable=MC3R1.R16.2
-enable=MC3R1.R16.3
-enable=MC3R1.R16.4
-enable=MC3R1.R16.5
-enable=MC3R1.R16.6
-enable=MC3R1.R16.7
-enable=MC3R1.R20.11
-enable=MC3R1.R20.12
-enable=MC3R1.R20.13
-enable=MC3R1.R20.14
-enable=MC3R1.R20.2
-enable=MC3R1.R20.3
-enable=MC3R1.R20.4
-enable=MC3R1.R20.8
-enable=MC3R1.R20.9
-enable=MC3R1.R3.1
-enable=MC3R1.R3.2
-enable=MC3R1.R5.2
-enable=MC3R1.R5.3
-enable=MC3R1.R5.4
-enable=MC3R1.R5.5
-enable=MC3R1.R6.1
-enable=MC3R1.R6.2
-enable=MC3R1.R7.1
-enable=MC3R1.R7.2
-enable=MC3R1.R7.3
-enable=MC3R1.R7.4
-enable=MC3R1.R8.1
-enable=MC3R1.R8.10
-enable=MC3R1.R8.12
-enable=MC3R1.R8.14
-enable=MC3R1.R8.2
-enable=MC3R1.R8.4
-enable=MC3R1.R8.8
+-enable=MC3A2.D4.13
+-enable=MC3A2.D4.2
+-enable=MC3A2.D4.4
+-enable=MC3A2.D4.5
+-enable=MC3A2.D4.8
+-enable=MC3A2.D4.11
+-enable=MC3A2.D4.12
+-enable=MC3A2.D4.14
+-enable=MC3A2.D4.7
+-enable=MC3A2.R10.5
+-enable=MC3A2.R10.2
+-enable=MC3A2.R10.6
+-enable=MC3A2.R10.7
+-enable=MC3A2.R10.8
+-enable=MC3A2.R1.2
+-enable=MC3A2.R1.3
+-enable=MC3A2.R12.4
+-enable=MC3A2.R12.5
+-enable=MC3A2.R12.2
+-enable=MC3A2.R13.4
+-enable=MC3A2.R13.1
+-enable=MC3A2.R13.2
+-enable=MC3A2.R13.5
+-enable=MC3A2.R13.6
+-enable=MC3A2.R18.5
+-enable=MC3A2.R18.1
+-enable=MC3A2.R18.2
+-enable=MC3A2.R18.3
+-enable=MC3A2.R18.6
+-enable=MC3A2.R18.8
+-enable=MC3A2.R21.11
+-enable=MC3A2.R21.13
+-enable=MC3A2.R21.17
+-enable=MC3A2.R21.18
+-enable=MC3A2.R21.19
+-enable=MC3A2.R21.20
+-enable=MC3A2.R2.7
+-enable=MC3A2.R2.2
+-enable=MC3A2.R4.2
+-enable=MC3A2.R4.1
+-enable=MC3A2.R17.3
+-enable=MC3A2.R17.4
+-enable=MC3A2.R17.6
+-enable=MC3A2.R17.1
+-enable=MC3A2.R17.5
+-enable=MC3A2.R19.1
+-enable=MC3A2.R22.2
+-enable=MC3A2.R22.5
+-enable=MC3A2.R22.6
+-enable=MC3A2.R9.1
+-enable=MC3A2.R9.2
+-enable=MC3A2.R9.3
+-enable=MC3A2.R9.4
+-enable=MC3A2.R9.5
+-enable=MC3A2.D2.1
+-enable=MC3A2.R11.2
+-enable=MC3A2.R11.6
+-enable=MC3A2.R11.7
+-enable=MC3A2.R11.8
+-enable=MC3A2.R11.9
+-enable=MC3A2.R14.1
+-enable=MC3A2.R14.2
+-enable=MC3A2.R14.3
+-enable=MC3A2.R15.2
+-enable=MC3A2.R15.3
+-enable=MC3A2.R15.6
+-enable=MC3A2.R15.7
+-enable=MC3A2.R16.1
+-enable=MC3A2.R16.2
+-enable=MC3A2.R16.3
+-enable=MC3A2.R16.4
+-enable=MC3A2.R16.5
+-enable=MC3A2.R16.6
+-enable=MC3A2.R16.7
+-enable=MC3A2.R20.11
+-enable=MC3A2.R20.12
+-enable=MC3A2.R20.13
+-enable=MC3A2.R20.14
+-enable=MC3A2.R20.2
+-enable=MC3A2.R20.3
+-enable=MC3A2.R20.4
+-enable=MC3A2.R20.8
+-enable=MC3A2.R20.9
+-enable=MC3A2.R3.1
+-enable=MC3A2.R3.2
+-enable=MC3A2.R5.2
+-enable=MC3A2.R5.3
+-enable=MC3A2.R5.4
+-enable=MC3A2.R5.5
+-enable=MC3A2.R6.1
+-enable=MC3A2.R6.2
+-enable=MC3A2.R7.1
+-enable=MC3A2.R7.2
+-enable=MC3A2.R7.3
+-enable=MC3A2.R7.4
+-enable=MC3A2.R8.1
+-enable=MC3A2.R8.10
+-enable=MC3A2.R8.12
+-enable=MC3A2.R8.14
+-enable=MC3A2.R8.2
+-enable=MC3A2.R8.4
+-enable=MC3A2.R8.8
 -doc_end
--- a/cmake/sca/eclair/ECL/analysis_WP.ecl
+++ b/cmake/sca/eclair/ECL/analysis_WP.ecl
@ -10,23 +10,23 @@
				@@ -10,23 +10,23 @@

 -doc_begin="Selection of guidelines from
 https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
-enable=MC3R1.R2.3
-enable=MC3R1.R2.1
-enable=MC3R1.R5.9
-enable=MC3R1.R5.1
-enable=MC3R1.R5.6
-enable=MC3R1.R5.7
-enable=MC3R1.R5.8
-enable=MC3R1.R8.9
-enable=MC3R1.R8.3
-enable=MC3R1.R8.5
-enable=MC3R1.R8.6
-enable=MC3R1.R22.4
-enable=MC3R1.R22.3
-enable=MC3R1.D1.1
-enable=MC3R1.D3.1
-enable=MC3R1.D4.1
-enable=MC3R1.D4.10
-enable=MC3R1.R17.2
-enable=MC3R1.R17.7
+-enable=MC3A2.R2.3
+-enable=MC3A2.R2.1
+-enable=MC3A2.R5.9
+-enable=MC3A2.R5.1
+-enable=MC3A2.R5.6
+-enable=MC3A2.R5.7
+-enable=MC3A2.R5.8
+-enable=MC3A2.R8.9
+-enable=MC3A2.R8.3
+-enable=MC3A2.R8.5
+-enable=MC3A2.R8.6
+-enable=MC3A2.R22.4
+-enable=MC3A2.R22.3
+-enable=MC3A2.D1.1
+-enable=MC3A2.D3.1
+-enable=MC3A2.D4.1
+-enable=MC3A2.D4.10
+-enable=MC3A2.R17.2
+-enable=MC3A2.R17.7
 -doc_end
--- a/cmake/sca/eclair/ECL/analysis_first_analysis.ecl
+++ b/cmake/sca/eclair/ECL/analysis_first_analysis.ecl
@ -10,12 +10,12 @@
				@@ -10,12 +10,12 @@

 -doc_begin="Selection of guidelines from
 https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
-enable=MC3R1.R8.2
-enable=MC3R1.R10.2
-enable=MC3R1.R10.5
-enable=MC3R1.R10.6
-enable=MC3R1.R11.2
-enable=MC3R1.R12.4
-enable=MC3R1.R13.4
-enable=MC3R1.R16.1
+-enable=MC3A2.R8.2
+-enable=MC3A2.R10.2
+-enable=MC3A2.R10.5
+-enable=MC3A2.R10.6
+-enable=MC3A2.R11.2
+-enable=MC3A2.R12.4
+-enable=MC3A2.R13.4
+-enable=MC3A2.R16.1
 -doc_end
--- a/cmake/sca/eclair/ECL/analysis_heavy_STU.ecl
+++ b/cmake/sca/eclair/ECL/analysis_heavy_STU.ecl
@ -10,14 +10,14 @@
				@@ -10,14 +10,14 @@

 -doc_begin="Selection of guidelines from
 https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
-enable=MC3R1.D4.6
-enable=MC3R1.D4.9
-enable=MC3R1.R12.1
-enable=MC3R1.R13.3
-enable=MC3R1.R2.6
-enable=MC3R1.R10.1
-enable=MC3R1.R10.3
-enable=MC3R1.R10.4
-enable=MC3R1.R14.4
-enable=MC3R1.R20.7
+-enable=MC3A2.D4.6
+-enable=MC3A2.D4.9
+-enable=MC3A2.R12.1
+-enable=MC3A2.R13.3
+-enable=MC3A2.R2.6
+-enable=MC3A2.R10.1
+-enable=MC3A2.R10.3
+-enable=MC3A2.R10.4
+-enable=MC3A2.R14.4
+-enable=MC3A2.R20.7
 -doc_end
--- a/cmake/sca/eclair/ECL/analysis_std_lib.ecl
+++ b/cmake/sca/eclair/ECL/analysis_std_lib.ecl
@ -9,20 +9,20 @@
				@@ -9,20 +9,20 @@

 -doc_begin="Selection of guidelines from
 https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
-enable=MC3R1.R21.1
-enable=MC3R1.R21.12
-enable=MC3R1.R21.14
-enable=MC3R1.R21.15
-enable=MC3R1.R21.16
-enable=MC3R1.R21.2
-enable=MC3R1.R21.3
-enable=MC3R1.R21.4
-enable=MC3R1.R21.6
-enable=MC3R1.R21.7
-enable=MC3R1.R21.9
-enable=MC3R1.R22.1
-enable=MC3R1.R22.10
-enable=MC3R1.R22.7
-enable=MC3R1.R22.8
-enable=MC3R1.R22.9
+-enable=MC3A2.R21.1
+-enable=MC3A2.R21.12
+-enable=MC3A2.R21.14
+-enable=MC3A2.R21.15
+-enable=MC3A2.R21.16
+-enable=MC3A2.R21.2
+-enable=MC3A2.R21.3
+-enable=MC3A2.R21.4
+-enable=MC3A2.R21.6
+-enable=MC3A2.R21.7
+-enable=MC3A2.R21.9
+-enable=MC3A2.R22.1
+-enable=MC3A2.R22.10
+-enable=MC3A2.R22.7
+-enable=MC3A2.R22.8
+-enable=MC3A2.R22.9
 -doc_end
--- a/cmake/sca/eclair/ECL/analysis_zephyr_guidelines.ecl
+++ b/cmake/sca/eclair/ECL/analysis_zephyr_guidelines.ecl
@ -9,151 +9,151 @@
				@@ -9,151 +9,151 @@

 -doc_begin="Main rules from
 https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
-enable=MC3R1.D1.1
-enable=MC3R1.D2.1
-enable=MC3R1.D3.1
-enable=MC3R1.D4.1
-enable=MC3R1.D4.2
-enable=MC3R1.D4.4
-enable=MC3R1.D4.5
-enable=MC3R1.D4.6
-enable=MC3R1.D4.7
-enable=MC3R1.D4.8
-enable=MC3R1.D4.9
-enable=MC3R1.D4.10
-enable=MC3R1.D4.11
-enable=MC3R1.D4.12
-enable=MC3R1.D4.13
-enable=MC3R1.D4.14
-enable=MC3R1.R1.2
-enable=MC3R1.R1.3
-enable=MC3R1.R2.1
-enable=MC3R1.R2.2
-enable=MC3R1.R2.3
-enable=MC3R1.R2.6
-enable=MC3R1.R2.7
-enable=MC3R1.R3.1
-enable=MC3R1.R3.2
-enable=MC3R1.R4.1
-enable=MC3R1.R4.2
-enable=MC3R1.R5.1
-enable=MC3R1.R5.2
-enable=MC3R1.R5.3
-enable=MC3R1.R5.4
-enable=MC3R1.R5.5
-enable=MC3R1.R5.6
-enable=MC3R1.R5.7
-enable=MC3R1.R5.8
-enable=MC3R1.R5.9
-enable=MC3R1.R6.1
-enable=MC3R1.R6.2
-enable=MC3R1.R7.1
-enable=MC3R1.R7.2
-enable=MC3R1.R7.3
-enable=MC3R1.R7.4
-enable=MC3R1.R8.1
-enable=MC3R1.R8.2
-enable=MC3R1.R8.3
-enable=MC3R1.R8.4
-enable=MC3R1.R8.5
-enable=MC3R1.R8.6
-enable=MC3R1.R8.8
-enable=MC3R1.R8.9
-enable=MC3R1.R8.10
-enable=MC3R1.R8.12
-enable=MC3R1.R8.14
-enable=MC3R1.R9.1
-enable=MC3R1.R9.2
-enable=MC3R1.R9.3
-enable=MC3R1.R9.4
-enable=MC3R1.R9.5
-enable=MC3R1.R10.1
-enable=MC3R1.R10.2
-enable=MC3R1.R10.3
-enable=MC3R1.R10.4
-enable=MC3R1.R10.5
-enable=MC3R1.R10.6
-enable=MC3R1.R10.7
-enable=MC3R1.R10.8
-enable=MC3R1.R11.2
-enable=MC3R1.R11.6
-enable=MC3R1.R11.7
-enable=MC3R1.R11.8
-enable=MC3R1.R11.9
-enable=MC3R1.R12.1
-enable=MC3R1.R12.2
-enable=MC3R1.R12.4
-enable=MC3R1.R12.5
-enable=MC3R1.R13.1
-enable=MC3R1.R13.2
-enable=MC3R1.R13.3
-enable=MC3R1.R13.4
-enable=MC3R1.R13.5
-enable=MC3R1.R13.6
-enable=MC3R1.R14.1
-enable=MC3R1.R14.2
-enable=MC3R1.R14.3
-enable=MC3R1.R14.4
-enable=MC3R1.R15.2
-enable=MC3R1.R15.3
-enable=MC3R1.R15.6
-enable=MC3R1.R15.7
-enable=MC3R1.R16.1
-enable=MC3R1.R16.2
-enable=MC3R1.R16.3
-enable=MC3R1.R16.4
-enable=MC3R1.R16.5
-enable=MC3R1.R16.6
-enable=MC3R1.R16.7
-enable=MC3R1.R17.1
-enable=MC3R1.R17.2
-enable=MC3R1.R17.3
-enable=MC3R1.R17.4
-enable=MC3R1.R17.5
-enable=MC3R1.R17.6
-enable=MC3R1.R17.7
-enable=MC3R1.R18.1
-enable=MC3R1.R18.2
-enable=MC3R1.R18.3
-enable=MC3R1.R18.5
-enable=MC3R1.R18.6
-enable=MC3R1.R18.8
-enable=MC3R1.R19.1
-enable=MC3R1.R20.2
-enable=MC3R1.R20.3
-enable=MC3R1.R20.4
-enable=MC3R1.R20.7
-enable=MC3R1.R20.8
-enable=MC3R1.R20.9
-enable=MC3R1.R20.11
-enable=MC3R1.R20.12
-enable=MC3R1.R20.13
-enable=MC3R1.R20.14
-enable=MC3R1.R21.1
-enable=MC3R1.R21.2
-enable=MC3R1.R21.3
-enable=MC3R1.R21.4
-enable=MC3R1.R21.6
-enable=MC3R1.R21.7
-enable=MC3R1.R21.9
-enable=MC3R1.R21.11
-enable=MC3R1.R21.12
-enable=MC3R1.R21.13
-enable=MC3R1.R21.14
-enable=MC3R1.R21.15
-enable=MC3R1.R21.16
-enable=MC3R1.R21.17
-enable=MC3R1.R21.18
-enable=MC3R1.R21.19
-enable=MC3R1.R21.20
-enable=MC3R1.R22.1
-enable=MC3R1.R22.2
-enable=MC3R1.R22.3
-enable=MC3R1.R22.4
-enable=MC3R1.R22.5
-enable=MC3R1.R22.6
-enable=MC3R1.R22.7
-enable=MC3R1.R22.8
-enable=MC3R1.R22.9
-enable=MC3R1.R22.10
+-enable=MC3A2.D1.1
+-enable=MC3A2.D2.1
+-enable=MC3A2.D3.1
+-enable=MC3A2.D4.1
+-enable=MC3A2.D4.2
+-enable=MC3A2.D4.4
+-enable=MC3A2.D4.5
+-enable=MC3A2.D4.6
+-enable=MC3A2.D4.7
+-enable=MC3A2.D4.8
+-enable=MC3A2.D4.9
+-enable=MC3A2.D4.10
+-enable=MC3A2.D4.11
+-enable=MC3A2.D4.12
+-enable=MC3A2.D4.13
+-enable=MC3A2.D4.14
+-enable=MC3A2.R1.2
+-enable=MC3A2.R1.3
+-enable=MC3A2.R2.1
+-enable=MC3A2.R2.2
+-enable=MC3A2.R2.3
+-enable=MC3A2.R2.6
+-enable=MC3A2.R2.7
+-enable=MC3A2.R3.1
+-enable=MC3A2.R3.2
+-enable=MC3A2.R4.1
+-enable=MC3A2.R4.2
+-enable=MC3A2.R5.1
+-enable=MC3A2.R5.2
+-enable=MC3A2.R5.3
+-enable=MC3A2.R5.4
+-enable=MC3A2.R5.5
+-enable=MC3A2.R5.6
+-enable=MC3A2.R5.7
+-enable=MC3A2.R5.8
+-enable=MC3A2.R5.9
+-enable=MC3A2.R6.1
+-enable=MC3A2.R6.2
+-enable=MC3A2.R7.1
+-enable=MC3A2.R7.2
+-enable=MC3A2.R7.3
+-enable=MC3A2.R7.4
+-enable=MC3A2.R8.1
+-enable=MC3A2.R8.2
+-enable=MC3A2.R8.3
+-enable=MC3A2.R8.4
+-enable=MC3A2.R8.5
+-enable=MC3A2.R8.6
+-enable=MC3A2.R8.8
+-enable=MC3A2.R8.9
+-enable=MC3A2.R8.10
+-enable=MC3A2.R8.12
+-enable=MC3A2.R8.14
+-enable=MC3A2.R9.1
+-enable=MC3A2.R9.2
+-enable=MC3A2.R9.3
+-enable=MC3A2.R9.4
+-enable=MC3A2.R9.5
+-enable=MC3A2.R10.1
+-enable=MC3A2.R10.2
+-enable=MC3A2.R10.3
+-enable=MC3A2.R10.4
+-enable=MC3A2.R10.5
+-enable=MC3A2.R10.6
+-enable=MC3A2.R10.7
+-enable=MC3A2.R10.8
+-enable=MC3A2.R11.2
+-enable=MC3A2.R11.6
+-enable=MC3A2.R11.7
+-enable=MC3A2.R11.8
+-enable=MC3A2.R11.9
+-enable=MC3A2.R12.1
+-enable=MC3A2.R12.2
+-enable=MC3A2.R12.4
+-enable=MC3A2.R12.5
+-enable=MC3A2.R13.1
+-enable=MC3A2.R13.2
+-enable=MC3A2.R13.3
+-enable=MC3A2.R13.4
+-enable=MC3A2.R13.5
+-enable=MC3A2.R13.6
+-enable=MC3A2.R14.1
+-enable=MC3A2.R14.2
+-enable=MC3A2.R14.3
+-enable=MC3A2.R14.4
+-enable=MC3A2.R15.2
+-enable=MC3A2.R15.3
+-enable=MC3A2.R15.6
+-enable=MC3A2.R15.7
+-enable=MC3A2.R16.1
+-enable=MC3A2.R16.2
+-enable=MC3A2.R16.3
+-enable=MC3A2.R16.4
+-enable=MC3A2.R16.5
+-enable=MC3A2.R16.6
+-enable=MC3A2.R16.7
+-enable=MC3A2.R17.1
+-enable=MC3A2.R17.2
+-enable=MC3A2.R17.3
+-enable=MC3A2.R17.4
+-enable=MC3A2.R17.5
+-enable=MC3A2.R17.6
+-enable=MC3A2.R17.7
+-enable=MC3A2.R18.1
+-enable=MC3A2.R18.2
+-enable=MC3A2.R18.3
+-enable=MC3A2.R18.5
+-enable=MC3A2.R18.6
+-enable=MC3A2.R18.8
+-enable=MC3A2.R19.1
+-enable=MC3A2.R20.2
+-enable=MC3A2.R20.3
+-enable=MC3A2.R20.4
+-enable=MC3A2.R20.7
+-enable=MC3A2.R20.8
+-enable=MC3A2.R20.9
+-enable=MC3A2.R20.11
+-enable=MC3A2.R20.12
+-enable=MC3A2.R20.13
+-enable=MC3A2.R20.14
+-enable=MC3A2.R21.1
+-enable=MC3A2.R21.2
+-enable=MC3A2.R21.3
+-enable=MC3A2.R21.4
+-enable=MC3A2.R21.6
+-enable=MC3A2.R21.7
+-enable=MC3A2.R21.9
+-enable=MC3A2.R21.11
+-enable=MC3A2.R21.12
+-enable=MC3A2.R21.13
+-enable=MC3A2.R21.14
+-enable=MC3A2.R21.15
+-enable=MC3A2.R21.16
+-enable=MC3A2.R21.17
+-enable=MC3A2.R21.18
+-enable=MC3A2.R21.19
+-enable=MC3A2.R21.20
+-enable=MC3A2.R22.1
+-enable=MC3A2.R22.2
+-enable=MC3A2.R22.3
+-enable=MC3A2.R22.4
+-enable=MC3A2.R22.5
+-enable=MC3A2.R22.6
+-enable=MC3A2.R22.7
+-enable=MC3A2.R22.8
+-enable=MC3A2.R22.9
+-enable=MC3A2.R22.10
 -doc_end
--- a/cmake/sca/eclair/ECL/deviations.ecl
+++ b/cmake/sca/eclair/ECL/deviations.ecl
@ -426,7 +426,7 @@ deliberate."
				@@ -426,7 +426,7 @@ deliberate."
 -doc_begin="Uses of a macro parameter for ordinary expansion and as an operand
 to the # or ## operators within the following macros are deliberate, to provide
 useful diagnostic messages to the user."
-config=MC3A2.R20.12,macros+={deliberate, "name(__ASSERT||__ASSERT_NO_MSG||BUILD_ASSERT"}
+-config=MC3A2.R20.12,macros+={deliberate, "name(__ASSERT||__ASSERT_NO_MSG||BUILD_ASSERT)"}
 -doc_end

 #
--- a/cmake/sca/eclair/ECL/language_extensions.ecl
+++ b/cmake/sca/eclair/ECL/language_extensions.ecl
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 -doc_begin="The following extension have been approved."
-config=MC3R1.R1.2,behaviors+={hide,"service(STD.tokenext)&&category(^(__asm__|__attribute__|__typeof__|__builtin_types_compatible_p|__volatile__|__alignof|__alignof__|__const__|__inline|_Generic|_Static_assert|__auto_type)$)"}
-config=MC3R1.R1.2,behaviors+={hide,"service(^STD.(stmtexpr|vptrarth|emptinit|emptrecd|arayzero|funojptr)$)"}
-config=MC3R1.R1.2,behaviors+={hide,"service(STD.nonstdc)&&category(^GCC diagnostic (push|pop|ignored \"-W.*\")$)"}
-config=MC3R1.R1.2,behaviors+={hide,"service(STD.freestlb)&&category(^(string|fcntl|time|errno|ctype|stdio|inttypes|stdlib).h$)"}
-config=MC3R1.R1.2,behaviors+={hide,"service(STD.diag)&&category(^(ext_missing_varargs_arg|ext_paste_comma|ext_flexible_array_in_array|ext_auto_type)$)"}
+-config=MC3A2.R1.2,behaviors+={hide,"service(STD.tokenext)&&category(^(__asm__|__attribute__|__typeof__|__builtin_types_compatible_p|__volatile__|__alignof|__alignof__|__const__|__inline|_Generic|_Static_assert|__auto_type)$)"}
+-config=MC3A2.R1.2,behaviors+={hide,"service(^STD.(stmtexpr|vptrarth|emptinit|emptrecd|arayzero|funojptr)$)"}
+-config=MC3A2.R1.2,behaviors+={hide,"service(STD.nonstdc)&&category(^GCC diagnostic (push|pop|ignored \"-W.*\")$)"}
+-config=MC3A2.R1.2,behaviors+={hide,"service(STD.freestlb)&&category(^(string|fcntl|time|errno|ctype|stdio|inttypes|stdlib).h$)"}
+-config=MC3A2.R1.2,behaviors+={hide,"service(STD.diag)&&category(^(ext_missing_varargs_arg|ext_paste_comma|ext_flexible_array_in_array|ext_auto_type)$)"}
 -doc_end
--- a/cmake/sca/eclair/ECL/zephyr_common_config.ecl
+++ b/cmake/sca/eclair/ECL/zephyr_common_config.ecl
@ -7,96 +7,96 @@
				@@ -7,96 +7,96 @@
 -reports+={hide,all_exp_external}

 -doc="The API interface files are allowed to contain unused macros."
-config=MC3R1.R2.5,reports+={hide, "any_area(macro(loc(top(public()||kind(pseudo)))))"}
+-config=MC3A2.R2.5,reports+={hide, "any_area(macro(loc(top(public()||kind(pseudo)))))"}

 -doc="Several header files are meant to be included in C as well as in C++ translation units."
-config=MC3R1.R20.1,exception=extern_C
+-config=MC3A2.R20.1,exception=extern_C

 -default_call_properties+="pointee_read(1..=never)"
 -default_call_properties+="pointee_write(1..=always)"
 -default_call_properties+="taken()"

 -doc_begin="These macros pass its first argument in a safe way to related compiler intrinsics."
-config=MC3R1.R20.7,macros={safe,"^(va_start||va_arg)$"}
+-config=MC3A2.R20.7,macros={safe,"^(va_start||va_arg)$"}
 -doc_end

 -doc_begin="The value-preserving conversions of integer constants are safe"
-config=MC3R1.R10.1,etypes={safe,"any()","preserved_integer_constant()"}
-config=MC3R1.R10.3,etypes={safe,"any()","preserved_integer_constant()"}
-config=MC3R1.R10.4,etypes={safe,"any()","preserved_integer_constant()||sibling(rhs,preserved_integer_constant())"}
+-config=MC3A2.R10.1,etypes={safe,"any()","preserved_integer_constant()"}
+-config=MC3A2.R10.3,etypes={safe,"any()","preserved_integer_constant()"}
+-config=MC3A2.R10.4,etypes={safe,"any()","preserved_integer_constant()||sibling(rhs,preserved_integer_constant())"}
 -doc_end

 -doc_begin="Some macros are deliberately compile-time constants due to project configurability."
 -macro_selector={const_wrapper_macros,"name(CONSTEXPR)"}
-config=MC3R1.R14.3,statements={safe, "node(if_stmt||conditional_operator)&&child(cond,wrapped(node(paren_expr)&&!macro(const_wrapper_macros), macro(const_wrapper_macros)))"}
+-config=MC3A2.R14.3,statements={safe, "node(if_stmt||conditional_operator)&&child(cond,wrapped(node(paren_expr)&&!macro(const_wrapper_macros), macro(const_wrapper_macros)))"}
 -doc_end

 -doc="Casts to log_arg_t in logging macros are safe and expected."
-config=MC3R1.R11.6,reports+={deliberate,"any_area(any_loc(any_exp(macro(name(__LOG_ARG_CAST)))))"}
+-config=MC3A2.R11.6,reports+={deliberate,"any_area(any_loc(any_exp(macro(name(__LOG_ARG_CAST)))))"}

 -doc_begin="The following function-like macros are not writable as inline functions."
-config=MC3R1.D4.9,macros+={deliberate,"name(ARG_UNUSED)"}
-config=MC3R1.D4.9,macros+={deliberate,"name(CONSTEXPR)"}
-config=MC3R1.D4.9,macros+={deliberate,"name(compiler_barrier)"}
-config=MC3R1.D4.9,macros+={deliberate,"name(likely)"}
-config=MC3R1.D4.9,macros+={deliberate,"name(unlikely)"}
+-config=MC3A2.D4.9,macros+={deliberate,"name(ARG_UNUSED)"}
+-config=MC3A2.D4.9,macros+={deliberate,"name(CONSTEXPR)"}
+-config=MC3A2.D4.9,macros+={deliberate,"name(compiler_barrier)"}
+-config=MC3A2.D4.9,macros+={deliberate,"name(likely)"}
+-config=MC3A2.D4.9,macros+={deliberate,"name(unlikely)"}
 -doc_end

 -doc_begin="For the following function-like macros it should be decided whether substitution with equivalent static inline functions is wanted and feasible."
-config=MC3R1.D4.9,macros+={questionable,"name(ATOMIC_ELEM)"}
-config=MC3R1.D4.9,macros+={questionable,"name(ATOMIC_MASK)"}
-config=MC3R1.D4.9,macros+={questionable,"name(BIT32)"}
-config=MC3R1.D4.9,macros+={questionable,"name(BIT64)"}
-config=MC3R1.D4.9,macros+={questionable,"name(BIT64_MASK)"}
-config=MC3R1.D4.9,macros+={questionable,"name(BIT_MASK)"}
-config=MC3R1.D4.9,macros+={questionable,"name(DEVICE_MMIO_GET)"}
-config=MC3R1.D4.9,macros+={questionable,"name(DEVICE_MMIO_MAP)"}
-config=MC3R1.D4.9,macros+={questionable,"name(DEVICE_MMIO_RAM_PTR)"}
-config=MC3R1.D4.9,macros+={questionable,"name(IN)"}
-config=MC3R1.D4.9,macros+={questionable,"name(LOG_CORE_INIT)"}
-config=MC3R1.D4.9,macros+={questionable,"name(MAX)"}
-config=MC3R1.D4.9,macros+={questionable,"name(MB)"}
-config=MC3R1.D4.9,macros+={questionable,"name(MIN)"}
-config=MC3R1.D4.9,macros+={questionable,"name(OUT)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_BDF)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_BDF_TO_BUS)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_BAR_64)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_BAR_ADDR)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_BAR_INVAL_FLAGS)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_BAR_IO)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_BAR_MEM)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_CAPPTR_FIRST)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_CAP_ID)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_CAP_NEXT)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_EXT_CAP_ID)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_EXT_CAP_NEXT)"}
-config=MC3R1.D4.9,macros+={questionable,"name(PCIE_CONF_INTR_IRQ)"}
-config=MC3R1.D4.9,macros+={questionable,"name(POINTER_TO_UINT)"}
-config=MC3R1.D4.9,macros+={questionable,"name(ROUND_DOWN)"}
-config=MC3R1.D4.9,macros+={questionable,"name(ROUND_UP)"}
-config=MC3R1.D4.9,macros+={questionable,"name(UINT_TO_POINTER)"}
-config=MC3R1.D4.9,macros+={questionable,"name(Z_BOOT_VIRT_TO_PHYS)"}
-config=MC3R1.D4.9,macros+={questionable,"name(Z_IRQ_TO_INTERRUPT_VECTOR)"}
-config=MC3R1.D4.9,macros+={questionable,"name(Z_KERNEL_STACK_SIZE_ADJUST)"}
-config=MC3R1.D4.9,macros+={questionable,"name(Z_LOG_MSG2_ALIGNED_WLEN)"}
-config=MC3R1.D4.9,macros+={questionable,"name(Z_MEM_PHYS_ADDR)"}
-config=MC3R1.D4.9,macros+={questionable,"name(Z_MEM_VIRT_ADDR)"}
-config=MC3R1.D4.9,macros+={questionable,"name(Z_STACK_PTR_ALIGN)"}
-config=MC3R1.D4.9,macros+={questionable,"name(Z_THREAD_STACK_SIZE_ADJUST)"}
-config=MC3R1.D4.9,macros+={questionable,"name(Z_TICK_ABS)"}
-config=MC3R1.D4.9,macros+={questionable,"name(ceiling_fraction)"}
-config=MC3R1.D4.9,macros+={questionable,"name(irq_enable)"}
-config=MC3R1.D4.9,macros+={questionable,"name(irq_lock)"}
-config=MC3R1.D4.9,macros+={questionable,"name(irq_unlock)"}
-config=MC3R1.D4.9,macros+={questionable,"name(k_panic)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(ATOMIC_ELEM)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(ATOMIC_MASK)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(BIT32)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(BIT64)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(BIT64_MASK)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(BIT_MASK)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(DEVICE_MMIO_GET)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(DEVICE_MMIO_MAP)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(DEVICE_MMIO_RAM_PTR)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(IN)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(LOG_CORE_INIT)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(MAX)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(MB)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(MIN)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(OUT)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_BDF)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_BDF_TO_BUS)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_BAR_64)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_BAR_ADDR)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_BAR_INVAL_FLAGS)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_BAR_IO)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_BAR_MEM)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_CAPPTR_FIRST)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_CAP_ID)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_CAP_NEXT)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_EXT_CAP_ID)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_EXT_CAP_NEXT)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(PCIE_CONF_INTR_IRQ)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(POINTER_TO_UINT)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(ROUND_DOWN)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(ROUND_UP)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(UINT_TO_POINTER)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(Z_BOOT_VIRT_TO_PHYS)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(Z_IRQ_TO_INTERRUPT_VECTOR)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(Z_KERNEL_STACK_SIZE_ADJUST)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(Z_LOG_MSG2_ALIGNED_WLEN)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(Z_MEM_PHYS_ADDR)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(Z_MEM_VIRT_ADDR)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(Z_STACK_PTR_ALIGN)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(Z_THREAD_STACK_SIZE_ADJUST)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(Z_TICK_ABS)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(ceiling_fraction)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(irq_enable)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(irq_lock)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(irq_unlock)"}
+-config=MC3A2.D4.9,macros+={questionable,"name(k_panic)"}
 -doc_end

 -doc="Use of CODE_UNREACHABLE is defensive programming."
-config=MC3R1.R2.1,reports+={safe,"any_area(any_loc(any_exp(macro(name(CODE_UNREACHABLE)))))"}
+-config=MC3A2.R2.1,reports+={safe,"any_area(any_loc(any_exp(macro(name(CODE_UNREACHABLE)))))"}

 -doc_begin="Identifers beginning with _ are tolerated."
-config=MC3R1.R21.1,macros={relied,"^_.*$"}
-config=MC3R1.R21.2,declarations={relied,"^(.*::)?_.*$"}
+-config=MC3A2.R21.1,macros={relied,"^_.*$"}
+-config=MC3A2.R21.2,declarations={relied,"^(.*::)?_.*$"}
 -doc_end

 -eval_file=adopted_code.ecl