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

ssi: convert to QEMU Object Model 

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2011-12-16 13:36:39 -06:00
parent ba7c05205c
commit cd6c4cf28b
10 changed files with 150 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/ads7846.c
View File

@ -153,11 +153,18 @@ static int ads7846_init(SSISlave *dev)
return 0; return 0;
} }
static SSISlaveInfo ads7846_info = { static void ads7846_class_init(ObjectClass *klass, void *data)
.qdev.name ="ads7846", {
.qdev.size = sizeof(ADS7846State), SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
.init = ads7846_init,
.transfer = ads7846_transfer k->init = ads7846_init;
k->transfer = ads7846_transfer;
}
static DeviceInfo ads7846_info = {
.name = "ads7846",
.size = sizeof(ADS7846State),
.class_init = ads7846_class_init,
}; };
static void ads7846_register_devices(void) static void ads7846_register_devices(void)

34
hw/max111x.c
View File

@ -153,18 +153,32 @@ void max111x_set_input(DeviceState *dev, int line, uint8_t value)
s->input[line] = value; s->input[line] = value;
} }
static SSISlaveInfo max1110_info = { static void max1110_class_init(ObjectClass *klass, void *data)
.qdev.name = "max1110", {
.qdev.size = sizeof(MAX111xState), SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
.init = max1110_init,
.transfer = max111x_transfer k->init = max1110_init;
k->transfer = max111x_transfer;
}
static DeviceInfo max1110_info = {
.name = "max1110",
.size = sizeof(MAX111xState),
.class_init = max1110_class_init,
}; };
static SSISlaveInfo max1111_info = { static void max1111_class_init(ObjectClass *klass, void *data)
.qdev.name = "max1111", {
.qdev.size = sizeof(MAX111xState), SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
.init = max1111_init,
.transfer = max111x_transfer k->init = max1111_init;
k->transfer = max111x_transfer;
}
static DeviceInfo max1111_info = {
.name = "max1111",
.size = sizeof(MAX111xState),
.class_init = max1111_class_init,
}; };
static void max111x_register_devices(void) static void max111x_register_devices(void)

39
hw/spitz.c
View File

@ -1070,12 +1070,20 @@ static const VMStateDescription vmstate_corgi_ssp_regs = {
} }
}; };
static SSISlaveInfo corgi_ssp_info = { static void corgi_ssp_class_init(ObjectClass *klass, void *data)
.qdev.name = "corgi-ssp", {
.qdev.size = sizeof(CorgiSSPState), SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
.qdev.vmsd = &vmstate_corgi_ssp_regs,
.init = corgi_ssp_init, k->init = corgi_ssp_init;
.transfer = corgi_ssp_transfer k->transfer = corgi_ssp_transfer;
}
static DeviceInfo corgi_ssp_info = {
.name = "corgi-ssp",
.size = sizeof(CorgiSSPState),
.vmsd = &vmstate_corgi_ssp_regs,
.class_init = corgi_ssp_class_init,
}; };
static const VMStateDescription vmstate_spitz_lcdtg_regs = { static const VMStateDescription vmstate_spitz_lcdtg_regs = {
@ -1090,12 +1098,19 @@ static const VMStateDescription vmstate_spitz_lcdtg_regs = {
} }
}; };
static SSISlaveInfo spitz_lcdtg_info = { static void spitz_lcdtg_class_init(ObjectClass *klass, void *data)
.qdev.name = "spitz-lcdtg", {
.qdev.size = sizeof(SpitzLCDTG), SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
.qdev.vmsd = &vmstate_spitz_lcdtg_regs,
.init = spitz_lcdtg_init, k->init = spitz_lcdtg_init;
.transfer = spitz_lcdtg_transfer k->transfer = spitz_lcdtg_transfer;
}
static DeviceInfo spitz_lcdtg_info = {
.name = "spitz-lcdtg",
.size = sizeof(SpitzLCDTG),
.vmsd = &vmstate_spitz_lcdtg_regs,
.class_init = spitz_lcdtg_class_init,
}; };
static void spitz_register_devices(void) static void spitz_register_devices(void)

17
hw/ssd0323.c
View File

