Skip to content

Commit 1658349

Browse files
steinerphilippsteinerphilipp
committed
Replace __attribute__((weak)) with MBED_WEAK
1 parent a8dcf52 commit 1658349

File tree

10 files changed

+105
-105
lines changed

10 files changed

+105
-105
lines changed

‎targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG/PeripheralPins.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
/************ADC***************/
2727
/* The third "function" value is used to select the correct ADC channel */
28-
const PinMap __attribute__((weak)) PinMap_ADC[] = {
28+
const PinMap MBED_WEAK PinMap_ADC[] = {
2929
#ifdef ADC0_BASE
3030
{PD0, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH0},
3131
{PD1, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH1},
@@ -40,7 +40,7 @@ const PinMap __attribute__((weak)) PinMap_ADC[] = {
4040
};
4141

4242
/************DAC***************/
43-
const PinMap __attribute__((weak)) PinMap_DAC[] = {
43+
const PinMap MBED_WEAK PinMap_DAC[] = {
4444
#ifdef DAC0_BASE
4545
{PB11, DAC_0, 0},
4646
{PB12, DAC_0, 1},
@@ -49,7 +49,7 @@ const PinMap __attribute__((weak)) PinMap_DAC[] = {
4949
};
5050

5151
/************I2C SCL***********/
52-
const PinMap __attribute__((weak)) PinMap_I2C_SCL[] = {
52+
const PinMap MBED_WEAK PinMap_I2C_SCL[] = {
5353
#ifdef I2C0_BASE
5454
/* I2C0 */
5555
{PA1, I2C_0, 0},
@@ -71,7 +71,7 @@ const PinMap __attribute__((weak)) PinMap_I2C_SCL[] = {
7171
};
7272

7373
/************I2C SDA***********/
74-
const PinMap __attribute__((weak)) PinMap_I2C_SDA[] = {
74+
const PinMap MBED_WEAK PinMap_I2C_SDA[] = {
7575
#ifdef I2C0_BASE
7676
/* I2C0 */
7777
{PA0, I2C_0, 0},
@@ -93,7 +93,7 @@ const PinMap __attribute__((weak)) PinMap_I2C_SDA[] = {
9393
};
9494

9595
/************PWM***************/
96-
const PinMap __attribute__((weak)) PinMap_PWM[] = {
96+
const PinMap MBED_WEAK PinMap_PWM[] = {
9797
#if defined(TIMER_ROUTE_CC0PEN) || defined(TIMER_ROUTEPEN_CC0PEN)
9898
/* PWM0 */
9999
{PA8, PWM_CH0, 0},
@@ -116,7 +116,7 @@ const PinMap __attribute__((weak)) PinMap_PWM[] = {
116116
};
117117

118118
/*************SPI**************/
119-
const PinMap __attribute__((weak)) PinMap_SPI_MOSI[] = {
119+
const PinMap MBED_WEAK PinMap_SPI_MOSI[] = {
120120
#ifdef USART0_BASE
121121
/* USART0 */
122122
{PE10, SPI_0, 0},
@@ -138,7 +138,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_MOSI[] = {
138138
{NC , NC , NC}
139139
};
140140

141-
const PinMap __attribute__((weak)) PinMap_SPI_MISO[] = {
141+
const PinMap MBED_WEAK PinMap_SPI_MISO[] = {
142142
#ifdef USART0_BASE
143143
/* USART0 */
144144
{PE11, SPI_0, 0},
@@ -160,7 +160,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_MISO[] = {
160160
{NC , NC , NC}
161161
};
162162

163-
const PinMap __attribute__((weak)) PinMap_SPI_CLK[] = {
163+
const PinMap MBED_WEAK PinMap_SPI_CLK[] = {
164164
#ifdef USART0_BASE
165165
/* USART0 */
166166
{PE12, SPI_0, 0},
@@ -182,7 +182,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_CLK[] = {
182182
{NC , NC , NC}
183183
};
184184

185-
const PinMap __attribute__((weak)) PinMap_SPI_CS[] = {
185+
const PinMap MBED_WEAK PinMap_SPI_CS[] = {
186186
#ifdef USART0_BASE
187187
/* USART0 */
188188
{PE13, SPI_0, 0},
@@ -205,7 +205,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_CS[] = {
205205
};
206206

207207
/************UART**************/
208-
const PinMap __attribute__((weak)) PinMap_UART_TX[] = {
208+
const PinMap MBED_WEAK PinMap_UART_TX[] = {
209209
#ifdef UART0_BASE
210210
/* UART0 */
211211
{PF6, UART_0, 0},
@@ -253,7 +253,7 @@ const PinMap __attribute__((weak)) PinMap_UART_TX[] = {
253253
{NC , NC , NC}
254254
};
255255

256-
const PinMap __attribute__((weak)) PinMap_UART_RX[] = {
256+
const PinMap MBED_WEAK PinMap_UART_RX[] = {
257257
#ifdef UART0_BASE
258258
/* UART0 */
259259
{PF7, UART_0, 0},

‎targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG11/PeripheralPins.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/************ADC***************/
2727
/* The third "function" value is used to select the correct ADC channel */
2828
#if DEVICE_ANALOGIN
29-
const PinMap __attribute__((weak)) PinMap_ADC[] = {
29+
const PinMap MBED_WEAK PinMap_ADC[] = {
3030
#if ADC0_BASE
3131
{PA0, ADC_0, adcPosSelAPORT3XCH8},
3232
{PA1, ADC_0, adcPosSelAPORT4XCH9},
@@ -70,7 +70,7 @@ const PinMap __attribute__((weak)) PinMap_ADC[] = {
7070

7171
/************I2C SCL***********/
7272
#if DEVICE_I2C
73-
const PinMap __attribute__((weak)) PinMap_I2C_SCL[] = {
73+
const PinMap MBED_WEAK PinMap_I2C_SCL[] = {
7474
/* I2C0 */
7575
#ifdef I2C0_BASE
7676
{PA1, I2C_0, 0},
@@ -106,7 +106,7 @@ const PinMap __attribute__((weak)) PinMap_I2C_SCL[] = {
106106
};
107107

108108
/************I2C SDA***********/
109-
const PinMap __attribute__((weak)) PinMap_I2C_SDA[] = {
109+
const PinMap MBED_WEAK PinMap_I2C_SDA[] = {
110110
/* I2C0 */
111111
#ifdef I2C0_BASE
112112
{PA0, I2C_0, 0},
@@ -146,7 +146,7 @@ const PinMap __attribute__((weak)) PinMap_I2C_SDA[] = {
146146

147147
/************PWM***************/
148148
#if DEVICE_PWMOUT
149-
const PinMap __attribute__((weak)) PinMap_PWM[] = {
149+
const PinMap MBED_WEAK PinMap_PWM[] = {
150150
{PC13, PWM_CH0, 0},
151151
{PE10, PWM_CH0, 1},
152152
{PB0, PWM_CH0, 2},
@@ -189,7 +189,7 @@ const PinMap __attribute__((weak)) PinMap_PWM[] = {
189189

190190
/*************SPI**************/
191191
#if DEVICE_SPI
192-
const PinMap __attribute__((weak)) PinMap_SPI_MOSI[] = {
192+
const PinMap MBED_WEAK PinMap_SPI_MOSI[] = {
193193
#ifdef USART0_BASE
194194
{PE10, SPI_0, 0},
195195
{PE7, SPI_0, 1},
@@ -245,7 +245,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_MOSI[] = {
245245
{NC , NC , NC}
246246
};
247247

248-
const PinMap __attribute__((weak)) PinMap_SPI_MISO[] = {
248+
const PinMap MBED_WEAK PinMap_SPI_MISO[] = {
249249
#ifdef USART0_BASE
250250
{PE11, SPI_0, 0},
251251
{PE6, SPI_0, 1},
@@ -301,7 +301,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_MISO[] = {
301301
{NC , NC , NC}
302302
};
303303

304-
const PinMap __attribute__((weak)) PinMap_SPI_CLK[] = {
304+
const PinMap MBED_WEAK PinMap_SPI_CLK[] = {
305305
#ifdef USART0_BASE
306306
/* USART0 */
307307
{PE12, SPI_0, 0},
@@ -358,7 +358,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_CLK[] = {
358358
{NC , NC , NC}
359359
};
360360

361-
const PinMap __attribute__((weak)) PinMap_SPI_CS[] = {
361+
const PinMap MBED_WEAK PinMap_SPI_CS[] = {
362362
#ifdef USART0_BASE
363363
/* USART0 */
364364
{PE13, SPI_0, 0},
@@ -416,7 +416,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_CS[] = {
416416
};
417417

418418
/************UART**************/
419-
const PinMap __attribute__((weak)) PinMap_UART_TX[] = {
419+
const PinMap MBED_WEAK PinMap_UART_TX[] = {
420420
#ifdef USART0_BASE
421421
{PE10, USART_0, 0},
422422
{PE7, USART_0, 1},
@@ -474,7 +474,7 @@ const PinMap __attribute__((weak)) PinMap_UART_TX[] = {
474474
#endif
475475

476476
#if DEVICE_SERIAL
477-
const PinMap __attribute__((weak)) PinMap_UART_RX[] = {
477+
const PinMap MBED_WEAK PinMap_UART_RX[] = {
478478
#ifdef USART0_BASE
479479
{PE11, USART_0, 0},
480480
{PE6, USART_0, 1},
@@ -532,7 +532,7 @@ const PinMap __attribute__((weak)) PinMap_UART_RX[] = {
532532
#endif
533533

534534
#if DEVICE_CAN
535-
const PinMap __attribute__((weak)) PinMap_CAN_TX[] = {
535+
const PinMap MBED_WEAK PinMap_CAN_TX[] = {
536536
#ifdef CAN0_BASE
537537
{PC1, CAN_0, 0},
538538
{PF2, CAN_0, 1},
@@ -555,7 +555,7 @@ const PinMap __attribute__((weak)) PinMap_CAN_TX[] = {
555555
#endif
556556
};
557557

558-
const PinMap __attribute__((weak)) PinMap_CAN_RX[] = {
558+
const PinMap MBED_WEAK PinMap_CAN_RX[] = {
559559
#ifdef CAN0_BASE
560560
{PC0, CAN_0, 0},
561561
{PF0, CAN_0, 1},

‎targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32HG/PeripheralPins.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "PeripheralPins.h"
2525

2626
/************ADC***************/
27-
const PinMap __attribute__((weak)) PinMap_ADC[] = {
27+
const PinMap MBED_WEAK PinMap_ADC[] = {
2828
#ifdef ADC0_BASE
2929
{PD4, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH4},
3030
{PD5, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH5},
@@ -35,7 +35,7 @@ const PinMap __attribute__((weak)) PinMap_ADC[] = {
3535
};
3636

3737
/************I2C SCL***********/
38-
const PinMap __attribute__((weak)) PinMap_I2C_SCL[] = {
38+
const PinMap MBED_WEAK PinMap_I2C_SCL[] = {
3939
#ifdef I2C0_BASE
4040
/* I2C0 */
4141
{PA1, I2C_0, 0},
@@ -49,7 +49,7 @@ const PinMap __attribute__((weak)) PinMap_I2C_SCL[] = {
4949
};
5050

5151
/************I2C SDA***********/
52-
const PinMap __attribute__((weak)) PinMap_I2C_SDA[] = {
52+
const PinMap MBED_WEAK PinMap_I2C_SDA[] = {
5353
#ifdef I2C0_BASE
5454
/* I2C0 */
5555
{PA0, I2C_0, 0},
@@ -62,7 +62,7 @@ const PinMap __attribute__((weak)) PinMap_I2C_SDA[] = {
6262
{NC , NC , NC}
6363
};
6464
/************PWM***************/
65-
const PinMap __attribute__((weak)) PinMap_PWM[] = {
65+
const PinMap MBED_WEAK PinMap_PWM[] = {
6666
#if defined(TIMER_ROUTE_CC0PEN) || defined(TIMER_ROUTEPEN_CC0PEN)
6767
/* PWM0 */
6868
{PA0, PWM_CH0, 0},
@@ -82,7 +82,7 @@ const PinMap __attribute__((weak)) PinMap_PWM[] = {
8282
};
8383

8484
/*************SPI**************/
85-
const PinMap __attribute__((weak)) PinMap_SPI_MOSI[] = {
85+
const PinMap MBED_WEAK PinMap_SPI_MOSI[] = {
8686
#ifdef USART0_BASE
8787
/* USART0 */
8888
{PE10, SPI_0, 0},
@@ -100,7 +100,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_MOSI[] = {
100100
{NC , NC , NC}
101101
};
102102

103-
const PinMap __attribute__((weak)) PinMap_SPI_MISO[] = {
103+
const PinMap MBED_WEAK PinMap_SPI_MISO[] = {
104104
#ifdef USART0_BASE
105105
/* USART0 */
106106
{PE11, SPI_0, 0},
@@ -118,7 +118,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_MISO[] = {
118118
{NC , NC , NC}
119119
};
120120

121-
const PinMap __attribute__((weak)) PinMap_SPI_CLK[] = {
121+
const PinMap MBED_WEAK PinMap_SPI_CLK[] = {
122122
#ifdef USART0_BASE
123123
/* USART0 */
124124
{PE12, SPI_0, 0},
@@ -136,7 +136,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_CLK[] = {
136136
{NC , NC , NC}
137137
};
138138

139-
const PinMap __attribute__((weak)) PinMap_SPI_CS[] = {
139+
const PinMap MBED_WEAK PinMap_SPI_CS[] = {
140140
#ifdef USART0_BASE
141141
/* USART0 */
142142
{PE13, SPI_0, 0},
@@ -154,7 +154,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_CS[] = {
154154
};
155155

156156
/************UART**************/
157-
const PinMap __attribute__((weak)) PinMap_UART_TX[] = {
157+
const PinMap MBED_WEAK PinMap_UART_TX[] = {
158158
#ifdef USART0_BASE
159159
/* USART0 */
160160
{PE10, USART_0, 0},
@@ -179,7 +179,7 @@ const PinMap __attribute__((weak)) PinMap_UART_TX[] = {
179179
{NC , NC , NC}
180180
};
181181

182-
const PinMap __attribute__((weak)) PinMap_UART_RX[] = {
182+
const PinMap MBED_WEAK PinMap_UART_RX[] = {
183183
#ifdef USART0_BASE
184184
/* USART0 */
185185
{PE11, USART_0, 0},

‎targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG/PeripheralPins.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
/************ADC***************/
2727
/* The third "function" value is used to select the correct ADC channel */
28-
const PinMap __attribute__((weak)) PinMap_ADC[] = {
28+
const PinMap MBED_WEAK PinMap_ADC[] = {
2929
#ifdef ADC0_BASE
3030
{PD0, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH0},
3131
{PD1, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH1},
@@ -40,7 +40,7 @@ const PinMap __attribute__((weak)) PinMap_ADC[] = {
4040
};
4141

4242
/************DAC***************/
43-
const PinMap __attribute__((weak)) PinMap_DAC[] = {
43+
const PinMap MBED_WEAK PinMap_DAC[] = {
4444
#ifdef DAC0_BASE
4545
{PB11, DAC_0, 0},
4646
{PB12, DAC_0, 1},
@@ -49,7 +49,7 @@ const PinMap __attribute__((weak)) PinMap_DAC[] = {
4949
};
5050

5151
/************I2C SCL***********/
52-
const PinMap __attribute__((weak)) PinMap_I2C_SCL[] = {
52+
const PinMap MBED_WEAK PinMap_I2C_SCL[] = {
5353
#ifdef I2C0_BASE
5454
/* I2C0 */
5555
{PA1, I2C_0, 0},
@@ -71,7 +71,7 @@ const PinMap __attribute__((weak)) PinMap_I2C_SCL[] = {
7171
};
7272

7373
/************I2C SDA***********/
74-
const PinMap __attribute__((weak)) PinMap_I2C_SDA[] = {
74+
const PinMap MBED_WEAK PinMap_I2C_SDA[] = {
7575
#ifdef I2C0_BASE
7676
/* I2C0 */
7777
{PA0, I2C_0, 0},
@@ -93,7 +93,7 @@ const PinMap __attribute__((weak)) PinMap_I2C_SDA[] = {
9393
};
9494

9595
/************PWM***************/
96-
const PinMap __attribute__((weak)) PinMap_PWM[] = {
96+
const PinMap MBED_WEAK PinMap_PWM[] = {
9797
#if defined(TIMER_ROUTE_CC0PEN) || defined(TIMER_ROUTEPEN_CC0PEN)
9898
/* PWM0 */
9999
{PA8, PWM_CH0, 0},
@@ -116,7 +116,7 @@ const PinMap __attribute__((weak)) PinMap_PWM[] = {
116116
};
117117

118118
/*************SPI**************/
119-
const PinMap __attribute__((weak)) PinMap_SPI_MOSI[] = {
119+
const PinMap MBED_WEAK PinMap_SPI_MOSI[] = {
120120
#ifdef USART0_BASE
121121
/* USART0 */
122122
{PE10, SPI_0, 0},
@@ -138,7 +138,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_MOSI[] = {
138138
{NC , NC , NC}
139139
};
140140

141-
const PinMap __attribute__((weak)) PinMap_SPI_MISO[] = {
141+
const PinMap MBED_WEAK PinMap_SPI_MISO[] = {
142142
#ifdef USART0_BASE
143143
/* USART0 */
144144
{PE11, SPI_0, 0},
@@ -160,7 +160,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_MISO[] = {
160160
{NC , NC , NC}
161161
};
162162

163-
const PinMap __attribute__((weak)) PinMap_SPI_CLK[] = {
163+
const PinMap MBED_WEAK PinMap_SPI_CLK[] = {
164164
#ifdef USART0_BASE
165165
/* USART0 */
166166
{PE12, SPI_0, 0},
@@ -182,7 +182,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_CLK[] = {
182182
{NC , NC , NC}
183183
};
184184

185-
const PinMap __attribute__((weak)) PinMap_SPI_CS[] = {
185+
const PinMap MBED_WEAK PinMap_SPI_CS[] = {
186186
#ifdef USART0_BASE
187187
/* USART0 */
188188
{PE13, SPI_0, 0},
@@ -205,7 +205,7 @@ const PinMap __attribute__((weak)) PinMap_SPI_CS[] = {
205205
};
206206

207207
/************UART**************/
208-
const PinMap __attribute__((weak)) PinMap_UART_TX[] = {
208+
const PinMap MBED_WEAK PinMap_UART_TX[] = {
209209
#ifdef UART0_BASE
210210
/* UART0 */
211211
{PF6, UART_0, 0},
@@ -253,7 +253,7 @@ const PinMap __attribute__((weak)) PinMap_UART_TX[] = {
253253
{NC , NC , NC}
254254
};
255255

256-
const PinMap __attribute__((weak)) PinMap_UART_RX[] = {
256+
const PinMap MBED_WEAK PinMap_UART_RX[] = {
257257
#ifdef UART0_BASE
258258
/* UART0 */
259259
{PF7, UART_0, 0},

0 commit comments

Comments
 (0)