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

smbus: Replace smbus_eeprom_init_single with new upstream equivalent

This commit is contained in:
Matt Borgerson 2018-09-02 14:08:25 -07:00
parent a0dad83029
commit aa32236d5a
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/i2c/smbus_eeprom.c
View File

@ -162,15 +162,3 @@ void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom,
smbus_eeprom_init_one(smbus, 0x50 + i, eeprom_buf + (i * 256)); smbus_eeprom_init_one(smbus, 0x50 + i, eeprom_buf + (i * 256));
} }
} }
#ifdef XBOX
void smbus_eeprom_init_single(I2CBus *smbus, int address,
uint8_t *eeprom_buf)
{
DeviceState *eeprom;
eeprom = qdev_create((BusState *)smbus, "smbus-eeprom");
qdev_prop_set_uint8(eeprom, "address", address);
qdev_prop_set_ptr(eeprom, "data", eeprom_buf);
qdev_init_nofail(eeprom);
}
#endif

2
hw/xbox/xbox.c
View File

@ -412,7 +412,7 @@ void xbox_init_common(MachineState *machine,
/* smbus devices */ /* smbus devices */
uint8_t *eeprom_buf = g_malloc0(256); uint8_t *eeprom_buf = g_malloc0(256);
memcpy(eeprom_buf, eeprom, 256); memcpy(eeprom_buf, eeprom, 256);
smbus_eeprom_init_single(smbus, 0x54, eeprom_buf); smbus_eeprom_init_one(smbus, 0x54, eeprom_buf);
smbus_xbox_smc_init(smbus, 0x10); smbus_xbox_smc_init(smbus, 0x10);
smbus_cx25871_init(smbus, 0x45); smbus_cx25871_init(smbus, 0x45);

5
include/hw/i2c/smbus.h
View File

@ -80,9 +80,4 @@ void smbus_eeprom_init_one(I2CBus *smbus, uint8_t address, uint8_t *eeprom_buf);
void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom, void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom,
const uint8_t *eeprom_spd, int size); const uint8_t *eeprom_spd, int size);
#ifdef XBOX
void smbus_eeprom_init_single(I2CBus *smbus, int address,
uint8_t *eeprom_buf);
#endif
#endif #endif