ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6490 from li-ho/ev-cog-us-ticker-fire-interrupt 

ADI: Fix EV_COG_AD3029LZ and EV_COG_AD4050LZ us_ticker_fire_interrupt() minimal time interval
pull/6561/head
Martin Kojtal 2018-04-06 10:31:58 +02:00 committed by GitHub
parent 3328ecd92a 04eaabf579
commit 54b6aa3d1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/us_ticker.c
View File

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2010-2017 Analog Devices, Inc. * Copyright (c) 2010-2018 Analog Devices, Inc.
* *
* All rights reserved. * All rights reserved.
* *
@ -206,7 +206,10 @@ static void event_timer()
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, &tmr2Config); adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, &tmr2Config);
adi_tmr_Enable(ADI_TMR_DEVICE_GP2, true); adi_tmr_Enable(ADI_TMR_DEVICE_GP2, true);
} else { } else {
us_ticker_irq_handler(); tmr2Config.nLoad = 65535u;
tmr2Config.nAsyncLoad = 65535u;
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, &tmr2Config);
adi_tmr_Enable(ADI_TMR_DEVICE_GP2, true);
} }
} }
@ -231,7 +234,11 @@ static void GP2CallbackFunction(void *pCBParam, uint32_t Event, void * pArg)
if (largecnt < 65536u) { if (largecnt < 65536u) {
adi_tmr_Enable(ADI_TMR_DEVICE_GP2, false); adi_tmr_Enable(ADI_TMR_DEVICE_GP2, false);
if (largecnt) {
event_timer(); event_timer();
} else {
us_ticker_irq_handler();
}
} }
} }
@ -328,6 +335,7 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
* *
*/ */
calc_event_counts(timestamp); // use timestamp to calculate largecnt to control number of timer interrupts calc_event_counts(timestamp); // use timestamp to calculate largecnt to control number of timer interrupts
tmr2Config.ePrescaler = ADI_TMR_PRESCALER_256; // TMR2 at 26MHz/256
event_timer(); // uses largecnt to initiate timer interrupts event_timer(); // uses largecnt to initiate timer interrupts
} }
@ -339,7 +347,9 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
*/ */
void us_ticker_fire_interrupt(void) void us_ticker_fire_interrupt(void)
{ {
NVIC_SetPendingIRQ(TMR2_EVT_IRQn); largecnt = 1; // set a minimal interval so interrupt fire immediately
tmr2Config.ePrescaler = ADI_TMR_PRESCALER_1; // TMR2 at 26MHz/1
event_timer(); // enable the timer and interrupt
} }

16
targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/us_ticker.c
View File

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2010-2017 Analog Devices, Inc. * Copyright (c) 2010-2018 Analog Devices, Inc.
* *
* All rights reserved. * All rights reserved.
* *
@ -205,7 +205,10 @@ static void event_timer()
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, tmr2Config); adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, tmr2Config);
adi_tmr_Enable(ADI_TMR_DEVICE_GP2, true); adi_tmr_Enable(ADI_TMR_DEVICE_GP2, true);
} else { } else {
us_ticker_irq_handler(); tmr2Config.nLoad = 65535u;
tmr2Config.nAsyncLoad = 65535u;
adi_tmr_ConfigTimer(ADI_TMR_DEVICE_GP2, tmr2Config);
adi_tmr_Enable(ADI_TMR_DEVICE_GP2, true);
} }
} }
@ -229,7 +232,11 @@ static void GP2CallbackFunction(void *pCBParam, uint32_t Event, void * pArg)
if (largecnt < 65536u) { if (largecnt < 65536u) {
adi_tmr_Enable(ADI_TMR_DEVICE_GP2, false); adi_tmr_Enable(ADI_TMR_DEVICE_GP2, false);
if (largecnt) {
event_timer(); event_timer();
} else {
us_ticker_irq_handler();
}
} }
} }
@ -326,6 +333,7 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
* *
*/ */
calc_event_counts(timestamp); // use timestamp to calculate largecnt to control number of timer interrupts calc_event_counts(timestamp); // use timestamp to calculate largecnt to control number of timer interrupts
tmr2Config.ePrescaler = ADI_TMR_PRESCALER_256; // TMR2 at 26MHz/256
event_timer(); // uses largecnt to initiate timer interrupts event_timer(); // uses largecnt to initiate timer interrupts
} }
@ -337,7 +345,9 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
*/ */
void us_ticker_fire_interrupt(void) void us_ticker_fire_interrupt(void)
{ {
NVIC_SetPendingIRQ(TMR2_EVT_IRQn); largecnt = 1; // set a minimal interval so interrupt fire immediately
tmr2Config.ePrescaler = ADI_TMR_PRESCALER_1; // TMR2 at 26MHz/1
event_timer(); // enable the timer and interrupt
} }