Skip to content

Commit 0374309

Browse files
Qinghao ShiQinghao Shi
authored andcommitted
FastModel: refactor us_ticker code, make names intuitive
- reanme US_TICKER_TIMER1 to US_TICKER_COUNTER - reanme US_TICKER_TIMER2 to US_TICKER_INTERRUPT
1 parent 8ebb363 commit 0374309

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

targets/TARGET_ARM_FM/TARGET_FVP_MPS2/us_ticker.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
#include <stddef.h>
1717
#include "us_ticker_api.h"
1818
#include "PeripheralNames.h"
19-
#define US_TICKER_TIMER1 CMSDK_DUALTIMER1
20-
#define US_TICKER_TIMER2 CMSDK_DUALTIMER2
19+
#define US_TICKER_COUNTER CMSDK_DUALTIMER1
20+
#define US_TICKER_INTERRUPT CMSDK_DUALTIMER2
2121
#define US_TICKER_TIMER_IRQn DUALTIMER_IRQn
2222

2323
/** mbed OS HAL API defined us_ticker as an increment ticker
2424
* MPS2 platform provided in SSE-200 are decrement tickers
2525
* with interrupt fired counter reaches 0.
2626
*
2727
* So 2 Timers are used to construct mbed OS HAL ticker.
28-
*
28+
*
2929
* TIMER1 is for counting, and returns inverted binary when read from it
3030
* TIMER1 will be kept in free-running mode (default, and not generate interrupts)
31-
*
31+
*
3232
* TIMER2 is for generating interrupts
3333
* So TIMER2 is set to periodic mode, which start decrement counting form LOADVALUE generates interrupts at 0
34-
* and TIMER2 also set into one-shot mode, which counter halts when is reaches 0
34+
* and TIMER2 also set into one-shot mode, which counter halts when is reaches 0
3535
*/
36-
36+
3737
static int us_ticker_inited = 0;
3838

3939
void us_ticker_init(void)
@@ -43,47 +43,47 @@ void us_ticker_init(void)
4343
return;
4444
}
4545

46-
US_TICKER_TIMER1->TimerControl = 0x0ul; // disable TIMER1 and reset all control
47-
US_TICKER_TIMER2->TimerControl = 0x0ul; // disable TIMER2 and reset all control
46+
US_TICKER_COUNTER->TimerControl = 0x0ul; // disable TIMER1 and reset all control
47+
US_TICKER_INTERRUPT->TimerControl = 0x0ul; // disable TIMER2 and reset all control
4848

49-
US_TICKER_TIMER1->TimerLoad = 0xFFFFFFFFul;
50-
US_TICKER_TIMER2->TimerLoad = 0xFFFFFFFFul;
49+
US_TICKER_COUNTER->TimerLoad = 0xFFFFFFFFul;
50+
US_TICKER_INTERRUPT->TimerLoad = 0xFFFFFFFFul;
5151

52-
US_TICKER_TIMER1->TimerControl |= CMSDK_DUALTIMER1_CTRL_SIZE_Msk; // set TIMER1 to 32 bit counter
53-
US_TICKER_TIMER2->TimerControl |= CMSDK_DUALTIMER2_CTRL_SIZE_Msk; // set TIMER2 to 32 bit counter
52+
US_TICKER_COUNTER->TimerControl |= CMSDK_DUALTIMER1_CTRL_SIZE_Msk; // set TIMER1 to 32 bit counter
53+
US_TICKER_INTERRUPT->TimerControl |= CMSDK_DUALTIMER2_CTRL_SIZE_Msk; // set TIMER2 to 32 bit counter
5454

55-
US_TICKER_TIMER1->TimerControl |= 0x1 << CMSDK_DUALTIMER1_CTRL_PRESCALE_Pos; // set TIMER1 with 4 stages prescale
56-
US_TICKER_TIMER2->TimerControl |= 0x1 << CMSDK_DUALTIMER2_CTRL_PRESCALE_Pos; // set TIMER2 with 4 stages prescale
55+
US_TICKER_COUNTER->TimerControl |= 0x1 << CMSDK_DUALTIMER1_CTRL_PRESCALE_Pos; // set TIMER1 with 4 stages prescale
56+
US_TICKER_INTERRUPT->TimerControl |= 0x1 << CMSDK_DUALTIMER2_CTRL_PRESCALE_Pos; // set TIMER2 with 4 stages prescale
5757

