Skip to content

Commit 61cfaa1

Browse files
gpsimenosgpsimenos
committed
Update UART pin names & add MBED_CONF_TARGET_STDIO_UART overrides
1 parent 96e19af commit 61cfaa1

File tree

168 files changed

+996
-483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+996
-483
lines changed

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/PeripheralNames.h

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,23 @@ typedef enum {
7575
PWM_11
7676
} PWMName;
7777

78-
#define STDIO_UART_TX USBTX
79-
#define STDIO_UART_RX USBRX
78+
#if defined(MBED_CONF_TARGET_STDIO_UART_TX)
79+
#define STDIO_UART_TX MBED_CONF_TARGET_STDIO_UART_TX
80+
#else
81+
#define STDIO_UART_TX CONSOLE_TX
82+
#endif
83+
#if defined(MBED_CONF_TARGET_STDIO_UART_RX)
84+
#define STDIO_UART_RX MBED_CONF_TARGET_STDIO_UART_RX
85+
#else
86+
#define STDIO_UART_RX CONSOLE_RX
87+
#endif
8088
#define STDIO_UART UART_0
8189

82-
#define MBED_UART0 USBTX, USBRX
90+
#define MBED_UART0 CONSOLE_TX, CONSOLE_RX
8391
#define MBED_UART1 XB_TX, XB_RX
8492
#define MBED_UART2 SH0_TX, SH0_RX
8593
#define MBED_UART3 SH1_TX, SH1_RX
86-
#define MBED_UARTUSB USBTX, USBRX
94+
#define MBED_UARTUSB CONSOLE_TX, CONSOLE_RX
8795

