[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/15] hw/timer/arm_timer: Use array of frequency in SP804State
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 10/15] hw/timer/arm_timer: Use array of frequency in SP804State |
Date: |
Wed, 31 May 2023 22:35:54 +0200 |
SP804State use arrays for timers and IRQ levels. Be consistent
and use another one for the frequencies. This will allow to
simplify using for() loop statement in the next commit.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/timer/arm_timer.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index 510ec74a51..4d31f917f6 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -204,7 +204,7 @@ struct SP804State {
MemoryRegion iomem;
ArmTimerState *timer[2];
- uint32_t freq0, freq1;
+ uint32_t freq[2];
int level[2];
qemu_irq irq;
};
@@ -308,8 +308,8 @@ static void sp804_realize(DeviceState *dev, Error **errp)
{
SP804State *s = SP804(dev);
- s->timer[0] = arm_timer_new(s->freq0);
- s->timer[1] = arm_timer_new(s->freq1);
+ s->timer[0] = arm_timer_new(s->freq[0]);
+ s->timer[1] = arm_timer_new(s->freq[1]);
s->timer[0]->irq = qemu_allocate_irq(sp804_set_irq, s, 0);
s->timer[1]->irq = qemu_allocate_irq(sp804_set_irq, s, 1);
}
@@ -324,8 +324,8 @@ static void sp804_unrealize(DeviceState *dev)
}
static Property sp804_properties[] = {
- DEFINE_PROP_UINT32("freq0", SP804State, freq0, 1000000),
- DEFINE_PROP_UINT32("freq1", SP804State, freq1, 1000000),
+ DEFINE_PROP_UINT32("freq0", SP804State, freq[0], 1000000),
+ DEFINE_PROP_UINT32("freq1", SP804State, freq[1], 1000000),
DEFINE_PROP_END_OF_LIST(),
};
--
2.38.1
- [PATCH 00/15] hw/timer/arm_timer: QOM'ify ARM_TIMER and correct sysbus/irq in ICP_PIT, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 01/15] hw/timer/arm_timer: Declare QOM types using DEFINE_TYPES() macro, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 02/15] hw/timer/arm_timer: Move SP804 code around, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 03/15] hw/timer/arm_timer: Add missing sp804_unrealize() handler, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 04/15] hw/timer/arm_timer: Remove pointless cast from void *, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 05/15] hw/timer/arm_timer: CamelCase rename icp_pit_state -> IntegratorPitState, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 06/15] hw/timer/arm_timer: CamelCase rename arm_timer_state -> ArmTimerState, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 07/15] hw/timer/arm_timer: Extract arm_timer_reset(), Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 08/15] hw/timer/arm_timer: Rename arm_timer_init() -> arm_timer_new(), Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 09/15] hw/timer/arm_timer: Convert ArmTimerState::freq to uint32_t type, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 10/15] hw/timer/arm_timer: Use array of frequency in SP804State,
Philippe Mathieu-Daudé <=
- [PATCH 11/15] hw/timer/arm_timer: Iterate on timers using for() loop statement, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 12/15] hw/timer/arm_timer: Pass timer output IRQ as parameter to arm_timer_new, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 13/15] hw/timer/arm_timer: Fix misuse of SysBus IRQ in IcpPitState, Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 14/15] hw/timer/arm_timer: Extract icp_pit_realize() from icp_pit_init(), Philippe Mathieu-Daudé, 2023/05/31
- [PATCH 15/15] hw/timer/arm_timer: QOM'ify ARM_TIMER, Philippe Mathieu-Daudé, 2023/05/31