Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EFM32: fix weak PeripheralPins configuration #7491

Merged
merged 5 commits into from
Jul 20, 2018
Merged

EFM32: fix weak PeripheralPins configuration #7491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95d78df
EFM32 Make PeripheralPins.c configuration tables weakly defined to be…
steinerphilipp Jul 12, 2018
a8dcf52
Make PeripheralPins.c configuration tables weakly defined to be overr…
steinerphilipp Jul 16, 2018
1658349
Replace __attribute__((weak)) with MBED_WEAK
steinerphilipp Jul 16, 2018
de266d8
Added missing include.
steinerphilipp Jul 16, 2018
804edd5
Place "MBED_WEAK" for IAR-Toolchain before the type.
steinerphilipp Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG/PeripheralPins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
******************************************************************************/

#include "PeripheralPins.h"
#include "mbed_toolchain.h"

/************ADC***************/
/* The third "function" value is used to select the correct ADC channel */
const PinMap PinMap_ADC[] = {
MBED_WEAK const PinMap PinMap_ADC[] = {
#ifdef ADC0_BASE
{PD0, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH0},
{PD1, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH1},
Expand All @@ -40,7 +41,7 @@ const PinMap PinMap_ADC[] = {
};

/************DAC***************/
const PinMap PinMap_DAC[] = {
MBED_WEAK const PinMap PinMap_DAC[] = {
#ifdef DAC0_BASE
{PB11, DAC_0, 0},
{PB12, DAC_0, 1},
Expand All @@ -49,7 +50,7 @@ const PinMap PinMap_DAC[] = {
};

/************I2C SCL***********/
const PinMap PinMap_I2C_SCL[] = {
MBED_WEAK const PinMap PinMap_I2C_SCL[] = {
#ifdef I2C0_BASE
/* I2C0 */
{PA1, I2C_0, 0},
Expand All @@ -71,7 +72,7 @@ const PinMap PinMap_I2C_SCL[] = {
};

/************I2C SDA***********/
const PinMap PinMap_I2C_SDA[] = {
MBED_WEAK const PinMap PinMap_I2C_SDA[] = {
#ifdef I2C0_BASE
/* I2C0 */
{PA0, I2C_0, 0},
Expand All @@ -93,7 +94,7 @@ const PinMap PinMap_I2C_SDA[] = {
};

/************PWM***************/
const PinMap PinMap_PWM[] = {
MBED_WEAK const PinMap PinMap_PWM[] = {
#if defined(TIMER_ROUTE_CC0PEN) || defined(TIMER_ROUTEPEN_CC0PEN)
/* PWM0 */
{PA8, PWM_CH0, 0},
Expand All @@ -116,7 +117,7 @@ const PinMap PinMap_PWM[] = {
};

/*************SPI**************/
const PinMap PinMap_SPI_MOSI[] = {
MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
#ifdef USART0_BASE
/* USART0 */
{PE10, SPI_0, 0},
Expand All @@ -138,7 +139,7 @@ const PinMap PinMap_SPI_MOSI[] = {
{NC , NC , NC}
};

const PinMap PinMap_SPI_MISO[] = {
MBED_WEAK const PinMap PinMap_SPI_MISO[] = {
#ifdef USART0_BASE
/* USART0 */
{PE11, SPI_0, 0},
Expand All @@ -160,7 +161,7 @@ const PinMap PinMap_SPI_MISO[] = {
{NC , NC , NC}
};

const PinMap PinMap_SPI_CLK[] = {
MBED_WEAK const PinMap PinMap_SPI_CLK[] = {
#ifdef USART0_BASE
/* USART0 */
{PE12, SPI_0, 0},
Expand All @@ -182,7 +183,7 @@ const PinMap PinMap_SPI_CLK[] = {
{NC , NC , NC}
};

const PinMap PinMap_SPI_CS[] = {
MBED_WEAK const PinMap PinMap_SPI_CS[] = {
#ifdef USART0_BASE
/* USART0 */
{PE13, SPI_0, 0},
Expand All @@ -205,7 +206,7 @@ const PinMap PinMap_SPI_CS[] = {
};

/************UART**************/
const PinMap PinMap_UART_TX[] = {
MBED_WEAK const PinMap PinMap_UART_TX[] = {
#ifdef UART0_BASE
/* UART0 */
{PF6, UART_0, 0},
Expand Down Expand Up @@ -253,7 +254,7 @@ const PinMap PinMap_UART_TX[] = {
{NC , NC , NC}
};

const PinMap PinMap_UART_RX[] = {
MBED_WEAK const PinMap PinMap_UART_RX[] = {
#ifdef UART0_BASE
/* UART0 */
{PF7, UART_0, 0},
Expand Down
25 changes: 13 additions & 12 deletions targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG11/PeripheralPins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
******************************************************************************/

#include "PeripheralPins.h"
#include "mbed_toolchain.h"

/************ADC***************/
/* The third "function" value is used to select the correct ADC channel */
#if DEVICE_ANALOGIN
const PinMap PinMap_ADC[] = {
MBED_WEAK const PinMap PinMap_ADC[] = {
#if ADC0_BASE
{PA0, ADC_0, adcPosSelAPORT3XCH8},
{PA1, ADC_0, adcPosSelAPORT4XCH9},
Expand Down Expand Up @@ -70,7 +71,7 @@ const PinMap PinMap_ADC[] = {

/************I2C SCL***********/
#if DEVICE_I2C
const PinMap PinMap_I2C_SCL[] = {
MBED_WEAK const PinMap PinMap_I2C_SCL[] = {
/* I2C0 */
#ifdef I2C0_BASE
{PA1, I2C_0, 0},
Expand Down Expand Up @@ -106,7 +107,7 @@ const PinMap PinMap_I2C_SCL[] = {
};

/************I2C SDA***********/
const PinMap PinMap_I2C_SDA[] = {
MBED_WEAK const PinMap PinMap_I2C_SDA[] = {
/* I2C0 */
#ifdef I2C0_BASE
{PA0, I2C_0, 0},
Expand Down Expand Up @@ -146,7 +147,7 @@ const PinMap PinMap_I2C_SDA[] = {

/************PWM***************/
#if DEVICE_PWMOUT
const PinMap PinMap_PWM[] = {
MBED_WEAK const PinMap PinMap_PWM[] = {
{PC13, PWM_CH0, 0},
{PE10, PWM_CH0, 1},
{PB0, PWM_CH0, 2},
Expand Down Expand Up @@ -189,7 +190,7 @@ const PinMap PinMap_PWM[] = {

/*************SPI**************/
#if DEVICE_SPI
const PinMap PinMap_SPI_MOSI[] = {
MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
#ifdef USART0_BASE
{PE10, SPI_0, 0},
{PE7, SPI_0, 1},
Expand Down Expand Up @@ -245,7 +246,7 @@ const PinMap PinMap_SPI_MOSI[] = {
{NC , NC , NC}
};

const PinMap PinMap_SPI_MISO[] = {
MBED_WEAK const PinMap PinMap_SPI_MISO[] = {
#ifdef USART0_BASE
{PE11, SPI_0, 0},
{PE6, SPI_0, 1},
Expand Down Expand Up @@ -301,7 +302,7 @@ const PinMap PinMap_SPI_MISO[] = {
{NC , NC , NC}
};

const PinMap PinMap_SPI_CLK[] = {
MBED_WEAK const PinMap PinMap_SPI_CLK[] = {
#ifdef USART0_BASE
/* USART0 */
{PE12, SPI_0, 0},
Expand Down Expand Up @@ -358,7 +359,7 @@ const PinMap PinMap_SPI_CLK[] = {
{NC , NC , NC}
};

const PinMap PinMap_SPI_CS[] = {
MBED_WEAK const PinMap PinMap_SPI_CS[] = {
#ifdef USART0_BASE
/* USART0 */
{PE13, SPI_0, 0},
Expand Down Expand Up @@ -416,7 +417,7 @@ const PinMap PinMap_SPI_CS[] = {
};

/************UART**************/
const PinMap PinMap_UART_TX[] = {
MBED_WEAK const PinMap PinMap_UART_TX[] = {
#ifdef USART0_BASE
{PE10, USART_0, 0},
{PE7, USART_0, 1},
Expand Down Expand Up @@ -474,7 +475,7 @@ const PinMap PinMap_UART_TX[] = {
#endif

#if DEVICE_SERIAL
const PinMap PinMap_UART_RX[] = {
MBED_WEAK const PinMap PinMap_UART_RX[] = {
#ifdef USART0_BASE
{PE11, USART_0, 0},
{PE6, USART_0, 1},
Expand Down Expand Up @@ -532,7 +533,7 @@ const PinMap PinMap_UART_RX[] = {
#endif

#if DEVICE_CAN
const PinMap PinMap_CAN_TX[] = {
MBED_WEAK const PinMap PinMap_CAN_TX[] = {
#ifdef CAN0_BASE
{PC1, CAN_0, 0},
{PF2, CAN_0, 1},
Expand All @@ -555,7 +556,7 @@ const PinMap PinMap_CAN_TX[] = {
#endif
};

const PinMap PinMap_CAN_RX[] = {
MBED_WEAK const PinMap PinMap_CAN_RX[] = {
#ifdef CAN0_BASE
{PC0, CAN_0, 0},
{PF0, CAN_0, 1},
Expand Down
21 changes: 11 additions & 10 deletions targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32HG/PeripheralPins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
******************************************************************************/

#include "PeripheralPins.h"
#include "mbed_toolchain.h"

/************ADC***************/
const PinMap PinMap_ADC[] = {
MBED_WEAK const PinMap PinMap_ADC[] = {
#ifdef ADC0_BASE
{PD4, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH4},
{PD5, ADC_0, ADC_SINGLECTRL_INPUTSEL_CH5},
Expand All @@ -35,7 +36,7 @@ const PinMap PinMap_ADC[] = {
};

/************I2C SCL***********/
const PinMap PinMap_I2C_SCL[] = {
MBED_WEAK const PinMap PinMap_I2C_SCL[] = {
#ifdef I2C0_BASE
/* I2C0 */
{PA1, I2C_0, 0},
Expand All @@ -49,7 +50,7 @@ const PinMap PinMap_I2C_SCL[] = {
};

/************I2C SDA***********/
const PinMap PinMap_I2C_SDA[] = {
MBED_WEAK const PinMap PinMap_I2C_SDA[] = {
#ifdef I2C0_BASE
/* I2C0 */
{PA0, I2C_0, 0},
Expand All @@ -62,7 +63,7 @@ const PinMap PinMap_I2C_SDA[] = {
{NC , NC , NC}
};
/************PWM***************/
const PinMap PinMap_PWM[] = {
MBED_WEAK const PinMap PinMap_PWM[] = {
#if defined(TIMER_ROUTE_CC0PEN) || defined(TIMER_ROUTEPEN_CC0PEN)
/* PWM0 */
{PA0, PWM_CH0, 0},
Expand All @@ -82,7 +83,7 @@ const PinMap PinMap_PWM[] = {
};

/*************SPI**************/
const PinMap PinMap_SPI_MOSI[] = {
MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
#ifdef USART0_BASE
/* USART0 */
{PE10, SPI_0, 0},
Expand All @@ -100,7 +101,7 @@ const PinMap PinMap_SPI_MOSI[] = {
{NC , NC , NC}
};

const PinMap PinMap_SPI_MISO[] = {
MBED_WEAK const PinMap PinMap_SPI_MISO[] = {
#ifdef USART0_BASE
/* USART0 */
{PE11, SPI_0, 0},
Expand All @@ -118,7 +119,7 @@ const PinMap PinMap_SPI_MISO[] = {
{NC , NC , NC}
};

const PinMap PinMap_SPI_CLK[] = {
MBED_WEAK const PinMap PinMap_SPI_CLK[] = {
#ifdef USART0_BASE
/* USART0 */
{PE12, SPI_0, 0},
Expand All @@ -136,7 +137,7 @@ const PinMap PinMap_SPI_CLK[] = {
{NC , NC , NC}
};

const PinMap PinMap_SPI_CS[] = {
MBED_WEAK const PinMap PinMap_SPI_CS[] = {
#ifdef USART0_BASE
/* USART0 */
{PE13, SPI_0, 0},
Expand All @@ -154,7 +155,7 @@ const PinMap PinMap_SPI_CS[] = {
};

/************UART**************/
const PinMap PinMap_UART_TX[] = {
MBED_WEAK const PinMap PinMap_UART_TX[] = {
#ifdef USART0_BASE
/* USART0 */
{PE10, USART_0, 0},
Expand All @@ -179,7 +180,7 @@ const PinMap PinMap_UART_TX[] = {
{NC , NC , NC}
};

const PinMap PinMap_UART_RX[] = {
MBED_WEAK const PinMap PinMap_UART_RX[] = {
#ifdef USART0_BASE
/* USART0 */
{PE11, USART_0, 0},
Expand Down
Loading