Skip to content

Commit 6aea34a

Browse files
Krzysztof Blazewiczdpgeorge
Krzysztof Blazewicz
authored and
dpgeorge
committed
lib/cmsis: move CMSIS headers to lib/
Files in lib/cmsis are generic for all Cortex-M MCU's files left in stmhal/cmsis are all STM32 specific.
1 parent 17b4509 commit 6aea34a

36 files changed

Lines changed: 16769 additions & 16769 deletions

stmhal/cmsis/inc/arm_common_tables.h renamed to lib/cmsis/inc/arm_common_tables.h

Lines changed: 93 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,93 @@
1-
/* ----------------------------------------------------------------------
2-
* Copyright (C) 2010-2013 ARM Limited. All rights reserved.
3-
*
4-
* $Date: 17. January 2013
5-
* $Revision: V1.4.1
6-
*
7-
* Project: CMSIS DSP Library
8-
* Title: arm_common_tables.h
9-
*
10-
* Description: This file has extern declaration for common tables like Bitreverse, reciprocal etc which are used across different functions
11-
*
12-
* Target Processor: Cortex-M4/Cortex-M3
13-
*
14-
* Redistribution and use in source and binary forms, with or without
15-
* modification, are permitted provided that the following conditions
16-
* are met:
17-
* - Redistributions of source code must retain the above copyright
18-
* notice, this list of conditions and the following disclaimer.
19-
* - Redistributions in binary form must reproduce the above copyright
20-
* notice, this list of conditions and the following disclaimer in
21-
* the documentation and/or other materials provided with the
22-
* distribution.
23-
* - Neither the name of ARM LIMITED nor the names of its contributors
24-
* may be used to endorse or promote products derived from this
25-
* software without specific prior written permission.
26-
*
27-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
28-
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
29-
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
30-
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
31-
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
32-
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
33-
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
34-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
35-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
36-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
37-
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
38-
* POSSIBILITY OF SUCH DAMAGE.
39-
* -------------------------------------------------------------------- */
40-
41-
#ifndef _ARM_COMMON_TABLES_H
42-
#define _ARM_COMMON_TABLES_H
43-
44-
#include "arm_math.h"
45-
46-
extern const uint16_t armBitRevTable[1024];
47-
extern const q15_t armRecipTableQ15[64];
48-
extern const q31_t armRecipTableQ31[64];
49-
extern const q31_t realCoefAQ31[1024];
50-
extern const q31_t realCoefBQ31[1024];
51-
extern const float32_t twiddleCoef_16[32];
52-
extern const float32_t twiddleCoef_32[64];
53-
extern const float32_t twiddleCoef_64[128];
54-
extern const float32_t twiddleCoef_128[256];
55-
extern const float32_t twiddleCoef_256[512];
56-
extern const float32_t twiddleCoef_512[1024];
57-
extern const float32_t twiddleCoef_1024[2048];
58-
extern const float32_t twiddleCoef_2048[4096];
59-
extern const float32_t twiddleCoef_4096[8192];
60-
#define twiddleCoef twiddleCoef_4096
61-
extern const q31_t twiddleCoefQ31[6144];
62-
extern const q15_t twiddleCoefQ15[6144];
63-
extern const float32_t twiddleCoef_rfft_32[32];
64-
extern const float32_t twiddleCoef_rfft_64[64];
65-
extern const float32_t twiddleCoef_rfft_128[128];
66-
extern const float32_t twiddleCoef_rfft_256[256];
67-
extern const float32_t twiddleCoef_rfft_512[512];
68-
extern const float32_t twiddleCoef_rfft_1024[1024];
69-
extern const float32_t twiddleCoef_rfft_2048[2048];
70-
extern const float32_t twiddleCoef_rfft_4096[4096];
71-
72-
73-
#define ARMBITREVINDEXTABLE__16_TABLE_LENGTH ((uint16_t)20 )
74-
#define ARMBITREVINDEXTABLE__32_TABLE_LENGTH ((uint16_t)48 )
75-
#define ARMBITREVINDEXTABLE__64_TABLE_LENGTH ((uint16_t)56 )
76-
#define ARMBITREVINDEXTABLE_128_TABLE_LENGTH ((uint16_t)208 )
77-
#define ARMBITREVINDEXTABLE_256_TABLE_LENGTH ((uint16_t)440 )
78-
#define ARMBITREVINDEXTABLE_512_TABLE_LENGTH ((uint16_t)448 )
79-
#define ARMBITREVINDEXTABLE1024_TABLE_LENGTH ((uint16_t)1800)
80-
#define ARMBITREVINDEXTABLE2048_TABLE_LENGTH ((uint16_t)3808)
81-
#define ARMBITREVINDEXTABLE4096_TABLE_LENGTH ((uint16_t)4032)
82-
83-
extern const uint16_t armBitRevIndexTable16[ARMBITREVINDEXTABLE__16_TABLE_LENGTH];
84-
extern const uint16_t armBitRevIndexTable32[ARMBITREVINDEXTABLE__32_TABLE_LENGTH];
85-
extern const uint16_t armBitRevIndexTable64[ARMBITREVINDEXTABLE__64_TABLE_LENGTH];
86-
extern const uint16_t armBitRevIndexTable128[ARMBITREVINDEXTABLE_128_TABLE_LENGTH];
87-
extern const uint16_t armBitRevIndexTable256[ARMBITREVINDEXTABLE_256_TABLE_LENGTH];
88-
extern const uint16_t armBitRevIndexTable512[ARMBITREVINDEXTABLE_512_TABLE_LENGTH];
89-
extern const uint16_t armBitRevIndexTable1024[ARMBITREVINDEXTABLE1024_TABLE_LENGTH];
90-
extern const uint16_t armBitRevIndexTable2048[ARMBITREVINDEXTABLE2048_TABLE_LENGTH];
91-
extern const uint16_t armBitRevIndexTable4096[ARMBITREVINDEXTABLE4096_TABLE_LENGTH];
92-
93-
#endif /* ARM_COMMON_TABLES_H */
1+
/* ----------------------------------------------------------------------
2+
* Copyright (C) 2010-2013 ARM Limited. All rights reserved.
3+
*
4+
* $Date: 17. January 2013
5+
* $Revision: V1.4.1
6+
*
7+
* Project: CMSIS DSP Library
8+
* Title: arm_common_tables.h
9+
*
10+
* Description: This file has extern declaration for common tables like Bitreverse, reciprocal etc which are used across different functions
11+
*
12+
* Target Processor: Cortex-M4/Cortex-M3
13+
*
14+
* Redistribution and use in source and binary forms, with or without
15+
* modification, are permitted provided that the following conditions
16+
* are met:
17+
* - Redistributions of source code must retain the above copyright
18+
* notice, this list of conditions and the following disclaimer.
19+
* - Redistributions in binary form must reproduce the above copyright
20+
* notice, this list of conditions and the following disclaimer in
21+
* the documentation and/or other materials provided with the
22+
* distribution.
23+
* - Neither the name of ARM LIMITED nor the names of its contributors
24+
* may be used to endorse or promote products derived from this
25+
* software without specific prior written permission.
26+
*
27+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
28+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
29+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
30+
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
31+
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
32+
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
33+
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
34+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
35+
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
36+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
37+
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
38+
* POSSIBILITY OF SUCH DAMAGE.
39+
* -------------------------------------------------------------------- */
40+
41+
#ifndef _ARM_COMMON_TABLES_H
42+
#define _ARM_COMMON_TABLES_H
43+
44+
#include "arm_math.h"
45+
46+
extern const uint16_t armBitRevTable[1024];
47+
extern const q15_t armRecipTableQ15[64];
48+
extern const q31_t armRecipTableQ31[64];
49+
extern const q31_t realCoefAQ31[1024];
50+
extern const q31_t realCoefBQ31[1024];
51+
extern const float32_t twiddleCoef_16[32];
52+
extern const float32_t twiddleCoef_32[64];
53+
extern const float32_t twiddleCoef_64[128];
54+
extern const float32_t twiddleCoef_128[256];
55+
extern const float32_t twiddleCoef_256[512];
56+
extern const float32_t twiddleCoef_512[1024];
57+
extern const float32_t twiddleCoef_1024[2048];
58+
extern const float32_t twiddleCoef_2048[4096];
59+
extern const float32_t twiddleCoef_4096[8192];
60+
#define twiddleCoef twiddleCoef_4096
61+
extern const q31_t twiddleCoefQ31[6144];
62+
extern const q15_t twiddleCoefQ15[6144];
63+
extern const float32_t twiddleCoef_rfft_32[32];
64+
extern const float32_t twiddleCoef_rfft_64[64];
65+
extern const float32_t twiddleCoef_rfft_128[128];
66+
extern const float32_t twiddleCoef_rfft_256[256];
67+
extern const float32_t twiddleCoef_rfft_512[512];
68+
extern const float32_t twiddleCoef_rfft_1024[1024];
69+
extern const float32_t twiddleCoef_rfft_2048[2048];
70+
extern const float32_t twiddleCoef_rfft_4096[4096];
71+
72+
73+
#define ARMBITREVINDEXTABLE__16_TABLE_LENGTH ((uint16_t)20 )
74+
#define ARMBITREVINDEXTABLE__32_TABLE_LENGTH ((uint16_t)48 )
75+
#define ARMBITREVINDEXTABLE__64_TABLE_LENGTH ((uint16_t)56 )
76+
#define ARMBITREVINDEXTABLE_128_TABLE_LENGTH ((uint16_t)208 )
77+
#define ARMBITREVINDEXTABLE_256_TABLE_LENGTH ((uint16_t)440 )
78+
#define ARMBITREVINDEXTABLE_512_TABLE_LENGTH ((uint16_t)448 )
79+
#define ARMBITREVINDEXTABLE1024_TABLE_LENGTH ((uint16_t)1800)
80+
#define ARMBITREVINDEXTABLE2048_TABLE_LENGTH ((uint16_t)3808)
81+
#define ARMBITREVINDEXTABLE4096_TABLE_LENGTH ((uint16_t)4032)
82+
83+
extern const uint16_t armBitRevIndexTable16[ARMBITREVINDEXTABLE__16_TABLE_LENGTH];
84+
extern const uint16_t armBitRevIndexTable32[ARMBITREVINDEXTABLE__32_TABLE_LENGTH];
85+
extern const uint16_t armBitRevIndexTable64[ARMBITREVINDEXTABLE__64_TABLE_LENGTH];
86+
extern const uint16_t armBitRevIndexTable128[ARMBITREVINDEXTABLE_128_TABLE_LENGTH];
87+
extern const uint16_t armBitRevIndexTable256[ARMBITREVINDEXTABLE_256_TABLE_LENGTH];
88+
extern const uint16_t armBitRevIndexTable512[ARMBITREVINDEXTABLE_512_TABLE_LENGTH];
89+
extern const uint16_t armBitRevIndexTable1024[ARMBITREVINDEXTABLE1024_TABLE_LENGTH];
90+
extern const uint16_t armBitRevIndexTable2048[ARMBITREVINDEXTABLE2048_TABLE_LENGTH];
91+
extern const uint16_t armBitRevIndexTable4096[ARMBITREVINDEXTABLE4096_TABLE_LENGTH];
92+
93+
#endif /* ARM_COMMON_TABLES_H */

