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

pl050: Rename pl050_state to PL050State

Browse Source 
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-26 18:40:25 +02:00
parent 2a052f6bf1
commit e607f25a62
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/input/pl050.c
View File

@ -10,7 +10,7 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/input/ps2.h" #include "hw/input/ps2.h"
typedef struct { typedef struct PL050State {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem; MemoryRegion iomem;
void *dev; void *dev;
@ -20,17 +20,17 @@ typedef struct {
int pending; int pending;
qemu_irq irq; qemu_irq irq;
int is_mouse; int is_mouse;
} pl050_state; } PL050State;
static const VMStateDescription vmstate_pl050 = { static const VMStateDescription vmstate_pl050 = {
.name = "pl050", .name = "pl050",
.version_id = 2, .version_id = 2,
.minimum_version_id = 2, .minimum_version_id = 2,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT32(cr, pl050_state), VMSTATE_UINT32(cr, PL050State),
VMSTATE_UINT32(clk, pl050_state), VMSTATE_UINT32(clk, PL050State),
VMSTATE_UINT32(last, pl050_state), VMSTATE_UINT32(last, PL050State),
VMSTATE_INT32(pending, pl050_state), VMSTATE_INT32(pending, PL050State),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };
@ -48,7 +48,7 @@ static const unsigned char pl050_id[] =
static void pl050_update(void *opaque, int level) static void pl050_update(void *opaque, int level)
{ {
pl050_state *s = (pl050_state *)opaque; PL050State *s = (PL050State *)opaque;
int raise; int raise;
s->pending = level; s->pending = level;
@ -60,7 +60,7 @@ static void pl050_update(void *opaque, int level)
static uint64_t pl050_read(void *opaque, hwaddr offset, static uint64_t pl050_read(void *opaque, hwaddr offset,
unsigned size) unsigned size)
{ {
pl050_state *s = (pl050_state *)opaque; PL050State *s = (PL050State *)opaque;
if (offset >= 0xfe0 && offset < 0x1000) if (offset >= 0xfe0 && offset < 0x1000)
return pl050_id[(offset - 0xfe0) >> 2]; return pl050_id[(offset - 0xfe0) >> 2];
@ -103,7 +103,7 @@ static uint64_t pl050_read(void *opaque, hwaddr offset,
static void pl050_write(void *opaque, hwaddr offset, static void pl050_write(void *opaque, hwaddr offset,
uint64_t value, unsigned size) uint64_t value, unsigned size)
{ {
pl050_state *s = (pl050_state *)opaque; PL050State *s = (PL050State *)opaque;
switch (offset >> 2) { switch (offset >> 2) {
case 0: /* KMICR */ case 0: /* KMICR */
s->cr = value; s->cr = value;
@ -135,7 +135,7 @@ static const MemoryRegionOps pl050_ops = {
static int pl050_init(SysBusDevice *dev, int is_mouse) static int pl050_init(SysBusDevice *dev, int is_mouse)
{ {
pl050_state *s = FROM_SYSBUS(pl050_state, dev); PL050State *s = FROM_SYSBUS(PL050State, dev);
memory_region_init_io(&s->iomem, OBJECT(s), &pl050_ops, s, "pl050", 0x1000); memory_region_init_io(&s->iomem, OBJECT(s), &pl050_ops, s, "pl050", 0x1000);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(dev, &s->iomem);
@ -170,7 +170,7 @@ static void pl050_kbd_class_init(ObjectClass *klass, void *data)
static const TypeInfo pl050_kbd_info = { static const TypeInfo pl050_kbd_info = {
.name = "pl050_keyboard", .name = "pl050_keyboard",
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(pl050_state), .instance_size = sizeof(PL050State),
.class_init = pl050_kbd_class_init, .class_init = pl050_kbd_class_init,
}; };
@ -186,7 +186,7 @@ static void pl050_mouse_class_init(ObjectClass *klass, void *data)
static const TypeInfo pl050_mouse_info = { static const TypeInfo pl050_mouse_info = {
.name = "pl050_mouse", .name = "pl050_mouse",
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(pl050_state), .instance_size = sizeof(PL050State),
.class_init = pl050_mouse_class_init, .class_init = pl050_mouse_class_init,
}; };