From: BALATON Zoltan via <qemu-devel@nongnu.org>
To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
Herve Poussineau <hpoussin@reactos.org>,
Philippe Mathieu-Daude <f4bug@amsat.org>,
Artyom Tarasenko <atar4qemu@gmail.com>,
David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 3/6] sun4m: use qdev instead of legacy m48t59_init() function
Date: Sat, 17 Oct 2020 22:13:41 +0200 [thread overview]
Message-ID: <8dc32bfedf44c77f3229bb2359565a2ee65409d7.1602965621.git.balaton@eik.bme.hu> (raw)
In-Reply-To: <cover.1602965621.git.balaton@eik.bme.hu>
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(-)
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);
--
2.21.3
next prev parent reply other threads:[~2020-10-17 20:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-17 20:13 [PATCH 0/6] m48t59: remove legacy init functions BALATON Zoltan via
2020-10-17 20:13 ` [PATCH 6/6] m48t59: remove legacy m48t59_init() function BALATON Zoltan via
2020-10-17 20:13 ` [PATCH 4/6] sun4u: use qdev instead of " BALATON Zoltan via
2020-10-18 7:15 ` Philippe Mathieu-Daudé
2020-10-17 20:13 ` [PATCH 5/6] ppc405_boards: " BALATON Zoltan via
2020-10-18 7:13 ` Philippe Mathieu-Daudé
2020-10-17 20:13 ` [PATCH 1/6] m48t59-isa: remove legacy m48t59_init_isa() function BALATON Zoltan via
2020-10-17 20:13 ` BALATON Zoltan via [this message]
2020-10-18 7:12 ` [PATCH 3/6] sun4m: use qdev instead of legacy m48t59_init() function Philippe Mathieu-Daudé
2020-10-17 20:13 ` [PATCH 2/6] mt48t59: Set default value of base-year property to 1968 BALATON Zoltan via
2020-10-18 7:11 ` Philippe Mathieu-Daudé
2020-10-18 16:13 ` [PATCH 0/6] m48t59: remove legacy init functions Mark Cave-Ayland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8dc32bfedf44c77f3229bb2359565a2ee65409d7.1602965621.git.balaton@eik.bme.hu \
--to=qemu-devel@nongnu.org \
--cc=atar4qemu@gmail.com \
--cc=balaton@eik.bme.hu \
--cc=david@gibson.dropbear.id.au \
--cc=f4bug@amsat.org \
--cc=hpoussin@reactos.org \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).