Neil Tan / dsp

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of dsp by Simon Ford

Files at this revision

API Documentation at this revision

Revision 3:ad02f4ea1fbe, committed 2017-06-29

Comitter:
nprobably
Date:
Thu Jun 29 06:56:55 2017 +0000
Parent:
2:208cacc9d789
Commit message:
A hack to make it compile with mbed 5

Changed in this revision

inc/arm_math.h Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/FastMathFunctions/arm_cos_f32.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/FastMathFunctions/arm_sin_f32.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/StatisticsFunctions/arm_var_q15.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/StatisticsFunctions/arm_var_q31.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/TransformFunctions/arm_dct4_init_q15.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/TransformFunctions/arm_dct4_init_q31.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/TransformFunctions/arm_dct4_q15.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/TransformFunctions/arm_dct4_q31.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/TransformFunctions/arm_rfft_init_q15.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/TransformFunctions/arm_rfft_init_q31.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/TransformFunctions/arm_rfft_q15.c Show annotated file Show diff for this revision Revisions of this file
src/Cortex-M4-M3/TransformFunctions/arm_rfft_q31.c Show annotated file Show diff for this revision Revisions of this file 
--- a/inc/arm_math.h	Thu Mar 10 15:29:46 2011 +0000
+++ b/inc/arm_math.h	Thu Jun 29 06:56:55 2017 +0000
@@ -223,7 +223,7 @@
 #ifndef _ARM_MATH_H
 #define _ARM_MATH_H
 
-#define ARM_MATH_CM3 // mbed: set to CM£ and include appropriate target cmsis library
+#define ARM_MATH_CM4 // mbed: set to CM� and include appropriate target cmsis library
 #include "cmsis.h"
 
 // #define __CMSIS_GENERIC              /* disable NVIC and Systick functions */
@@ -2138,7 +2138,7 @@
    * @param[out] *pDst points to the output buffer.
    * @return none.
    */
