motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-18 23:52:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

applesmc: replace register_ioport*

Browse source 
Convert over to memory regions to obsolete register_ioport*.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Jan Kiszka 2013-06-22 08:06:55 +02:00 • committed by Paolo Bonzini
parent a8aec29569
commit e3914e3ad8
1 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

50
hw/misc/applesmc.c
View file

@ -73,6 +73,8 @@ typedef struct AppleSMCState AppleSMCState;
struct AppleSMCState { struct AppleSMCState {
ISADevice parent_obj; ISADevice parent_obj;
MemoryRegion io_data;
MemoryRegion io_cmd;
uint32_t iobase; uint32_t iobase;
uint8_t cmd; uint8_t cmd;
uint8_t status; uint8_t status;
@ -86,7 +88,8 @@ struct AppleSMCState {
QLIST_HEAD(, AppleSMCData) data_def; 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; 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; 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; AppleSMCState *s = opaque;
uint8_t retval = 0; uint8_t retval = 0;
@ -162,7 +167,7 @@ static uint32_t applesmc_io_data_readb(void *opaque, uint32_t addr1)
return retval; 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; AppleSMCState *s = opaque;
@ -201,18 +206,39 @@ static void qdev_applesmc_isa_reset(DeviceState *dev)
applesmc_add_key(s, "MSSD", 1, "\0x3"); 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) static void applesmc_isa_realize(DeviceState *dev, Error **errp)
{ {
AppleSMCState *s = APPLE_SMC(dev); AppleSMCState *s = APPLE_SMC(dev);
register_ioport_read(s->iobase + APPLESMC_DATA_PORT, 4, 1, memory_region_init_io(&s->io_data, &applesmc_data_io_ops, s,
applesmc_io_data_readb, s); "applesmc-data", 4);
register_ioport_read(s->iobase + APPLESMC_CMD_PORT, 4, 1, isa_register_ioport(&s->parent_obj, &s->io_data,
applesmc_io_cmd_readb, s); s->iobase + APPLESMC_DATA_PORT);
register_ioport_write(s->iobase + APPLESMC_DATA_PORT, 4, 1,
applesmc_io_data_writeb, s); memory_region_init_io(&s->io_cmd, &applesmc_cmd_io_ops, s,
register_ioport_write(s->iobase + APPLESMC_CMD_PORT, 4, 1, "applesmc-cmd", 4);
applesmc_io_cmd_writeb, s); isa_register_ioport(&s->parent_obj, &s->io_cmd,
s->iobase + APPLESMC_CMD_PORT);
if (!s->osk || (strlen(s->osk) != 64)) { if (!s->osk || (strlen(s->osk) != 64)) {
fprintf(stderr, "WARNING: Using AppleSMC with invalid key\n"); fprintf(stderr, "WARNING: Using AppleSMC with invalid key\n");