[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 4/6] m48t59: move ISA ports registration to QOM constr
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [RFC 4/6] m48t59: move ISA ports registration to QOM constructor |
Date: |
Thu, 14 Mar 2013 23:12:05 +0100 |
-device m48t59 can now be used to create a fully functional nvram,
and m48t59_init_isa() becomes a much simpler helper.
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/m48t59.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/m48t59.c b/hw/m48t59.c
index 39a9d80..1093716 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -676,11 +676,6 @@ M48t59State *m48t59_init_isa(ISABus *bus, uint32_t
io_base, uint16_t size,
d = DO_UPCAST(M48t59ISAState, busdev, dev);
s = &d->state;
- memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4);
- if (io_base != 0) {
- isa_register_ioport(dev, &d->io, io_base);
- }
-
return s;
}
@@ -703,6 +698,10 @@ static int m48t59_init_isa1(ISADevice *dev)
isa_init_irq(dev, &s->IRQ, 8);
m48t59_init_common(s);
+ memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4);
+ if (s->io_base != 0) {
+ isa_register_ioport(dev, &d->io, s->io_base);
+ }
return 0;
}
--
1.7.10.4
- [Qemu-devel] [RFC 0/6] ppc/prep: add IBM RS/6000 43p machine, Hervé Poussineau, 2013/03/14
- [Qemu-devel] [RFC 4/6] m48t59: move ISA ports registration to QOM constructor,
Hervé Poussineau <=
- [Qemu-devel] [RFC 1/6] pci: add MPC105 PCI host b ridge emulation, Hervé Poussineau, 2013/03/14
- [Qemu-devel] [RFC 2/6] prep: add IBM RS/6000 7248 (43p) machine emulation, Hervé Poussineau, 2013/03/14
- [Qemu-devel] [RFC 3/6] prep: add RS/6000 debug device, Hervé Poussineau, 2013/03/14
- [Qemu-devel] [RFC 5/6] m48t59: hack(?) to make it work on IBM 43p, Hervé Poussineau, 2013/03/14
- [Qemu-devel] [RFC 6/6] prep: QOM'ify System I/O, Hervé Poussineau, 2013/03/14