@@ -121,6 +121,7 @@ void test_set_top_value_with_alarm_instance(const char *dev_name)
121
121
int err ;
122
122
u32_t cnt ;
123
123
u32_t ticks ;
124
+ u32_t tmp_top_cnt ;
124
125
125
126
top_cnt = 0 ;
126
127
@@ -141,9 +142,10 @@ void test_set_top_value_with_alarm_instance(const char *dev_name)
141
142
142
143
k_busy_wait (5.2 * COUNTER_PERIOD_US );
143
144
144
- zassert_true ((u32_t )top_cnt == 5 ,
145
+ tmp_top_cnt = top_cnt ; /* to avoid passing volatile to the macro */
146
+ zassert_true (tmp_top_cnt == 5 ,
145
147
"Unexpected number of turnarounds (%d) (dev: %s).\n" ,
146
- ( u32_t ) top_cnt , dev_name );
148
+ tmp_top_cnt , dev_name );
147
149
}
148
150
149
151
void test_set_top_value_with_alarm (void )
@@ -168,6 +170,7 @@ void test_single_shot_alarm_instance(const char *dev_name, bool set_top)
168
170
struct device * dev ;
169
171
int err ;
170
172
u32_t ticks ;
173
+ u32_t tmp_alarm_cnt ;
171
174
172
175
dev = device_get_binding (dev_name );
173
176
ticks = counter_us_to_ticks (dev , COUNTER_PERIOD_US );
@@ -205,10 +208,12 @@ void test_single_shot_alarm_instance(const char *dev_name, bool set_top)
205
208
zassert_equal (0 , err , "Counter set alarm failed\n" );
206
209
207
210
k_busy_wait (1.5 * counter_ticks_to_us (dev , ticks ));
208
- zassert_equal (1 , (u32_t )alarm_cnt , "Expecting alarm callback\n" );
211
+ tmp_alarm_cnt = alarm_cnt ; /* to avoid passing volatile to the macro */
212
+ zassert_equal (1 , tmp_alarm_cnt , "Expecting alarm callback\n" );
209
213
210
214
k_busy_wait (1.5 * counter_ticks_to_us (dev , ticks ));
211
- zassert_equal (1 , (u32_t )alarm_cnt , "Expecting alarm callback\n" );
215
+ tmp_alarm_cnt = alarm_cnt ; /* to avoid passing volatile to the macro */
216
+ zassert_equal (1 , tmp_alarm_cnt , "Expecting alarm callback\n" );
212
217
213
218
err = counter_cancel_channel_alarm (dev , 0 );
214
219
zassert_equal (0 , err , "Counter disabling alarm failed\n" );
@@ -266,6 +271,7 @@ void test_multiple_alarms_instance(const char *dev_name)
266
271
struct device * dev ;
267
272
int err ;
268
273
u32_t ticks ;
274
+ u32_t tmp_alarm_cnt ;
269
275
270
276
dev = device_get_binding (dev_name );
271
277
ticks = counter_us_to_ticks (dev , COUNTER_PERIOD_US );
@@ -302,7 +308,8 @@ void test_multiple_alarms_instance(const char *dev_name)
302
308
zassert_equal (0 , err , "Counter set alarm failed\n" );
303
309
304
310
k_busy_wait (1.2 * counter_ticks_to_us (dev , 2 * ticks ));
305
- zassert_equal (2 , (u32_t )alarm_cnt , "Counter set alarm failed\n" );
311
+ tmp_alarm_cnt = alarm_cnt ; /* to avoid passing volatile to the macro */
312
+ zassert_equal (2 , tmp_alarm_cnt , "Counter set alarm failed\n" );
306
313
zassert_equal (& alarm_cfg2 , clbk_data [0 ],
307
314
"Expected different order or callbacks\n" );
308
315
zassert_equal (& alarm_cfg , clbk_data [1 ],
@@ -330,6 +337,7 @@ void test_all_channels_instance(const char *str)
330
337
bool limit_reached = false;
331
338
struct counter_alarm_cfg alarm_cfgs ;
332
339
u32_t ticks ;
340
+ u32_t tmp_alarm_cnt ;
333
341
334
342
dev = device_get_binding (str );
335
343
ticks = counter_us_to_ticks (dev , COUNTER_PERIOD_US );
@@ -355,7 +363,8 @@ void test_all_channels_instance(const char *str)
355
363
}
356
364
357
365
k_busy_wait (1.5 * counter_ticks_to_us (dev , ticks ));
358
- zassert_equal (nchan , (u32_t )alarm_cnt , "Expecting alarm callback\n" );
366
+ tmp_alarm_cnt = alarm_cnt ; /* to avoid passing volatile to the macro */
367
+ zassert_equal (nchan , tmp_alarm_cnt , "Expecting alarm callback\n" );
359
368
360
369
for (int i = 0 ; i < nchan ; i ++ ) {
361
370
err = counter_cancel_channel_alarm (dev , i );
0 commit comments