mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-04 02:08:49 -04:00
33 lines
1.2 KiB
C
33 lines
1.2 KiB
C
$NetBSD: patch-memory.c,v 1.4 2013/06/16 18:27:25 tsutsui Exp $
|
|
|
|
Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
|
|
(PR lib/43832: ssp causes common names to be defines)
|
|
|
|
--- memory.c.orig 2013-05-24 13:37:57.000000000 +0000
|
|
+++ memory.c
|
|
@@ -313,7 +313,7 @@ static void memory_region_read_accessor(
|
|
if (mr->flush_coalesced_mmio) {
|
|
qemu_flush_coalesced_mmio_buffer();
|
|
}
|
|
- tmp = mr->ops->read(mr->opaque, addr, size);
|
|
+ tmp = (*mr->ops->read)(mr->opaque, addr, size);
|
|
*value |= (tmp & mask) << shift;
|
|
}
|
|
|
|
@@ -396,12 +396,12 @@ static void memory_region_iorange_read(I
|
|
|
|
*data = ((uint64_t)1 << (width * 8)) - 1;
|
|
if (mrp) {
|
|
- *data = mrp->read(mr->opaque, offset);
|
|
+ *data = (*mrp->read)(mr->opaque, offset);
|
|
} else if (width == 2) {
|
|
mrp = find_portio(mr, offset - mrio->offset, 1, false);
|
|
assert(mrp);
|
|
- *data = mrp->read(mr->opaque, offset) |
|
|
- (mrp->read(mr->opaque, offset + 1) << 8);
|
|
+ *data = (*mrp->read)(mr->opaque, offset) |
|
|
+ ((*mrp->read)(mr->opaque, offset + 1) << 8);
|
|
}
|
|
return;
|
|
}
|