stmhal/cmsis/inc/arm_const_structs.h renamed to lib/cmsis/inc/arm_const_structs.h

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
1-
/* ----------------------------------------------------------------------
2-
* Copyright (C) 2010-2013 ARM Limited. All rights reserved.
3-
*
4-
* $Date: 17. January 2013
5-
* $Revision: V1.4.1
6-
*
7-
* Project: CMSIS DSP Library
8-
* Title: arm_const_structs.h
9-
*
10-
* Description: This file has constant structs that are initialized for
11-
* user convenience. For example, some can be given as
12-
* arguments to the arm_cfft_f32() function.
13-
*
14-
* Target Processor: Cortex-M4/Cortex-M3
15-
*
16-
* Redistribution and use in source and binary forms, with or without
17-
* modification, are permitted provided that the following conditions
18-
* are met:
19-
* - Redistributions of source code must retain the above copyright
20-
* notice, this list of conditions and the following disclaimer.
21-
* - Redistributions in binary form must reproduce the above copyright
22-
* notice, this list of conditions and the following disclaimer in
23-
* the documentation and/or other materials provided with the
24-
* distribution.
25-
* - Neither the name of ARM LIMITED nor the names of its contributors
26-
* may be used to endorse or promote products derived from this
27-
* software without specific prior written permission.
28-
*
29-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
30-
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
31-
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
32-
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
33-
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
34-
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
35-
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
36-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
37-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
38-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
39-
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
40-
* POSSIBILITY OF SUCH DAMAGE.
41-
* -------------------------------------------------------------------- */
42-
43-
#ifndef _ARM_CONST_STRUCTS_H
44-
#define _ARM_CONST_STRUCTS_H
45-
46-
#include "arm_math.h"
47-
#include "arm_common_tables.h"
48-
49-
const arm_cfft_instance_f32 arm_cfft_sR_f32_len16 = {
50-
16, twiddleCoef_16, armBitRevIndexTable16, ARMBITREVINDEXTABLE__16_TABLE_LENGTH
51-
};
52-
53-
const arm_cfft_instance_f32 arm_cfft_sR_f32_len32 = {
54-
32, twiddleCoef_32, armBitRevIndexTable32, ARMBITREVINDEXTABLE__32_TABLE_LENGTH
55-
};
56-
57-
const arm_cfft_instance_f32 arm_cfft_sR_f32_len64 = {
58-
64, twiddleCoef_64, armBitRevIndexTable64, ARMBITREVINDEXTABLE__64_TABLE_LENGTH
59-
};
60-
61-
const arm_cfft_instance_f32 arm_cfft_sR_f32_len128 = {
62-
128, twiddleCoef_128, armBitRevIndexTable128, ARMBITREVINDEXTABLE_128_TABLE_LENGTH
63-
};
64-
65-
const arm_cfft_instance_f32 arm_cfft_sR_f32_len256 = {
66-
256, twiddleCoef_256, armBitRevIndexTable256, ARMBITREVINDEXTABLE_256_TABLE_LENGTH
67-
};
68-
69-
const arm_cfft_instance_f32 arm_cfft_sR_f32_len512 = {
70-
512, twiddleCoef_512, armBitRevIndexTable512, ARMBITREVINDEXTABLE_512_TABLE_LENGTH
71-
};
72-
73-
const arm_cfft_instance_f32 arm_cfft_sR_f32_len1024 = {
74-
1024, twiddleCoef_1024, armBitRevIndexTable1024, ARMBITREVINDEXTABLE1024_TABLE_LENGTH
75-
};
76-
77-
const arm_cfft_instance_f32 arm_cfft_sR_f32_len2048 = {
78-
2048, twiddleCoef_2048, armBitRevIndexTable2048, ARMBITREVINDEXTABLE2048_TABLE_LENGTH
79-
};
80-
81-
const arm_cfft_instance_f32 arm_cfft_sR_f32_len4096 = {
82-
4096, twiddleCoef_4096, armBitRevIndexTable4096, ARMBITREVINDEXTABLE4096_TABLE_LENGTH
83-
};
84-
85-
#endif
1+
/* ----------------------------------------------------------------------
2+
* Copyright (C) 2010-2013 ARM Limited. All rights reserved.
3+
*
4+
* $Date: 17. January 2013
5+
* $Revision: V1.4.1
6+
*
7+
* Project: CMSIS DSP Library
8+
* Title: arm_const_structs.h
9+
*
10+
* Description: This file has constant structs that are initialized for
11+
* user convenience. For example, some can be given as
12+
* arguments to the arm_cfft_f32() function.
13+
*
14+
* Target Processor: Cortex-M4/Cortex-M3
15+
*
16+
* Redistribution and use in source and binary forms, with or without
17+
* modification, are permitted provided that the following conditions
18+
* are met:
19+
* - Redistributions of source code must retain the above copyright
20+
* notice, this list of conditions and the following disclaimer.
21+
* - Redistributions in binary form must reproduce the above copyright
22+
* notice, this list of conditions and the following disclaimer in
23+
* the documentation and/or other materials provided with the
24+
* distribution.
25+
* - Neither the name of ARM LIMITED nor the names of its contributors
26+
* may be used to endorse or promote products derived from this
27+
* software without specific prior written permission.
28+
*
29+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
30+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
31+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
32+
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
33+
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
34+
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
35+
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
36+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
37+
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
38+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
39+
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
40+
* POSSIBILITY OF SUCH DAMAGE.
41+
* -------------------------------------------------------------------- */
42+
43+
#ifndef _ARM_CONST_STRUCTS_H
44+
#define _ARM_CONST_STRUCTS_H
45+
46+
#include "arm_math.h"
47+
#include "arm_common_tables.h"
48+
49+
const arm_cfft_instance_f32 arm_cfft_sR_f32_len16 = {
50+
16, twiddleCoef_16, armBitRevIndexTable16, ARMBITREVINDEXTABLE__16_TABLE_LENGTH
51+
};
52+
53+
const arm_cfft_instance_f32 arm_cfft_sR_f32_len32 = {
54+
32, twiddleCoef_32, armBitRevIndexTable32, ARMBITREVINDEXTABLE__32_TABLE_LENGTH
55+
};
56+
57+
const arm_cfft_instance_f32 arm_cfft_sR_f32_len64 = {
58+
64, twiddleCoef_64, armBitRevIndexTable64, ARMBITREVINDEXTABLE__64_TABLE_LENGTH
59+
};
60+
61+
const arm_cfft_instance_f32 arm_cfft_sR_f32_len128 = {
62+
128, twiddleCoef_128, armBitRevIndexTable128, ARMBITREVINDEXTABLE_128_TABLE_LENGTH
63+
};
64+
65+
const arm_cfft_instance_f32 arm_cfft_sR_f32_len256 = {
66+
256, twiddleCoef_256, armBitRevIndexTable256, ARMBITREVINDEXTABLE_256_TABLE_LENGTH
67+
};
68+
69+
const arm_cfft_instance_f32 arm_cfft_sR_f32_len512 = {
70+
512, twiddleCoef_512, armBitRevIndexTable512, ARMBITREVINDEXTABLE_512_TABLE_LENGTH
71+
};
72+
73+
const arm_cfft_instance_f32 arm_cfft_sR_f32_len1024 = {
74+
1024, twiddleCoef_1024, armBitRevIndexTable1024, ARMBITREVINDEXTABLE1024_TABLE_LENGTH
75+
};
76+
77+
const arm_cfft_instance_f32 arm_cfft_sR_f32_len2048 = {
78+
2048, twiddleCoef_2048, armBitRevIndexTable2048, ARMBITREVINDEXTABLE2048_TABLE_LENGTH
79+
};
80+
81+
const arm_cfft_instance_f32 arm_cfft_sR_f32_len4096 = {
82+
4096, twiddleCoef_4096, armBitRevIndexTable4096, ARMBITREVINDEXTABLE4096_TABLE_LENGTH
83+
};
84+
85+
#endif

0 commit comments

Comments
 (0)