* [Qemu-devel] [PATCH 1/2] pc87312: Replace register_ioport_*() with MemoryRegion
2013-01-15 8:57 [Qemu-devel] [PULL] PReP patch queue 2013-01-15 Andreas Färber
@ 2013-01-15 8:57 ` Andreas Färber
2013-01-15 8:57 ` [Qemu-devel] [PATCH 2/2] pc87312: Avoid define conflict on mingw32 Andreas Färber
2013-01-16 1:18 ` [Qemu-devel] [PULL] PReP patch queue 2013-01-15 Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Färber @ 2013-01-15 8:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Andreas Färber, qemu-ppc
Prepare an instance_init function for the MemoryRegion init.
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Tested-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/pc87312.c | 26 ++++++++++++++++++++++----
hw/pc87312.h | 2 ++
2 Dateien geändert, 24 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/hw/pc87312.c b/hw/pc87312.c
index 6a17afd..97fabfa 100644
--- a/hw/pc87312.c
+++ b/hw/pc87312.c
@@ -194,7 +194,8 @@ static void pc87312_hard_reset(PC87312State *s)
pc87312_soft_reset(s);
}
-static void pc87312_ioport_write(void *opaque, uint32_t addr, uint32_t val)
+static void pc87312_io_write(void *opaque, hwaddr addr, uint64_t val,
+ unsigned int size)
{
PC87312State *s = opaque;
@@ -213,7 +214,7 @@ static void pc87312_ioport_write(void *opaque, uint32_t addr, uint32_t val)
}
}
-static uint32_t pc87312_ioport_read(void *opaque, uint32_t addr)
+static uint64_t pc87312_io_read(void *opaque, hwaddr addr, unsigned int size)
{
PC87312State *s = opaque;
uint32_t val;
@@ -241,6 +242,16 @@ static uint32_t pc87312_ioport_read(void *opaque, uint32_t addr)
return val;
}
+static const MemoryRegionOps pc87312_io_ops = {
+ .read = pc87312_io_read,
+ .write = pc87312_io_write,
+ .endianness = DEVICE_LITTLE_ENDIAN,
+ .valid = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ },
+};
+
static int pc87312_post_load(void *opaque, int version_id)
{
PC87312State *s = opaque;
@@ -270,6 +281,7 @@ static int pc87312_init(ISADevice *dev)
s = PC87312(dev);
bus = isa_bus_from_device(dev);
pc87312_hard_reset(s);
+ isa_register_ioport(dev, &s->io, s->iobase);
if (is_parallel_enabled(s)) {
chr = parallel_hds[0];
@@ -337,11 +349,16 @@ static int pc87312_init(ISADevice *dev)
trace_pc87312_info_ide(get_ide_iobase(s));
}
- register_ioport_write(s->iobase, 2, 1, pc87312_ioport_write, s);
- register_ioport_read(s->iobase, 2, 1, pc87312_ioport_read, s);
return 0;
}
+static void pc87312_initfn(Object *obj)
+{
+ PC87312State *s = PC87312(obj);
+
+ memory_region_init_io(&s->io, &pc87312_io_ops, s, "pc87312", 2);
+}
+
static const VMStateDescription vmstate_pc87312 = {
.name = "pc87312",
.version_id = 1,
@@ -376,6 +393,7 @@ static const TypeInfo pc87312_type_info = {
.name = TYPE_PC87312,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(PC87312State),
+ .instance_init = pc87312_initfn,
.class_init = pc87312_class_init,
};
diff --git a/hw/pc87312.h b/hw/pc87312.h
index 7ca7912..7b9e6f6 100644
--- a/hw/pc87312.h
+++ b/hw/pc87312.h
@@ -56,6 +56,8 @@ typedef struct PC87312State {
uint32_t base;
} ide;
+ MemoryRegion io;
+
uint8_t read_id_step;
uint8_t selected_index;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] [PATCH 2/2] pc87312: Avoid define conflict on mingw32
2013-01-15 8:57 [Qemu-devel] [PULL] PReP patch queue 2013-01-15 Andreas Färber
2013-01-15 8:57 ` [Qemu-devel] [PATCH 1/2] pc87312: Replace register_ioport_*() with MemoryRegion Andreas Färber
@ 2013-01-15 8:57 ` Andreas Färber
2013-01-16 1:18 ` [Qemu-devel] [PULL] PReP patch queue 2013-01-15 Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Färber @ 2013-01-15 8:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl, Andreas Färber, qemu-ppc
From: Blue Swirl <blauwirbel@gmail.com>
Mingw32 headers define FAR, causing this warning:
/src/qemu/hw/pc87312.c:38:0: warning: "FAR" redefined [enabled by default]
In file included from /usr/local/lib/gcc/i686-mingw32msvc/4.7.0/../../../../i686-mingw32msvc/include/windows.h:48:0,
from /src/qemu/include/sysemu/os-win32.h:29,
from /src/qemu/include/qemu-common.h:46,
from /src/qemu/include/exec/ioport.h:27,
from /src/qemu/hw/isa.h:6,
from /src/qemu/hw/pc87312.h:28,
from /src/qemu/hw/pc87312.c:26:
/usr/local/lib/gcc/i686-mingw32msvc/4.7.0/../../../../i686-mingw32msvc/include/windef.h:34:0: note: this is the location of the previous definition
Avoid the warning by expanding the macros.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Acked-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
---
hw/pc87312.c | 38 +++++++++++++++++---------------------
1 Datei geändert, 17 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-)
diff --git a/hw/pc87312.c b/hw/pc87312.c
index 97fabfa..38af4c1 100644
--- a/hw/pc87312.c
+++ b/hw/pc87312.c
@@ -34,10 +34,6 @@
#define REG_FAR 1
#define REG_PTR 2
-#define FER regs[REG_FER]
-#define FAR regs[REG_FAR]
-#define PTR regs[REG_PTR]
-
#define FER_PARALLEL_EN 0x01
#define FER_UART1_EN 0x02
#define FER_UART2_EN 0x04
@@ -66,14 +62,14 @@
static inline bool is_parallel_enabled(PC87312State *s)
{
- return s->FER & FER_PARALLEL_EN;
+ return s->regs[REG_FER] & FER_PARALLEL_EN;
}
static const uint32_t parallel_base[] = { 0x378, 0x3bc, 0x278, 0x00 };
static inline uint32_t get_parallel_iobase(PC87312State *s)
{
- return parallel_base[s->FAR & FAR_PARALLEL_ADDR];
+ return parallel_base[s->regs[REG_FAR] & FAR_PARALLEL_ADDR];
}
static const uint32_t parallel_irq[] = { 5, 7, 5, 0 };
@@ -81,9 +77,9 @@ static const uint32_t parallel_irq[] = { 5, 7, 5, 0 };
static inline uint32_t get_parallel_irq(PC87312State *s)
{
int idx;
- idx = (s->FAR & FAR_PARALLEL_ADDR);
+ idx = (s->regs[REG_FAR] & FAR_PARALLEL_ADDR);
if (idx == 0) {
- return (s->PTR & PTR_IRQ_5_7) ? 7 : 5;
+ return (s->regs[REG_PTR] & PTR_IRQ_5_7) ? 7 : 5;
} else {
return parallel_irq[idx];
}
@@ -91,7 +87,7 @@ static inline uint32_t get_parallel_irq(PC87312State *s)
static inline bool is_parallel_epp(PC87312State *s)
{
- return s->PTR & PTR_EPP_MODE;
+ return s->regs[REG_PTR] & PTR_EPP_MODE;
}
@@ -105,26 +101,26 @@ static const uint32_t uart_base[2][4] = {
static inline uint32_t get_uart_iobase(PC87312State *s, int i)
{
int idx;
- idx = (s->FAR >> (2 * i + 2)) & 0x3;
+ idx = (s->regs[REG_FAR] >> (2 * i + 2)) & 0x3;
if (idx == 0) {
return 0x3f8;
} else if (idx == 1) {
return 0x2f8;
} else {
- return uart_base[idx & 1][(s->FAR & FAR_UART_3_4) >> 6];
+ return uart_base[idx & 1][(s->regs[REG_FAR] & FAR_UART_3_4) >> 6];
}
}
static inline uint32_t get_uart_irq(PC87312State *s, int i)
{
int idx;
- idx = (s->FAR >> (2 * i + 2)) & 0x3;
+ idx = (s->regs[REG_FAR] >> (2 * i + 2)) & 0x3;
return (idx & 1) ? 3 : 4;
}
static inline bool is_uart_enabled(PC87312State *s, int i)
{
- return s->FER & (FER_UART1_EN << i);
+ return s->regs[REG_FER] & (FER_UART1_EN << i);
}
@@ -132,12 +128,12 @@ static inline bool is_uart_enabled(PC87312State *s, int i)
static inline bool is_fdc_enabled(PC87312State *s)
{
- return s->FER & FER_FDC_EN;
+ return s->regs[REG_FER] & FER_FDC_EN;
}
static inline uint32_t get_fdc_iobase(PC87312State *s)
{
- return (s->FER & FER_FDC_ADDR) ? 0x370 : 0x3f0;
+ return (s->regs[REG_FER] & FER_FDC_ADDR) ? 0x370 : 0x3f0;
}
@@ -145,19 +141,19 @@ static inline uint32_t get_fdc_iobase(PC87312State *s)
static inline bool is_ide_enabled(PC87312State *s)
{
- return s->FER & FER_IDE_EN;
+ return s->regs[REG_FER] & FER_IDE_EN;
}
static inline uint32_t get_ide_iobase(PC87312State *s)
{
- return (s->FER & FER_IDE_ADDR) ? 0x170 : 0x1f0;
+ return (s->regs[REG_FER] & FER_IDE_ADDR) ? 0x170 : 0x1f0;
}
static void reconfigure_devices(PC87312State *s)
{
error_report("pc87312: unsupported device reconfiguration (%02x %02x %02x)",
- s->FER, s->FAR, s->PTR);
+ s->regs[REG_FER], s->regs[REG_FAR], s->regs[REG_PTR]);
}
static void pc87312_soft_reset(PC87312State *s)
@@ -184,9 +180,9 @@ static void pc87312_soft_reset(PC87312State *s)
s->read_id_step = 0;
s->selected_index = REG_FER;
- s->FER = fer_init[s->config & 0x1f];
- s->FAR = far_init[s->config & 0x1f];
- s->PTR = ptr_init[s->config & 0x1f];
+ s->regs[REG_FER] = fer_init[s->config & 0x1f];
+ s->regs[REG_FAR] = far_init[s->config & 0x1f];
+ s->regs[REG_PTR] = ptr_init[s->config & 0x1f];
}
static void pc87312_hard_reset(PC87312State *s)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread