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

ssi: Convert legacy SSI_SLAVE -> DEVICE casts 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/arm/spitz.c
View File

@ -658,14 +658,15 @@ static void spitz_adc_temp_on(void *opaque, int line, int level)
max111x_set_input(max1111, MAX1111_BATT_TEMP, 0);
}
static int corgi_ssp_init(SSISlave *dev)
static int corgi_ssp_init(SSISlave *d)
{
CorgiSSPState *s = FROM_SSI_SLAVE(CorgiSSPState, dev);
DeviceState *dev = DEVICE(d);
CorgiSSPState *s = FROM_SSI_SLAVE(CorgiSSPState, d);
qdev_init_gpio_in(&dev->qdev, corgi_ssp_gpio_cs, 3);
s->bus[0] = ssi_create_bus(&dev->qdev, "ssi0");
s->bus[1] = ssi_create_bus(&dev->qdev, "ssi1");
s->bus[2] = ssi_create_bus(&dev->qdev, "ssi2");
qdev_init_gpio_in(dev, corgi_ssp_gpio_cs, 3);
s->bus[0] = ssi_create_bus(dev, "ssi0");
s->bus[1] = ssi_create_bus(dev, "ssi1");
s->bus[2] = ssi_create_bus(dev, "ssi2");
return 0;
}

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;
}

9
hw/misc/max111x.c
View File

@ -115,11 +115,12 @@ static const VMStateDescription vmstate_max111x = {
}
};
static int max111x_init(SSISlave *dev, int inputs)
static int max111x_init(SSISlave *d, int inputs)
{
MAX111xState *s = FROM_SSI_SLAVE(MAX111xState, dev);
DeviceState *dev = DEVICE(d);
MAX111xState *s = FROM_SSI_SLAVE(MAX111xState, d);
qdev_init_gpio_out(&dev->qdev, &s->interrupt, 1);
qdev_init_gpio_out(dev, &s->interrupt, 1);
s->inputs = inputs;
/* TODO: add a user interface for setting these */
@ -133,7 +134,7 @@ static int max111x_init(SSISlave *dev, int inputs)
s->input[7] = 0x80;
s->com = 0;
vmstate_register(&dev->qdev, -1, &vmstate_max111x, s);
vmstate_register(dev, -1, &vmstate_max111x, s);
return 0;
}

7
hw/sd/ssi-sd.c
View File

@ -238,9 +238,10 @@ static int ssi_sd_load(QEMUFile *f, void *opaque, int version_id)
return 0;
}
static int ssi_sd_init(SSISlave *dev)
static int ssi_sd_init(SSISlave *d)
{
ssi_sd_state *s = FROM_SSI_SLAVE(ssi_sd_state, dev);
DeviceState *dev = DEVICE(d);
ssi_sd_state *s = FROM_SSI_SLAVE(ssi_sd_state, d);
DriveInfo *dinfo;
s->mode = SSI_SD_CMD;
@ -249,7 +250,7 @@ static int ssi_sd_init(SSISlave *dev)
if (s->sd == NULL) {
return -1;
}
register_savevm(&dev->qdev, "ssi_sd", -1, 1, ssi_sd_save, ssi_sd_load, s);
register_savevm(dev, "ssi_sd", -1, 1, ssi_sd_save, ssi_sd_load, s);
return 0;
}

2
hw/ssi/ssi.c
View File

@ -60,7 +60,7 @@ static int ssi_slave_init(DeviceState *dev)
if (ssc->transfer_raw == ssi_transfer_raw_default &&
ssc->cs_polarity != SSI_CS_NONE) {
qdev_init_gpio_in(&s->qdev, ssi_cs_default, 1);
qdev_init_gpio_in(dev, ssi_cs_default, 1);
}
return ssc->init(s);