2 files changed, 44 insertions, 34 deletions

diff --git a/tests/libqos/i2c.c b/tests/libqos/i2c.c
index 8117d13170..156114e745 100644
--- a/tests/libqos/i2c.c
+++ b/tests/libqos/i2c.c
@@ -10,63 +10,59 @@
 #include "libqos/i2c.h"
 #include "libqtest.h"
 
-void i2c_send(I2CAdapter *i2c, uint8_t addr,
-              const uint8_t *buf, uint16_t len)
+void i2c_send(QI2CDevice *i2cdev, const uint8_t *buf, uint16_t len)
 {
-    i2c->send(i2c, addr, buf, len);
+    i2cdev->bus->send(i2cdev->bus, i2cdev->addr, buf, len);
 }
 
-void i2c_recv(I2CAdapter *i2c, uint8_t addr,
-              uint8_t *buf, uint16_t len)
+void i2c_recv(QI2CDevice *i2cdev, uint8_t *buf, uint16_t len)
 {
-    i2c->recv(i2c, addr, buf, len);
+    i2cdev->bus->recv(i2cdev->bus, i2cdev->addr, buf, len);
 }
 
-void i2c_read_block(I2CAdapter *i2c, uint8_t addr, uint8_t reg,
-                       uint8_t *buf, uint16_t len)
+void i2c_read_block(QI2CDevice *i2cdev, uint8_t reg,
+                    uint8_t *buf, uint16_t len)
 {
-    i2c_send(i2c, addr, &reg, 1);
-    i2c_recv(i2c, addr, buf, len);
+    i2c_send(i2cdev, &reg, 1);
+    i2c_recv(i2cdev, buf, len);
 }
 
-void i2c_write_block(I2CAdapter *i2c, uint8_t addr, uint8_t reg,
+void i2c_write_block(QI2CDevice *i2cdev, uint8_t reg,
                      const uint8_t *buf, uint16_t len)
 {
     uint8_t *cmd = g_malloc(len + 1);
     cmd[0] = reg;
     memcpy(&cmd[1], buf, len);
-    i2c_send(i2c, addr, cmd, len + 1);
+    i2c_send(i2cdev, cmd, len + 1);
     g_free(cmd);
 }
 
-uint8_t i2c_get8(I2CAdapter *i2c, uint8_t addr, uint8_t reg)
+uint8_t i2c_get8(QI2CDevice *i2cdev, uint8_t reg)
 {
     uint8_t resp[1];
-    i2c_read_block(i2c, addr, reg, resp, sizeof(resp));
+    i2c_read_block(i2cdev, reg, resp, sizeof(resp));
     return resp[0];
 }
 
-uint16_t i2c_get16(I2CAdapter *i2c, uint8_t addr, uint8_t reg)
+uint16_t i2c_get16(QI2CDevice *i2cdev, uint8_t reg)
 {
     uint8_t resp[2];
-    i2c_read_block(i2c, addr, reg, resp, sizeof(resp));
+    i2c_read_block(i2cdev, reg, resp, sizeof(resp));
     return (resp[0] << 8) | resp[1];
 }
 
-void i2c_set8(I2CAdapter *i2c, uint8_t addr, uint8_t reg,
-              uint8_t value)
+void i2c_set8(QI2CDevice *i2cdev, uint8_t reg, uint8_t value)
 {
-    i2c_write_block(i2c, addr, reg, &value, 1);
+    i2c_write_block(i2cdev, reg, &value, 1);
 }
 
-void i2c_set16(I2CAdapter *i2c, uint8_t addr, uint8_t reg,
-               uint16_t value)
+void i2c_set16(QI2CDevice *i2cdev, uint8_t reg, uint16_t value)
 {
     uint8_t data[2];
 
     data[0] = value >> 8;
     data[1] = value & 255;
-    i2c_write_block(i2c, addr, reg, data, sizeof(data));
+    i2c_write_block(i2cdev, reg, data, sizeof(data));
 }
 
 void *i2c_device_create(void *i2c_bus, QGuestAllocator *alloc, void *addr)
@@ -74,5 +70,16 @@ void *i2c_device_create(void *i2c_bus, QGuestAllocator *alloc, void *addr)
     QI2CDevice *i2cdev = g_new0(QI2CDevice, 1);
 
     i2cdev->bus = i2c_bus;
+    if (addr) {
+        i2cdev->addr = ((QI2CAddress *)addr)->addr;
+    }
     return &i2cdev->obj;
 }
+
+void add_qi2c_address(QOSGraphEdgeOptions *opts, QI2CAddress *addr)
+{
+    g_assert(addr);
+
+    opts->arg = addr;
+    opts->size_arg = sizeof(QI2CAddress);
+}
diff --git a/tests/libqos/i2c.h b/tests/libqos/i2c.h
index 2c8cc3eab5..945b65b34c 100644
--- a/tests/libqos/i2c.h
+++ b/tests/libqos/i2c.h
@@ -22,6 +22,11 @@ struct I2CAdapter {
     QTestState *qts;
 };
 
+typedef struct QI2CAddress QI2CAddress;
+struct QI2CAddress {
+    uint8_t addr;
+};
+
 typedef struct QI2CDevice QI2CDevice;
 struct QI2CDevice {
     /*
@@ -36,25 +41,23 @@ struct QI2CDevice {
      */
     QOSGraphObject obj;
     I2CAdapter *bus;
+    uint8_t addr;
 };
 
 void *i2c_device_create(void *i2c_bus, QGuestAllocator *alloc, void *addr);
+void add_qi2c_address(QOSGraphEdgeOptions *opts, QI2CAddress *addr);
 
-void i2c_send(I2CAdapter *i2c, uint8_t addr,
-              const uint8_t *buf, uint16_t len);
-void i2c_recv(I2CAdapter *i2c, uint8_t addr,
-              uint8_t *buf, uint16_t len);
+void i2c_send(QI2CDevice *dev, const uint8_t *buf, uint16_t len);
+void i2c_recv(QI2CDevice *dev, uint8_t *buf, uint16_t len);
 
-void i2c_read_block(I2CAdapter *i2c, uint8_t addr, uint8_t reg,
+void i2c_read_block(QI2CDevice *dev, uint8_t reg,
                     uint8_t *buf, uint16_t len);
-void i2c_write_block(I2CAdapter *i2c, uint8_t addr, uint8_t reg,
+void i2c_write_block(QI2CDevice *dev, uint8_t reg,
                      const uint8_t *buf, uint16_t len);
-uint8_t i2c_get8(I2CAdapter *i2c, uint8_t addr, uint8_t reg);
-uint16_t i2c_get16(I2CAdapter *i2c, uint8_t addr, uint8_t reg);
-void i2c_set8(I2CAdapter *i2c, uint8_t addr, uint8_t reg,
-              uint8_t value);
-void i2c_set16(I2CAdapter *i2c, uint8_t addr, uint8_t reg,
-               uint16_t value);
+uint8_t i2c_get8(QI2CDevice *dev, uint8_t reg);
+uint16_t i2c_get16(QI2CDevice *dev, uint8_t reg);
+void i2c_set8(QI2CDevice *dev, uint8_t reg, uint8_t value);
+void i2c_set16(QI2CDevice *dev, uint8_t reg, uint16_t value);
 
 /* i2c-omap.c */
 typedef struct OMAPI2C {