diff mbox series

[2/5] sun4m: use qdev properties instead of legacy m48t59_init() function

Message ID 20201016182739.22875-3-mark.cave-ayland@ilande.co.uk
State New
Headers show
Series m48t59: remove legacy init functions | expand

Commit Message

Mark Cave-Ayland Oct. 16, 2020, 6:27 p.m. UTC 
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/sparc/sun4m.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé Oct. 17, 2020, 9:42 a.m. UTC | #1 
On 10/16/20 8:27 PM, Mark Cave-Ayland wrote:
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

> ---

>   hw/sparc/sun4m.c | 8 +++++++-

>   1 file changed, 7 insertions(+), 1 deletion(-)

> 

> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c

> index 54a2b2f9ef..a9bb60f2b2 100644

> --- a/hw/sparc/sun4m.c

> +++ b/hw/sparc/sun4m.c

> @@ -966,7 +966,13 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,

>           create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000);

>       }

>   

> -    nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 1968, 8);

> +    dev = qdev_new("sysbus-m48t08");

> +    qdev_prop_set_int32(dev, "base-year", 1968);

> +    s = SYS_BUS_DEVICE(dev);

> +    sysbus_realize_and_unref(s, &error_fatal);

> +    sysbus_connect_irq(s, 0, slavio_irq[0]);

> +    sysbus_mmio_map(s, 0, hwdef->nvram_base);

> +    nvram = NVRAM(dev);


While here, can you declare "Nvram *nvram"?

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


>   

>       slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_irq, smp_cpus);

>   

>
diff mbox series

Patch

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 54a2b2f9ef..a9bb60f2b2 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -966,7 +966,13 @@  static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
         create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000);
     }
 
-    nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 1968, 8);
+    dev = qdev_new("sysbus-m48t08");
+    qdev_prop_set_int32(dev, "base-year", 1968);
+    s = SYS_BUS_DEVICE(dev);
+    sysbus_realize_and_unref(s, &error_fatal);
+    sysbus_connect_irq(s, 0, slavio_irq[0]);
+    sysbus_mmio_map(s, 0, hwdef->nvram_base);
+    nvram = NVRAM(dev);
 
     slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_irq, smp_cpus);