libqos: convert I2C to qgraph

Create an i2c-bus interface, corresponding to the I2CAdapter struct.
Wrap IMXI2C and OMAPI2C with a QOSGraphObject, and add the get_driver
function to retrieve the I2CAdapter.

The conversion is still not complete; for simplicity, i2c_recv and
i2c_send (along with their wrappers) still take an adapter/address
pair.  Fixing that would be complicated until the tests are converted
to qgraph, so it is left for after the conversion.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-03-18 13:48:23 +01:00
parent 732c919cf0
commit c0825c63cf
5 changed files with 83 additions and 8 deletions

View file

@ -10,6 +10,7 @@
#define LIBQOS_I2C_H
#include "libqtest.h"
#include "libqos/qgraph.h"
typedef struct I2CAdapter I2CAdapter;
struct I2CAdapter {
@ -21,8 +22,26 @@ struct I2CAdapter {
QTestState *qts;
};
typedef struct QI2CDevice QI2CDevice;
struct QI2CDevice {
/*
* For now, all devices are simple enough that there is no need for
* them to define their own constructor and get_driver functions.
* Therefore, QOSGraphObject is included directly in QI2CDevice;
* the tests expect to get a QI2CDevice rather than doing something
* like obj->get_driver("i2c-device").
*
* In fact there is no i2c-device interface even, because there are
* no generic I2C tests).
*/
QOSGraphObject obj;
I2CAdapter *bus;
};
#define OMAP2_I2C_1_BASE 0x48070000
void *i2c_device_create(void *i2c_bus, QGuestAllocator *alloc, void *addr);
void i2c_send(I2CAdapter *i2c, uint8_t addr,
const uint8_t *buf, uint16_t len);
void i2c_recv(I2CAdapter *i2c, uint8_t addr,
@ -41,6 +60,7 @@ void i2c_set16(I2CAdapter *i2c, uint8_t addr, uint8_t reg,
/* i2c-omap.c */
typedef struct OMAPI2C {
QOSGraphObject obj;
I2CAdapter parent;
uint64_t addr;
@ -52,6 +72,7 @@ void omap_i2c_free(I2CAdapter *i2c);
/* i2c-imx.c */
typedef struct IMXI2C {
QOSGraphObject obj;
I2CAdapter parent;
uint64_t addr;