diff options
author | Paul Brook | 2009-05-14 23:35:08 +0200 |
---|---|---|
committer | Paul Brook | 2009-05-14 23:35:08 +0200 |
commit | 697454eb8e2335c21e07b8cd0a7468d1c53bed08 (patch) | |
tree | 2afa62a2e1142e9d7d5049489f0d0047d9dfe249 /hw/tmp105.c | |
parent | PXA2xx I2C slave qdev conversion (diff) | |
download | qemu-697454eb8e2335c21e07b8cd0a7468d1c53bed08.tar.gz qemu-697454eb8e2335c21e07b8cd0a7468d1c53bed08.tar.xz qemu-697454eb8e2335c21e07b8cd0a7468d1c53bed08.zip |
TMP105 qdev conversion
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/tmp105.c')
-rw-r--r-- | hw/tmp105.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/hw/tmp105.c b/hw/tmp105.c index 0877e126fc..59b039804d 100644 --- a/hw/tmp105.c +++ b/hw/tmp105.c @@ -214,7 +214,7 @@ static int tmp105_load(QEMUFile *f, void *opaque, int version_id) return 0; } -void tmp105_reset(i2c_slave *i2c) +static void tmp105_reset(i2c_slave *i2c) { TMP105State *s = (TMP105State *) i2c; @@ -227,19 +227,27 @@ void tmp105_reset(i2c_slave *i2c) tmp105_interrupt_update(s); } -struct i2c_slave *tmp105_init(i2c_bus *bus, qemu_irq alarm) +static void tmp105_init(i2c_slave *i2c) { - TMP105State *s = (TMP105State *) - i2c_slave_init(bus, 0, sizeof(TMP105State)); + TMP105State *s = FROM_I2C_SLAVE(TMP105State, i2c); - s->i2c.event = tmp105_event; - s->i2c.recv = tmp105_rx; - s->i2c.send = tmp105_tx; - s->pin = alarm; + qdev_init_gpio_out(&i2c->qdev, &s->pin, 1); tmp105_reset(&s->i2c); register_savevm("TMP105", -1, 0, tmp105_save, tmp105_load, s); +} + +static I2CSlaveInfo tmp105_info = { + .init = tmp105_init, + .event = tmp105_event, + .recv = tmp105_rx, + .send = tmp105_tx +}; - return &s->i2c; +static void tmp105_register_devices(void) +{ + i2c_register_slave("tmp105", sizeof(TMP105State), &tmp105_info); } + +device_init(tmp105_register_devices) |