Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_SerialManager: moved uart declaration to cpp file

Browse Source 
improves ccache efficiency
This commit is contained in:
Andrew Tridgell 2022-02-22 14:19:15 +11:00
parent 607a7bfd70
commit 372e785a10
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/AP_SerialManager/AP_SerialManager.cpp
View File

@ -114,7 +114,6 @@ extern const AP_HAL::HAL& hal;
#define SERIAL9_PROTOCOL SerialProtocol_None #define SERIAL9_PROTOCOL SerialProtocol_None
#endif // HAL_BUILD_AP_PERIPH #endif // HAL_BUILD_AP_PERIPH
const AP_Param::GroupInfo AP_SerialManager::var_info[] = { const AP_Param::GroupInfo AP_SerialManager::var_info[] = {
#if SERIALMANAGER_NUM_PORTS > 0 #if SERIALMANAGER_NUM_PORTS > 0
// @Param: 0_BAUD // @Param: 0_BAUD
@ -807,7 +806,7 @@ void AP_SerialManager::disable_passthru(void)
// accessor for AP_Periph to set baudrate and type // accessor for AP_Periph to set baudrate and type
void AP_SerialManager::set_protocol_and_baud(uint8_t sernum, enum SerialProtocol protocol, uint32_t baudrate) void AP_SerialManager::set_protocol_and_baud(uint8_t sernum, enum SerialProtocol protocol, uint32_t baudrate)
{ {
if (sernum <= ARRAY_SIZE(state)) { if (sernum < SERIALMANAGER_NUM_PORTS) {
state[sernum].protocol.set(protocol); state[sernum].protocol.set(protocol);
state[sernum].baud.set(baudrate); state[sernum].baud.set(baudrate);
} }

20
libraries/AP_SerialManager/AP_SerialManager.h
View File

@ -38,6 +38,19 @@
#define SERIALMANAGER_NUM_PORTS 8 #define SERIALMANAGER_NUM_PORTS 8
#endif #endif
/*
array size for state[]. This needs to be at least
SERIALMANAGER_NUM_PORTS, but we want it to be the same length on
similar boards to get the ccache efficiency up. This wastes a small
amount of memory, but makes a huge difference to the build times
*/
#if SERIALMANAGER_NUM_PORTS > 10 || SERIALMANAGER_NUM_PORTS < 5
#define SERIALMANAGER_MAX_PORTS SERIALMANAGER_NUM_PORTS
#else
#define SERIALMANAGER_MAX_PORTS 10
#endif
// console default baud rates and buffer sizes // console default baud rates and buffer sizes
#ifdef HAL_SERIAL0_BAUD_DEFAULT #ifdef HAL_SERIAL0_BAUD_DEFAULT
# define AP_SERIALMANAGER_CONSOLE_BAUD HAL_SERIAL0_BAUD_DEFAULT # define AP_SERIALMANAGER_CONSOLE_BAUD HAL_SERIAL0_BAUD_DEFAULT
@ -223,12 +236,13 @@ public:
private: private:
static AP_SerialManager *_singleton; static AP_SerialManager *_singleton;
// array of uart info // array of uart info. See comment above about
// SERIALMANAGER_MAX_PORTS
struct UARTState { struct UARTState {
AP_Int8 protocol;
AP_Int32 baud; AP_Int32 baud;
AP_Int16 options; AP_Int16 options;
} state[SERIALMANAGER_NUM_PORTS]; AP_Int8 protocol;
} state[SERIALMANAGER_MAX_PORTS];
// pass-through serial support // pass-through serial support
AP_Int8 passthru_port1; AP_Int8 passthru_port1;