rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/amorale/OP-1218_pios_com_thread_safe' into rel-14.01

Browse Source 
Conflicts:
	flight/modules/RadioComBridge/RadioComBridge.c
This commit is contained in:
Alessio Morale 2014-02-17 15:24:50 +01:00
commit 3044185019
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/modules/RadioComBridge/RadioComBridge.c
View File

@ -518,7 +518,7 @@ static void serialRxTask(__attribute__((unused)) void *parameters)
int32_t ret = -2; int32_t ret = -2;
uint8_t count = 5; uint8_t count = 5;
while (count-- > 0 && ret < -1) { while (count-- > 0 && ret < -1) {
PIOS_COM_SendBufferNonBlocking(PIOS_COM_RADIO, data->serialRxBuf, bytes_to_process); ret = PIOS_COM_SendBufferNonBlocking(PIOS_COM_RADIO, data->serialRxBuf, bytes_to_process);
} }
} }
} else { } else {

3
flight/pios/common/pios_com.c
View File

@ -346,6 +346,7 @@ int32_t PIOS_COM_SendBufferNonBlocking(uint32_t com_id, const uint8_t *buffer, u
* \param[in] len buffer length * \param[in] len buffer length
* \return -1 if port not available * \return -1 if port not available
* \return -2 if mutex can't be taken; * \return -2 if mutex can't be taken;
* \return -3 if data cannot be sent in the max allotted time of 5000msec
* \return number of bytes transmitted on success * \return number of bytes transmitted on success
*/ */
int32_t PIOS_COM_SendBuffer(uint32_t com_id, const uint8_t *buffer, uint16_t len) int32_t PIOS_COM_SendBuffer(uint32_t com_id, const uint8_t *buffer, uint16_t len)
@ -358,7 +359,7 @@ int32_t PIOS_COM_SendBuffer(uint32_t com_id, const uint8_t *buffer, uint16_t len
} }
PIOS_Assert(com_dev->has_tx); PIOS_Assert(com_dev->has_tx);
#if defined(PIOS_INCLUDE_FREERTOS) #if defined(PIOS_INCLUDE_FREERTOS)
if (xSemaphoreTake(com_dev->sendbuffer_sem, 0) != pdTRUE) { if (xSemaphoreTake(com_dev->sendbuffer_sem, 5) != pdTRUE) {
return -2; return -2;
} }
#endif /* PIOS_INCLUDE_FREERTOS */ #endif /* PIOS_INCLUDE_FREERTOS */