Fix functions broken by nested mutex feature

tangzz98 · tangzz98 · commit 3e2191ea62cf · 2022-11-10T13:05:34.000-05:00
diff --git a/FreeRTOS/queue.c b/FreeRTOS/queue.c
@@ -569,7 +569,14 @@ UBaseType_t uxQueueMessagesWaiting( const QueueHandle_t xQueue )
 
     if ( type == RT_Object_Class_Mutex )
     {
-        uxReturn = ( ( rt_mutex_t ) pipc )->value;
+        if ( ( ( rt_mutex_t ) pipc )->owner == RT_NULL )
+        {
+            uxReturn = 1;
+        }
+        else
+        {
+            uxReturn = 0;
+        }
     }
     else if ( type == RT_Object_Class_Semaphore )
     {
@@ -603,7 +610,14 @@ UBaseType_t uxQueueSpacesAvailable( const QueueHandle_t xQueue )
 
     if ( type == RT_Object_Class_Mutex )
     {
-        uxReturn = 1 - ( ( rt_mutex_t ) pipc )->value;
+        if ( ( ( rt_mutex_t ) pipc )->owner == RT_NULL )
+        {
+            uxReturn = 0;
+        }
+        else
+        {
+            uxReturn = 1;
+        }
     }
     else if ( type == RT_Object_Class_Semaphore )
     {

Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,14 @@ UBaseType_t uxQueueMessagesWaiting( const QueueHandle_t xQueue )`
`569`	`569`
`570`	`570`	`if ( type == RT_Object_Class_Mutex )`
`571`	`571`	`{`
`572`		`- uxReturn = ( ( rt_mutex_t ) pipc )->value;`
	`572`	`+ if ( ( ( rt_mutex_t ) pipc )->owner == RT_NULL )`
	`573`	`+ {`
	`574`	`+ uxReturn = 1;`
	`575`	`+ }`
	`576`	`+ else`
	`577`	`+ {`
	`578`	`+ uxReturn = 0;`
	`579`	`+ }`
`573`	`580`	`}`
`574`	`581`	`else if ( type == RT_Object_Class_Semaphore )`
`575`	`582`	`{`
`@@ -603,7 +610,14 @@ UBaseType_t uxQueueSpacesAvailable( const QueueHandle_t xQueue )`
`603`	`610`
`604`	`611`	`if ( type == RT_Object_Class_Mutex )`
`605`	`612`	`{`
`606`		`- uxReturn = 1 - ( ( rt_mutex_t ) pipc )->value;`
	`613`	`+ if ( ( ( rt_mutex_t ) pipc )->owner == RT_NULL )`
	`614`	`+ {`
	`615`	`+ uxReturn = 0;`
	`616`	`+ }`
	`617`	`+ else`
	`618`	`+ {`
	`619`	`+ uxReturn = 1;`
	`620`	`+ }`
`607`	`621`	`}`
`608`	`622`	`else if ( type == RT_Object_Class_Semaphore )`
`609`	`623`	`{`