mirror of https://github.com/xqemu/xqemu.git
I2C cleanup
Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
parent
0077147eab
commit
e325e1f83e
21
hw/i2c.c
21
hw/i2c.c
|
@ -48,23 +48,6 @@ i2c_bus *i2c_init_bus(void)
|
||||||
return 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, int address)
|
||||||
{
|
{
|
||||||
dev->address = address;
|
dev->address = address;
|
||||||
|
@ -165,10 +148,6 @@ static void i2c_slave_qdev_init(DeviceState *dev, void *opaque)
|
||||||
s->next = s->bus->dev;
|
s->next = s->bus->dev;
|
||||||
s->bus->dev = s;
|
s->bus->dev = s;
|
||||||
|
|
||||||
s->event = info->event;
|
|
||||||
s->recv = info->recv;
|
|
||||||
s->send = info->send;
|
|
||||||
|
|
||||||
info->init(s);
|
info->init(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
5
hw/i2c.h
5
hw/i2c.h
|
@ -36,10 +36,6 @@ struct i2c_slave
|
||||||
{
|
{
|
||||||
DeviceState qdev;
|
DeviceState qdev;
|
||||||
I2CSlaveInfo *info;
|
I2CSlaveInfo *info;
|
||||||
/* FIXME: These 3 should go away once all devices have been converted. */
|
|
||||||
i2c_event_cb event;
|
|
||||||
i2c_recv_cb recv;
|
|
||||||
i2c_send_cb send;
|
|
||||||
|
|
||||||
/* Remaining fields for internal use by the I2C code. */
|
/* Remaining fields for internal use by the I2C code. */
|
||||||
int address;
|
int address;
|
||||||
|
@ -48,7 +44,6 @@ struct i2c_slave
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c_bus *i2c_init_bus(void);
|
i2c_bus *i2c_init_bus(void);
|
||||||
i2c_slave *i2c_slave_init(i2c_bus *bus, int address, int size);
|
|
||||||
void i2c_set_slave_address(i2c_slave *dev, int address);
|
void i2c_set_slave_address(i2c_slave *dev, int address);
|
||||||
int i2c_bus_busy(i2c_bus *bus);
|
int i2c_bus_busy(i2c_bus *bus);
|
||||||
int i2c_start_transfer(i2c_bus *bus, int address, int recv);
|
int i2c_start_transfer(i2c_bus *bus, int address, int recv);
|
||||||
|
|
Loading…
Reference in New Issue