Commit 7fe2812

dok-netme-no-dev

authored and

committed

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

* Inline ESP::getCycleCount() to make it safe to call from ISRs * Attribute IRAM_ATTR ISR-safe function in addition to inlining.

1 parent 9710fed commit 7fe2812Copy full SHA for 7fe2812

File tree

-8

lines changed

-8

lines changed

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,6 @@ void EspClass::deepSleep(uint32_t time_us)`
`92`	`92`	`esp_deep_sleep(time_us);`
`93`	`93`	`}`
`94`	`94`
`95`		`-uint32_t EspClass::getCycleCount()`
`96`		`-{`
`97`		`- uint32_t ccount;`
`98`		`- __asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));`
`99`		`- return ccount;`
`100`		`-}`
`101`		`-`
`102`	`95`	`void EspClass::restart(void)`
`103`	`96`	`{`
`104`	`97`	`esp_restart();`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class EspClass`
`76`	`76`
`77`	`77`	`uint8_t getChipRevision();`
`78`	`78`	`uint32_t getCpuFreqMHz(){ return getCpuFrequencyMhz(); }`
`79`		`- uint32_t getCycleCount();`
	`79`	`+ inlineuint32_t getCycleCount() __attribute__((always_inline));`
`80`	`80`	`const char * getSdkVersion();`
`81`	`81`
`82`	`82`	`void deepSleep(uint32_t time_us);`
`@@ -101,6 +101,13 @@ class EspClass`
`101`	`101`
`102`	`102`	`};`
`103`	`103`
	`104`	`+uint32_t IRAM_ATTR EspClass::getCycleCount()`
	`105`	`+{`
	`106`	`+ uint32_t ccount;`
	`107`	`+ __asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));`
	`108`	`+ return ccount;`
	`109`	`+}`
	`110`	`+`
`104`	`111`	`extern EspClass ESP;`
`105`	`112`
`106`	`113`	`#endif //ESP_H`

Comments

(0)