Skip to content

Commit a937a62

Browse files
committed
[Nuvoton] Check configuration option for default UART baudrate setting
1 parent ae98b94 commit a937a62

File tree

5 files changed

+65
-10
lines changed

5 files changed

+65
-10
lines changed

targets/TARGET_NUVOTON/TARGET_M2351/serial_api.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,19 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
221221
pinmap_pinout(tx, PinMap_UART_TX);
222222
pinmap_pinout(rx, PinMap_UART_RX);
223223

224-
// Configure the UART module and set its baudrate
225-
serial_baud(obj, 9600);
224+
// Configure baudrate
225+
int baudrate = 9600;
226+
if (obj->serial.uart == STDIO_UART) {
227+
#if MBED_CONF_PLATFORM_STDIO_BAUD_RATE
228+
baudrate = MBED_CONF_PLATFORM_STDIO_BAUD_RATE;
229+
#endif
230+
} else {
231+
#if MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE
232+
baudrate = MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE;
233+
#endif
234+
}
235+
serial_baud(obj, baudrate);
236+
226237
// Configure data bits, parity, and stop bits
227238
serial_format(obj, 8, ParityNone, 1);
228239
}

targets/TARGET_NUVOTON/TARGET_M451/serial_api.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,19 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
181181
pinmap_pinout(tx, PinMap_UART_TX);
182182
pinmap_pinout(rx, PinMap_UART_RX);
183183

184-
// Configure the UART module and set its baudrate
185-
serial_baud(obj, 9600);
184+
// Configure baudrate
185+
int baudrate = 9600;
186+
if (obj->serial.uart == STDIO_UART) {
187+
#if MBED_CONF_PLATFORM_STDIO_BAUD_RATE
188+
baudrate = MBED_CONF_PLATFORM_STDIO_BAUD_RATE;
189+
#endif
190+
} else {
191+
#if MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE
192+
baudrate = MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE;
193+
#endif
194+
}
195+
serial_baud(obj, baudrate);
196+
186197
// Configure data bits, parity, and stop bits
187198
serial_format(obj, 8, ParityNone, 1);
188199
}

targets/TARGET_NUVOTON/TARGET_M480/serial_api.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,19 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
211211
pinmap_pinout(tx, PinMap_UART_TX);
212212
pinmap_pinout(rx, PinMap_UART_RX);
213213

214-
// Configure the UART module and set its baudrate
215-
serial_baud(obj, 9600);
214+
// Configure baudrate
215+
int baudrate = 9600;
216+
if (obj->serial.uart == STDIO_UART) {
217+
#if MBED_CONF_PLATFORM_STDIO_BAUD_RATE
218+
baudrate = MBED_CONF_PLATFORM_STDIO_BAUD_RATE;
219+
#endif
220+
} else {
221+
#if MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE
222+
baudrate = MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE;
223+
#endif
224+
}
225+
serial_baud(obj, baudrate);
226+
216227
// Configure data bits, parity, and stop bits
217228
serial_format(obj, 8, ParityNone, 1);
218229
}

targets/TARGET_NUVOTON/TARGET_NANO100/serial_api.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,19 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
146146
pinmap_pinout(tx, PinMap_UART_TX);
147147
pinmap_pinout(rx, PinMap_UART_RX);
148148

149-
// Configure the UART module and set its baudrate
150-
serial_baud(obj, 9600);
149+
// Configure baudrate
150+
int baudrate = 9600;
151+
if (obj->serial.uart == STDIO_UART) {
152+
#if MBED_CONF_PLATFORM_STDIO_BAUD_RATE
153+
baudrate = MBED_CONF_PLATFORM_STDIO_BAUD_RATE;
154+
#endif
155+
} else {
156+
#if MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE
157+
baudrate = MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE;
158+
#endif
159+
}
160+
serial_baud(obj, baudrate);
161+
151162
// Configure data bits, parity, and stop bits
152163
serial_format(obj, 8, ParityNone, 1);
153164
}

targets/TARGET_NUVOTON/TARGET_NUC472/serial_api.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,19 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
211211
pinmap_pinout(tx, PinMap_UART_TX);
212212
pinmap_pinout(rx, PinMap_UART_RX);
213213

214-
// Configure the UART module and set its baudrate
215-
serial_baud(obj, 9600);
214+
// Configure baudrate
215+
int baudrate = 9600;
216+
if (obj->serial.uart == STDIO_UART) {
217+
#if MBED_CONF_PLATFORM_STDIO_BAUD_RATE
218+
baudrate = MBED_CONF_PLATFORM_STDIO_BAUD_RATE;
219+
#endif
220+
} else {
221+
#if MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE
222+
baudrate = MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE;
223+
#endif
224+
}
225+
serial_baud(obj, baudrate);
226+
216227
// Configure data bits, parity, and stop bits
217228
serial_format(obj, 8, ParityNone, 1);
218229
}

0 commit comments

Comments
 (0)