Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 06:45:16 +03:00
Code Issues Wiki Activity

Use SERIAL_PORT_NONE identifier to mark ports which are unavailable

Browse source
This commit is contained in:
Nicholas Sherlock 2015-04-02 01:55:13 +13:00
parent 86ddf27515
commit dce873434b
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/io/serial.c
View file

@ -241,8 +241,8 @@ serialPort_t *openSerialPort(
portOptions_t options)
{
serialPortUsage_t *serialPortUsage = findSerialPortUsageByIdentifier(identifier);
if (!serialPortUsage->enabled || serialPortUsage->function != FUNCTION_NONE) {
// already in use
if (!serialPortUsage || serialPortUsage->function != FUNCTION_NONE) {
// not available / already in use
return NULL;
}
@ -323,19 +323,18 @@ void serialInit(serialConfig_t *initialSerialConfig, bool softserialEnabled)
for (index = 0; index < SERIAL_PORT_COUNT; index++) {
serialPortUsageList[index].identifier = serialPortIdentifiers[index];
serialPortUsageList[index].enabled = true;
if (!softserialEnabled) {
if (0
#ifdef USE_SOFTSERIAL1
if (serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL1) {
serialPortUsageList[index].enabled = softserialEnabled;
}
|| serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL1
#endif
#ifdef USE_SOFTSERIAL2
if (serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL2) {
serialPortUsageList[index].enabled = softserialEnabled;
}
|| serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL2
#endif
) {
serialPortUsageList[index].identifier = SERIAL_PORT_NONE;
}
}
}
}