qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
	qemu-arm@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
	"Sergey Kambalin" <serg.oker@gmail.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 12/19] hw/timer/arm_timer: Use array of frequency in SP804Timer
Date: Tue,  4 Jul 2023 16:50:05 +0200	[thread overview]
Message-ID: <20230704145012.49870-13-philmd@linaro.org> (raw)
In-Reply-To: <20230704145012.49870-1-philmd@linaro.org>

SP804Timer 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>
Reviewed-by: Peter Maydell <peter.maydell@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 2b5fb75577..0ad0e55df8 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -206,7 +206,7 @@ struct SP804Timer {
 
     MemoryRegion iomem;
     ArmTimer *timer[2];
-    uint32_t freq0, freq1;
+    uint32_t freq[2];
     int level[2];
     qemu_irq irq;
 };
@@ -310,15 +310,15 @@ static void sp804_realize(DeviceState *dev, Error **errp)
 {
     SP804Timer *s = SP804_TIMER(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);
 }
 
 static Property sp804_properties[] = {
-    DEFINE_PROP_UINT32("freq0", SP804Timer, freq0, 1000000),
-    DEFINE_PROP_UINT32("freq1", SP804Timer, freq1, 1000000),
+    DEFINE_PROP_UINT32("freq0", SP804Timer, freq[0], 1000000),
+    DEFINE_PROP_UINT32("freq1", SP804Timer, freq[1], 1000000),
     DEFINE_PROP_END_OF_LIST(),
 };
 
-- 
2.38.1



  parent reply	other threads:[~2023-07-04 14:53 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-04 14:49 [PATCH v2 00/19] hw/timer/arm_timer: QOM'ify ARM_TIMER and correct sysbus/irq in ICP_PIT Philippe Mathieu-Daudé
2023-07-04 14:49 ` [PATCH v2 01/19] hw/timer/arm_timer: Declare QOM types using DEFINE_TYPES() macro Philippe Mathieu-Daudé
2023-07-05 15:25   ` Richard Henderson
2023-07-04 14:49 ` [PATCH v2 02/19] hw/timer/arm_timer: Remove pointless cast from void * Philippe Mathieu-Daudé
2023-07-05 15:26   ` Richard Henderson
2023-07-04 14:49 ` [PATCH v2 03/19] hw/timer/arm_timer: Move SP804 code around Philippe Mathieu-Daudé
2023-07-05 15:26   ` Richard Henderson
2023-07-04 14:49 ` [PATCH v2 04/19] hw/timer/arm_timer: CamelCase rename icp_pit_state -> IntegratorPIT Philippe Mathieu-Daudé
2023-07-05 15:27   ` Richard Henderson
2023-07-04 14:49 ` [PATCH v2 05/19] hw/timer/arm_timer: CamelCase rename arm_timer_state -> ArmTimer Philippe Mathieu-Daudé
2023-07-05 15:28   ` Richard Henderson
2023-07-04 14:49 ` [PATCH v2 06/19] hw/timer/arm_timer: Rename SP804State -> SP804Timer Philippe Mathieu-Daudé
2023-07-05 15:33   ` Richard Henderson
2023-07-04 14:50 ` [PATCH v2 07/19] hw/timer/arm_timer: Rename TYPE_SP804 -> TYPE_SP804_TIMER Philippe Mathieu-Daudé
2023-07-05 15:34   ` Richard Henderson
2023-07-04 14:50 ` [PATCH v2 08/19] hw/timer/arm_timer: Extract arm_timer_reset_hold() Philippe Mathieu-Daudé
2023-07-05 15:34   ` Richard Henderson
2023-07-04 14:50 ` [PATCH v2 09/19] hw/timer/arm_timer: Convert read/write handlers to MemoryRegionOps ones Philippe Mathieu-Daudé
2023-07-05 15:35   ` Richard Henderson
2023-07-04 14:50 ` [PATCH v2 10/19] hw/timer/arm_timer: Rename arm_timer_init() -> arm_timer_new() Philippe Mathieu-Daudé
2023-07-05 15:35   ` Richard Henderson
2023-07-04 14:50 ` [PATCH v2 11/19] hw/timer/arm_timer: Convert ArmTimer::freq to uint32_t type Philippe Mathieu-Daudé
2023-07-05 15:35   ` Richard Henderson
2023-07-04 14:50 ` Philippe Mathieu-Daudé [this message]
2023-07-05 15:36   ` [PATCH v2 12/19] hw/timer/arm_timer: Use array of frequency in SP804Timer Richard Henderson
2023-07-04 14:50 ` [PATCH v2 13/19] hw/timer/arm_timer: Iterate on timers using for() loop statement Philippe Mathieu-Daudé
2023-07-05 15:37   ` Richard Henderson
2023-07-04 14:50 ` [PATCH v2 14/19] hw/timer/arm_timer: Pass timer output IRQ as parameter to arm_timer_new Philippe Mathieu-Daudé
2023-07-05 15:39   ` Richard Henderson
2023-07-04 14:50 ` [PATCH v2 15/19] hw/timer/arm_timer: Fix misuse of SysBus IRQ in IntegratorPIT Philippe Mathieu-Daudé
2023-07-05 15:40   ` Richard Henderson
2023-07-04 14:50 ` [PATCH v2 16/19] hw/timer/arm_timer: Extract icp_pit_realize() from icp_pit_init() Philippe Mathieu-Daudé
2023-07-05 15:41   ` Richard Henderson
2023-07-04 14:50 ` [PATCH v2 17/19] hw/timer/arm_timer: QDev'ify ARM_TIMER Philippe Mathieu-Daudé
2023-07-24 15:01   ` Peter Maydell
2023-07-04 14:50 ` [PATCH v2 18/19] hw/timer/arm_timer: Map ARM_TIMER MMIO regions into IntegratorPIT Philippe Mathieu-Daudé
2023-07-05 15:44   ` Richard Henderson
2023-07-04 14:50 ` [PATCH v2 19/19] hw/timer/arm_timer: Map ARM_TIMER MMIO regions into SP804Timer Philippe Mathieu-Daudé
2023-07-05 15:44   ` Richard Henderson
2023-07-04 15:10 ` [PATCH v2 00/19] hw/timer/arm_timer: QOM'ify ARM_TIMER and correct sysbus/irq in ICP_PIT Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230704145012.49870-13-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=mark.cave-ayland@ilande.co.uk \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=serg.oker@gmail.com \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).