xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-12-03 09:00:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

smbus: Use DeviceClass::realize instead of init

Browse Source 
I2CSlaveClass::init removed in c8c9e10, use DeviceClass::realize
instead.
This commit is contained in:
Matt Borgerson 2018-09-02 13:44:07 -07:00
parent 95503c6608
commit a0ed8d9c8b
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xbox/smbus_adm1032.c
View File

@ -48,17 +48,10 @@ static uint8_t tm_read_data(SMBusDevice *dev, uint8_t cmd, int n)
return 0;
}
static int tm_init(SMBusDevice *dev)
{
return 0;
}
static void smbus_adm1032_class_initfn(ObjectClass *klass, void *data)
{
// DeviceClass *dc = DEVICE_CLASS(klass);
SMBusDeviceClass *sc = SMBUS_DEVICE_CLASS(klass);
sc->init = tm_init;
sc->read_data = tm_read_data;
}
@ -76,7 +69,6 @@ static void smbus_adm1032_register_devices(void)
type_init(smbus_adm1032_register_devices)
void smbus_adm1032_init(I2CBus *smbus, int address)
{
DeviceState *tm;

6
hw/xbox/smbus_cx25871.c
View File

@ -69,16 +69,10 @@ static uint8_t cx_read_data(SMBusDevice *dev, uint8_t cmd, int n)
return cx->registers[cmd];
}
static int smbus_cx_init(SMBusDevice *dev)
{
return 0;
}
static void smbus_cx25871_class_initfn(ObjectClass *klass, void *data)
{
SMBusDeviceClass *sc = SMBUS_DEVICE_CLASS(klass);
sc->init = smbus_cx_init;
sc->quick_cmd = cx_quick_cmd;
sc->send_byte = cx_send_byte;
sc->receive_byte = cx_receive_byte;

14
hw/xbox/smbus_xbox_smc.c
View File

@ -26,6 +26,9 @@
#include "sysemu/sysemu.h"
#include "smbus.h"
#define TYPE_XBOX_SMC "smbus-xbox-smc"
#define XBOX_SMC(obj) OBJECT_CHECK(SMBusSMCDevice, (obj), TYPE_XBOX_SMC)
// #define DEBUG
#ifdef DEBUG
# define DPRINTF(format, ...) printf(format, ## __VA_ARGS__)
@ -168,9 +171,9 @@ static uint8_t smc_read_data(SMBusDevice *dev, uint8_t cmd, int n)
return 0;
}
static int smbus_smc_init(SMBusDevice *dev)
static void smbus_smc_realize(DeviceState *dev, Error **errp)
{
SMBusSMCDevice *smc = (SMBusSMCDevice *)dev;
SMBusSMCDevice *smc = XBOX_SMC(dev);
smc->version_string_index = 0;
smc->scratch_reg = 0;
@ -178,15 +181,14 @@ static int smbus_smc_init(SMBusDevice *dev)
if (object_property_get_bool(qdev_get_machine(), "short-animation", NULL)) {
smc->scratch_reg = SMC_REG_SCRATCH_SHORT_ANIMATION;
}
return 0;
}
static void smbus_smc_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
SMBusDeviceClass *sc = SMBUS_DEVICE_CLASS(klass);
sc->init = smbus_smc_init;
dc->realize = smbus_smc_realize;
sc->quick_cmd = smc_quick_cmd;
sc->send_byte = smc_send_byte;
sc->receive_byte = smc_receive_byte;
@ -195,7 +197,7 @@ static void smbus_smc_class_initfn(ObjectClass *klass, void *data)
}
static TypeInfo smbus_smc_info = {
.name = "smbus-xbox-smc",
.name = TYPE_XBOX_SMC,
.parent = TYPE_SMBUS_DEVICE,
.instance_size = sizeof(SMBusSMCDevice),
.class_init = smbus_smc_class_initfn,