Skip to content

Commit 10af90a

Browse files
author
Edmund Hsu
committed
Resolve adi_tmr_ConfigTimer api conflict in us_ticker.c for both EV_COG_AD4050LZ and EV_COG_AD3029LZ
1 parent da6c6bd commit 10af90a

File tree

1 file changed

+5
-5
lines changed
  • targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api

1 file changed

+5
-5
lines changed

targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/us_ticker.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,12 @@ static void event_timer()
202202

203203
tmrConfig.nLoad = cnt;
204204
tmrConfig.nAsyncLoad = cnt;
205-
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, tmrConfig);
205+
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, &tmrConfig);
206206
adi_tmr_Enable(ADI_TMR_DEVICE_GP2, true);
207207
} else {
208208
tmrConfig.nLoad = 65535u;
209209
tmrConfig.nAsyncLoad = 65535u;
210-
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, tmrConfig);
210+
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, &tmrConfig);
211211
adi_tmr_Enable(ADI_TMR_DEVICE_GP2, true);
212212
}
213213
}
@@ -274,13 +274,13 @@ void us_ticker_init(void)
274274
tmrConfig.nAsyncLoad = 0;
275275
tmrConfig.bReloading = false;
276276
tmrConfig.bSyncBypass = true; // Allow x1 prescale: requires PCLK as a clk
277-
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP0, tmrConfig);
277+
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP0, &tmrConfig);
278278

279279
/* Configure GP1 to have a period 256 times longer than GP0 */
280280
tmrConfig.nLoad = 0;
281281
tmrConfig.nAsyncLoad = 0;
282282
tmrConfig.ePrescaler = ADI_TMR_PRESCALER_256; // TMR1 = 26MHz/256
283-
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP1, tmrConfig);
283+
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP1, &tmrConfig);
284284

285285
/* Configure GP2 for doing event counts */
286286
tmrConfig.bCountingUp = true;
@@ -291,7 +291,7 @@ void us_ticker_init(void)
291291
tmrConfig.nAsyncLoad = 0;
292292
tmrConfig.bReloading = false;
293293
tmrConfig.bSyncBypass = true; // Allow x1 prescale
294-
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, tmrConfig);
294+
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, &tmrConfig);
295295

296296

297297
/*------------------------- GP TIMER ENABLE ------------------------------*/

0 commit comments

Comments
 (0)