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

Stellaris I2C qdev conversion 

Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
Paul Brook 2009-05-14 22:35:09 +01:00
parent e325e1f83e
commit 1de9610c8f
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/stellaris.c
View File

@ -680,6 +680,7 @@ static void stellaris_sys_init(uint32_t base, qemu_irq irq,
/* I2C controller. */ /* I2C controller. */
typedef struct { typedef struct {
SysBusDevice busdev;
i2c_bus *bus; i2c_bus *bus;
qemu_irq irq; qemu_irq irq;
uint32_t msa; uint32_t msa;
@ -870,18 +871,19 @@ static int stellaris_i2c_load(QEMUFile *f, void *opaque, int version_id)
return 0; return 0;
} }
static void stellaris_i2c_init(uint32_t base, qemu_irq irq, i2c_bus *bus) static void stellaris_i2c_init(SysBusDevice * dev)
{ {
stellaris_i2c_state *s; stellaris_i2c_state *s = FROM_SYSBUS(stellaris_i2c_state, dev);
i2c_bus *bus = i2c_init_bus();
int iomemtype; int iomemtype;
s = (stellaris_i2c_state *)qemu_mallocz(sizeof(stellaris_i2c_state)); sysbus_init_irq(dev, &s->irq);
s->irq = irq; qdev_attach_child_bus(&dev->qdev, "i2c", bus);
s->bus = bus; s->bus = bus;
iomemtype = cpu_register_io_memory(0, stellaris_i2c_readfn, iomemtype = cpu_register_io_memory(0, stellaris_i2c_readfn,
stellaris_i2c_writefn, s); stellaris_i2c_writefn, s);
cpu_register_physical_memory(base, 0x00001000, iomemtype); sysbus_init_mmio(dev, 0x1000, iomemtype);
/* ??? For now we only implement the master interface. */ /* ??? For now we only implement the master interface. */
stellaris_i2c_reset(s); stellaris_i2c_reset(s);
register_savevm("stellaris_i2c", -1, 1, register_savevm("stellaris_i2c", -1, 1,
@ -1321,8 +1323,9 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,
} }
if (board->dc2 & (1 << 12)) { if (board->dc2 & (1 << 12)) {
i2c = i2c_init_bus(); DeviceState *dev;
stellaris_i2c_init(0x40020000, pic[8], i2c); dev = sysbus_create_simple("stellaris-i2c", 0x40020000, pic[8]);
i2c = qdev_get_child_bus(dev, "i2c");
if (board->peripherals & BP_OLED_I2C) { if (board->peripherals & BP_OLED_I2C) {
i2c_create_slave(i2c, "ssd0303", 0x3d); i2c_create_slave(i2c, "ssd0303", 0x3d);
} }
@ -1409,3 +1412,11 @@ QEMUMachine lm3s6965evb_machine = {
.desc = "Stellaris LM3S6965EVB", .desc = "Stellaris LM3S6965EVB",
.init = lm3s6965evb_init, .init = lm3s6965evb_init,
}; };
static void stellaris_register_devices(void)
{
sysbus_register_dev("stellaris-i2c", sizeof(stellaris_i2c_state),
stellaris_i2c_init);
}
device_init(stellaris_register_devices)