diff options
| author | Alexander Graf <agraf@suse.de> | 2012-10-08 13:12:31 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-10-29 11:45:55 +0100 |
| commit | 0505bcdec8228d8de39ab1a02644e71999e7c052 (patch) | |
| tree | a1d33b3d170ef661c2a67fea09f1a59b536b5529 | |
| parent | f3726fd78d79693b73c1ac41cc8ca0f1bb90082b (diff) | |
i8254: convert PIO to new memory api read/write
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/i8254.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/hw/i8254.c b/hw/i8254.c index 77bd5e8222..bea5f92fd2 100644 --- a/hw/i8254.c +++ b/hw/i8254.c @@ -111,7 +111,8 @@ static void pit_latch_count(PITChannelState *s) } } -static void pit_ioport_write(void *opaque, uint32_t addr, uint32_t val) +static void pit_ioport_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size) { PITCommonState *pit = opaque; int channel, access; @@ -178,7 +179,8 @@ static void pit_ioport_write(void *opaque, uint32_t addr, uint32_t val) } } -static uint32_t pit_ioport_read(void *opaque, uint32_t addr) +static uint64_t pit_ioport_read(void *opaque, hwaddr addr, + unsigned size) { PITCommonState *pit = opaque; int ret, count; @@ -290,14 +292,14 @@ static void pit_irq_control(void *opaque, int n, int enable) } } -static const MemoryRegionPortio pit_portio[] = { - { 0, 4, 1, .write = pit_ioport_write }, - { 0, 3, 1, .read = pit_ioport_read }, - PORTIO_END_OF_LIST() -}; - static const MemoryRegionOps pit_ioport_ops = { - .old_portio = pit_portio + .read = pit_ioport_read, + .write = pit_ioport_write, + .impl = { + .min_access_size = 1, + .max_access_size = 1, + }, + .endianness = DEVICE_LITTLE_ENDIAN, }; static void pit_post_load(PITCommonState *s) |