[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/24] memory: Fix old portio word accesses
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 11/24] memory: Fix old portio word accesses |
Date: |
Mon, 10 Oct 2011 16:59:40 +0200 |
From: Jan Kiszka <address@hidden>
As we register old portio regions via ioport_register, we are also
responsible for providing the word access wrapper.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
memory.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/memory.c b/memory.c
index 27abd3e..dc5e35d 100644
--- a/memory.c
+++ b/memory.c
@@ -404,6 +404,11 @@ static void memory_region_iorange_read(IORange *iorange,
*data = ((uint64_t)1 << (width * 8)) - 1;
if (mrp) {
*data = mrp->read(mr->opaque, offset + mr->offset);
+ } else if (width == 2) {
+ mrp = find_portio(mr, offset, 1, false);
+ assert(mrp);
+ *data = mrp->read(mr->opaque, offset + mr->offset) |
+ (mrp->read(mr->opaque, offset + mr->offset + 1) << 8);
}
return;
}
@@ -426,6 +431,11 @@ static void memory_region_iorange_write(IORange *iorange,
if (mrp) {
mrp->write(mr->opaque, offset + mr->offset, data);
+ } else if (width == 2) {
+ mrp = find_portio(mr, offset, 1, false);
+ assert(mrp);
+ mrp->write(mr->opaque, offset + mr->offset, data & 0xff);
+ mrp->write(mr->opaque, offset + mr->offset + 1, data >> 8);
}
return;
}
--
1.7.6.3
- [Qemu-devel] [PATCH 02/24] palm: convert to memory API, (continued)
- [Qemu-devel] [PATCH 02/24] palm: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 08/24] ppc_newworld: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 22/24] vmport: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 05/24] ppc405_boards: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 13/24] fdc: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 16/24] rtc: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 10/24] Introduce PortioList, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 12/24] isa: Add isa_register_portio_list(), Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 09/24] isa: Tidy support code for isabus_get_fw_dev_path, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 17/24] ne2000: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 11/24] memory: Fix old portio word accesses,
Avi Kivity <=
- [Qemu-devel] [PATCH 04/24] petalogix_s2adsp1800: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 03/24] petalogix_ml605: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 19/24] sb16: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 14/24] gus: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 06/24] hw/arm11mpcore: Clean up to avoid using sysbus_mmio_init_cb2, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 24/24] isa: Remove isa_init_ioport_range and isa_init_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 18/24] parallel: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 15/24] m48t59: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 21/24] pc: Convert port92 to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 01/24] hw/lan9118.c: Convert to MemoryRegion, Avi Kivity, 2011/10/10