diff options
author | Paul Brook <paul@codesourcery.com> | 2009-05-14 22:35:08 +0100 |
---|---|---|
committer | Paul Brook <paul@codesourcery.com> | 2009-05-14 22:35:08 +0100 |
commit | fe8de49258d2351472ad395b85966f7204f22a01 (patch) | |
tree | 43c483d80238eec2acfd94af339c08807f609022 /hw/i2c.c | |
parent | b47b50fa9e55bf15570e83971c01205be11b2e1d (diff) | |
download | qemu-fe8de49258d2351472ad395b85966f7204f22a01.zip qemu-fe8de49258d2351472ad395b85966f7204f22a01.tar.gz qemu-fe8de49258d2351472ad395b85966f7204f22a01.tar.bz2 |
I2C qdev support
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/i2c.c')
-rw-r--r-- | hw/i2c.c | 54 |
1 files changed, 45 insertions, 9 deletions
@@ -7,7 +7,6 @@ * This code is licenced under the LGPL. */ -#include "hw.h" #include "i2c.h" struct i2c_bus @@ -61,7 +60,7 @@ i2c_slave *i2c_slave_init(i2c_bus *bus, int address, int size) dev->address = address; dev->next = bus->dev; bus->dev = dev; - dev->bus = bus; + dev->qdev.bus = bus; return dev; } @@ -94,7 +93,7 @@ int i2c_start_transfer(i2c_bus *bus, int address, int recv) /* If the bus is already busy, assume this is a repeated start condition. */ bus->current_dev = dev; - dev->event(dev, recv ? I2C_START_RECV : I2C_START_SEND); + dev->info->event(dev, recv ? I2C_START_RECV : I2C_START_SEND); return 0; } @@ -105,7 +104,7 @@ void i2c_end_transfer(i2c_bus *bus) if (!dev) return; - dev->event(dev, I2C_FINISH); + dev->info->event(dev, I2C_FINISH); bus->current_dev = NULL; } @@ -117,7 +116,7 @@ int i2c_send(i2c_bus *bus, uint8_t data) if (!dev) return -1; - return dev->send(dev, data); + return dev->info->send(dev, data); } int i2c_recv(i2c_bus *bus) @@ -127,7 +126,7 @@ int i2c_recv(i2c_bus *bus) if (!dev) return -1; - return dev->recv(dev); + return dev->info->recv(dev); } void i2c_nack(i2c_bus *bus) @@ -137,7 +136,7 @@ void i2c_nack(i2c_bus *bus) if (!dev) return; - dev->event(dev, I2C_NACK); + dev->info->event(dev, I2C_NACK); } void i2c_slave_save(QEMUFile *f, i2c_slave *dev) @@ -147,7 +146,44 @@ void i2c_slave_save(QEMUFile *f, i2c_slave *dev) void i2c_slave_load(QEMUFile *f, i2c_slave *dev) { + i2c_bus *bus; + bus = qdev_get_bus(&dev->qdev); dev->address = qemu_get_byte(f); - if (dev->bus->saved_address == dev->address) - dev->bus->current_dev = dev; + if (bus->saved_address == dev->address) { + bus->current_dev = dev; + } +} + +static void i2c_slave_qdev_init(DeviceState *dev, void *opaque) +{ + I2CSlaveInfo *info = opaque; + i2c_slave *s = I2C_SLAVE_FROM_QDEV(dev); + + s->info = info; + s->bus = qdev_get_bus(dev); + s->address = qdev_get_prop_int(dev, "address", 0); + s->next = s->bus->dev; + s->bus->dev = s; + + s->event = info->event; + s->recv = info->recv; + s->send = info->send; + + info->init(s); +} + +void i2c_register_slave(const char *name, int size, I2CSlaveInfo *info) +{ + assert(size >= sizeof(i2c_slave)); + qdev_register(name, size, i2c_slave_qdev_init, info); +} + +DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, int addr) +{ + DeviceState *dev; + + dev = qdev_create(bus, name); + qdev_set_prop_int(dev, "address", addr); + qdev_init(dev); + return dev; } |