proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-13 18:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

syborg_keyboard: convert to memory API

Browse Source 
Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-10-24 22:38:23 +02:00 committed by Avi Kivity
parent 9cc600761a
commit 6620cb3cc5
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/syborg_keyboard.c
View File

@ -51,6 +51,7 @@ enum {
typedef struct { typedef struct {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
uint32_t int_enabled; uint32_t int_enabled;
int extension_bit; int extension_bit;
uint32_t fifo_size; uint32_t fifo_size;
@ -66,7 +67,8 @@ static void syborg_keyboard_update(SyborgKeyboardState *s)
qemu_set_irq(s->irq, level); qemu_set_irq(s->irq, level);
} }
static uint32_t syborg_keyboard_read(void *opaque, target_phys_addr_t offset) static uint64_t syborg_keyboard_read(void *opaque, target_phys_addr_t offset,
unsigned size)
{ {
SyborgKeyboardState *s = (SyborgKeyboardState *)opaque; SyborgKeyboardState *s = (SyborgKeyboardState *)opaque;
int c; int c;
@ -104,7 +106,7 @@ static uint32_t syborg_keyboard_read(void *opaque, target_phys_addr_t offset)
} }
static void syborg_keyboard_write(void *opaque, target_phys_addr_t offset, static void syborg_keyboard_write(void *opaque, target_phys_addr_t offset,
uint32_t value) uint64_t value, unsigned size)
{ {
SyborgKeyboardState *s = (SyborgKeyboardState *)opaque; SyborgKeyboardState *s = (SyborgKeyboardState *)opaque;
@ -121,16 +123,10 @@ static void syborg_keyboard_write(void *opaque, target_phys_addr_t offset,
} }
} }
static CPUReadMemoryFunc * const syborg_keyboard_readfn[] = { static const MemoryRegionOps syborg_keyboard_ops = {
syborg_keyboard_read, .read = syborg_keyboard_read,
syborg_keyboard_read, .write = syborg_keyboard_write,
syborg_keyboard_read .endianness = DEVICE_NATIVE_ENDIAN,
};
static CPUWriteMemoryFunc * const syborg_keyboard_writefn[] = {
syborg_keyboard_write,
syborg_keyboard_write,
syborg_keyboard_write
}; };
static void syborg_keyboard_event(void *opaque, int keycode) static void syborg_keyboard_event(void *opaque, int keycode)
@ -184,13 +180,11 @@ static const VMStateDescription vmstate_syborg_keyboard = {
static int syborg_keyboard_init(SysBusDevice *dev) static int syborg_keyboard_init(SysBusDevice *dev)
{ {
SyborgKeyboardState *s = FROM_SYSBUS(SyborgKeyboardState, dev); SyborgKeyboardState *s = FROM_SYSBUS(SyborgKeyboardState, dev);
int iomemtype;
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
iomemtype = cpu_register_io_memory(syborg_keyboard_readfn, memory_region_init_io(&s->iomem, &syborg_keyboard_ops, s,
syborg_keyboard_writefn, s, "keyboard", 0x1000);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_mmio(dev, 0x1000, iomemtype);
if (s->fifo_size <= 0) { if (s->fifo_size <= 0) {
fprintf(stderr, "syborg_keyboard: fifo too small\n"); fprintf(stderr, "syborg_keyboard: fifo too small\n");
s->fifo_size = 16; s->fifo_size = 16;