[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/19] hw/timer/arm_timer: Rename SP804State -> SP804Timer
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 06/19] hw/timer/arm_timer: Rename SP804State -> SP804Timer |
Date: |
Tue, 4 Jul 2023 16:49:59 +0200 |
Following docs/devel/style.rst guidelines, rename SP804State
as SP804Timer.
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/timer/arm_timer.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index 8a2939483f..41045de8ed 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -192,9 +192,9 @@ static ArmTimer *arm_timer_init(uint32_t freq)
*/
#define TYPE_SP804 "sp804"
-OBJECT_DECLARE_SIMPLE_TYPE(SP804State, SP804)
+OBJECT_DECLARE_SIMPLE_TYPE(SP804Timer, SP804)
-struct SP804State {
+struct SP804Timer {
SysBusDevice parent_obj;
MemoryRegion iomem;
@@ -214,7 +214,7 @@ static const uint8_t sp804_ids[] = {
/* Merge the IRQs from the two component devices. */
static void sp804_set_irq(void *opaque, int irq, int level)
{
- SP804State *s = opaque;
+ SP804Timer *s = opaque;
s->level[irq] = level;
qemu_set_irq(s->irq, s->level[0] || s->level[1]);
@@ -223,7 +223,7 @@ static void sp804_set_irq(void *opaque, int irq, int level)
static uint64_t sp804_read(void *opaque, hwaddr offset,
unsigned size)
{
- SP804State *s = opaque;
+ SP804Timer *s = opaque;
if (offset < 0x20) {
return arm_timer_read(s->timer[0], offset);
@@ -255,7 +255,7 @@ static uint64_t sp804_read(void *opaque, hwaddr offset,
static void sp804_write(void *opaque, hwaddr offset,
uint64_t value, unsigned size)
{
- SP804State *s = opaque;
+ SP804Timer *s = opaque;
if (offset < 0x20) {
arm_timer_write(s->timer[0], offset, value);
@@ -283,14 +283,14 @@ static const VMStateDescription vmstate_sp804 = {
.version_id = 1,
.minimum_version_id = 1,
.fields = (VMStateField[]) {
- VMSTATE_INT32_ARRAY(level, SP804State, 2),
+ VMSTATE_INT32_ARRAY(level, SP804Timer, 2),
VMSTATE_END_OF_LIST()
}
};
static void sp804_init(Object *obj)
{
- SP804State *s = SP804(obj);
+ SP804Timer *s = SP804(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
sysbus_init_irq(sbd, &s->irq);
@@ -301,7 +301,7 @@ static void sp804_init(Object *obj)
static void sp804_realize(DeviceState *dev, Error **errp)
{
- SP804State *s = SP804(dev);
+ SP804Timer *s = SP804(dev);
s->timer[0] = arm_timer_init(s->freq0);
s->timer[1] = arm_timer_init(s->freq1);
@@ -310,8 +310,8 @@ static void sp804_realize(DeviceState *dev, Error **errp)
}
static Property sp804_properties[] = {
- DEFINE_PROP_UINT32("freq0", SP804State, freq0, 1000000),
- DEFINE_PROP_UINT32("freq1", SP804State, freq1, 1000000),
+ DEFINE_PROP_UINT32("freq0", SP804Timer, freq0, 1000000),
+ DEFINE_PROP_UINT32("freq1", SP804Timer, freq1, 1000000),
DEFINE_PROP_END_OF_LIST(),
};
@@ -405,7 +405,7 @@ static const TypeInfo arm_timer_types[] = {
}, {
.name = TYPE_SP804,
.parent = TYPE_SYS_BUS_DEVICE,
- .instance_size = sizeof(SP804State),
+ .instance_size = sizeof(SP804Timer),
.instance_init = sp804_init,
.class_init = sp804_class_init,
}
--
2.38.1
- [PATCH v2 02/19] hw/timer/arm_timer: Remove pointless cast from void *, (continued)
- [PATCH v2 02/19] hw/timer/arm_timer: Remove pointless cast from void *, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 03/19] hw/timer/arm_timer: Move SP804 code around, 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 08/19] hw/timer/arm_timer: Extract arm_timer_reset_hold(), 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 06/19] hw/timer/arm_timer: Rename SP804State -> SP804Timer,
Philippe Mathieu-Daudé <=
- [PATCH v2 07/19] hw/timer/arm_timer: Rename TYPE_SP804 -> TYPE_SP804_TIMER, 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 12/19] hw/timer/arm_timer: Use array of frequency in SP804Timer, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 09/19] hw/timer/arm_timer: Convert read/write handlers to MemoryRegionOps ones, 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