From 49a38a5eb132328afa05532555f94c57fe14591b Mon Sep 17 00:00:00 2001
From: Christophe Favergeon <Christophe.Favergeon@arm.com>
Date: Thu, 30 Sep 2021 09:01:14 +0200
Subject: [PATCH] CMSIS-DSP: Corrected issue #1053

(documentation issue)
---
 Source/SupportFunctions/arm_q15_to_f16.c   | 2 +-
 Source/SupportFunctions/arm_q15_to_float.c | 2 +-
 Source/SupportFunctions/arm_q31_to_float.c | 2 +-
 Source/SupportFunctions/arm_q7_to_float.c  | 2 +-
 cmsisdspconfig.py                          | 7 ++++++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Source/SupportFunctions/arm_q15_to_f16.c b/Source/SupportFunctions/arm_q15_to_f16.c
index faef0dbe..22a7eaaa 100755
--- a/Source/SupportFunctions/arm_q15_to_f16.c
+++ b/Source/SupportFunctions/arm_q15_to_f16.c
@@ -36,7 +36,7 @@
  */
 
 /**
- * @defgroup q15_to_x  Convert 16-bit Integer value
+ * @defgroup q15_to_x  Convert 16-bit fixed point value
  */
 
 /**
diff --git a/Source/SupportFunctions/arm_q15_to_float.c b/Source/SupportFunctions/arm_q15_to_float.c
index 2dded65b..902d302e 100644
--- a/Source/SupportFunctions/arm_q15_to_float.c
+++ b/Source/SupportFunctions/arm_q15_to_float.c
@@ -33,7 +33,7 @@
  */
 
 /**
- * @defgroup q15_to_x  Convert 16-bit Integer value
+ * @defgroup q15_to_x  Convert 16-bit fixed point value
  */
 
 /**
diff --git a/Source/SupportFunctions/arm_q31_to_float.c b/Source/SupportFunctions/arm_q31_to_float.c
index 32ff400c..ce7ce422 100644
--- a/Source/SupportFunctions/arm_q31_to_float.c
+++ b/Source/SupportFunctions/arm_q31_to_float.c
@@ -33,7 +33,7 @@
  */
 
 /**
- * @defgroup q31_to_x  Convert 32-bit Integer value
+ * @defgroup q31_to_x  Convert 32-bit fixed point value
  */
 
 /**
diff --git a/Source/SupportFunctions/arm_q7_to_float.c b/Source/SupportFunctions/arm_q7_to_float.c
index 258309ea..776a5383 100644
--- a/Source/SupportFunctions/arm_q7_to_float.c
+++ b/Source/SupportFunctions/arm_q7_to_float.c
@@ -33,7 +33,7 @@
  */
 
 /**
- * @defgroup q7_to_x  Convert 8-bit Integer value
+ * @defgroup q7_to_x  Convert 8-bit fixed point value
  */
 
 /**
diff --git a/cmsisdspconfig.py b/cmsisdspconfig.py
index 3fafbbf3..f1c6c832 100755
--- a/cmsisdspconfig.py
+++ b/cmsisdspconfig.py
@@ -44,6 +44,7 @@ config["LMS_NORM_Q31"]=False
 config["LMS_NORM_Q15"]=False
 config["CMPLX_MAG_Q31"]=False
 config["CMPLX_MAG_Q15"]=False
+config["CMPLX_MAG_FAST_Q15"]=False
 
 config["CFFT_RADIX2_Q15"]=False
 config["CFFT_RADIX4_Q15"]=False
@@ -85,6 +86,7 @@ realname["LMS_NORM_Q31"]="ARM_LMS_NORM_Q31"
 realname["LMS_NORM_Q15"]="ARM_LMS_NORM_Q15"
 realname["CMPLX_MAG_Q31"]="ARM_CMPLX_MAG_Q31"
 realname["CMPLX_MAG_Q15"]="ARM_CMPLX_MAG_Q15"
+realname["CMPLX_MAG_FAST_Q15"]="ARM_CMPLX_MAG_FAST_Q15"
 realname["CFFT_RADIX2_Q15"]="ARM_CFFT_RADIX2_Q15"
 realname["CFFT_RADIX4_Q15"]="ARM_CFFT_RADIX4_Q15"
 realname["CFFT_RADIX2_Q31"]="ARM_CFFT_RADIX2_Q31"
@@ -370,6 +372,9 @@ def interpretCmakeOptions(cmake):
         r.append("-DARM_TABLE_FAST_SQRT_Q31_MVE")
 
     if test(cmake,"ARM_CMPLX_MAG_Q15"):
+        r.append("-DARM_TABLE_FAST_SQRT_Q31_MVE")
+
+    if test(cmake,"ARM_CMPLX_MAG_FAST_Q15"):
         r.append("-DARM_TABLE_FAST_SQRT_Q15_MVE")
 
     if test(cmake,"MVEI"):
@@ -494,7 +499,7 @@ def configMake(config):
 
            if config["MVEI"]:
               st.sidebar.markdown("#### Complex Magnitude")
-              multiselect(config,"Complex Magnitude",["CMPLX_MAG_Q31","CMPLX_MAG_Q15"])
+              multiselect(config,"Complex Magnitude",["CMPLX_MAG_Q31","CMPLX_MAG_Q15","CMPLX_MAG_FAST_Q15"])