Skip to content

Commit fb3fe60

Browse files
SissorsSissors
committed
Put PeripheralPin constant values in .c files, definitions in .h
1 parent 67972d0 commit fb3fe60

File tree

4 files changed

+88
-56
lines changed

4 files changed

+88
-56
lines changed

‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/PeripheralPins.h

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/* mbed Microcontroller Library
2+
* Copyright (c) 2006-2013 ARM Limited
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
#ifndef MBED_PERIPHERALPINS_H
18+
#define MBED_PERIPHERALPINS_H
19+
20+
#include "pinmap.h"
21+
#include "PeripheralNames.h"
22+
23+
/************RTC***************/
24+
extern const PinMap PinMap_RTC[];
25+
26+
/************ADC***************/
27+
extern const PinMap PinMap_ADC[];
28+
29+
/************DAC***************/
30+
extern const PinMap PinMap_DAC[];
31+
32+
/************I2C***************/
33+
extern const PinMap PinMap_I2C_SDA[];
34+
extern const PinMap PinMap_I2C_SCL[];
35+
36+
/************UART***************/
37+
extern const PinMap PinMap_UART_TX[];
38+
extern const PinMap PinMap_UART_RX[];
39+
40+
/************SPI***************/
41+
extern const PinMap PinMap_SPI_SCLK[];
42+
extern const PinMap PinMap_SPI_MOSI[];
43+
extern const PinMap PinMap_SPI_MISO[];
44+
extern const PinMap PinMap_SPI_SSEL[];
45+
46+
/************PWM***************/
47+
extern const PinMap PinMap_PWM[];
48+
49+
#endif

‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/PeripheralPins.h renamed to ‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/PeripheralPins.c

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,16 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
17-
#ifndef MBED_PERIPHERALPINS_H
18-
#define MBED_PERIPHERALPINS_H
1916

20-
#include "pinmap.h"
21-
#include "PeripheralNames.h"
17+
#include "PeripheralPins.h"
2218

