change return type of micros() and millis()

me-no-dev · me-no-dev · commit 7db8f709569e · 2017-05-22T15:47:12.000+03:00
Fixes: espressif#384
diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c
@@ -30,11 +30,11 @@ void yield()
 
 portMUX_TYPE microsMux = portMUX_INITIALIZER_UNLOCKED;
 
-uint32_t IRAM_ATTR micros()
+unsigned long IRAM_ATTR micros()
{
- static uint32_t lccount = 0;
- static uint32_t overflow = 0;
- uint32_t ccount;
+ static unsigned long lccount = 0;
+ static unsigned long overflow = 0;
+ unsigned long ccount;
 portENTER_CRITICAL_ISR(&microsMux);
 __asm__ __volatile__ ( "rsr %0, ccount" : "=a" (ccount) );
 if(ccount < lccount){
@@ -45,7 +45,7 @@ uint32_t IRAM_ATTR micros()
 return overflow + (ccount / CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ);
 }
 
-uint32_t IRAM_ATTR millis()
+unsigned long IRAM_ATTR millis()
{
 return xTaskGetTickCount() * portTICK_PERIOD_MS;
 }
diff --git a/cores/esp32/esp32-hal.h b/cores/esp32/esp32-hal.h
@@ -61,8 +61,8 @@ void yield(void);
 #include "esp32-hal-bt.h"
 #include "esp_system.h"
 
-uint32_t micros();
-uint32_t millis();
+unsigned long micros();
+unsigned long millis();
 void delay(uint32_t);
 void delayMicroseconds(uint32_t us);
 

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ void yield()`
`30`	`30`
`31`	`31`	`portMUX_TYPEmicrosMux=portMUX_INITIALIZER_UNLOCKED;`
`32`	`32`
`33`		`-uint32_tIRAM_ATTRmicros()`
	`33`	`+unsigned longIRAM_ATTRmicros()`
`34`	`34`	`{`
`35`		`-staticuint32_tlccount=0;`
`36`		`-staticuint32_toverflow=0;`
`37`		`-uint32_tccount;`
	`35`	`+staticunsigned longlccount=0;`
	`36`	`+staticunsigned longoverflow=0;`
	`37`	`+unsigned longccount;`
`38`	`38`	`portENTER_CRITICAL_ISR(&microsMux);`
`39`	`39`	`__asm__ __volatile__ ( "rsr %0, ccount" : "=a" (ccount) );`
`40`	`40`	`if(ccount<lccount){`
`@@ -45,7 +45,7 @@ uint32_t IRAM_ATTR micros()`
`45`	`45`	`returnoverflow+ (ccount / CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ);`
`46`	`46`	`}`
`47`	`47`
`48`		`-uint32_tIRAM_ATTRmillis()`
	`48`	`+unsigned longIRAM_ATTRmillis()`
`49`	`49`	`{`
`50`	`50`	`returnxTaskGetTickCount() *portTICK_PERIOD_MS;`
`51`	`51`	`}`
-Original file line number
+Diff line change
 #include"esp32-hal-bt.h"
 #include"esp_system.h"
 -uint32_tmicros();
 -uint32_tmillis();
 +unsigned longmicros();
 +unsigned longmillis();
 voiddelay(uint32_t);
 voiddelayMicroseconds(uint32_tus);