Skip to content

Commit 0e8096c

Browse files
committed
Update esp32-hal-timer.c
1 parent 585398e commit 0e8096c

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

cores/esp32/esp32-hal-timer.c

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -113,56 +113,56 @@ void ARDUINO_ISR_ATTR __timerISR(void * arg){
113113
}
114114
}
115115

116-
uint64_t IRAM_ATTR timerRead(hw_timer_t *timer){
116+
uint64_t timerRead(hw_timer_t *timer){
117117
timer->dev->update = 1;
118118
uint64_t h = timer->dev->cnt_high;
119119
uint64_t l = timer->dev->cnt_low;
120120
return (h << 32) | l;
121121
}
122122

123-
uint64_t IRAM_ATTR timerAlarmRead(hw_timer_t *timer){
123+
uint64_t timerAlarmRead(hw_timer_t *timer){
124124
uint64_t h = timer->dev->alarm_high;
125125
uint64_t l = timer->dev->alarm_low;
126126
return (h << 32) | l;
127127
}
128128

129-
void IRAM_ATTR timerWrite(hw_timer_t *timer, uint64_t val){
129+
void timerWrite(hw_timer_t *timer, uint64_t val){
130130
timer->dev->load_high = (uint32_t) (val >> 32);
131131
timer->dev->load_low = (uint32_t) (val);
132132
timer->dev->reload = 1;
133133
}
134134

135-
void IRAM_ATTR timerAlarmWrite(hw_timer_t *timer, uint64_t alarm_value, bool autoreload){
135+
void timerAlarmWrite(hw_timer_t *timer, uint64_t alarm_value, bool autoreload){
136136
timer->dev->alarm_high = (uint32_t) (alarm_value >> 32);
137137
timer->dev->alarm_low = (uint32_t) alarm_value;
138138
timer->dev->config.autoreload = autoreload;
139139
}
140140

141-
void IRAM_ATTR timerSetConfig(hw_timer_t *timer, uint32_t config){
141+
void timerSetConfig(hw_timer_t *timer, uint32_t config){
142142
timer->dev->config.val = config;
143143
}
144144

145-
uint32_t IRAM_ATTR timerGetConfig(hw_timer_t *timer){
145+
uint32_t timerGetConfig(hw_timer_t *timer){
146146
return timer->dev->config.val;
147147
}
148148

149-
void IRAM_ATTR timerSetCountUp(hw_timer_t *timer, bool countUp){
149+
void timerSetCountUp(hw_timer_t *timer, bool countUp){
150150
timer->dev->config.increase = countUp;
151151
}
152152

153-
bool IRAM_ATTR timerGetCountUp(hw_timer_t *timer){
153+
bool timerGetCountUp(hw_timer_t *timer){
154154
return timer->dev->config.increase;
155155
}
156156

157-
void IRAM_ATTR timerSetAutoReload(hw_timer_t *timer, bool autoreload){
157+
void timerSetAutoReload(hw_timer_t *timer, bool autoreload){
158158
timer->dev->config.autoreload = autoreload;
159159
}
160160

161-
bool IRAM_ATTR timerGetAutoReload(hw_timer_t *timer){
161+
bool timerGetAutoReload(hw_timer_t *timer){
162162
return timer->dev->config.autoreload;
163163
}
164164

165-
void IRAM_ATTR timerSetDivider(hw_timer_t *timer, uint16_t divider){//2 to 65536
165+
void timerSetDivider(hw_timer_t *timer, uint16_t divider){//2 to 65536
166166
if(!divider){
167167
divider = 0xFFFF;
168168
} else if(divider == 1){
@@ -174,41 +174,41 @@ void IRAM_ATTR timerSetDivider(hw_timer_t *timer, uint16_t divider){//2 to 65536
174174
timer->dev->config.enable = timer_en;
175175
}
176176

177-
uint16_t IRAM_ATTR timerGetDivider(hw_timer_t *timer){
177+
uint16_t timerGetDivider(hw_timer_t *timer){
178178
return timer->dev->config.divider;
179179
}
180180

181-
void IRAM_ATTR timerStart(hw_timer_t *timer){
181+
void timerStart(hw_timer_t *timer){
182182
timer->dev->config.enable = 1;
183183
}
184184

185-
void IRAM_ATTR timerStop(hw_timer_t *timer){
185+
void timerStop(hw_timer_t *timer){
186186
timer->dev->config.enable = 0;
187187
}
188188

189-
void IRAM_ATTR timerRestart(hw_timer_t *timer){
189+
void timerRestart(hw_timer_t *timer){
190190
timer->dev->config.enable = 0;
191191
timer->dev->reload = 1;
192192
timer->dev->config.enable = 1;
193193
}
194194

195-
bool IRAM_ATTR timerStarted(hw_timer_t *timer){
195+
bool timerStarted(hw_timer_t *timer){
196196
return timer->dev->config.enable;
197197
}
198198

199-
void IRAM_ATTR timerAlarmEnable(hw_timer_t *timer){
199+
void timerAlarmEnable(hw_timer_t *timer){
200200
timer->dev->config.alarm_en = 1;
201201
}
202202

203-
void IRAM_ATTR timerAlarmDisable(hw_timer_t *timer){
203+
void timerAlarmDisable(hw_timer_t *timer){
204204
timer->dev->config.alarm_en = 0;
205205
}
206206

207-
bool IRAM_ATTR timerAlarmEnabled(hw_timer_t *timer){
207+
bool timerAlarmEnabled(hw_timer_t *timer){
208208
return timer->dev->config.alarm_en;
209209
}
210210

211-
static void IRAM_ATTR _on_apb_change(void * arg, apb_change_ev_t ev_type, uint32_t old_apb, uint32_t new_apb){
211+
static void _on_apb_change(void * arg, apb_change_ev_t ev_type, uint32_t old_apb, uint32_t new_apb){
212212
hw_timer_t * timer = (hw_timer_t *)arg;
213213
if(ev_type == APB_BEFORE_CHANGE){
214214
timer->dev->config.enable = 0;
@@ -220,7 +220,7 @@ static void IRAM_ATTR _on_apb_change(void * arg, apb_change_ev_t ev_type, uint32
220220
}
221221
}
222222

223-
hw_timer_t * IRAM_ATTR timerBegin(uint8_t num, uint16_t divider, bool countUp){
223+
hw_timer_t * timerBegin(uint8_t num, uint16_t divider, bool countUp){
224224
if(num > 3){
225225
return NULL;
226226
}
@@ -259,13 +259,13 @@ hw_timer_t * IRAM_ATTR timerBegin(uint8_t num, uint16_t divider, bool countUp){
259259
return timer;
260260
}
261261

262-
void IRAM_ATTR timerEnd(hw_timer_t *timer){
262+
void timerEnd(hw_timer_t *timer){
263263
timer->dev->config.enable = 0;
264264
timerAttachInterrupt(timer, NULL, false);
265265
removeApbChangeCallback(timer, _on_apb_change);
266266
}
267267

268-
void IRAM_ATTR timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool edge){
268+
void timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool edge){
269269
static bool initialized = false;
270270
static intr_handle_t intr_handle = NULL;
271271
if(intr_handle){
@@ -326,29 +326,29 @@ void IRAM_ATTR timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool ed
326326
}
327327
}
328328

329-
void IRAM_ATTR timerDetachInterrupt(hw_timer_t *timer){
329+
void timerDetachInterrupt(hw_timer_t *timer){
330330
timerAttachInterrupt(timer, NULL, false);
331331
}
332332

333-
uint64_t IRAM_ATTR timerReadMicros(hw_timer_t *timer){
333+
uint64_t timerReadMicros(hw_timer_t *timer){
334334
uint64_t timer_val = timerRead(timer);
335335
uint16_t div = timerGetDivider(timer);
336336
return timer_val * div / (getApbFrequency() / 1000000);
337337
}
338338

339-
double IRAM_ATTR timerReadSeconds(hw_timer_t *timer){
339+
double timerReadSeconds(hw_timer_t *timer){
340340
uint64_t timer_val = timerRead(timer);
341341
uint16_t div = timerGetDivider(timer);
342342
return (double)timer_val * div / getApbFrequency();
343343
}
344344

345-
uint64_t IRAM_ATTR timerAlarmReadMicros(hw_timer_t *timer){
345+
uint64_t timerAlarmReadMicros(hw_timer_t *timer){
346346
uint64_t timer_val = timerAlarmRead(timer);
347347
uint16_t div = timerGetDivider(timer);
348348
return timer_val * div / (getApbFrequency() / 1000000);
349349
}
350350

351-
double IRAM_ATTR timerAlarmReadSeconds(hw_timer_t *timer){
351+
double timerAlarmReadSeconds(hw_timer_t *timer){
352352
uint64_t timer_val = timerAlarmRead(timer);
353353
uint16_t div = timerGetDivider(timer);
354354
return (double)timer_val * div / getApbFrequency();

0 commit comments

Comments
 (0)