2319
/************RTC***************/
24-
static const PinMap PinMap_RTC[] = {
20+
const PinMap PinMap_RTC[] = {
2521
{NC, OSC32KCLK, 0},
2622
};
2723

2824
/************ADC***************/
29-
static const PinMap PinMap_ADC[] = {
25+
const PinMap PinMap_ADC[] = {
3026
/* A0-A5 pins */
3127
{PTA0, ADC0_SE12, 0},
3228
{PTA8, ADC0_SE3, 0},
@@ -47,55 +43,55 @@ static const PinMap PinMap_ADC[] = {
4743
};
4844

4945
/************DAC***************/
50-
static const PinMap PinMap_DAC[] = {
46+
const PinMap PinMap_DAC[] = {
5147
{PTB1, DAC_0, 0},
5248
{NC , NC , 0}
5349
};
5450

5551
/************I2C***************/
56-
static const PinMap PinMap_I2C_SDA[] = {
52+
const PinMap PinMap_I2C_SDA[] = {
5753
{PTB4, I2C_0, 2},
5854
{NC , NC , 0}
5955
};
6056

61-
static const PinMap PinMap_I2C_SCL[] = {
57+
const PinMap PinMap_I2C_SCL[] = {
6258
{PTB3, I2C_0, 2},
6359
{NC , NC , 0}
6460
};
6561
/************UART***************/
66-
static const PinMap PinMap_UART_TX[] = {
62+
const PinMap PinMap_UART_TX[] = {
6763
{PTB1, UART_0, 2},
6864
{NC , NC , 0}
6965
};
7066

71-
static const PinMap PinMap_UART_RX[] = {
67+
const PinMap PinMap_UART_RX[] = {
7268
{PTB2, UART_0, 2},
7369
{NC , NC , 0}
7470
};
7571

7672
/************SPI***************/
77-
static const PinMap PinMap_SPI_SCLK[] = {
73+
const PinMap PinMap_SPI_SCLK[] = {
7874
{PTB0, SPI_0, 3},
7975
{NC , NC , 0}
8076
};
8177

82-
static const PinMap PinMap_SPI_MOSI[] = {
78+
const PinMap PinMap_SPI_MOSI[] = {
8379
{PTA7, SPI_0, 3},
8480
{NC , NC , 0}
8581
};
8682

87-
static const PinMap PinMap_SPI_MISO[] = {
83+
const PinMap PinMap_SPI_MISO[] = {
8884
{PTA6, SPI_0, 3},
8985
{NC , NC , 0}
9086
};
9187

92-
static const PinMap PinMap_SPI_SSEL[] = {
88+
const PinMap PinMap_SPI_SSEL[] = {
9389
{PTA5, SPI_0, 3},
9490
{NC , NC , 0}
9591
};
9692

9793
/************PWM***************/
98-
static const PinMap PinMap_PWM[] = {
94+
const PinMap PinMap_PWM[] = {
9995
// LEDs
10096
{LED_RED , PWM_4 , 2}, // PTB8 , TPM0 CH3
10197
{LED_GREEN, PWM_3, 2}, // PTB9 , TPM0 CH2
@@ -113,4 +109,3 @@ static const PinMap PinMap_PWM[] = {
113109
{NC , NC , 0}
114110
};
115111

116-
#endif

‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/PeripheralPins.h renamed to ‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/PeripheralPins.c

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,15 @@
1515
* limitations under the License.
1616
*/
1717

18-
#ifndef MBED_PERIPHERALPINS_H
19-
#define MBED_PERIPHERALPINS_H
20-
21-
#include "pinmap.h"
22-
#include "PeripheralNames.h"
18+
#include "PeripheralPins.h"
2319

2420
/************RTC***************/
25-
static const PinMap PinMap_RTC[] = {
21+
const PinMap PinMap_RTC[] = {
2622
{PTC1, RTC_CLKIN, 2},
2723
};
2824

2925
/************ADC***************/
30-
static const PinMap PinMap_ADC[] = {
26+
const PinMap PinMap_ADC[] = {
3127
{PTE20, ADC0_SE0, 0},
3228
{PTE22, ADC0_SE3, 0},
3329
{PTE21, ADC0_SE4a, 0},
@@ -48,13 +44,13 @@ static const PinMap PinMap_ADC[] = {
4844
};
4945

5046
/************DAC***************/
51-
static const PinMap PinMap_DAC[] = {
47+
const PinMap PinMap_DAC[] = {
5248
{PTE30, DAC_0, 0},
5349
{NC , NC , 0}
5450
};
5551

5652
/************I2C***************/
57-
static const PinMap PinMap_I2C_SDA[] = {
53+
const PinMap PinMap_I2C_SDA[] = {
5854
{PTE25, I2C_0, 5},
5955
{PTC9, I2C_0, 2},
6056
{PTE0, I2C_1, 6},
@@ -66,7 +62,7 @@ static const PinMap PinMap_I2C_SDA[] = {
6662
{NC , NC , 0}
6763
};
6864

69-
static const PinMap PinMap_I2C_SCL[] = {
65+
const PinMap PinMap_I2C_SCL[] = {
7066
{PTE24, I2C_0, 5},
7167
{PTC8, I2C_0, 2},
7268
{PTE1, I2C_1, 6},
@@ -78,7 +74,7 @@ static const PinMap PinMap_I2C_SCL[] = {
7874
};
7975

8076
/************UART***************/
81-
static const PinMap PinMap_UART_TX[] = {
77+
const PinMap PinMap_UART_TX[] = {
8278
{PTC4, UART_1, 3},
8379
{PTA2, UART_0, 2},
8480
{PTD5, UART_2, 3},
@@ -90,7 +86,7 @@ static const PinMap PinMap_UART_TX[] = {
9086
{NC , NC , 0}
9187
};
9288

93-
static const PinMap PinMap_UART_RX[] = {
89+
const PinMap PinMap_UART_RX[] = {
9490
{PTC3, UART_1, 3},
9591
{PTA1, UART_0, 2},
9692
{PTD4, UART_2, 3},
@@ -103,7 +99,7 @@ static const PinMap PinMap_UART_RX[] = {
10399
};
104100

105101
/************SPI***************/
106-
static const PinMap PinMap_SPI_SCLK[] = {
102+
const PinMap PinMap_SPI_SCLK[] = {
107103
{PTA15, SPI_0, 2},
108104
{PTB11, SPI_1, 2},
109105
{PTC5, SPI_0, 2},
@@ -113,7 +109,7 @@ static const PinMap PinMap_SPI_SCLK[] = {
113109
{NC , NC , 0}
114110
};
115111

116-
static const PinMap PinMap_SPI_MOSI[] = {
112+
const PinMap PinMap_SPI_MOSI[] = {
117113
{PTA16, SPI_0, 2},
118114
{PTA17, SPI_0, 5},
119115
{PTB16, SPI_1, 2},
@@ -129,7 +125,7 @@ static const PinMap PinMap_SPI_MOSI[] = {
129125
{NC , NC , 0}
130126
};
131127

132-
static const PinMap PinMap_SPI_MISO[] = {
128+
const PinMap PinMap_SPI_MISO[] = {
133129
{PTA16, SPI_0, 5},
134130
{PTA17, SPI_0, 2},
135131
{PTB16, SPI_1, 5},
@@ -145,7 +141,7 @@ static const PinMap PinMap_SPI_MISO[] = {
145141
{NC , NC , 0}
146142
};
147143

148-
static const PinMap PinMap_SPI_SSEL[] = {
144+
const PinMap PinMap_SPI_SSEL[] = {
149145
{PTA14, SPI_0, 2},
150146
{PTB10, SPI_1, 2},
151147
{PTC4, SPI_0, 2},
@@ -156,7 +152,7 @@ static const PinMap PinMap_SPI_SSEL[] = {
156152
};
157153

158154
/************PWM***************/
159-
static const PinMap PinMap_PWM[] = {
155+
const PinMap PinMap_PWM[] = {
160156
// LEDs
161157
{LED_RED , PWM_9 , 3}, // PTB18, TPM2 CH0
162158
{LED_GREEN, PWM_10, 3}, // PTB19, TPM2 CH1
@@ -200,5 +196,3 @@ static const PinMap PinMap_PWM[] = {
200196

201197
{NC , NC , 0}
202198
};
203-
204-
#endif

‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PeripheralPins.h renamed to ‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PeripheralPins.c

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef MBED_PERIPHERALPINS_H
18-
#define MBED_PERIPHERALPINS_H
19-
20-
#include "pinmap.h"
21-
#include "PeripheralNames.h"
17+
#include "PeripheralPins.h"
2218

2319
/************RTC***************/
24-
static const PinMap PinMap_RTC[] = {
20+
const PinMap PinMap_RTC[] = {
2521
{PTC1, RTC_CLKIN, 2},
2622
};
2723

2824
/************ADC***************/
29-
static const PinMap PinMap_ADC[] = {
25+
const PinMap PinMap_ADC[] = {
3026
{PTE20, ADC0_SE0, 0},
3127
{PTE22, ADC0_SE3, 0},
3228
{PTE21, ADC0_SE4a, 0},
@@ -47,13 +43,13 @@ static const PinMap PinMap_ADC[] = {
4743
};
4844

4945
/************DAC***************/
50-
static const PinMap PinMap_DAC[] = {
46+
const PinMap PinMap_DAC[] = {
5147
{PTE30, DAC_0, 0},
5248
{NC , NC , 0}
5349
};
5450

5551
/************I2C***************/
56-
static const PinMap PinMap_I2C_SDA[] = {
52+
const PinMap PinMap_I2C_SDA[] = {
5753
{PTE25, I2C_0, 5},
5854
{PTC9, I2C_0, 2},
5955
{PTE0, I2C_1, 6},
@@ -65,7 +61,7 @@ static const PinMap PinMap_I2C_SDA[] = {
6561
{NC , NC , 0}
6662
};
6763

68-
static const PinMap PinMap_I2C_SCL[] = {
64+
const PinMap PinMap_I2C_SCL[] = {
6965
{PTE24, I2C_0, 5},
7066
{PTC8, I2C_0, 2},
7167
{PTE1, I2C_1, 6},
@@ -77,7 +73,7 @@ static const PinMap PinMap_I2C_SCL[] = {
7773
};
7874

7975
/************UART***************/
80-
static const PinMap PinMap_UART_TX[] = {
76+
const PinMap PinMap_UART_TX[] = {
8177
{PTA2, UART_0, 2},
8278
{PTA14, UART_0, 3},
8379
{PTC4, UART_1, 3},
@@ -91,7 +87,7 @@ static const PinMap PinMap_UART_TX[] = {
9187
{NC , NC , 0}
9288
};
9389

94-
static const PinMap PinMap_UART_RX[] = {
90+
const PinMap PinMap_UART_RX[] = {
9591
{PTA1, UART_0, 2},
9692
{PTA15, UART_0, 3},
9793
{PTC3, UART_1, 3},
@@ -106,7 +102,7 @@ static const PinMap PinMap_UART_RX[] = {
106102
};
107103

108104
/************SPI***************/
109-
static const PinMap PinMap_SPI_SCLK[] = {
105+
const PinMap PinMap_SPI_SCLK[] = {
110106
{PTA15, SPI_0, 2},
111107
{PTB9, SPI_1, 2},
112108
{PTB11, SPI_1, 2},
@@ -118,7 +114,7 @@ static const PinMap PinMap_SPI_SCLK[] = {
118114
{NC , NC , 0}
119115
};
120116

121-
static const PinMap PinMap_SPI_MOSI[] = {
117+
const PinMap PinMap_SPI_MOSI[] = {
122118
{PTA16, SPI_0, 2},
123119
{PTA17, SPI_0, 5},
124120
{PTB16, SPI_1, 2},
@@ -136,7 +132,7 @@ static const PinMap PinMap_SPI_MOSI[] = {
136132
{NC , NC , 0}
137133
};
138134

139-
static const PinMap PinMap_SPI_MISO[] = {
135+
const PinMap PinMap_SPI_MISO[] = {
140136
{PTA16, SPI_0, 5},
141137
{PTA17, SPI_0, 2},
142138
{PTB16, SPI_1, 5},
@@ -154,7 +150,7 @@ static const PinMap PinMap_SPI_MISO[] = {
154150
{NC , NC , 0}
155151
};
156152

157-
static const PinMap PinMap_SPI_SSEL[] = {
153+
const PinMap PinMap_SPI_SSEL[] = {
158154
{PTA14, SPI_0, 2},
159155
{PTB10, SPI_1, 2},
160156
{PTC4, SPI_0, 2},
@@ -166,7 +162,7 @@ static const PinMap PinMap_SPI_SSEL[] = {
166162
};
167163

168164
/************PWM***************/
169-
static const PinMap PinMap_PWM[] = {
165+
const PinMap PinMap_PWM[] = {
170166
// LEDs - only RED pin is PWM capable
171167
{LED_RED, PWM_3, 3}, // PTE29, TPM0 CH2
172168

@@ -211,5 +207,3 @@ static const PinMap PinMap_PWM[] = {
211207

212208
{NC , NC , 0}
213209
};
214-
215-
#endif

0 commit comments

Comments
 (0)