* Copyright (c) 2007 CodeSourcery.
* Written by Paul Brook
*
- * This code is licenced under the LGPL.
+ * This code is licensed under the LGPL.
*/
#include "i2c.h"
struct i2c_bus
{
+ BusState qbus;
i2c_slave *current_dev;
i2c_slave *dev;
- int saved_address;
+ uint8_t saved_address;
};
-static void i2c_bus_save(QEMUFile *f, void *opaque)
+static struct BusInfo i2c_bus_info = {
+ .name = "I2C",
+ .size = sizeof(i2c_bus),
+ .props = (Property[]) {
+ DEFINE_PROP_UINT8("address", struct i2c_slave, address, 0),
+ DEFINE_PROP_END_OF_LIST(),
+ }
+};
+
+static void i2c_bus_pre_save(void *opaque)
{
- i2c_bus *bus = (i2c_bus *)opaque;
+ i2c_bus *bus = opaque;
- qemu_put_byte(f, bus->current_dev ? bus->current_dev->address : -1);
+ bus->saved_address = bus->current_dev ? bus->current_dev->address : -1;
}
-static int i2c_bus_load(QEMUFile *f, void *opaque, int version_id)
+static int i2c_bus_post_load(void *opaque, int version_id)
{
- i2c_bus *bus = (i2c_bus *)opaque;
-
- if (version_id != 1)
- return -EINVAL;
+ i2c_bus *bus = opaque;
/* The bus is loaded before attached devices, so load and save the
current device id. Devices will check themselves as loaded. */
- bus->saved_address = (int8_t) qemu_get_byte(f);
bus->current_dev = NULL;
-
return 0;
}
+static const VMStateDescription vmstate_i2c_bus = {
+ .name = "i2c_bus",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .pre_save = i2c_bus_pre_save,
+ .post_load = i2c_bus_post_load,
+ .fields = (VMStateField []) {
+ VMSTATE_UINT8(saved_address, i2c_bus),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
/* Create a new I2C bus. */
-i2c_bus *i2c_init_bus(void)
+i2c_bus *i2c_init_bus(DeviceState *parent, const char *name)
{
i2c_bus *bus;
- bus = (i2c_bus *)qemu_mallocz(sizeof(i2c_bus));
- register_savevm("i2c_bus", -1, 1, i2c_bus_save, i2c_bus_load, bus);
+ bus = FROM_QBUS(i2c_bus, qbus_create(&i2c_bus_info, parent, name));
+ vmstate_register(NULL, -1, &vmstate_i2c_bus, bus);
return bus;
}
-/* Create a new slave device. */
-i2c_slave *i2c_slave_init(i2c_bus *bus, int address, int size)
-{
- i2c_slave *dev;
-
- if (size < sizeof(i2c_slave))
- hw_error("I2C struct too small");
-
- dev = (i2c_slave *)qemu_mallocz(size);
- dev->address = address;
- dev->next = bus->dev;
- bus->dev = dev;
- dev->qdev.bus = bus;
-
- return dev;
-}
-
-void i2c_set_slave_address(i2c_slave *dev, int address)
+void i2c_set_slave_address(i2c_slave *dev, uint8_t address)
{
dev->address = address;
}
/* Returns non-zero if the address is not valid. */
/* TODO: Make this handle multiple masters. */
-int i2c_start_transfer(i2c_bus *bus, int address, int recv)
+int i2c_start_transfer(i2c_bus *bus, uint8_t address, int recv)
{
- i2c_slave *dev;
+ DeviceState *qdev;
+ i2c_slave *slave = NULL;
- for (dev = bus->dev; dev; dev = dev->next) {
- if (dev->address == address)
+ QLIST_FOREACH(qdev, &bus->qbus.children, sibling) {
+ i2c_slave *candidate = I2C_SLAVE_FROM_QDEV(qdev);
+ if (candidate->address == address) {
+ slave = candidate;
break;
+ }
}
- if (!dev)
+ if (!slave)
return 1;
/* If the bus is already busy, assume this is a repeated
start condition. */
- bus->current_dev = dev;
- dev->info->event(dev, recv ? I2C_START_RECV : I2C_START_SEND);
+ bus->current_dev = slave;
+ slave->info->event(slave, recv ? I2C_START_RECV : I2C_START_SEND);
return 0;
}
dev->info->event(dev, I2C_NACK);
}
-void i2c_slave_save(QEMUFile *f, i2c_slave *dev)
-{
- qemu_put_byte(f, dev->address);
-}
-
-void i2c_slave_load(QEMUFile *f, i2c_slave *dev)
+static int i2c_slave_post_load(void *opaque, int version_id)
{
+ i2c_slave *dev = opaque;
i2c_bus *bus;
- bus = qdev_get_bus(&dev->qdev);
- dev->address = qemu_get_byte(f);
+ bus = FROM_QBUS(i2c_bus, qdev_get_parent_bus(&dev->qdev));
if (bus->saved_address == dev->address) {
bus->current_dev = dev;
}
+ return 0;
}
-static void i2c_slave_qdev_init(DeviceState *dev, void *opaque)
+const VMStateDescription vmstate_i2c_slave = {
+ .name = "i2c_slave",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .post_load = i2c_slave_post_load,
+ .fields = (VMStateField []) {
+ VMSTATE_UINT8(address, i2c_slave),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static int i2c_slave_qdev_init(DeviceState *dev, DeviceInfo *base)
{
- I2CSlaveInfo *info = opaque;
+ I2CSlaveInfo *info = container_of(base, I2CSlaveInfo, qdev);
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);
+ return info->init(s);
}
-void i2c_register_slave(const char *name, int size, I2CSlaveInfo *info)
+void i2c_register_slave(I2CSlaveInfo *info)
{
- assert(size >= sizeof(i2c_slave));
- qdev_register(name, size, i2c_slave_qdev_init, info);
+ assert(info->qdev.size >= sizeof(i2c_slave));
+ info->qdev.init = i2c_slave_qdev_init;
+ info->qdev.bus_info = &i2c_bus_info;
+ qdev_register(&info->qdev);
}
-DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, int addr)
+DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr)
{
DeviceState *dev;
- dev = qdev_create(bus, name);
- qdev_set_prop_int(dev, "address", addr);
- qdev_init(dev);
+ dev = qdev_create(&bus->qbus, name);
+ qdev_prop_set_uint8(dev, "address", addr);
+ qdev_init_nofail(dev);
return dev;
}
projects / qemu.git / blobdiff