[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 02/13] applesmc: replace register_ioport*
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 02/13] applesmc: replace register_ioport* |
Date: |
Fri, 21 Jun 2013 18:41:34 +0200 |
Convert over to memory regions to obsolete register_ioport*.
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/misc/applesmc.c | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c
index 46f4fbd..83468dc 100644
--- a/hw/misc/applesmc.c
+++ b/hw/misc/applesmc.c
@@ -73,6 +73,8 @@ typedef struct AppleSMCState AppleSMCState;
struct AppleSMCState {
ISADevice parent_obj;
+ MemoryRegion io_data;
+ MemoryRegion io_cmd;
uint32_t iobase;
uint8_t cmd;
uint8_t status;
@@ -86,7 +88,8 @@ struct AppleSMCState {
QLIST_HEAD(, AppleSMCData) data_def;
};
-static void applesmc_io_cmd_writeb(void *opaque, uint32_t addr, uint32_t val)
+static void applesmc_io_cmd_write(void *opaque, hwaddr addr, uint64_t val,
+ unsigned size)
{
AppleSMCState *s = opaque;
@@ -115,7 +118,8 @@ static void applesmc_fill_data(AppleSMCState *s)
}
}
-static void applesmc_io_data_writeb(void *opaque, uint32_t addr, uint32_t val)
+static void applesmc_io_data_write(void *opaque, hwaddr addr, uint64_t val,
+ unsigned size)
{
AppleSMCState *s = opaque;
@@ -138,7 +142,8 @@ static void applesmc_io_data_writeb(void *opaque, uint32_t
addr, uint32_t val)
}
}
-static uint32_t applesmc_io_data_readb(void *opaque, uint32_t addr1)
+static uint64_t applesmc_io_data_read(void *opaque, hwaddr addr1,
+ unsigned size)
{
AppleSMCState *s = opaque;
uint8_t retval = 0;
@@ -162,7 +167,7 @@ static uint32_t applesmc_io_data_readb(void *opaque,
uint32_t addr1)
return retval;
}
-static uint32_t applesmc_io_cmd_readb(void *opaque, uint32_t addr1)
+static uint64_t applesmc_io_cmd_read(void *opaque, hwaddr addr1, unsigned size)
{
AppleSMCState *s = opaque;
@@ -201,18 +206,39 @@ static void qdev_applesmc_isa_reset(DeviceState *dev)
applesmc_add_key(s, "MSSD", 1, "\0x3");
}
+static const MemoryRegionOps applesmc_data_io_ops = {
+ .write = applesmc_io_data_write,
+ .read = applesmc_io_data_read,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ },
+};
+
+static const MemoryRegionOps applesmc_cmd_io_ops = {
+ .write = applesmc_io_cmd_write,
+ .read = applesmc_io_cmd_read,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ },
+};
+
static void applesmc_isa_realize(DeviceState *dev, Error **errp)
{
AppleSMCState *s = APPLE_SMC(dev);
- register_ioport_read(s->iobase + APPLESMC_DATA_PORT, 4, 1,
- applesmc_io_data_readb, s);
- register_ioport_read(s->iobase + APPLESMC_CMD_PORT, 4, 1,
- applesmc_io_cmd_readb, s);
- register_ioport_write(s->iobase + APPLESMC_DATA_PORT, 4, 1,
- applesmc_io_data_writeb, s);
- register_ioport_write(s->iobase + APPLESMC_CMD_PORT, 4, 1,
- applesmc_io_cmd_writeb, s);
+ memory_region_init_io(&s->io_data, &applesmc_data_io_ops, s,
+ "applesmc-data", 4);
+ isa_register_ioport(&s->parent_obj, &s->io_data,
+ s->iobase + APPLESMC_DATA_PORT);
+
+ memory_region_init_io(&s->io_cmd, &applesmc_cmd_io_ops, s,
+ "applesmc-cmd", 4);
+ isa_register_ioport(&s->parent_obj, &s->io_cmd,
+ s->iobase + APPLESMC_CMD_PORT);
if (!s->osk || (strlen(s->osk) != 64)) {
fprintf(stderr, "WARNING: Using AppleSMC with invalid key\n");
--
1.7.3.4
- [Qemu-devel] [PATCH v2 00/13] Refactor portio dispatching, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 09/13] vmware-vga: Accept unaligned I/O accesses, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 10/13] xen: Mark fixed platform I/O as unaligned, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 05/13] prep: replace register_ioport*, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 06/13] vt82c686: replace register_ioport*, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 02/13] applesmc: replace register_ioport*,
Jan Kiszka <=
- [Qemu-devel] [PATCH v2 11/13] ioport: Switch dispatching to memory core layer, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 03/13] wdt_ib700: replace register_ioport*, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 04/13] i82374: replace register_ioport*, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 12/13] ioport: Remove unused old dispatching services, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 08/13] isa: implement isa_is_ioport_assigned via memory_region_find, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 01/13] adlib: replace register_ioport*, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 07/13] Privatize register_ioport_read/write, Jan Kiszka, 2013/06/21
- [Qemu-devel] [PATCH v2 13/13] ioport: Move IOPortRead/WriteFunc typedefs to memory.h, Jan Kiszka, 2013/06/21
- Re: [Qemu-devel] [PATCH v2 00/13] Refactor portio dispatching, Paolo Bonzini, 2013/06/21