rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Get rid of the mutex when enabling/disabling soft IRQs. This isn't ideal but

Browse Source 
it seems to be triggering deadlocks.
This commit is contained in:
James Cotton 2012-03-11 21:49:21 -05:00
parent 6adc74f6f9
commit 6df2df6eec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
View File

@ -109,7 +109,7 @@ static pthread_mutex_t xRunningThread = PTHREAD_MUTEX_INITIALIZER;
#endif #endif
static pthread_mutex_t xSuspendResumeThreadMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t xSuspendResumeThreadMutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t xSwappingThreadMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t xSwappingThreadMutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t xIrqMutex = PTHREAD_MUTEX_INITIALIZER; //static pthread_mutex_t xIrqMutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_t hMainThread = ( pthread_t )NULL; static pthread_t hMainThread = ( pthread_t )NULL;
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -514,18 +514,18 @@ tskTCB * oldTask, * newTask;
void vPortDisableInterrupts( void ) void vPortDisableInterrupts( void )
{ {
//debug_printf("\r\n"); //debug_printf("\r\n");
assert( pthread_mutex_lock( &xIrqMutex ) == 0); //assert( pthread_mutex_lock( &xIrqMutex ) == 0);
xInterruptsEnabled = pdFALSE; xInterruptsEnabled = pdFALSE;
assert( pthread_mutex_unlock( &xIrqMutex) == 0); //assert( pthread_mutex_unlock( &xIrqMutex) == 0);
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
void vPortEnableInterrupts( void ) void vPortEnableInterrupts( void )
{ {
//debug_printf("\r\n"); //debug_printf("\r\n");
assert( pthread_mutex_lock( &xIrqMutex ) == 0); //assert( pthread_mutex_lock( &xIrqMutex ) == 0);
xInterruptsEnabled = pdTRUE; xInterruptsEnabled = pdTRUE;
assert( pthread_mutex_unlock( &xIrqMutex) == 0); //assert( pthread_mutex_unlock( &xIrqMutex) == 0);
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/