diff mbox series

[3/6] sun4m: use qdev instead of legacy m48t59_init() function

Message ID 8dc32bfedf44c77f3229bb2359565a2ee65409d7.1602965621.git.balaton@eik.bme.hu
State New
Headers show
Series m48t59: remove legacy init functions | expand

Commit Message

Xingtao Yao (Fujitsu)" via Oct. 17, 2020, 8:13 p.m. UTC 
Also declare nvram variable with the correct type.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
 hw/sparc/sun4m.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé Oct. 18, 2020, 7:12 a.m. UTC | #1 
On 10/17/20 10:13 PM, BALATON Zoltan via wrote:
> Also declare nvram variable with the correct type.

> 

> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>


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


> ---

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

>   1 file changed, 3 insertions(+), 2 deletions(-)

> 

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

> index 54a2b2f9ef..7f1a48440c 100644

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

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

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

>   {

>       DeviceState *slavio_intctl;

>       unsigned int i;

> -    void *nvram;

> +    Nvram *nvram;

>       qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS];

>       qemu_irq fdc_tc;

>       unsigned long kernel_size;

> @@ -966,7 +966,8 @@ 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);

> +    nvram = NVRAM(sysbus_create_simple("sysbus-m48t08", hwdef->nvram_base,

> +                                       slavio_irq[0]));

>   

>       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..7f1a48440c 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -837,7 +837,7 @@  static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
 {
     DeviceState *slavio_intctl;
     unsigned int i;
-    void *nvram;
+    Nvram *nvram;
     qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS];
     qemu_irq fdc_tc;
     unsigned long kernel_size;
@@ -966,7 +966,8 @@  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);
+    nvram = NVRAM(sysbus_create_simple("sysbus-m48t08", hwdef->nvram_base,
+                                       slavio_irq[0]));
 
     slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_irq, smp_cpus);