8896
#ifdef __cplusplus
8997
}

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/PinNames.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ typedef enum {
156156
ADC_SSEL = 653,
157157

158158
//MPS2 Uart
159-
USBTX = 400,
160-
USBRX = 401,
159+
CONSOLE_TX = 400,
160+
CONSOLE_RX = 401,
161161
XB_TX = 402,
162162
XB_RX = 403,
163163
UART_TX2 = 404,

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/serial_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
******************************************************************************/
3232

3333
static const PinMap PinMap_UART_TX[] = {
34-
{USBTX, UART_0, 0},
34+
{CONSOLE_TX, UART_0, 0},
3535
{XB_TX, UART_1, 0},
3636
{SH0_TX, UART_2, 0},
3737
{SH1_TX, UART_3, 0},
3838
{NC, NC, 0}
3939
};
4040

4141
static const PinMap PinMap_UART_RX[] = {
42-
{USBRX, UART_0, 0},
42+
{CONSOLE_RX, UART_0, 0},
4343
{XB_RX, UART_1, 0},
4444
{SH0_RX, UART_2, 0},
4545
{SH1_RX, UART_3, 0},

‎targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/PinNames.h

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,16 @@
2323
#include "cmsis.h"
2424

2525
/* Pins used by mbed OS to identify STDIO UART pins */
26-
#define STDIO_UART_TX USBTX
27-
#define STDIO_UART_RX USBRX
26+
#if defined(MBED_CONF_TARGET_STDIO_UART_TX)
27+
#define STDIO_UART_TX MBED_CONF_TARGET_STDIO_UART_TX
28+
#else
29+
#define STDIO_UART_TX CONSOLE_TX
30+
#endif
31+
#if defined(MBED_CONF_TARGET_STDIO_UART_RX)
32+
#define STDIO_UART_RX MBED_CONF_TARGET_STDIO_UART_RX
33+
#else
34+
#define STDIO_UART_RX CONSOLE_RX
35+
#endif
2836

2937
#ifdef __cplusplus
3038
extern "C" {
@@ -156,8 +164,8 @@ typedef enum {
156164
/* MPS2 UART */
157165
MCC_TX = 400,
158166
MCC_RX = 401,
159-
USBTX = 402,
160-
USBRX = 403,
167+
CONSOLE_TX = 402,
168+
CONSOLE_RX = 403,
161169
XB_TX = EXP24,
162170
XB_RX = EXP23,
163171
SH0_TX = EXP4,

‎targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/serial_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct uart_irq_t {
4141

4242
static const PinMap PinMap_UART_TX[] = {
4343
{MCC_TX, UART_0, 0},
44-
{USBTX, UART_1, 0},
44+
{CONSOLE_TX, UART_1, 0},
4545
{SH0_TX, UART_2, ALTERNATE_FUNC},
4646
{SH1_TX, UART_3, ALTERNATE_FUNC},
4747
{XB_TX, UART_4, ALTERNATE_FUNC},
@@ -50,7 +50,7 @@ static const PinMap PinMap_UART_TX[] = {
5050

5151
static const PinMap PinMap_UART_RX[] = {
5252
{MCC_RX, UART_0, 0},
53-
{USBRX, UART_1, 0},
53+
{CONSOLE_RX, UART_1, 0},
5454
{SH0_RX, UART_2, ALTERNATE_FUNC},
5555
{SH1_RX, UART_3, ALTERNATE_FUNC},
5656
{XB_RX, UART_4, ALTERNATE_FUNC},

‎targets/TARGET_ARM_SSG/TARGET_MPS2/PeripheralNames.h

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,23 @@ typedef enum {
7575
PWM_11
7676
} PWMName;
7777

78-
#define STDIO_UART_TX USBTX
79-
#define STDIO_UART_RX USBRX
78+
#if defined(MBED_CONF_TARGET_STDIO_UART_TX)
79+
#define STDIO_UART_TX MBED_CONF_TARGET_STDIO_UART_TX
80+
#else
81+
#define STDIO_UART_TX CONSOLE_TX
82+
#endif
83+
#if defined(MBED_CONF_TARGET_STDIO_UART_RX)
84+
#define STDIO_UART_RX MBED_CONF_TARGET_STDIO_UART_RX
85+
#else
86+
#define STDIO_UART_RX CONSOLE_RX
87+
#endif
8088
#define STDIO_UART UART_0
8189

82-
#define MBED_UART0 USBTX, USBRX
90+
#define MBED_UART0 CONSOLE_TX, CONSOLE_RX
8391
#define MBED_UART1 XB_TX, XB_RX
8492
#define MBED_UART2 SH0_TX, SH0_RX
8593
#define MBED_UART3 SH1_TX, SH1_RX
86-
#define MBED_UARTUSB USBTX, USBRX
94+
#define MBED_UARTUSB CONSOLE_TX, CONSOLE_RX
8795

8896
#ifdef __cplusplus
8997
}

‎targets/TARGET_ARM_SSG/TARGET_MPS2/PinNames.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ typedef enum {
156156
ADC_SSEL = 653,
157157

158158
//MPS2 Uart
159-
USBTX = 400,
160-
USBRX = 401,
159+
CONSOLE_TX = 400,
160+
CONSOLE_RX = 401,
161161
XB_TX = 402,
162162
XB_RX = 403,
163163
UART_TX2 = 404,

‎targets/TARGET_ARM_SSG/TARGET_MPS2/serial_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
******************************************************************************/
3232

3333
static const PinMap PinMap_UART_TX[] = {
34-
{USBTX , UART_0, 0},
34+
{CONSOLE_TX , UART_0, 0},
3535
{XB_TX , UART_1, 0},
3636
{SH0_TX , UART_2, 0},
3737
{SH1_TX , UART_3, 0},
3838
{NC , NC , 0}
3939
};
4040

4141
static const PinMap PinMap_UART_RX[] = {
42-
{USBRX , UART_0, 0},
42+
{CONSOLE_RX , UART_0, 0},
4343
{XB_RX , UART_1, 0},
4444
{SH0_RX , UART_2, 0},
4545
{SH1_RX , UART_3, 0},

‎targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/PeripheralNames.h

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,20 @@ typedef enum {
3535
I2C_1
3636
} I2CName;
3737

38-
#define STDIO_UART_TX UART1_TX
39-
#define STDIO_UART_RX UART1_RX
38+
#if defined(MBED_CONF_TARGET_STDIO_UART_TX)
39+
#define STDIO_UART_TX MBED_CONF_TARGET_STDIO_UART_TX
40+
#else
41+
#define STDIO_UART_TX UART1_TX
42+
#endif
43+
#if defined(MBED_CONF_TARGET_STDIO_UART_RX)
44+
#define STDIO_UART_RX MBED_CONF_TARGET_STDIO_UART_RX
45+
#else
46+
#define STDIO_UART_RX UART1_RX
47+
#endif
4048
#define STDIO_UART UART_1
4149

42-
#define USBTX STDIO_UART_TX
43-
#define USBRX STDIO_UART_RX
50+
#define CONSOLE_TX STDIO_UART_TX
51+
#define CONSOLE_RX STDIO_UART_RX
4452

4553
#ifdef __cplusplus
4654
}

‎targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/PeripheralNames.h

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,20 @@ typedef enum {
3535
I2C_1
3636
} I2CName;
3737

38-
#define STDIO_UART_TX UART1_TX
39-
#define STDIO_UART_RX UART1_RX
38+
#if defined(MBED_CONF_TARGET_STDIO_UART_TX)
39+
#define STDIO_UART_TX MBED_CONF_TARGET_STDIO_UART_TX
40+
#else
41+
#define STDIO_UART_TX UART1_TX
42+
#endif
43+
#if defined(MBED_CONF_TARGET_STDIO_UART_RX)
44+
#define STDIO_UART_RX MBED_CONF_TARGET_STDIO_UART_RX
45+
#else
46+
#define STDIO_UART_RX UART1_RX
47+
#endif
4048
#define STDIO_UART UART_1
4149

42-
#define USBTX STDIO_UART_TX
43-
#define USBRX STDIO_UART_RX
50+
#define CONSOLE_TX STDIO_UART_TX
51+
#define CONSOLE_RX STDIO_UART_RX
4452

4553
#ifdef __cplusplus
4654
}

0 commit comments

Comments
 (0)