feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

enable sys_arch_protect/sys_arch_unprotect with portENTER_CRITICAL/portEXIT_CRITICAL

Browse Source
This commit is contained in:
liuzhifu
2016-08-23 20:10:42 +08:00
committed by Wu Jian Gang
parent 52953851f4
commit cb3d46786d
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/lwip/port/freertos/sys_arch.c
View File

@@ -231,6 +231,10 @@ sys_mbox_trypost(sys_mbox_t *mbox, void *msg)
{ {
err_t xReturn; err_t xReturn;
if (msg == NULL){
LWIP_DEBUGF(THREAD_SAFE_DEBUG, ("&msg=%p\n", &msg));
}
if (xQueueSend((*mbox)->os_mbox, &msg, (portTickType)0) == pdPASS) { if (xQueueSend((*mbox)->os_mbox, &msg, (portTickType)0) == pdPASS) {
xReturn = ERR_OK; xReturn = ERR_OK;
} else { } else {
@@ -384,7 +388,7 @@ sys_mbox_free(sys_mbox_t *mbox)
LWIP_DEBUGF(THREAD_SAFE_DEBUG, ("sys_mbox_free:free mbox\n")); LWIP_DEBUGF(THREAD_SAFE_DEBUG, ("sys_mbox_free:free mbox\n"));
#if 0 //ESP32_WORKAROUND #if 1 //ESP32_WORKAROUND
if (uxQueueMessagesWaiting((*mbox)->os_mbox)) { if (uxQueueMessagesWaiting((*mbox)->os_mbox)) {
xQueueReset((*mbox)->os_mbox); xQueueReset((*mbox)->os_mbox);
/* Line for breakpoint. Should never break here! */ /* Line for breakpoint. Should never break here! */
@@ -434,6 +438,7 @@ sys_now(void)
return xTaskGetTickCount(); return xTaskGetTickCount();
} }
static portMUX_TYPE g_lwip_mux = portMUX_INITIALIZER_UNLOCKED;
/* /*
This optional function does a "fast" critical region protection and returns This optional function does a "fast" critical region protection and returns
the previous protection level. This function is only called during very short the previous protection level. This function is only called during very short
@@ -450,7 +455,10 @@ sys_now(void)
sys_prot_t sys_prot_t
sys_arch_protect(void) sys_arch_protect(void)
{ {
// vTaskEnterCritical(); #if 1//ESP32_WORKAROUND
//vTaskEnterCritical();
portENTER_CRITICAL(&g_lwip_mux);
#endif
return (sys_prot_t) 1; return (sys_prot_t) 1;
} }
@@ -465,7 +473,10 @@ void
sys_arch_unprotect(sys_prot_t pval) sys_arch_unprotect(sys_prot_t pval)
{ {
(void) pval; (void) pval;
// vTaskExitCritical(); #if 1 //ESP32_WORKAROUND
//vTaskExitCritical();
portEXIT_CRITICAL(&g_lwip_mux);
#endif
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/