Merge branch 'main' into rp2040_cmake_fix

aggarg · web-flow · commit e7e5bf53f5f2 · 2022-06-23T01:22:09.000-07:00
diff --git a/portable/ThirdParty/GCC/RP2040/port.c b/portable/ThirdParty/GCC/RP2040/port.c
@@ -742,9 +742,6 @@ __attribute__( ( weak ) ) void vPortSetupTimerInterrupt( void )
             ulYieldSpinLockSaveValue = ulSave;
             xEventGroupWaitBits( xEventGroup, prvGetEventGroupBit(pxLock->spin_lock),
                                  pdTRUE, pdFALSE, portMAX_DELAY);
-            /* sanity check that interrupts were disabled, then re-enabled during the call, which will have
-             * taken care of the yield */
-            configASSERT( pxYieldSpinLock == NULL);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -742,9 +742,6 @@ __attribute__( ( weak ) ) void vPortSetupTimerInterrupt( void )`
`742`	`742`	`ulYieldSpinLockSaveValue = ulSave;`
`743`	`743`	`xEventGroupWaitBits( xEventGroup, prvGetEventGroupBit(pxLock->spin_lock),`
`744`	`744`	`pdTRUE, pdFALSE, portMAX_DELAY);`
`745`		`- /* sanity check that interrupts were disabled, then re-enabled during the call, which will have`
`746`		`- * taken care of the yield */`
`747`		`- configASSERT( pxYieldSpinLock == NULL);`
`748`	`745`	`}`
`749`	`746`	`}`
`750`	`747`