[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 05/10] serial: Allow to reconfigure ISA I/O base
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC 05/10] serial: Allow to reconfigure ISA I/O base |
Date: |
Mon, 6 Jun 2011 18:20:54 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/isa.h | 3 +++
hw/serial.c | 23 ++++++++++++++++++++---
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/hw/isa.h b/hw/isa.h
index 54698b5..8bd082a 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -45,6 +45,9 @@ void isa_mmio_init(target_phys_addr_t base,
target_phys_addr_t size);
void parallel_isa_reconfigure_iobase(ISADevice *dev, uint32_t base);
void parallel_isa_reconfigure_irq(ISADevice *dev, uint32_t isairq);
+/* serial.c */
+void serial_isa_reconfigure_iobase(ISADevice *dev, uint32_t base);
+
/* dma.c */
int DMA_get_channel_mode (int nchan);
int DMA_read_memory (int nchan, void *buf, int pos, int size);
diff --git a/hw/serial.c b/hw/serial.c
index 0ee61dd..dd91272 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -752,6 +752,25 @@ void serial_set_frequency(SerialState *s, uint32_t
frequency)
serial_update_parameters(s);
}
+static void serial_isa_init_iobase(ISASerialState *isa)
+{
+ SerialState *s = &isa->state;
+
+ register_ioport_write(isa->iobase, 8, 1, serial_ioport_write, s);
+ register_ioport_read(isa->iobase, 8, 1, serial_ioport_read, s);
+ isa_init_ioport_range(&isa->dev, isa->iobase, 8);
+}
+
+void serial_isa_reconfigure_iobase(ISADevice *dev, uint32_t iobase)
+{
+ ISASerialState *isa = DO_UPCAST(ISASerialState, dev, dev);
+
+ if (iobase != isa->iobase) {
+ isa->iobase = iobase;
+ serial_isa_init_iobase(isa);
+ }
+}
+
static const int isa_serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8,
0x2e8 };
static const int isa_serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 };
@@ -776,9 +795,7 @@ static int serial_isa_initfn(ISADevice *dev)
serial_init_core(s);
qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 3);
- register_ioport_write(isa->iobase, 8, 1, serial_ioport_write, s);
- register_ioport_read(isa->iobase, 8, 1, serial_ioport_read, s);
- isa_init_ioport_range(dev, isa->iobase, 8);
+ serial_isa_init_iobase(isa);
return 0;
}
--
1.7.5.3
- [Qemu-devel] [RFC 00/10] ISA reconfigurability, Andreas Färber, 2011/06/06
- [Qemu-devel] [RFC 01/10] isa: Allow to un-assign I/O ports, Andreas Färber, 2011/06/06
- [Qemu-devel] [RFC 02/10] isa: Allow to un-associate an IRQ, Andreas Färber, 2011/06/06
- [Qemu-devel] [RFC 03/10] parallel: Allow to reconfigure ISA I/O base, Andreas Färber, 2011/06/06
- [Qemu-devel] [RFC 04/10] parallel: Allow to reconfigure ISA IRQ, Andreas Färber, 2011/06/06
- [Qemu-devel] [RFC 05/10] serial: Allow to reconfigure ISA I/O base,
Andreas Färber <=
- [Qemu-devel] [RFC 06/10] serial: Allow to reconfigure ISA IRQ, Andreas Färber, 2011/06/06
- [Qemu-devel] [PATCH v2 07/10] fdc: Parametrize ISA base, IRQ and DMA, Andreas Färber, 2011/06/06
- [Qemu-devel] [RFC 08/10] fdc: Allow to reconfigure ISA I/O base, Andreas Färber, 2011/06/06
- [Qemu-devel] [RFC 09/10] ide: Allow to reconfigure ISA I/O base, Andreas Färber, 2011/06/06
- [Qemu-devel] [RFC 10/10] prep: Add pc87312 Super I/O emulation, Andreas Färber, 2011/06/06
- Re: [Qemu-devel] [RFC 05/10] serial: Allow to reconfigure ISA I/O base, Richard Henderson, 2011/06/06
- Re: [Qemu-devel] [RFC 05/10] serial: Allow to reconfigure ISA I/O base, Andreas Färber, 2011/06/06
Re: [Qemu-devel] [RFC 00/10] ISA reconfigurability, Gerd Hoffmann, 2011/06/07