ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ssd0303: QOM'ify 

Replace usages of FROM_I2C_SLAVE() with QOM cast macro.
Rename parent field.

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-12-19 22:10:23 +01:00
parent bc229b0f90
commit b1be45153e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/display/ssd0303.c
View File

@ -41,8 +41,12 @@ enum ssd0303_cmd {
SSD0303_CMD_SKIP1 SSD0303_CMD_SKIP1
}; };
#define TYPE_SSD0303 "ssd0303"
#define SSD0303(obj) OBJECT_CHECK(ssd0303_state, (obj), TYPE_SSD0303)
typedef struct { typedef struct {
I2CSlave i2c; I2CSlave parent_obj;
QemuConsole *con; QemuConsole *con;
int row; int row;
int col; int col;
@ -65,8 +69,9 @@ static int ssd0303_recv(I2CSlave *i2c)
static int ssd0303_send(I2CSlave *i2c, uint8_t data) static int ssd0303_send(I2CSlave *i2c, uint8_t data)
{ {
ssd0303_state *s = (ssd0303_state *)i2c; ssd0303_state *s = SSD0303(i2c);
enum ssd0303_cmd old_cmd_state; enum ssd0303_cmd old_cmd_state;
switch (s->mode) { switch (s->mode) {
case SSD0303_IDLE: case SSD0303_IDLE:
DPRINTF("byte 0x%02x\n", data); DPRINTF("byte 0x%02x\n", data);
@ -175,7 +180,8 @@ static int ssd0303_send(I2CSlave *i2c, uint8_t data)
static void ssd0303_event(I2CSlave *i2c, enum i2c_event event) static void ssd0303_event(I2CSlave *i2c, enum i2c_event event)
{ {
ssd0303_state *s = (ssd0303_state *)i2c; ssd0303_state *s = SSD0303(i2c);
switch (event) { switch (event) {
case I2C_FINISH: case I2C_FINISH:
s->mode = SSD0303_IDLE; s->mode = SSD0303_IDLE;
@ -279,7 +285,7 @@ static const VMStateDescription vmstate_ssd0303 = {
VMSTATE_UINT32(mode, ssd0303_state), VMSTATE_UINT32(mode, ssd0303_state),
VMSTATE_UINT32(cmd_state, ssd0303_state), VMSTATE_UINT32(cmd_state, ssd0303_state),
VMSTATE_BUFFER(framebuffer, ssd0303_state), VMSTATE_BUFFER(framebuffer, ssd0303_state),
VMSTATE_I2C_SLAVE(i2c, ssd0303_state), VMSTATE_I2C_SLAVE(parent_obj, ssd0303_state),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };
@ -291,7 +297,7 @@ static const GraphicHwOps ssd0303_ops = {
static int ssd0303_init(I2CSlave *i2c) static int ssd0303_init(I2CSlave *i2c)
{ {
ssd0303_state *s = FROM_I2C_SLAVE(ssd0303_state, i2c); ssd0303_state *s = SSD0303(i2c);
s->con = graphic_console_init(DEVICE(i2c), &ssd0303_ops, s); s->con = graphic_console_init(DEVICE(i2c), &ssd0303_ops, s);
qemu_console_resize(s->con, 96 * MAGNIFY, 16 * MAGNIFY); qemu_console_resize(s->con, 96 * MAGNIFY, 16 * MAGNIFY);
@ -311,7 +317,7 @@ static void ssd0303_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo ssd0303_info = { static const TypeInfo ssd0303_info = {
.name = "ssd0303", .name = TYPE_SSD0303,
.parent = TYPE_I2C_SLAVE, .parent = TYPE_I2C_SLAVE,
.instance_size = sizeof(ssd0303_state), .instance_size = sizeof(ssd0303_state),
.class_init = ssd0303_class_init, .class_init = ssd0303_class_init,