95d63137d1
This commit fixes bugs with the dual core changes to freeRTOS tick and idle hooks. Interrupt watchdog now registers tick hooks to both cores. API for cross core tick and idle hook registration were also added
115 lines
3.2 KiB
C
115 lines
3.2 KiB
C
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
#include <stdbool.h>
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "esp_attr.h"
|
|
#include "esp_freertos_hooks.h"
|
|
|
|
//We use just a static array here because it's not expected many components will need
|
|
//an idle or tick hook.
|
|
#define MAX_HOOKS 8
|
|
|
|
static esp_freertos_idle_cb_t idle_cb[portNUM_PROCESSORS][MAX_HOOKS]={0};
|
|
static esp_freertos_tick_cb_t tick_cb[portNUM_PROCESSORS][MAX_HOOKS]={0};
|
|
|
|
void IRAM_ATTR esp_vApplicationTickHook()
|
|
{
|
|
int n;
|
|
int core = xPortGetCoreID();
|
|
for (n=0; n<MAX_HOOKS; n++) {
|
|
if (tick_cb[core][n]!=NULL) {
|
|
tick_cb[core][n]();
|
|
}
|
|
}
|
|
}
|
|
|
|
void esp_vApplicationIdleHook()
|
|
{
|
|
bool doWait=true;
|
|
bool r;
|
|
int n;
|
|
int core = xPortGetCoreID();
|
|
for (n=0; n<MAX_HOOKS; n++) {
|
|
if (idle_cb[core][n]!=NULL) {
|
|
r=idle_cb[core][n]();
|
|
if (!r) doWait=false;
|
|
}
|
|
}
|
|
if (doWait) {
|
|
//Wait for whatever interrupt comes next... this should save some power.
|
|
asm("waiti 0");
|
|
}
|
|
}
|
|
|
|
esp_err_t esp_register_freertos_idle_hook_for_cpu(esp_freertos_idle_cb_t new_idle_cb, UBaseType_t cpuid)
|
|
{
|
|
if(cpuid >= portNUM_PROCESSORS){
|
|
return ESP_ERR_INVALID_ARG;
|
|
}
|
|
for(int n = 0; n < MAX_HOOKS; n++){
|
|
if (idle_cb[cpuid][n]==NULL) {
|
|
idle_cb[cpuid][n]=new_idle_cb;
|
|
return ESP_OK;
|
|
}
|
|
}
|
|
return ESP_ERR_NO_MEM;
|
|
}
|
|
|
|
esp_err_t esp_register_freertos_idle_hook(esp_freertos_idle_cb_t new_idle_cb)
|
|
{
|
|
return esp_register_freertos_idle_hook_for_cpu(new_idle_cb, xPortGetCoreID());
|
|
}
|
|
|
|
esp_err_t esp_register_freertos_tick_hook_for_cpu(esp_freertos_tick_cb_t new_tick_cb, UBaseType_t cpuid)
|
|
{
|
|
if(cpuid >= portNUM_PROCESSORS){
|
|
return ESP_ERR_INVALID_ARG;
|
|
}
|
|
for(int n = 0; n < MAX_HOOKS; n++){
|
|
if (tick_cb[cpuid][n]==NULL) {
|
|
tick_cb[cpuid][n]=new_tick_cb;
|
|
return ESP_OK;
|
|
}
|
|
}
|
|
return ESP_ERR_NO_MEM;
|
|
}
|
|
|
|
esp_err_t esp_register_freertos_tick_hook(esp_freertos_tick_cb_t new_tick_cb)
|
|
{
|
|
return esp_register_freertos_tick_hook_for_cpu(new_tick_cb, xPortGetCoreID());
|
|
}
|
|
|
|
void esp_deregister_freertos_idle_hook(esp_freertos_idle_cb_t old_idle_cb)
|
|
{
|
|
for(int m = 0; m < portNUM_PROCESSORS; m++) {
|
|
for(int n = 0; n < MAX_HOOKS; n++){
|
|
if(idle_cb[m][n] == old_idle_cb) idle_cb[m][n] = NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
void esp_deregister_freertos_tick_hook(esp_freertos_tick_cb_t old_tick_cb)
|
|
{
|
|
for(int m = 0; m < portNUM_PROCESSORS; m++){
|
|
for(int n = 0; n < MAX_HOOKS; n++){
|
|
if(tick_cb[m][n] == old_tick_cb) tick_cb[m][n] = NULL;
|
|
}
|
|
}
|
|
}
|
|
|