[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/19] hw/timer/arm_timer: Convert read/write handlers to Memo
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 09/19] hw/timer/arm_timer: Convert read/write handlers to MemoryRegionOps ones |
Date: |
Tue, 4 Jul 2023 16:50:02 +0200 |
In order to simplify the QOM convertion of ARM_TIMER in a few
commits, start converting the read/write() handlers to follow
the MemoryRegionOps::read/write() prototypes.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/timer/arm_timer.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index 0d7fac4d78..cbd82e8365 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -50,7 +50,7 @@ static void arm_timer_update(ArmTimer *s)
}
}
-static uint32_t arm_timer_read(void *opaque, hwaddr offset)
+static uint64_t arm_timer_read(void *opaque, hwaddr offset, unsigned size)
{
ArmTimer *s = opaque;
@@ -97,7 +97,7 @@ static void arm_timer_recalibrate(ArmTimer *s, int reload)
}
static void arm_timer_write(void *opaque, hwaddr offset,
- uint32_t value)
+ uint64_t value, unsigned size)
{
ArmTimer *s = opaque;
int freq;
@@ -233,10 +233,10 @@ static uint64_t sp804_read(void *opaque, hwaddr offset,
SP804Timer *s = opaque;
if (offset < 0x20) {
- return arm_timer_read(s->timer[0], offset);
+ return arm_timer_read(&s->timer[0], offset, size);
}
if (offset < 0x40) {
- return arm_timer_read(s->timer[1], offset - 0x20);
+ return arm_timer_read(&s->timer[1], offset - 0x20, size);
}
/* TimerPeriphID */
@@ -265,12 +265,12 @@ static void sp804_write(void *opaque, hwaddr offset,
SP804Timer *s = opaque;
if (offset < 0x20) {
- arm_timer_write(s->timer[0], offset, value);
+ arm_timer_write(&s->timer[0], offset, value, size);
return;
}
if (offset < 0x40) {
- arm_timer_write(s->timer[1], offset - 0x20, value);
+ arm_timer_write(&s->timer[1], offset - 0x20, value, size);
return;
}
@@ -356,7 +356,7 @@ static uint64_t icp_pit_read(void *opaque, hwaddr offset,
return 0;
}
- return arm_timer_read(s->timer[n], offset & 0xff);
+ return arm_timer_read(&s->timer[n], offset & 0xff, size);
}
static void icp_pit_write(void *opaque, hwaddr offset,
@@ -371,7 +371,7 @@ static void icp_pit_write(void *opaque, hwaddr offset,
return;
}
- arm_timer_write(s->timer[n], offset & 0xff, value);
+ arm_timer_write(&s->timer[n], offset & 0xff, value, size);
}
static const MemoryRegionOps icp_pit_ops = {
--
2.38.1
- [PATCH v2 03/19] hw/timer/arm_timer: Move SP804 code around, (continued)
- [PATCH v2 03/19] hw/timer/arm_timer: Move SP804 code around, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 06/19] hw/timer/arm_timer: Rename SP804State -> SP804Timer, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 04/19] hw/timer/arm_timer: CamelCase rename icp_pit_state -> IntegratorPIT, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 05/19] hw/timer/arm_timer: CamelCase rename arm_timer_state -> ArmTimer, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 07/19] hw/timer/arm_timer: Rename TYPE_SP804 -> TYPE_SP804_TIMER, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 09/19] hw/timer/arm_timer: Convert read/write handlers to MemoryRegionOps ones,
Philippe Mathieu-Daudé <=
- [PATCH v2 08/19] hw/timer/arm_timer: Extract arm_timer_reset_hold(), Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 13/19] hw/timer/arm_timer: Iterate on timers using for() loop statement, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 10/19] hw/timer/arm_timer: Rename arm_timer_init() -> arm_timer_new(), Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 11/19] hw/timer/arm_timer: Convert ArmTimer::freq to uint32_t type, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 14/19] hw/timer/arm_timer: Pass timer output IRQ as parameter to arm_timer_new, Philippe Mathieu-Daudé, 2023/07/04