58-
US_TICKER_TIMER2->TimerControl |= CMSDK_DUALTIMER2_CTRL_MODE_Msk; // set TIMER2 periodic mode
59-
US_TICKER_TIMER2->TimerControl |= CMSDK_DUALTIMER2_CTRL_ONESHOOT_Msk; // set TIMER2 one-shot mode
58+
US_TICKER_INTERRUPT->TimerControl |= CMSDK_DUALTIMER2_CTRL_MODE_Msk; // set TIMER2 periodic mode
59+
US_TICKER_INTERRUPT->TimerControl |= CMSDK_DUALTIMER2_CTRL_ONESHOOT_Msk; // set TIMER2 one-shot mode
6060

61-
US_TICKER_TIMER1->TimerControl |= CMSDK_DUALTIMER1_CTRL_EN_Msk; // enable TIMER1 counter
61+
US_TICKER_COUNTER->TimerControl |= CMSDK_DUALTIMER1_CTRL_EN_Msk; // enable TIMER1 counter
6262

6363
NVIC_SetVector(US_TICKER_TIMER_IRQn, (uint32_t)us_ticker_irq_handler);
6464
us_ticker_inited = 1;
6565
}
6666

6767
void us_ticker_free(void)
6868
{
69-
US_TICKER_TIMER1->TimerControl &= ~CMSDK_DUALTIMER1_CTRL_EN_Msk; // disable TIMER1
70-
US_TICKER_TIMER2->TimerControl &= ~CMSDK_DUALTIMER2_CTRL_EN_Msk; // disable TIMER2
69+
US_TICKER_COUNTER->TimerControl &= ~CMSDK_DUALTIMER1_CTRL_EN_Msk; // disable TIMER1
70+
US_TICKER_INTERRUPT->TimerControl &= ~CMSDK_DUALTIMER2_CTRL_EN_Msk; // disable TIMER2
7171
us_ticker_disable_interrupt();
7272
us_ticker_inited = 0;
7373
}
7474

7575
uint32_t us_ticker_read()
7676
{
77-
return ~US_TICKER_TIMER1->TimerValue;
77+
return ~US_TICKER_COUNTER->TimerValue;
7878
}
7979

8080
void us_ticker_set_interrupt(timestamp_t timestamp)
8181
{
8282
uint32_t delta = timestamp - us_ticker_read();
83-
US_TICKER_TIMER2->TimerControl &= ~CMSDK_DUALTIMER2_CTRL_EN_Msk; // disable TIMER2
84-
US_TICKER_TIMER2->TimerLoad = delta; // Set TIMER2 load value
85-
US_TICKER_TIMER2->TimerControl |= CMSDK_DUALTIMER2_CTRL_INTEN_Msk; // enable TIMER2 interrupt
86-
US_TICKER_TIMER2->TimerControl |= CMSDK_DUALTIMER2_CTRL_EN_Msk; // enable TIMER2 counter
83+
US_TICKER_INTERRUPT->TimerControl &= ~CMSDK_DUALTIMER2_CTRL_EN_Msk; // disable TIMER2
84+
US_TICKER_INTERRUPT->TimerLoad = delta; // Set TIMER2 load value
85+
US_TICKER_INTERRUPT->TimerControl |= CMSDK_DUALTIMER2_CTRL_INTEN_Msk; // enable TIMER2 interrupt
86+
US_TICKER_INTERRUPT->TimerControl |= CMSDK_DUALTIMER2_CTRL_EN_Msk; // enable TIMER2 counter
8787
NVIC_EnableIRQ(US_TICKER_TIMER_IRQn);
8888
}
8989

@@ -96,14 +96,14 @@ void us_ticker_fire_interrupt(void)
9696

9797
void us_ticker_disable_interrupt(void)
9898
{
99-
US_TICKER_TIMER2->TimerControl &= ~CMSDK_DUALTIMER2_CTRL_INTEN_Msk;
100-
US_TICKER_TIMER2->TimerControl &= ~CMSDK_DUALTIMER2_CTRL_EN_Msk; // disable TIMER2
99+
US_TICKER_INTERRUPT->TimerControl &= ~CMSDK_DUALTIMER2_CTRL_INTEN_Msk;
100+
US_TICKER_INTERRUPT->TimerControl &= ~CMSDK_DUALTIMER2_CTRL_EN_Msk; // disable TIMER2
101101
NVIC_DisableIRQ(US_TICKER_TIMER_IRQn);
102102
}
103103

104104
void us_ticker_clear_interrupt(void)
105105
{
106-
US_TICKER_TIMER2->TimerIntClr = CMSDK_DUALTIMER2_INTCLR_Msk;
106+
US_TICKER_INTERRUPT->TimerIntClr = CMSDK_DUALTIMER2_INTCLR_Msk;
107107
}
108108

109109
const ticker_info_t *us_ticker_get_info(void)

0 commit comments

Comments
 (0)