Skip to content

Commit cfe9232

Browse files
committed
Change "APR" references to "ARR" in timer module
I assume this was a typo...
1 parent f28e8a5 commit cfe9232

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

hw/timer/stm32_timer.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#define TIMER_CCER_OFFSET 0x20
5555
#define TIMER_CNT_OFFSET 0x24
5656
#define TIMER_PSC_OFFSET 0x28
57-
#define TIMER_APR_OFFSET 0x2c
57+
#define TIMER_ARR_OFFSET 0x2c
5858
#define TIMER_RCR_OFFSET 0x30
5959
#define TIMER_CCR1_OFFSET 0x34
6060
#define TIMER_CCR2_OFFSET 0x38
@@ -106,7 +106,7 @@ struct Stm32Timer {
106106
uint32_t ccer;
107107
/* uint32_t cnt; Handled by ptimer */
108108
uint32_t psc;
109-
uint32_t apr;
109+
uint32_t arr;
110110
/* uint32_t rcr; Repetition count not supported */
111111
uint32_t ccr1;
112112
uint32_t ccr2;
@@ -137,7 +137,7 @@ static uint32_t stm32_timer_get_count(Stm32Timer *s)
137137
uint64_t cnt = ptimer_get_count(s->timer);
138138
if (s->countMode == TIMER_UP_COUNT)
139139
{
140-
return s->apr - (cnt & 0xfffff);
140+
return s->arr - (cnt & 0xfffff);
141141
}
142142
else
143143
{
@@ -149,7 +149,7 @@ static void stm32_timer_set_count(Stm32Timer *s, uint32_t cnt)
149149
{
150150
if (s->countMode == TIMER_UP_COUNT)
151151
{
152-
ptimer_set_count(s->timer, s->apr - (cnt & 0xfffff));
152+
ptimer_set_count(s->timer, s->arr - (cnt & 0xfffff));
153153
}
154154
else
155155
{
@@ -207,7 +207,7 @@ static void stm32_timer_tick(void *opaque)
207207
}
208208
else
209209
{
210-
stm32_timer_set_count(s, s->apr);
210+
stm32_timer_set_count(s, s->arr);
211211
}
212212

213213
if (s->cr1 & 0x0300) /* CMS */
@@ -271,9 +271,9 @@ static uint64_t stm32_timer_read(void *opaque, hwaddr offset,
271271
case TIMER_PSC_OFFSET:
272272
DPRINTF("%s psc = %x\n", stm32_periph_name(s->periph), s->psc);
273273
return s->psc;
274-
case TIMER_APR_OFFSET:
275-
DPRINTF("%s apr = %x\n", stm32_periph_name(s->periph), s->apr);
276-
return s->apr;
274+
case TIMER_ARR_OFFSET:
275+
DPRINTF("%s arr = %x\n", stm32_periph_name(s->periph), s->arr);
276+
return s->arr;
277277
case TIMER_RCR_OFFSET:
278278
qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: RCR not supported");
279279
return 0;
@@ -342,7 +342,7 @@ static void stm32_timer_write(void * opaque, hwaddr offset,
342342
}
343343
if (s->egr & 0x1) {
344344
/* UG bit - reload count */
345-
ptimer_set_limit(s->timer, s->apr, 1);
345+
ptimer_set_limit(s->timer, s->arr, 1);
346346
}
347347
DPRINTF("%s egr = %x\n", stm32_periph_name(s->periph), s->egr);
348348
break;
@@ -367,10 +367,10 @@ static void stm32_timer_write(void * opaque, hwaddr offset,
367367
DPRINTF("%s psc = %x\n", stm32_periph_name(s->periph), s->psc);
368368
stm32_timer_freq(s);
369369
break;
370-
case TIMER_APR_OFFSET:
371-
s->apr = value & 0xffff;
372-
ptimer_set_limit(s->timer, s->apr, 1);
373-
DPRINTF("%s apr = %x\n", stm32_periph_name(s->periph), s->apr);
370+
case TIMER_ARR_OFFSET:
371+
s->arr = value & 0xffff;
372+
ptimer_set_limit(s->timer, s->arr, 1);
373+
DPRINTF("%s arr = %x\n", stm32_periph_name(s->periph), s->arr);
374374
break;
375375
case TIMER_RCR_OFFSET:
376376
qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: RCR not supported");
@@ -445,7 +445,7 @@ static int stm32_timer_init(SysBusDevice *dev)
445445
s->ccmr2 = 0;
446446
s->ccer = 0;
447447
s->psc = 0;
448-
s->apr = 0;
448+
s->arr = 0;
449449
s->ccr1 = 0;
450450
s->ccr2 = 0;
451451
s->ccr3 = 0;

0 commit comments

Comments
 (0)