OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pckbd: Convert to MemoryRegion

Browse Source 
Slightly non-obvious with mips_jazz passing in the region
structure to populate.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Richard Henderson 2011-08-10 15:28:17 -07:00 committed by Avi Kivity
parent 098d314a32
commit dbff76ac33
3 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/mips_jazz.c
View File

@ -115,6 +115,7 @@ static void mips_jazz_init(MemoryRegion *address_space,
rc4030_dma *dmas; rc4030_dma *dmas;
void* rc4030_opaque; void* rc4030_opaque;
MemoryRegion *rtc = g_new(MemoryRegion, 1); MemoryRegion *rtc = g_new(MemoryRegion, 1);
MemoryRegion *i8042 = g_new(MemoryRegion, 1);
MemoryRegion *dma_dummy = g_new(MemoryRegion, 1); MemoryRegion *dma_dummy = g_new(MemoryRegion, 1);
NICInfo *nd; NICInfo *nd;
DeviceState *dev; DeviceState *dev;
@ -258,7 +259,8 @@ static void mips_jazz_init(MemoryRegion *address_space,
memory_region_add_subregion(address_space, 0x80004000, rtc); memory_region_add_subregion(address_space, 0x80004000, rtc);
/* Keyboard (i8042) */ /* Keyboard (i8042) */
i8042_mm_init(rc4030[6], rc4030[7], 0x80005000, 0x1000, 0x1); i8042_mm_init(rc4030[6], rc4030[7], i8042, 0x1000, 0x1);
memory_region_add_subregion(address_space, 0x80005000, i8042);
/* Serial ports */ /* Serial ports */
if (serial_hds[0]) { if (serial_hds[0]) {

2
hw/pc.h
View File

@ -118,7 +118,7 @@ void vmmouse_set_data(const uint32_t *data);
void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base); void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base);
void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
target_phys_addr_t base, ram_addr_t size, MemoryRegion *region, ram_addr_t size,
target_phys_addr_t mask); target_phys_addr_t mask);
void i8042_isa_mouse_fake_event(void *opaque); void i8042_isa_mouse_fake_event(void *opaque);
void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out); void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out);

59
hw/pckbd.c
View File

@ -400,33 +400,27 @@ static void kbd_mm_writeb (void *opaque, target_phys_addr_t addr, uint32_t value
kbd_write_data(s, 0, value & 0xff); kbd_write_data(s, 0, value & 0xff);
} }
static CPUReadMemoryFunc * const kbd_mm_read[] = { static const MemoryRegionOps i8042_mmio_ops = {
&kbd_mm_readb, .endianness = DEVICE_NATIVE_ENDIAN,
&kbd_mm_readb, .old_mmio = {
&kbd_mm_readb, .read = { kbd_mm_readb, kbd_mm_readb, kbd_mm_readb },
}; .write = { kbd_mm_writeb, kbd_mm_writeb, kbd_mm_writeb },
},
static CPUWriteMemoryFunc * const kbd_mm_write[] = {
&kbd_mm_writeb,
&kbd_mm_writeb,
&kbd_mm_writeb,
}; };
void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
target_phys_addr_t base, ram_addr_t size, MemoryRegion *region, ram_addr_t size,
target_phys_addr_t mask) target_phys_addr_t mask)
{ {
KBDState *s = g_malloc0(sizeof(KBDState)); KBDState *s = g_malloc0(sizeof(KBDState));
int s_io_memory;
s->irq_kbd = kbd_irq; s->irq_kbd = kbd_irq;
s->irq_mouse = mouse_irq; s->irq_mouse = mouse_irq;
s->mask = mask; s->mask = mask;
vmstate_register(NULL, 0, &vmstate_kbd, s); vmstate_register(NULL, 0, &vmstate_kbd, s);
s_io_memory = cpu_register_io_memory(kbd_mm_read, kbd_mm_write, s,
DEVICE_NATIVE_ENDIAN); memory_region_init_io(region, &i8042_mmio_ops, s, "i8042", size);
cpu_register_physical_memory(base, size, s_io_memory);
s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s); s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
s->mouse = ps2_mouse_init(kbd_update_aux_irq, s); s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
@ -435,7 +429,8 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
typedef struct ISAKBDState { typedef struct ISAKBDState {
ISADevice dev; ISADevice dev;
KBDState kbd; KBDState kbd;
MemoryRegion io[2];
} ISAKBDState; } ISAKBDState;
void i8042_isa_mouse_fake_event(void *opaque) void i8042_isa_mouse_fake_event(void *opaque)
@ -464,19 +459,37 @@ static const VMStateDescription vmstate_kbd_isa = {
} }
}; };
static const MemoryRegionPortio i8042_data_portio[] = {
{ 0, 1, 1, .read = kbd_read_data, .write = kbd_write_data },
PORTIO_END_OF_LIST()
};
static const MemoryRegionPortio i8042_cmd_portio[] = {
{ 0, 1, 1, .read = kbd_read_status, .write = kbd_write_command },
PORTIO_END_OF_LIST()
};
static const MemoryRegionOps i8042_data_ops = {
.old_portio = i8042_data_portio
};
static const MemoryRegionOps i8042_cmd_ops = {
.old_portio = i8042_cmd_portio
};
static int i8042_initfn(ISADevice *dev) static int i8042_initfn(ISADevice *dev)
{ {
KBDState *s = &(DO_UPCAST(ISAKBDState, dev, dev)->kbd); ISAKBDState *isa_s = DO_UPCAST(ISAKBDState, dev, dev);
KBDState *s = &isa_s->kbd;
isa_init_irq(dev, &s->irq_kbd, 1); isa_init_irq(dev, &s->irq_kbd, 1);
isa_init_irq(dev, &s->irq_mouse, 12); isa_init_irq(dev, &s->irq_mouse, 12);
register_ioport_read(0x60, 1, 1, kbd_read_data, s); memory_region_init_io(isa_s->io + 0, &i8042_data_ops, s, "i8042-data", 1);
register_ioport_write(0x60, 1, 1, kbd_write_data, s); isa_register_ioport(dev, isa_s->io + 0, 0x60);
isa_init_ioport(dev, 0x60);
register_ioport_read(0x64, 1, 1, kbd_read_status, s); memory_region_init_io(isa_s->io + 1, &i8042_cmd_ops, s, "i8042-cmd", 1);
register_ioport_write(0x64, 1, 1, kbd_write_command, s); isa_register_ioport(dev, isa_s->io + 1, 0x64);
isa_init_ioport(dev, 0x64);
s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s); s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
s->mouse = ps2_mouse_init(kbd_update_aux_irq, s); s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);