[19/36] next-cube: convert next-pc device to use Resettable interface

Commit Message

Mark Cave-Ayland Oct. 23, 2024, 8:58 a.m. UTC

Signed-off-by: Mark Cave-Ayland <[e-mail]>
---
 hw/m68k/next-cube.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Thomas Huth Nov. 2, 2024, 9:48 a.m. UTC | #1

Am Wed, 23 Oct 2024 09:58:35 +0100
schrieb Mark Cave-Ayland <[e-mail]>:

> Signed-off-by: Mark Cave-Ayland <[e-mail]>
> ---
>  hw/m68k/next-cube.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

Acked-by: Thomas Huth <[e-mail]>

Patch

diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index 9829f49387..c44a1c6f0c 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -1009,9 +1009,9 @@  static const MemoryRegionOps next_dummy_en_ops = {
     .endianness = DEVICE_BIG_ENDIAN,
 };
 
-static void next_pc_reset(DeviceState *dev)
+static void next_pc_reset_hold(Object *obj, ResetType type)
 {
-    NeXTPC *s = NEXT_PC(dev);
+    NeXTPC *s = NEXT_PC(obj);
 
     /* Set internal registers to initial values */
     /*     0x0000XX00 << vital bits */
@@ -1141,12 +1141,13 @@  static const VMStateDescription next_pc_vmstate = {
 static void next_pc_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
+    ResettableClass *rc = RESETTABLE_CLASS(klass);
 
     dc->desc = "NeXT Peripheral Controller";
     dc->realize = next_pc_realize;
-    device_class_set_legacy_reset(dc, next_pc_reset);
     device_class_set_props(dc, next_pc_properties);
     dc->vmsd = &next_pc_vmstate;
+    rc->phases.hold = next_pc_reset_hold;
 }
 
 static const TypeInfo next_pc_info = {