Skip to content

Inline ESP::getCycleCount() to make it safe to call from ISRs #3165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
me-no-dev merged 3 commits into from
Sep 11, 2019
Merged

Inline ESP::getCycleCount() to make it safe to call from ISRs #3165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fbb76a
Inline ESP::getCycleCount() to make it safe to call from ISRs
dok-net Sep 1, 2019
9f3e75d
Attribute IRAM_ATTR ISR-safe function in addition to inlining.
dok-net Sep 10, 2019
32383b4
Merge branch 'master' into isr_safe_cyclecount
me-no-dev Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions cores/esp32/Esp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,6 @@ void EspClass::deepSleep(uint32_t time_us)
esp_deep_sleep(time_us);
}

uint32_t EspClass::getCycleCount()
{
uint32_t ccount;
__asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));
return ccount;
}

void EspClass::restart(void)
{
esp_restart();
Expand Down
9 changes: 8 additions & 1 deletion cores/esp32/Esp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class EspClass

uint8_t getChipRevision();
uint32_t getCpuFreqMHz(){ return getCpuFrequencyMhz(); }
uint32_t getCycleCount();
inline uint32_t getCycleCount() __attribute__((always_inline));
const char * getSdkVersion();

void deepSleep(uint32_t time_us);
Expand All @@ -101,6 +101,13 @@ class EspClass

};

uint32_t IRAM_ATTR EspClass::getCycleCount()
{
uint32_t ccount;
__asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));
return ccount;
}

extern EspClass ESP;

#endif //ESP_H