motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ssi: Convert legacy SSI_SLAVE -> DEVICE casts

Browse source 
Convert legacy ->qdev style casts from TYPE_SSI_SLAVE to TYPE_DEVICE.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
[AF: Introduce local DeviceState variable for transition to QOM realize]
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Peter Crosthwaite 2014-02-11 16:27:50 -08:00 • committed by Andreas Färber
parent a01aedc8d3
commit 1a7d9ee6dd
6 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hw/display/ads7846.c
View file

@ -133,11 +133,12 @@ static const VMStateDescription vmstate_ads7846 = {
}
};
static int ads7846_init(SSISlave *dev)
static int ads7846_init(SSISlave *d)
{
ADS7846State *s = FROM_SSI_SLAVE(ADS7846State, dev);
DeviceState *dev = DEVICE(d);
ADS7846State *s = FROM_SSI_SLAVE(ADS7846State, d);
qdev_init_gpio_out(&dev->qdev, &s->interrupt, 1);
qdev_init_gpio_out(dev, &s->interrupt, 1);
s->input[0] = ADS_TEMP0; /* TEMP0 */
s->input[2] = ADS_VBAT; /* VBAT */

11
hw/display/ssd0323.c
View file

@ -336,18 +336,19 @@ static const GraphicHwOps ssd0323_ops = {
.gfx_update = ssd0323_update_display,
};
static int ssd0323_init(SSISlave *dev)
static int ssd0323_init(SSISlave *d)
{
ssd0323_state *s = FROM_SSI_SLAVE(ssd0323_state, dev);
DeviceState *dev = DEVICE(d);
ssd0323_state *s = FROM_SSI_SLAVE(ssd0323_state, d);
s->col_end = 63;
s->row_end = 79;
s->con = graphic_console_init(DEVICE(dev), 0, &ssd0323_ops, s);
s->con = graphic_console_init(dev, 0, &ssd0323_ops, s);
qemu_console_resize(s->con, 128 * MAGNIFY, 64 * MAGNIFY);
qdev_init_gpio_in(&dev->qdev, ssd0323_cd, 1);
qdev_init_gpio_in(dev, ssd0323_cd, 1);
register_savevm(&dev->qdev, "ssd0323_oled", -1, 1,
register_savevm(dev, "ssd0323_oled", -1, 1,
ssd0323_save, ssd0323_load, s);
return 0;
}