static void smbus_do_quick_cmd(SMBusDevice *dev, int recv)
{
+ SMBusDeviceInfo *t = container_of(dev->i2c.info, SMBusDeviceInfo, i2c);
+
DPRINTF("Quick Command %d\n", recv);
- if (dev->quick_cmd)
- dev->quick_cmd(dev, recv);
+ if (t->quick_cmd)
+ t->quick_cmd(dev, recv);
}
static void smbus_do_write(SMBusDevice *dev)
{
+ SMBusDeviceInfo *t = container_of(dev->i2c.info, SMBusDeviceInfo, i2c);
+
if (dev->data_len == 0) {
smbus_do_quick_cmd(dev, 0);
} else if (dev->data_len == 1) {
DPRINTF("Send Byte\n");
- if (dev->send_byte) {
- dev->send_byte(dev, dev->data_buf[0]);
+ if (t->send_byte) {
+ t->send_byte(dev, dev->data_buf[0]);
}
} else {
dev->command = dev->data_buf[0];
DPRINTF("Command %d len %d\n", dev->command, dev->data_len - 1);
- if (dev->write_data) {
- dev->write_data(dev, dev->command, dev->data_buf + 1,
- dev->data_len - 1);
+ if (t->write_data) {
+ t->write_data(dev, dev->command, dev->data_buf + 1,
+ dev->data_len - 1);
}
}
}
static void smbus_i2c_event(i2c_slave *s, enum i2c_event event)
{
- SMBusDevice *dev = (SMBusDevice *)s;
+ SMBusDevice *dev = FROM_I2C_SLAVE(SMBusDevice, s);
+
switch (event) {
case I2C_START_SEND:
switch (dev->mode) {
static int smbus_i2c_recv(i2c_slave *s)
{
- SMBusDevice *dev = (SMBusDevice *)s;
+ SMBusDeviceInfo *t = container_of(s->info, SMBusDeviceInfo, i2c);
+ SMBusDevice *dev = FROM_I2C_SLAVE(SMBusDevice, s);
int ret;
switch (dev->mode) {
case SMBUS_RECV_BYTE:
- if (dev->receive_byte) {
- ret = dev->receive_byte(dev);
+ if (t->receive_byte) {
+ ret = t->receive_byte(dev);
} else {
ret = 0;
}
dev->mode = SMBUS_DONE;
break;
case SMBUS_READ_DATA:
- if (dev->read_data) {
- ret = dev->read_data(dev, dev->command, dev->data_len);
+ if (t->read_data) {
+ ret = t->read_data(dev, dev->command, dev->data_len);
dev->data_len++;
} else {
ret = 0;
static int smbus_i2c_send(i2c_slave *s, uint8_t data)
{
- SMBusDevice *dev = (SMBusDevice *)s;
+ SMBusDevice *dev = FROM_I2C_SLAVE(SMBusDevice, s);
+
switch (dev->mode) {
case SMBUS_WRITE_DATA:
DPRINTF("Write data %02x\n", data);
return 0;
}
-SMBusDevice *smbus_device_init(i2c_bus *bus, int address, int size)
+static int smbus_device_init(i2c_slave *i2c)
{
- SMBusDevice *dev;
+ SMBusDeviceInfo *t = container_of(i2c->info, SMBusDeviceInfo, i2c);
+ SMBusDevice *dev = FROM_I2C_SLAVE(SMBusDevice, i2c);
- if (size < sizeof(SMBusDevice))
- hw_error("SMBus struct too small");
-
- dev = (SMBusDevice *)i2c_slave_init(bus, address, size);
- dev->i2c.event = smbus_i2c_event;
- dev->i2c.recv = smbus_i2c_recv;
- dev->i2c.send = smbus_i2c_send;
+ return t->init(dev);
+}
- return dev;
+void smbus_register_device(SMBusDeviceInfo *info)
+{
+ assert(info->i2c.qdev.size >= sizeof(SMBusDevice));
+ info->i2c.init = smbus_device_init;
+ info->i2c.event = smbus_i2c_event;
+ info->i2c.recv = smbus_i2c_recv;
+ info->i2c.send = smbus_i2c_send;
+ i2c_register_slave(&info->i2c);
}
/* Master device commands. */
-void smbus_quick_command(i2c_bus *bus, int addr, int read)
+void smbus_quick_command(i2c_bus *bus, uint8_t addr, int read)
{
i2c_start_transfer(bus, addr, read);
i2c_end_transfer(bus);
}
-uint8_t smbus_receive_byte(i2c_bus *bus, int addr)
+uint8_t smbus_receive_byte(i2c_bus *bus, uint8_t addr)
{
uint8_t data;
return data;
}
-void smbus_send_byte(i2c_bus *bus, int addr, uint8_t data)
+void smbus_send_byte(i2c_bus *bus, uint8_t addr, uint8_t data)
{
i2c_start_transfer(bus, addr, 0);
i2c_send(bus, data);
i2c_end_transfer(bus);
}
-uint8_t smbus_read_byte(i2c_bus *bus, int addr, uint8_t command)
+uint8_t smbus_read_byte(i2c_bus *bus, uint8_t addr, uint8_t command)
{
uint8_t data;
i2c_start_transfer(bus, addr, 0);
return data;
}
-void smbus_write_byte(i2c_bus *bus, int addr, uint8_t command, uint8_t data)
+void smbus_write_byte(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t data)
{
i2c_start_transfer(bus, addr, 0);
i2c_send(bus, command);
i2c_end_transfer(bus);
}
-uint16_t smbus_read_word(i2c_bus *bus, int addr, uint8_t command)
+uint16_t smbus_read_word(i2c_bus *bus, uint8_t addr, uint8_t command)
{
uint16_t data;
i2c_start_transfer(bus, addr, 0);
return data;
}
-void smbus_write_word(i2c_bus *bus, int addr, uint8_t command, uint16_t data)
+void smbus_write_word(i2c_bus *bus, uint8_t addr, uint8_t command, uint16_t data)
{
i2c_start_transfer(bus, addr, 0);
i2c_send(bus, command);
i2c_end_transfer(bus);
}
-int smbus_read_block(i2c_bus *bus, int addr, uint8_t command, uint8_t *data)
+int smbus_read_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t *data)
{
int len;
int i;
return len;
}
-void smbus_write_block(i2c_bus *bus, int addr, uint8_t command, uint8_t *data,
+void smbus_write_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t *data,
int len)
{
int i;