david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pl110: Rename pl110_state to PL110State

Browse Source 
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-25 00:57:23 +02:00
parent 54df97bb0c
commit 513960eaae
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
hw/display/pl110.c
View File

@ -39,7 +39,7 @@ enum pl110_version
PL111 PL111
}; };
typedef struct { typedef struct PL110State {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem; MemoryRegion iomem;
QemuConsole *con; QemuConsole *con;
@ -59,7 +59,7 @@ typedef struct {
uint32_t palette[256]; uint32_t palette[256];
uint32_t raw_palette[128]; uint32_t raw_palette[128];
qemu_irq irq; qemu_irq irq;
} pl110_state; } PL110State;
static int vmstate_pl110_post_load(void *opaque, int version_id); static int vmstate_pl110_post_load(void *opaque, int version_id);
@ -69,20 +69,20 @@ static const VMStateDescription vmstate_pl110 = {
.minimum_version_id = 1, .minimum_version_id = 1,
.post_load = vmstate_pl110_post_load, .post_load = vmstate_pl110_post_load,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_INT32(version, pl110_state), VMSTATE_INT32(version, PL110State),
VMSTATE_UINT32_ARRAY(timing, pl110_state, 4), VMSTATE_UINT32_ARRAY(timing, PL110State, 4),
VMSTATE_UINT32(cr, pl110_state), VMSTATE_UINT32(cr, PL110State),
VMSTATE_UINT32(upbase, pl110_state), VMSTATE_UINT32(upbase, PL110State),
VMSTATE_UINT32(lpbase, pl110_state), VMSTATE_UINT32(lpbase, PL110State),
VMSTATE_UINT32(int_status, pl110_state), VMSTATE_UINT32(int_status, PL110State),
VMSTATE_UINT32(int_mask, pl110_state), VMSTATE_UINT32(int_mask, PL110State),
VMSTATE_INT32(cols, pl110_state), VMSTATE_INT32(cols, PL110State),
VMSTATE_INT32(rows, pl110_state), VMSTATE_INT32(rows, PL110State),
VMSTATE_UINT32(bpp, pl110_state), VMSTATE_UINT32(bpp, PL110State),
VMSTATE_INT32(invalidate, pl110_state), VMSTATE_INT32(invalidate, PL110State),
VMSTATE_UINT32_ARRAY(palette, pl110_state, 256), VMSTATE_UINT32_ARRAY(palette, PL110State, 256),
VMSTATE_UINT32_ARRAY(raw_palette, pl110_state, 128), VMSTATE_UINT32_ARRAY(raw_palette, PL110State, 128),
VMSTATE_UINT32_V(mux_ctrl, pl110_state, 2), VMSTATE_UINT32_V(mux_ctrl, PL110State, 2),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };
@ -121,14 +121,14 @@ static const unsigned char *idregs[] = {
#define BITS 32 #define BITS 32
#include "pl110_template.h" #include "pl110_template.h"
static int pl110_enabled(pl110_state *s) static int pl110_enabled(PL110State *s)
{ {
return (s->cr & PL110_CR_EN) && (s->cr & PL110_CR_PWR); return (s->cr & PL110_CR_EN) && (s->cr & PL110_CR_PWR);
} }
static void pl110_update_display(void *opaque) static void pl110_update_display(void *opaque)
{ {
pl110_state *s = (pl110_state *)opaque; PL110State *s = (PL110State *)opaque;
DisplaySurface *surface = qemu_console_surface(s->con); DisplaySurface *surface = qemu_console_surface(s->con);
drawfn* fntable; drawfn* fntable;
drawfn fn; drawfn fn;
@ -246,14 +246,14 @@ static void pl110_update_display(void *opaque)
static void pl110_invalidate_display(void * opaque) static void pl110_invalidate_display(void * opaque)
{ {
pl110_state *s = (pl110_state *)opaque; PL110State *s = (PL110State *)opaque;
s->invalidate = 1; s->invalidate = 1;
if (pl110_enabled(s)) { if (pl110_enabled(s)) {
qemu_console_resize(s->con, s->cols, s->rows); qemu_console_resize(s->con, s->cols, s->rows);
} }
} }
static void pl110_update_palette(pl110_state *s, int n) static void pl110_update_palette(PL110State *s, int n)
{ {
DisplaySurface *surface = qemu_console_surface(s->con); DisplaySurface *surface = qemu_console_surface(s->con);
int i; int i;
@ -289,7 +289,7 @@ static void pl110_update_palette(pl110_state *s, int n)
} }
} }
static void pl110_resize(pl110_state *s, int width, int height) static void pl110_resize(PL110State *s, int width, int height)
{ {
if (width != s->cols || height != s->rows) { if (width != s->cols || height != s->rows) {
if (pl110_enabled(s)) { if (pl110_enabled(s)) {
@ -301,7 +301,7 @@ static void pl110_resize(pl110_state *s, int width, int height)
} }
/* Update interrupts. */ /* Update interrupts. */
static void pl110_update(pl110_state *s) static void pl110_update(PL110State *s)
{ {
/* TODO: Implement interrupts. */ /* TODO: Implement interrupts. */
} }
@ -309,7 +309,7 @@ static void pl110_update(pl110_state *s)
static uint64_t pl110_read(void *opaque, hwaddr offset, static uint64_t pl110_read(void *opaque, hwaddr offset,
unsigned size) unsigned size)
{ {
pl110_state *s = (pl110_state *)opaque; PL110State *s = (PL110State *)opaque;
if (offset >= 0xfe0 && offset < 0x1000) { if (offset >= 0xfe0 && offset < 0x1000) {
return idregs[s->version][(offset - 0xfe0) >> 2]; return idregs[s->version][(offset - 0xfe0) >> 2];
@ -359,7 +359,7 @@ static uint64_t pl110_read(void *opaque, hwaddr offset,
static void pl110_write(void *opaque, hwaddr offset, static void pl110_write(void *opaque, hwaddr offset,
uint64_t val, unsigned size) uint64_t val, unsigned size)
{ {
pl110_state *s = (pl110_state *)opaque; PL110State *s = (PL110State *)opaque;
int n; int n;
/* For simplicity invalidate the display whenever a control register /* For simplicity invalidate the display whenever a control register
@ -432,13 +432,13 @@ static const MemoryRegionOps pl110_ops = {
static void pl110_mux_ctrl_set(void *opaque, int line, int level) static void pl110_mux_ctrl_set(void *opaque, int line, int level)
{ {
pl110_state *s = (pl110_state *)opaque; PL110State *s = (PL110State *)opaque;
s->mux_ctrl = level; s->mux_ctrl = level;
} }
static int vmstate_pl110_post_load(void *opaque, int version_id) static int vmstate_pl110_post_load(void *opaque, int version_id)
{ {
pl110_state *s = opaque; PL110State *s = opaque;
/* Make sure we redraw, and at the right size */ /* Make sure we redraw, and at the right size */
pl110_invalidate_display(s); pl110_invalidate_display(s);
return 0; return 0;
@ -451,7 +451,7 @@ static const GraphicHwOps pl110_gfx_ops = {
static int pl110_init(SysBusDevice *dev) static int pl110_init(SysBusDevice *dev)
{ {
pl110_state *s = FROM_SYSBUS(pl110_state, dev); PL110State *s = FROM_SYSBUS(PL110State, dev);
memory_region_init_io(&s->iomem, OBJECT(s), &pl110_ops, s, "pl110", 0x1000); memory_region_init_io(&s->iomem, OBJECT(s), &pl110_ops, s, "pl110", 0x1000);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(dev, &s->iomem);
@ -463,14 +463,14 @@ static int pl110_init(SysBusDevice *dev)
static int pl110_versatile_init(SysBusDevice *dev) static int pl110_versatile_init(SysBusDevice *dev)
{ {
pl110_state *s = FROM_SYSBUS(pl110_state, dev); PL110State *s = FROM_SYSBUS(PL110State, dev);
s->version = PL110_VERSATILE; s->version = PL110_VERSATILE;
return pl110_init(dev); return pl110_init(dev);
} }
static int pl111_init(SysBusDevice *dev) static int pl111_init(SysBusDevice *dev)
{ {
pl110_state *s = FROM_SYSBUS(pl110_state, dev); PL110State *s = FROM_SYSBUS(PL110State, dev);
s->version = PL111; s->version = PL111;
return pl110_init(dev); return pl110_init(dev);
} }
@ -489,7 +489,7 @@ static void pl110_class_init(ObjectClass *klass, void *data)
static const TypeInfo pl110_info = { static const TypeInfo pl110_info = {
.name = "pl110", .name = "pl110",
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(pl110_state), .instance_size = sizeof(PL110State),
.class_init = pl110_class_init, .class_init = pl110_class_init,
}; };
@ -507,7 +507,7 @@ static void pl110_versatile_class_init(ObjectClass *klass, void *data)
static const TypeInfo pl110_versatile_info = { static const TypeInfo pl110_versatile_info = {
.name = "pl110_versatile", .name = "pl110_versatile",
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(pl110_state), .instance_size = sizeof(PL110State),
.class_init = pl110_versatile_class_init, .class_init = pl110_versatile_class_init,
}; };
@ -525,7 +525,7 @@ static void pl111_class_init(ObjectClass *klass, void *data)
static const TypeInfo pl111_info = { static const TypeInfo pl111_info = {
.name = "pl111", .name = "pl111",
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(pl110_state), .instance_size = sizeof(PL110State),
.class_init = pl111_class_init, .class_init = pl111_class_init,
}; };