Skip to content

Commit 2c99b52

Browse files
committed
[Serial] Declare extern only if available
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 55fa0df commit 2c99b52

File tree

2 files changed

+66
-22
lines changed

2 files changed

+66
-22
lines changed

cores/arduino/HardwareSerial.h

+33-11
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,38 @@ class HardwareSerial : public Stream {
173173
void configForLowPower(void);
174174
};
175175

176-
extern HardwareSerial Serial1;
177-
extern HardwareSerial Serial2;
178-
extern HardwareSerial Serial3;
179-
extern HardwareSerial Serial4;
180-
extern HardwareSerial Serial5;
181-
extern HardwareSerial Serial6;
182-
extern HardwareSerial Serial7;
183-
extern HardwareSerial Serial8;
184-
extern HardwareSerial Serial9;
185-
extern HardwareSerial Serial10;
186-
extern HardwareSerial SerialLP1;
176+
#if defined(USART1)
177+
extern HardwareSerial Serial1;
178+
#endif
179+
#if defined(USART2)
180+
extern HardwareSerial Serial2;
181+
#endif
182+
#if defined(USART3)
183+
extern HardwareSerial Serial3;
184+
#endif
185+
#if defined(UART4) || defined(USART4)
186+
extern HardwareSerial Serial4;
187+
#endif
188+
#if defined(UART5) || defined(USART5)
189+
extern HardwareSerial Serial5;
190+
#endif
191+
#if defined(USART6)
192+
extern HardwareSerial Serial6;
193+
#endif
194+
#if defined(UART7) || defined(USART7)
195+
extern HardwareSerial Serial7;
196+
#endif
197+
#if defined(UART8) || defined(USART8)
198+
extern HardwareSerial Serial8;
199+
#endif
200+
#if defined(UART9)
201+
extern HardwareSerial Serial9;
202+
#endif
203+
#if defined(UART10) || defined(USART10)
204+
extern HardwareSerial Serial10;
205+
#endif
206+
#if defined(LPUART1)
207+
extern HardwareSerial SerialLP1;
208+
#endif
187209

188210
#endif

cores/arduino/WSerial.h

+33-11
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,39 @@
169169
#endif
170170
#endif
171171

172-
extern void serialEvent1(void) __attribute__((weak));
173-
extern void serialEvent2(void) __attribute__((weak));
174-
extern void serialEvent3(void) __attribute__((weak));
175-
extern void serialEvent4(void) __attribute__((weak));
176-
extern void serialEvent5(void) __attribute__((weak));
177-
extern void serialEvent6(void) __attribute__((weak));
178-
extern void serialEvent7(void) __attribute__((weak));
179-
extern void serialEvent8(void) __attribute__((weak));
180-
extern void serialEvent9(void) __attribute__((weak));
181-
extern void serialEvent10(void) __attribute__((weak));
182-
extern void serialEventLP1(void) __attribute__((weak));
172+
#if defined(HAVE_HWSERIAL1)
173+
extern void serialEvent1(void) __attribute__((weak));
174+
#endif
175+
#if defined(HAVE_HWSERIAL2)
176+
extern void serialEvent2(void) __attribute__((weak));
177+
#endif
178+
#if defined(HAVE_HWSERIAL3)
179+
extern void serialEvent3(void) __attribute__((weak));
180+
#endif
181+
#if defined(HAVE_HWSERIAL4)
182+
extern void serialEvent4(void) __attribute__((weak));
183+
#endif
184+
#if defined(HAVE_HWSERIAL5)
185+
extern void serialEvent5(void) __attribute__((weak));
186+
#endif
187+
#if defined(HAVE_HWSERIAL6)
188+
extern void serialEvent6(void) __attribute__((weak));
189+
#endif
190+
#if defined(HAVE_HWSERIAL7)
191+
extern void serialEvent7(void) __attribute__((weak));
192+
#endif
193+
#if defined(HAVE_HWSERIAL8)
194+
extern void serialEvent8(void) __attribute__((weak));
195+
#endif
196+
#if defined(HAVE_HWSERIAL9)
197+
extern void serialEvent9(void) __attribute__((weak));
198+
#endif
199+
#if defined(HAVE_HWSERIAL10)
200+
extern void serialEvent10(void) __attribute__((weak));
201+
#endif
202+
#if defined(HAVE_HWSERIALLP1)
203+
extern void serialEventLP1(void) __attribute__((weak));
204+
#endif
183205
#endif /* HAL_UART_MODULE_ENABLED && !HAL_UART_MODULE_ONLY */
184206

185207
extern void serialEventRun(void);

0 commit comments

Comments
 (0)