-
+#ifdef 0
   void arm_rfft_q15(
 		    const arm_rfft_instance_q15 * S,
 		    q15_t * pSrc,
@@ -2153,7 +2153,7 @@
    * @param[in]      bitReverseFlag flag that enables (bitReverseFlag=1) or disables (bitReverseFlag=0) bit reversal of output.
    * @return		The function returns ARM_MATH_SUCCESS if initialization is successful or ARM_MATH_ARGUMENT_ERROR if <code>fftLenReal</code> is not a supported value.
    */
-
+#endif
   arm_status arm_rfft_init_q15(
 			       arm_rfft_instance_q15 * S,
 			       arm_cfft_radix4_instance_q15 * S_CFFT,
@@ -2168,12 +2168,12 @@
    * @param[out] *pDst points to the output buffer.
    * @return none.
    */
-
+#ifdef 0
   void arm_rfft_q31(
 		    const arm_rfft_instance_q31 * S,
 		    q31_t * pSrc,
 		    q31_t * pDst);
-
+#endif
   /**
    * @brief  Initialization function for the Q31 RFFT/RIFFT.
    * @param[in, out] *S             points to an instance of the Q31 RFFT/RIFFT structure.

--- a/src/Cortex-M4-M3/FastMathFunctions/arm_cos_f32.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/FastMathFunctions/arm_cos_f32.c	Thu Jun 29 06:56:55 2017 +0000
@@ -185,7 +185,7 @@
  * @param[in] x input value in radians. 
  * @return cos(x). 
  */ 
- 
+#define TABLE_SIZE			256
 float32_t arm_cos_f32( 
   float32_t x) 
 { 

--- a/src/Cortex-M4-M3/FastMathFunctions/arm_sin_f32.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/FastMathFunctions/arm_sin_f32.c	Thu Jun 29 06:56:55 2017 +0000
@@ -188,7 +188,7 @@
  * @param[in] x input value in radians. 
  * @return  sin(x). 
  */ 
- 
+#define TABLE_SIZE			256
 float32_t arm_sin_f32( 
   float32_t x) 
 { 

--- a/src/Cortex-M4-M3/StatisticsFunctions/arm_var_q15.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/StatisticsFunctions/arm_var_q15.c	Thu Jun 29 06:56:55 2017 +0000
@@ -57,7 +57,7 @@
  *  
  */ 
  
- 
+#ifdef 0
 void arm_var_q15( 
   q15_t * pSrc, 
   uint32_t blockSize, 
@@ -166,7 +166,9 @@
   *pResult = (meanOfSquares - squareOfMean); 
  
 } 
- 
+
+#endif
+
 /**  
  * @} end of variance group  
  */ 

--- a/src/Cortex-M4-M3/StatisticsFunctions/arm_var_q31.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/StatisticsFunctions/arm_var_q31.c	Thu Jun 29 06:56:55 2017 +0000
@@ -59,7 +59,7 @@
  *  
  */ 
  
- 
+#ifdef 0
 void arm_var_q31( 
   q31_t * pSrc, 
   uint32_t blockSize, 
@@ -170,7 +170,7 @@
   *pResult = (q63_t) meanOfSquares - squareOfMean; 
  
 } 
- 
+#endif
 /**  
  * @} end of variance group  
  */ 

--- a/src/Cortex-M4-M3/TransformFunctions/arm_dct4_init_q15.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/TransformFunctions/arm_dct4_init_q15.c	Thu Jun 29 06:56:55 2017 +0000
@@ -1118,7 +1118,7 @@
  * Normalizing factors in 1.15 format are mentioned in the table below for different DCT sizes:  
  * \image html dct4NormalizingQ15Table.gif  
  */ 
- 
+#ifdef 0
 arm_status arm_dct4_init_q15( 
   arm_dct4_instance_q15 * S, 
   arm_rfft_instance_q15 * S_RFFT, 
@@ -1181,7 +1181,7 @@
   /* return the status of DCT4 Init function */ 
   return (status); 
 } 
- 
+#endif
 /**  
    * @} end of DCT4_IDCT4 group  
    */ 

--- a/src/Cortex-M4-M3/TransformFunctions/arm_dct4_init_q31.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/TransformFunctions/arm_dct4_init_q31.c	Thu Jun 29 06:56:55 2017 +0000
@@ -2126,7 +2126,7 @@
  * Normalizing factors in 1.31 format are mentioned in the table below for different DCT sizes:  
  * \image html dct4NormalizingQ31Table.gif  
  */ 
- 
+#ifdef 0
 arm_status arm_dct4_init_q31( 
   arm_dct4_instance_q31 * S, 
   arm_rfft_instance_q31 * S_RFFT, 
@@ -2189,7 +2189,7 @@
   /* return the status of DCT4 Init function */ 
   return (status); 
 } 
- 
+#endif
 /**  
    * @} end of DCT4_IDCT4 group  
    */ 

--- a/src/Cortex-M4-M3/TransformFunctions/arm_dct4_q15.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/TransformFunctions/arm_dct4_q15.c	Thu Jun 29 06:56:55 2017 +0000
@@ -45,7 +45,7 @@
  *  
  * \image html dct4FormatsQ15Table.gif  
  */ 
- 
+#ifdef 0
 void arm_dct4_q15( 
   const arm_dct4_instance_q15 * S, 
   q15_t * pState, 
@@ -259,7 +259,7 @@
   } while(i > 0u); 
  
 } 
- 
+#endif
 /**  
    * @} end of DCT4_IDCT4 group  
    */ 

--- a/src/Cortex-M4-M3/TransformFunctions/arm_dct4_q31.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/TransformFunctions/arm_dct4_q31.c	Thu Jun 29 06:56:55 2017 +0000
@@ -46,7 +46,7 @@
  *  
  * \image html dct4FormatsQ31Table.gif  
  */ 
- 
+#ifdef 0
 void arm_dct4_q31( 
   const arm_dct4_instance_q31 * S, 
   q31_t * pState, 
@@ -260,7 +260,7 @@
   } while(i > 0u); 
  
 } 
- 
+#endif
 /**  
    * @} end of DCT4_IDCT4 group  
    */ 

--- a/src/Cortex-M4-M3/TransformFunctions/arm_rfft_init_q15.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/TransformFunctions/arm_rfft_init_q15.c	Thu Jun 29 06:56:55 2017 +0000
@@ -613,7 +613,7 @@
 * \par  
 * This function also initializes Twiddle factor table.   
 */ 
- 
+#ifdef 0
 arm_status arm_rfft_init_q15( 
   arm_rfft_instance_q15 * S, 
   arm_cfft_radix4_instance_q15 * S_CFFT, 
@@ -679,7 +679,7 @@
   return (status); 
  
 } 
- 
+#endif
   /**  
    * @} end of RFFT_RIFFT group  
    */ 

--- a/src/Cortex-M4-M3/TransformFunctions/arm_rfft_init_q31.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/TransformFunctions/arm_rfft_init_q31.c	Thu Jun 29 06:56:55 2017 +0000
@@ -1121,7 +1121,7 @@
 * \par  
 * This function also initializes Twiddle factor table.  
 */ 
- 
+#ifdef 0
 arm_status arm_rfft_init_q31( 
   arm_rfft_instance_q31 * S, 
   arm_cfft_radix4_instance_q31 * S_CFFT, 
@@ -1186,7 +1186,7 @@
   return (status); 
  
 } 
- 
+#endif
   /**  
    * @} end of RFFT_RIFFT group  
    */ 

--- a/src/Cortex-M4-M3/TransformFunctions/arm_rfft_q15.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/TransformFunctions/arm_rfft_q15.c	Thu Jun 29 06:56:55 2017 +0000
@@ -73,7 +73,7 @@
  * \par  
  * \image html RIFFTQ15.gif "Input and Output Formats for Q15 RIFFT"  
  */ 
- 
+#ifdef 0
 void arm_rfft_q15( 
   const arm_rfft_instance_q15 * S, 
   q15_t * pSrc, 
@@ -288,5 +288,6 @@
     i--; 
  
   } 
- 
+
 } 
+#endif
\ No newline at end of file

--- a/src/Cortex-M4-M3/TransformFunctions/arm_rfft_q31.c	Thu Mar 10 15:29:46 2011 +0000
+++ b/src/Cortex-M4-M3/TransformFunctions/arm_rfft_q31.c	Thu Jun 29 06:56:55 2017 +0000
@@ -73,7 +73,7 @@
  * \par  
  * \image html RIFFTQ31.gif "Input and Output Formats for Q31 RIFFT"  
  */ 
- 
+#ifdef 0
 void arm_rfft_q31( 
   const arm_rfft_instance_q31 * S, 
   q31_t * pSrc, 
@@ -120,7 +120,7 @@
   } 
  
 } 
- 
+#endif
  
   /**  
    * @} end of RFFT_RIFFT group