@ -340,11 +340,18 @@ static int ssd0323_init(SSISlave *dev)
return 0; return 0;
} }
static SSISlaveInfo ssd0323_info = { static void ssd0323_class_init(ObjectClass *klass, void *data)
.qdev.name = "ssd0323", {
.qdev.size = sizeof(ssd0323_state), SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
.init = ssd0323_init,
.transfer = ssd0323_transfer k->init = ssd0323_init;
k->transfer = ssd0323_transfer;
}
static DeviceInfo ssd0323_info = {
.name = "ssd0323",
.size = sizeof(ssd0323_state),
.class_init = ssd0323_class_init,
}; };
static void ssd03232_register_devices(void) static void ssd03232_register_devices(void)

17
hw/ssi-sd.c
View File

@ -244,11 +244,18 @@ static int ssi_sd_init(SSISlave *dev)
return 0; return 0;
} }
static SSISlaveInfo ssi_sd_info = { static void ssi_sd_class_init(ObjectClass *klass, void *data)
.qdev.name = "ssi-sd", {
.qdev.size = sizeof(ssi_sd_state), SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
.init = ssi_sd_init,
.transfer = ssi_sd_transfer k->init = ssi_sd_init;
k->transfer = ssi_sd_transfer;
}
static DeviceInfo ssi_sd_info = {
.name = "ssi-sd",
.size = sizeof(ssi_sd_state),
.class_init = ssi_sd_class_init,
}; };
static void ssi_sd_register_devices(void) static void ssi_sd_register_devices(void)

23
hw/ssi.c
View File

@ -23,8 +23,8 @@ static struct BusInfo ssi_bus_info = {
static int ssi_slave_init(DeviceState *dev, DeviceInfo *base_info) static int ssi_slave_init(DeviceState *dev, DeviceInfo *base_info)
{ {
SSISlaveInfo *info = container_of(base_info, SSISlaveInfo, qdev); SSISlave *s = SSI_SLAVE(dev);
SSISlave *s = SSI_SLAVE_FROM_QDEV(dev); SSISlaveClass *ssc = SSI_SLAVE_GET_CLASS(s);
SSIBus *bus; SSIBus *bus;
bus = FROM_QBUS(SSIBus, qdev_get_parent_bus(dev)); bus = FROM_QBUS(SSIBus, qdev_get_parent_bus(dev));
@ -33,16 +33,15 @@ static int ssi_slave_init(DeviceState *dev, DeviceInfo *base_info)
hw_error("Too many devices on SSI bus"); hw_error("Too many devices on SSI bus");
} }
s->info = info; return ssc->init(s);
return info->init(s);
} }
void ssi_register_slave(SSISlaveInfo *info) void ssi_register_slave(DeviceInfo *info)
{ {
assert(info->qdev.size >= sizeof(SSISlave)); assert(info->size >= sizeof(SSISlave));
info->qdev.init = ssi_slave_init; info->init = ssi_slave_init;
info->qdev.bus_info = &ssi_bus_info; info->bus_info = &ssi_bus_info;
qdev_register(&info->qdev); qdev_register(info);
} }
DeviceState *ssi_create_slave(SSIBus *bus, const char *name) DeviceState *ssi_create_slave(SSIBus *bus, const char *name)
@ -64,10 +63,12 @@ uint32_t ssi_transfer(SSIBus *bus, uint32_t val)
{ {
DeviceState *dev; DeviceState *dev;
SSISlave *slave; SSISlave *slave;
SSISlaveClass *ssc;
dev = QTAILQ_FIRST(&bus->qbus.children); dev = QTAILQ_FIRST(&bus->qbus.children);
if (!dev) { if (!dev) {
return 0; return 0;
} }
slave = SSI_SLAVE_FROM_QDEV(dev); slave = SSI_SLAVE(dev);
return slave->info->transfer(slave, val); ssc = SSI_SLAVE_GET_CLASS(slave);
return ssc->transfer(slave, val);
} }

18
hw/ssi.h
View File

