hw/i2c: Rename i2c_set_slave_address() -> i2c_slave_set_address()
Other functions from I2C slave API are named "i2c_slave_XXX()". Follow that pattern with set_address(). Add docstring along. No logical change. Patch created mechanically using: $ sed -i s/i2c_set_slave_address/i2c_slave_set_address/ \ $(git grep -l i2c_set_slave_address) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Acked-by: Corey Minyard <cminyard@mvista.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
parent
2038a2907c
commit
c8665a5997
|
@ -1437,7 +1437,7 @@ static void pxa2xx_i2c_write(void *opaque, hwaddr addr,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ISAR:
|
case ISAR:
|
||||||
i2c_set_slave_address(I2C_SLAVE(s->slave), value & 0x7f);
|
i2c_slave_set_address(I2C_SLAVE(s->slave), value & 0x7f);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDBR:
|
case IDBR:
|
||||||
|
|
|
@ -769,9 +769,9 @@ static void spitz_wm8750_addr(void *opaque, int line, int level)
|
||||||
{
|
{
|
||||||
I2CSlave *wm = (I2CSlave *) opaque;
|
I2CSlave *wm = (I2CSlave *) opaque;
|
||||||
if (level)
|
if (level)
|
||||||
i2c_set_slave_address(wm, SPITZ_WM_ADDRH);
|
i2c_slave_set_address(wm, SPITZ_WM_ADDRH);
|
||||||
else
|
else
|
||||||
i2c_set_slave_address(wm, SPITZ_WM_ADDRL);
|
i2c_slave_set_address(wm, SPITZ_WM_ADDRL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void spitz_i2c_setup(PXA2xxState *cpu)
|
static void spitz_i2c_setup(PXA2xxState *cpu)
|
||||||
|
|
|
@ -968,7 +968,7 @@ static void ati_vga_realize(PCIDevice *dev, Error **errp)
|
||||||
I2CBus *i2cbus = i2c_init_bus(DEVICE(s), "ati-vga.ddc");
|
I2CBus *i2cbus = i2c_init_bus(DEVICE(s), "ati-vga.ddc");
|
||||||
bitbang_i2c_init(&s->bbi2c, i2cbus);
|
bitbang_i2c_init(&s->bbi2c, i2cbus);
|
||||||
I2CSlave *i2cddc = I2C_SLAVE(qdev_new(TYPE_I2CDDC));
|
I2CSlave *i2cddc = I2C_SLAVE(qdev_new(TYPE_I2CDDC));
|
||||||
i2c_set_slave_address(i2cddc, 0x50);
|
i2c_slave_set_address(i2cddc, 0x50);
|
||||||
qdev_realize_and_unref(DEVICE(i2cddc), BUS(i2cbus), &error_abort);
|
qdev_realize_and_unref(DEVICE(i2cddc), BUS(i2cbus), &error_abort);
|
||||||
|
|
||||||
/* mmio register space */
|
/* mmio register space */
|
||||||
|
|
|
@ -1828,7 +1828,7 @@ static void sm501_init(SM501State *s, DeviceState *dev,
|
||||||
s->i2c_bus = i2c_init_bus(dev, "sm501.i2c");
|
s->i2c_bus = i2c_init_bus(dev, "sm501.i2c");
|
||||||
/* ddc */
|
/* ddc */
|
||||||
I2CDDCState *ddc = I2CDDC(qdev_new(TYPE_I2CDDC));
|
I2CDDCState *ddc = I2CDDC(qdev_new(TYPE_I2CDDC));
|
||||||
i2c_set_slave_address(I2C_SLAVE(ddc), 0x50);
|
i2c_slave_set_address(I2C_SLAVE(ddc), 0x50);
|
||||||
qdev_realize_and_unref(DEVICE(ddc), BUS(s->i2c_bus), &error_abort);
|
qdev_realize_and_unref(DEVICE(ddc), BUS(s->i2c_bus), &error_abort);
|
||||||
|
|
||||||
/* mmio */
|
/* mmio */
|
||||||
|
|
|
@ -1253,7 +1253,7 @@ static void xlnx_dp_init(Object *obj)
|
||||||
object_property_add_child(OBJECT(s), "dpcd", OBJECT(s->dpcd));
|
object_property_add_child(OBJECT(s), "dpcd", OBJECT(s->dpcd));
|
||||||
|
|
||||||
s->edid = I2CDDC(qdev_new("i2c-ddc"));
|
s->edid = I2CDDC(qdev_new("i2c-ddc"));
|
||||||
i2c_set_slave_address(I2C_SLAVE(s->edid), 0x50);
|
i2c_slave_set_address(I2C_SLAVE(s->edid), 0x50);
|
||||||
object_property_add_child(OBJECT(s), "edid", OBJECT(s->edid));
|
object_property_add_child(OBJECT(s), "edid", OBJECT(s->edid));
|
||||||
|
|
||||||
fifo8_create(&s->rx_fifo, 16);
|
fifo8_create(&s->rx_fifo, 16);
|
||||||
|
|
|
@ -66,7 +66,7 @@ I2CBus *i2c_init_bus(DeviceState *parent, const char *name)
|
||||||
return bus;
|
return bus;
|
||||||
}
|
}
|
||||||
|
|
||||||
void i2c_set_slave_address(I2CSlave *dev, uint8_t address)
|
void i2c_slave_set_address(I2CSlave *dev, uint8_t address)
|
||||||
{
|
{
|
||||||
dev->address = address;
|
dev->address = address;
|
||||||
}
|
}
|
||||||
|
|
|
@ -171,7 +171,7 @@ static void imx_i2c_write(void *opaque, hwaddr offset,
|
||||||
switch (offset) {
|
switch (offset) {
|
||||||
case IADR_ADDR:
|
case IADR_ADDR:
|
||||||
s->iadr = value & IADR_MASK;
|
s->iadr = value & IADR_MASK;
|
||||||
/* i2c_set_slave_address(s->bus, (uint8_t)s->iadr); */
|
/* i2c_slave_set_address(s->bus, (uint8_t)s->iadr); */
|
||||||
break;
|
break;
|
||||||
case IFDR_ADDR:
|
case IFDR_ADDR:
|
||||||
s->ifdr = value & IFDR_MASK;
|
s->ifdr = value & IFDR_MASK;
|
||||||
|
|
|
@ -79,7 +79,6 @@ struct I2CBus {
|
||||||
};
|
};
|
||||||
|
|
||||||
I2CBus *i2c_init_bus(DeviceState *parent, const char *name);
|
I2CBus *i2c_init_bus(DeviceState *parent, const char *name);
|
||||||
void i2c_set_slave_address(I2CSlave *dev, uint8_t address);
|
|
||||||
int i2c_bus_busy(I2CBus *bus);
|
int i2c_bus_busy(I2CBus *bus);
|
||||||
int i2c_start_transfer(I2CBus *bus, uint8_t address, int recv);
|
int i2c_start_transfer(I2CBus *bus, uint8_t address, int recv);
|
||||||
void i2c_end_transfer(I2CBus *bus);
|
void i2c_end_transfer(I2CBus *bus);
|
||||||
|
@ -141,6 +140,13 @@ I2CSlave *i2c_slave_create_simple(I2CBus *bus, const char *name, uint8_t addr);
|
||||||
*/
|
*/
|
||||||
bool i2c_slave_realize_and_unref(I2CSlave *dev, I2CBus *bus, Error **errp);
|
bool i2c_slave_realize_and_unref(I2CSlave *dev, I2CBus *bus, Error **errp);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the I2C bus address of a slave device
|
||||||
|
* @dev: I2C slave device
|
||||||
|
* @address: I2C address of the slave when put on a bus
|
||||||
|
*/
|
||||||
|
void i2c_slave_set_address(I2CSlave *dev, uint8_t address);
|
||||||
|
|
||||||
extern const VMStateDescription vmstate_i2c_slave;
|
extern const VMStateDescription vmstate_i2c_slave;
|
||||||
|
|
||||||
#define VMSTATE_I2C_SLAVE(_field, _state) { \
|
#define VMSTATE_I2C_SLAVE(_field, _state) { \
|
||||||
|
|
Loading…
Reference in New Issue