@ -15,22 +15,30 @@
typedef struct SSISlave SSISlave; typedef struct SSISlave SSISlave;
#define TYPE_SSI_SLAVE "ssi-slave"
#define SSI_SLAVE(obj) \
OBJECT_CHECK(SSISlave, (obj), TYPE_SSI_SLAVE)
#define SSI_SLAVE_CLASS(klass) \
OBJECT_CLASS_CHECK(SSISlaveClass, (klass), TYPE_SSI_SLAVE)
#define SSI_SLAVE_GET_CLASS(obj) \
OBJECT_GET_CLASS(SSISlaveClass, (obj), TYPE_SSI_SLAVE)
/* Slave devices. */ /* Slave devices. */
typedef struct { typedef struct SSISlaveClass {
DeviceInfo qdev; DeviceClass parent_class;
int (*init)(SSISlave *dev); int (*init)(SSISlave *dev);
uint32_t (*transfer)(SSISlave *dev, uint32_t val); uint32_t (*transfer)(SSISlave *dev, uint32_t val);
} SSISlaveInfo; } SSISlaveClass;
struct SSISlave { struct SSISlave {
DeviceState qdev; DeviceState qdev;
SSISlaveInfo *info;
}; };
#define SSI_SLAVE_FROM_QDEV(dev) DO_UPCAST(SSISlave, qdev, dev) #define SSI_SLAVE_FROM_QDEV(dev) DO_UPCAST(SSISlave, qdev, dev)
#define FROM_SSI_SLAVE(type, dev) DO_UPCAST(type, ssidev, dev) #define FROM_SSI_SLAVE(type, dev) DO_UPCAST(type, ssidev, dev)
void ssi_register_slave(SSISlaveInfo *info); void ssi_register_slave(DeviceInfo *info);
DeviceState *ssi_create_slave(SSIBus *bus, const char *name); DeviceState *ssi_create_slave(SSIBus *bus, const char *name);

17
hw/stellaris.c
View File

@ -1394,11 +1394,18 @@ static void stellaris_machine_init(void)
machine_init(stellaris_machine_init); machine_init(stellaris_machine_init);
static SSISlaveInfo stellaris_ssi_bus_info = { static void stellaris_ssi_bus_class_init(ObjectClass *klass, void *data)
.qdev.name = "evb6965-ssi", {
.qdev.size = sizeof(stellaris_ssi_bus_state), SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
.init = stellaris_ssi_bus_init,
.transfer = stellaris_ssi_bus_transfer k->init = stellaris_ssi_bus_init;
k->transfer = stellaris_ssi_bus_transfer;
}
static DeviceInfo stellaris_ssi_bus_info = {
.name = "evb6965-ssi",
.size = sizeof(stellaris_ssi_bus_state),
.class_init = stellaris_ssi_bus_class_init,
}; };
static void stellaris_register_devices(void) static void stellaris_register_devices(void)

19
hw/tosa.c
View File

@ -266,13 +266,20 @@ static I2CSlaveInfo tosa_dac_info = {
.event = tosa_dac_event, .event = tosa_dac_event,
.recv = tosa_dac_recv, .recv = tosa_dac_recv,
.send = tosa_dac_send .send = tosa_dac_send
}; };
static SSISlaveInfo tosa_ssp_info = { static void tosa_ssp_class_init(ObjectClass *klass, void *data)
.qdev.name = "tosa-ssp", {
.qdev.size = sizeof(SSISlave), SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
.init = tosa_ssp_init,
.transfer = tosa_ssp_tansfer k->init = tosa_ssp_init;
k->transfer = tosa_ssp_tansfer;
}
static DeviceInfo tosa_ssp_info = {
.name = "tosa-ssp",
.size = sizeof(SSISlave),
.class_init = tosa_ssp_class_init,
}; };
static void tosa_register_devices(void) static void tosa_register_devices(void)

19
hw/z2.c
View File

@ -174,12 +174,19 @@ static VMStateDescription vmstate_zipit_lcd_state = {
} }
}; };
static SSISlaveInfo zipit_lcd_info = { static void zipit_lcd_class_init(ObjectClass *klass, void *data)
.qdev.name = "zipit-lcd", {
.qdev.size = sizeof(ZipitLCD), SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
.qdev.vmsd = &vmstate_zipit_lcd_state,
.init = zipit_lcd_init, k->init = zipit_lcd_init;
.transfer = zipit_lcd_transfer k->transfer = zipit_lcd_transfer;
}
static DeviceInfo zipit_lcd_info = {
.name = "zipit-lcd",
.size = sizeof(ZipitLCD),
.vmsd = &vmstate_zipit_lcd_state,
.class_init = zipit_lcd_class_init,
}; };
typedef struct { typedef struct {