[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 01/11] i2c: Rename i2c_bus to I2CBus
|
From: |
Peter Crosthwaite |
|
Subject: |
Re: [Qemu-devel] [PATCH 01/11] i2c: Rename i2c_bus to I2CBus |
|
Date: |
Sun, 9 Feb 2014 11:24:05 +1000 |
On Sat, Feb 1, 2014 at 12:34 AM, Andreas Färber <address@hidden> wrote:
> Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
> ---
> hw/acpi/piix4.c | 6 +++---
> hw/arm/exynos4210.c | 2 +-
> hw/arm/musicpal.c | 4 ++--
> hw/arm/nseries.c | 2 +-
> hw/arm/pxa2xx.c | 6 +++---
> hw/arm/realview.c | 4 ++--
> hw/arm/spitz.c | 2 +-
> hw/arm/stellaris.c | 8 ++++----
> hw/arm/tosa.c | 2 +-
> hw/arm/versatilepb.c | 4 ++--
> hw/arm/z2.c | 2 +-
> hw/i2c/bitbang_i2c.c | 6 +++---
> hw/i2c/bitbang_i2c.h | 2 +-
> hw/i2c/core.c | 32 ++++++++++++++++----------------
> hw/i2c/exynos4210_i2c.c | 2 +-
> hw/i2c/omap_i2c.c | 4 ++--
> hw/i2c/pm_smbus.c | 2 +-
> hw/i2c/smbus.c | 18 +++++++++---------
> hw/i2c/smbus_eeprom.c | 2 +-
> hw/i2c/smbus_ich9.c | 2 +-
> hw/i2c/versatile_i2c.c | 2 +-
> hw/i386/pc_piix.c | 2 +-
> hw/isa/vt82c686.c | 4 ++--
> hw/mips/mips_fulong2e.c | 2 +-
> hw/mips/mips_malta.c | 2 +-
> include/hw/arm/exynos4210.h | 2 +-
> include/hw/arm/omap.h | 2 +-
> include/hw/arm/pxa.h | 2 +-
> include/hw/i2c/i2c.h | 16 ++++++++--------
> include/hw/i2c/pm_smbus.h | 2 +-
> include/hw/i2c/smbus.h | 20 ++++++++++----------
> include/hw/i386/ich9.h | 2 +-
> include/hw/i386/pc.h | 6 +++---
> include/hw/isa/vt82c686.h | 4 ++--
> include/qemu/typedefs.h | 2 +-
> 35 files changed, 91 insertions(+), 91 deletions(-)
>
> diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
> index 5d55a3c..33e812d 100644
> --- a/hw/acpi/piix4.c
> +++ b/hw/acpi/piix4.c
> @@ -517,9 +517,9 @@ Object *piix4_pm_find(void)
> return o;
> }
>
> -i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> - qemu_irq sci_irq, qemu_irq smi_irq,
> - int kvm_enabled, FWCfgState *fw_cfg)
> +I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> + qemu_irq sci_irq, qemu_irq smi_irq,
> + int kvm_enabled, FWCfgState *fw_cfg)
> {
> DeviceState *dev;
> PIIX4PMState *s;
> diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
> index 4ebb938..9f137e9 100644
> --- a/hw/arm/exynos4210.c
> +++ b/hw/arm/exynos4210.c
> @@ -326,7 +326,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem,
> busdev = SYS_BUS_DEVICE(dev);
> sysbus_connect_irq(busdev, 0, i2c_irq);
> sysbus_mmio_map(busdev, 0, addr);
> - s->i2c_if[n] = (i2c_bus *)qdev_get_child_bus(dev, "i2c");
> + s->i2c_if[n] = (I2CBus *)qdev_get_child_bus(dev, "i2c");
> }
>
>
> diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
> index 023e875..50a3b8f 100644
> --- a/hw/arm/musicpal.c
> +++ b/hw/arm/musicpal.c
> @@ -1593,7 +1593,7 @@ static void musicpal_init(QEMUMachineInitArgs *args)
> DeviceState *key_dev;
> DeviceState *wm8750_dev;
> SysBusDevice *s;
> - i2c_bus *i2c;
> + I2CBus *i2c;
> int i;
> unsigned long flash_size;
> DriveInfo *dinfo;
> @@ -1687,7 +1687,7 @@ static void musicpal_init(QEMUMachineInitArgs *args)
> dev = sysbus_create_simple(TYPE_MUSICPAL_GPIO, MP_GPIO_BASE,
> pic[MP_GPIO_IRQ]);
> i2c_dev = sysbus_create_simple("gpio_i2c", -1, NULL);
> - i2c = (i2c_bus *)qdev_get_child_bus(i2c_dev, "i2c");
> + i2c = (I2CBus *)qdev_get_child_bus(i2c_dev, "i2c");
>
> lcd_dev = sysbus_create_simple(TYPE_MUSICPAL_LCD, MP_LCD_BASE, NULL);
> key_dev = sysbus_create_simple(TYPE_MUSICPAL_KEY, -1, NULL);
> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
> index 9ef31ca..c28f895 100644
> --- a/hw/arm/nseries.c
> +++ b/hw/arm/nseries.c
> @@ -202,7 +202,7 @@ static void n8x0_i2c_setup(struct n800_s *s)
> {
> DeviceState *dev;
> qemu_irq tmp_irq = qdev_get_gpio_in(s->mpu->gpio, N8X0_TMP105_GPIO);
> - i2c_bus *i2c = omap_i2c_bus(s->mpu->i2c[0]);
> + I2CBus *i2c = omap_i2c_bus(s->mpu->i2c[0]);
>
> /* Attach a menelaus PM chip */
> dev = i2c_create_slave(i2c, "twl92230", N8X0_MENELAUS_ADDR);
> diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
> index 02b7016..daf60e8 100644
> --- a/hw/arm/pxa2xx.c
> +++ b/hw/arm/pxa2xx.c
> @@ -1238,7 +1238,7 @@ struct PXA2xxI2CState {
>
> MemoryRegion iomem;
> PXA2xxI2CSlaveState *slave;
> - i2c_bus *bus;
> + I2CBus *bus;
> qemu_irq irq;
> uint32_t offset;
> uint32_t region_size;
> @@ -1482,7 +1482,7 @@ PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base,
> DeviceState *dev;
> SysBusDevice *i2c_dev;
> PXA2xxI2CState *s;
> - i2c_bus *i2cbus;
> + I2CBus *i2cbus;
>
> dev = qdev_create(NULL, TYPE_PXA2XX_I2C);
> qdev_prop_set_uint32(dev, "size", region_size + 1);
> @@ -1518,7 +1518,7 @@ static int pxa2xx_i2c_initfn(SysBusDevice *sbd)
> return 0;
> }
>
> -i2c_bus *pxa2xx_i2c_bus(PXA2xxI2CState *s)
> +I2CBus *pxa2xx_i2c_bus(PXA2xxI2CState *s)
> {
> return s->bus;
> }
> diff --git a/hw/arm/realview.c b/hw/arm/realview.c
> index 8d845dd..6ef7646 100644
> --- a/hw/arm/realview.c
> +++ b/hw/arm/realview.c
> @@ -60,7 +60,7 @@ static void realview_init(QEMUMachineInitArgs *args,
> qemu_irq mmc_irq[2];
> PCIBus *pci_bus = NULL;
> NICInfo *nd;
> - i2c_bus *i2c;
> + I2CBus *i2c;
> int n;
> int done_nic = 0;
> qemu_irq cpu_irq[4];
> @@ -255,7 +255,7 @@ static void realview_init(QEMUMachineInitArgs *args,
> }
>
> dev = sysbus_create_simple("versatile_i2c", 0x10002000, NULL);
> - i2c = (i2c_bus *)qdev_get_child_bus(dev, "i2c");
> + i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
> i2c_create_slave(i2c, "ds1338", 0x68);
>
> /* Memory map for RealView Emulation Baseboard: */
> diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
> index ba17283..2decff1 100644
> --- a/hw/arm/spitz.c
> +++ b/hw/arm/spitz.c
> @@ -734,7 +734,7 @@ static void spitz_wm8750_addr(void *opaque, int line, int
> level)
> static void spitz_i2c_setup(PXA2xxState *cpu)
> {
> /* Attach the CPU on one end of our I2C bus. */
> - i2c_bus *bus = pxa2xx_i2c_bus(cpu->i2c[0]);
> + I2CBus *bus = pxa2xx_i2c_bus(cpu->i2c[0]);
>
> DeviceState *wm;
>
> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
> index 3170d69..d6cc77b 100644
> --- a/hw/arm/stellaris.c
> +++ b/hw/arm/stellaris.c
> @@ -692,7 +692,7 @@ static int stellaris_sys_init(uint32_t base, qemu_irq irq,
> typedef struct {
> SysBusDevice parent_obj;
>
> - i2c_bus *bus;
> + I2CBus *bus;
> qemu_irq irq;
> MemoryRegion iomem;
> uint32_t msa;
> @@ -868,7 +868,7 @@ static int stellaris_i2c_init(SysBusDevice *sbd)
> {
> DeviceState *dev = DEVICE(sbd);
> stellaris_i2c_state *s = STELLARIS_I2C(dev);
> - i2c_bus *bus;
> + I2CBus *bus;
>
> sysbus_init_irq(sbd, &s->irq);
> bus = i2c_init_bus(dev, "i2c");
> @@ -1213,7 +1213,7 @@ static void stellaris_init(const char *kernel_filename,
> const char *cpu_model,
> qemu_irq adc;
> int sram_size;
> int flash_size;
> - i2c_bus *i2c;
> + I2CBus *i2c;
> DeviceState *dev;
> int i;
> int j;
> @@ -1256,7 +1256,7 @@ static void stellaris_init(const char *kernel_filename,
> const char *cpu_model,
>
> if (board->dc2 & (1 << 12)) {
> dev = sysbus_create_simple(TYPE_STELLARIS_I2C, 0x40020000, pic[8]);
> - i2c = (i2c_bus *)qdev_get_child_bus(dev, "i2c");
> + i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
> if (board->peripherals & BP_OLED_I2C) {
> i2c_create_slave(i2c, "ssd0303", 0x3d);
> }
> diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
> index c00d8c2..dd224d3 100644
> --- a/hw/arm/tosa.c
> +++ b/hw/arm/tosa.c
> @@ -194,7 +194,7 @@ static int tosa_dac_init(I2CSlave *i2c)
>
> static void tosa_tg_init(PXA2xxState *cpu)
> {
> - i2c_bus *bus = pxa2xx_i2c_bus(cpu->i2c[0]);
> + I2CBus *bus = pxa2xx_i2c_bus(cpu->i2c[0]);
> i2c_create_slave(bus, "tosa_dac", DAC_BASE);
> ssi_create_slave(cpu->ssp[1], "tosa-ssp");
> }
> diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
> index aef2bde..e5493b4 100644
> --- a/hw/arm/versatilepb.c
> +++ b/hw/arm/versatilepb.c
> @@ -185,7 +185,7 @@ static void versatile_init(QEMUMachineInitArgs *args, int
> board_id)
> DeviceState *pl041;
> PCIBus *pci_bus;
> NICInfo *nd;
> - i2c_bus *i2c;
> + I2CBus *i2c;
> int n;
> int done_smc = 0;
> DriveInfo *dinfo;
> @@ -288,7 +288,7 @@ static void versatile_init(QEMUMachineInitArgs *args, int
> board_id)
> sysbus_create_simple("pl031", 0x101e8000, pic[10]);
>
> dev = sysbus_create_simple("versatile_i2c", 0x10002000, NULL);
> - i2c = (i2c_bus *)qdev_get_child_bus(dev, "i2c");
> + i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
> i2c_create_slave(i2c, "ds1338", 0x68);
>
> /* Add PL041 AACI Interface to the LM4549 codec */
> diff --git a/hw/arm/z2.c b/hw/arm/z2.c
> index 97367b1..97ec381 100644
> --- a/hw/arm/z2.c
> +++ b/hw/arm/z2.c
> @@ -308,7 +308,7 @@ static void z2_init(QEMUMachineInitArgs *args)
> DriveInfo *dinfo;
> int be;
> void *z2_lcd;
> - i2c_bus *bus;
> + I2CBus *bus;
> DeviceState *wm;
>
> if (!cpu_model) {
> diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c
> index ca59456..6d1bb03 100644
> --- a/hw/i2c/bitbang_i2c.c
> +++ b/hw/i2c/bitbang_i2c.c
> @@ -46,7 +46,7 @@ typedef enum bitbang_i2c_state {
> } bitbang_i2c_state;
>
> struct bitbang_i2c_interface {
> - i2c_bus *bus;
> + I2CBus *bus;
> bitbang_i2c_state state;
> int last_data;
> int last_clock;
> @@ -170,7 +170,7 @@ int bitbang_i2c_set(bitbang_i2c_interface *i2c, int line,
> int level)
> abort();
> }
>
> -bitbang_i2c_interface *bitbang_i2c_init(i2c_bus *bus)
> +bitbang_i2c_interface *bitbang_i2c_init(I2CBus *bus)
> {
> bitbang_i2c_interface *s;
>
> @@ -213,7 +213,7 @@ static int gpio_i2c_init(SysBusDevice *sbd)
> {
> DeviceState *dev = DEVICE(sbd);
> GPIOI2CState *s = GPIO_I2C(dev);
> - i2c_bus *bus;
> + I2CBus *bus;
>
> memory_region_init(&s->dummy_iomem, OBJECT(s), "gpio_i2c", 0);
> sysbus_init_mmio(sbd, &s->dummy_iomem);
> diff --git a/hw/i2c/bitbang_i2c.h b/hw/i2c/bitbang_i2c.h
> index 2866ac3..3a7126d 100644
> --- a/hw/i2c/bitbang_i2c.h
> +++ b/hw/i2c/bitbang_i2c.h
> @@ -8,7 +8,7 @@ typedef struct bitbang_i2c_interface bitbang_i2c_interface;
> #define BITBANG_I2C_SDA 0
> #define BITBANG_I2C_SCL 1
>
> -bitbang_i2c_interface *bitbang_i2c_init(i2c_bus *bus);
> +bitbang_i2c_interface *bitbang_i2c_init(I2CBus *bus);
> int bitbang_i2c_set(bitbang_i2c_interface *i2c, int line, int level);
>
> #endif
> diff --git a/hw/i2c/core.c b/hw/i2c/core.c
> index c97e7f7..efd8b4f 100644
> --- a/hw/i2c/core.c
> +++ b/hw/i2c/core.c
> @@ -9,7 +9,7 @@
>
> #include "hw/i2c/i2c.h"
>
> -struct i2c_bus
> +struct I2CBus
> {
> BusState qbus;
> I2CSlave *current_dev;
> @@ -23,24 +23,24 @@ static Property i2c_props[] = {
> };
>
> #define TYPE_I2C_BUS "i2c-bus"
> -#define I2C_BUS(obj) OBJECT_CHECK(i2c_bus, (obj), TYPE_I2C_BUS)
> +#define I2C_BUS(obj) OBJECT_CHECK(I2CBus, (obj), TYPE_I2C_BUS)
>
> static const TypeInfo i2c_bus_info = {
> .name = TYPE_I2C_BUS,
> .parent = TYPE_BUS,
> - .instance_size = sizeof(i2c_bus),
> + .instance_size = sizeof(I2CBus),
> };
>
> static void i2c_bus_pre_save(void *opaque)
> {
> - i2c_bus *bus = opaque;
> + I2CBus *bus = opaque;
>
> bus->saved_address = bus->current_dev ? bus->current_dev->address : -1;
> }
>
> static int i2c_bus_post_load(void *opaque, int version_id)
> {
> - i2c_bus *bus = opaque;
> + I2CBus *bus = opaque;
>
> /* The bus is loaded before attached devices, so load and save the
> current device id. Devices will check themselves as loaded. */
> @@ -56,15 +56,15 @@ static const VMStateDescription vmstate_i2c_bus = {
> .pre_save = i2c_bus_pre_save,
> .post_load = i2c_bus_post_load,
> .fields = (VMStateField []) {
> - VMSTATE_UINT8(saved_address, i2c_bus),
> + VMSTATE_UINT8(saved_address, I2CBus),
> VMSTATE_END_OF_LIST()
> }
> };
>
> /* Create a new I2C bus. */
> -i2c_bus *i2c_init_bus(DeviceState *parent, const char *name)
> +I2CBus *i2c_init_bus(DeviceState *parent, const char *name)
> {
> - i2c_bus *bus;
> + I2CBus *bus;
>
> bus = I2C_BUS(qbus_create(TYPE_I2C_BUS, parent, name));
> vmstate_register(NULL, -1, &vmstate_i2c_bus, bus);
> @@ -77,14 +77,14 @@ void i2c_set_slave_address(I2CSlave *dev, uint8_t address)
> }
>
> /* Return nonzero if bus is busy. */
> -int i2c_bus_busy(i2c_bus *bus)
> +int i2c_bus_busy(I2CBus *bus)
> {
> return bus->current_dev != NULL;
> }
>
> /* Returns non-zero if the address is not valid. */
> /* TODO: Make this handle multiple masters. */
> -int i2c_start_transfer(i2c_bus *bus, uint8_t address, int recv)
> +int i2c_start_transfer(I2CBus *bus, uint8_t address, int recv)
> {
> BusChild *kid;
> I2CSlave *slave = NULL;
> @@ -113,7 +113,7 @@ int i2c_start_transfer(i2c_bus *bus, uint8_t address, int
> recv)
> return 0;
> }
>
> -void i2c_end_transfer(i2c_bus *bus)
> +void i2c_end_transfer(I2CBus *bus)
> {
> I2CSlave *dev = bus->current_dev;
> I2CSlaveClass *sc;
> @@ -130,7 +130,7 @@ void i2c_end_transfer(i2c_bus *bus)
> bus->current_dev = NULL;
> }
>
> -int i2c_send(i2c_bus *bus, uint8_t data)
> +int i2c_send(I2CBus *bus, uint8_t data)
> {
> I2CSlave *dev = bus->current_dev;
> I2CSlaveClass *sc;
> @@ -147,7 +147,7 @@ int i2c_send(i2c_bus *bus, uint8_t data)
> return -1;
> }
>
> -int i2c_recv(i2c_bus *bus)
> +int i2c_recv(I2CBus *bus)
> {
> I2CSlave *dev = bus->current_dev;
> I2CSlaveClass *sc;
> @@ -164,7 +164,7 @@ int i2c_recv(i2c_bus *bus)
> return -1;
> }
>
> -void i2c_nack(i2c_bus *bus)
> +void i2c_nack(I2CBus *bus)
> {
> I2CSlave *dev = bus->current_dev;
> I2CSlaveClass *sc;
> @@ -182,7 +182,7 @@ void i2c_nack(i2c_bus *bus)
> static int i2c_slave_post_load(void *opaque, int version_id)
> {
> I2CSlave *dev = opaque;
> - i2c_bus *bus;
> + I2CBus *bus;
> bus = I2C_BUS(qdev_get_parent_bus(DEVICE(dev)));
> if (bus->saved_address == dev->address) {
> bus->current_dev = dev;
> @@ -210,7 +210,7 @@ static int i2c_slave_qdev_init(DeviceState *dev)
> return sc->init(s);
> }
>
> -DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr)
> +DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr)
> {
> DeviceState *dev;
>
> diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c
> index ce5f849..fb99dfd 100644
> --- a/hw/i2c/exynos4210_i2c.c
> +++ b/hw/i2c/exynos4210_i2c.c
> @@ -83,7 +83,7 @@ typedef struct Exynos4210I2CState {
> SysBusDevice parent_obj;
>
> MemoryRegion iomem;
> - i2c_bus *bus;
> + I2CBus *bus;
> qemu_irq irq;
>
> uint8_t i2ccon;
> diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
> index 2d8e2b7..d63278d 100644
> --- a/hw/i2c/omap_i2c.c
> +++ b/hw/i2c/omap_i2c.c
> @@ -30,7 +30,7 @@ typedef struct OMAPI2CState {
> MemoryRegion iomem;
> qemu_irq irq;
> qemu_irq drq[2];
> - i2c_bus *bus;
> + I2CBus *bus;
>
> uint8_t revision;
> void *iclk;
> @@ -491,7 +491,7 @@ static void omap_i2c_register_types(void)
> type_register_static(&omap_i2c_info);
> }
>
> -i2c_bus *omap_i2c_bus(DeviceState *omap_i2c)
> +I2CBus *omap_i2c_bus(DeviceState *omap_i2c)
> {
> OMAPI2CState *s = OMAP_I2C(omap_i2c);
> return s->bus;
> diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
> index c98e447..9f50067 100644
> --- a/hw/i2c/pm_smbus.c
> +++ b/hw/i2c/pm_smbus.c
> @@ -59,7 +59,7 @@ static void smb_transaction(PMSMBus *s)
> uint8_t read = s->smb_addr & 0x01;
> uint8_t cmd = s->smb_cmd;
> uint8_t addr = s->smb_addr >> 1;
> - i2c_bus *bus = s->smbus;
> + I2CBus *bus = s->smbus;
>
> SMBUS_DPRINTF("SMBus trans addr=0x%02x prot=0x%02x\n", addr, prot);
> /* Transaction isn't exec if STS_DEV_ERR bit set */
> diff --git a/hw/i2c/smbus.c b/hw/i2c/smbus.c
> index 25d2d04..3febf3c 100644
> --- a/hw/i2c/smbus.c
> +++ b/hw/i2c/smbus.c
> @@ -208,13 +208,13 @@ static int smbus_device_init(I2CSlave *i2c)
> }
>
> /* Master device commands. */
> -void smbus_quick_command(i2c_bus *bus, uint8_t addr, int read)
> +void smbus_quick_command(I2CBus *bus, uint8_t addr, int read)
> {
> i2c_start_transfer(bus, addr, read);
> i2c_end_transfer(bus);
> }
>
> -uint8_t smbus_receive_byte(i2c_bus *bus, uint8_t addr)
> +uint8_t smbus_receive_byte(I2CBus *bus, uint8_t addr)
> {
> uint8_t data;
>
> @@ -225,14 +225,14 @@ uint8_t smbus_receive_byte(i2c_bus *bus, uint8_t addr)
> return data;
> }
>
> -void smbus_send_byte(i2c_bus *bus, uint8_t addr, uint8_t data)
> +void smbus_send_byte(I2CBus *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, uint8_t addr, uint8_t command)
> +uint8_t smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command)
> {
> uint8_t data;
> i2c_start_transfer(bus, addr, 0);
> @@ -244,7 +244,7 @@ uint8_t smbus_read_byte(i2c_bus *bus, uint8_t addr,
> uint8_t command)
> return data;
> }
>
> -void smbus_write_byte(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t
> data)
> +void smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t
> data)
> {
> i2c_start_transfer(bus, addr, 0);
> i2c_send(bus, command);
> @@ -252,7 +252,7 @@ void smbus_write_byte(i2c_bus *bus, uint8_t addr, uint8_t
> command, uint8_t data)
> i2c_end_transfer(bus);
> }
>
> -uint16_t smbus_read_word(i2c_bus *bus, uint8_t addr, uint8_t command)
> +uint16_t smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command)
> {
> uint16_t data;
> i2c_start_transfer(bus, addr, 0);
> @@ -265,7 +265,7 @@ uint16_t smbus_read_word(i2c_bus *bus, uint8_t addr,
> uint8_t command)
> return data;
> }
>
> -void smbus_write_word(i2c_bus *bus, uint8_t addr, uint8_t command, uint16_t
> data)
> +void smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_t
> data)
> {
> i2c_start_transfer(bus, addr, 0);
> i2c_send(bus, command);
> @@ -274,7 +274,7 @@ void smbus_write_word(i2c_bus *bus, uint8_t addr, uint8_t
> command, uint16_t data
> i2c_end_transfer(bus);
> }
>
> -int smbus_read_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t
> *data)
> +int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t
> *data)
> {
> int len;
> int i;
> @@ -292,7 +292,7 @@ int smbus_read_block(i2c_bus *bus, uint8_t addr, uint8_t
> command, uint8_t *data)
> return len;
> }
>
> -void smbus_write_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t
> *data,
> +void smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t
> *data,
> int len)
> {
> int i;
> diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
> index 0218f8a..86f35c1 100644
> --- a/hw/i2c/smbus_eeprom.c
> +++ b/hw/i2c/smbus_eeprom.c
> @@ -139,7 +139,7 @@ static void smbus_eeprom_register_types(void)
>
> type_init(smbus_eeprom_register_types)
>
> -void smbus_eeprom_init(i2c_bus *smbus, int nb_eeprom,
> +void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom,
> const uint8_t *eeprom_spd, int eeprom_spd_size)
> {
> int i;
> diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
> index 8d47eaf..295b62e 100644
> --- a/hw/i2c/smbus_ich9.c
> +++ b/hw/i2c/smbus_ich9.c
> @@ -108,7 +108,7 @@ static void ich9_smb_class_init(ObjectClass *klass, void
> *data)
> dc->cannot_instantiate_with_device_add_yet = true;
> }
>
> -i2c_bus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base)
> +I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base)
> {
> PCIDevice *d =
> pci_create_simple_multifunction(bus, devfn, true,
> TYPE_ICH9_SMB_DEVICE);
> diff --git a/hw/i2c/versatile_i2c.c b/hw/i2c/versatile_i2c.c
> index 02e9f17..3c0c2c1 100644
> --- a/hw/i2c/versatile_i2c.c
> +++ b/hw/i2c/versatile_i2c.c
> @@ -81,7 +81,7 @@ static int versatile_i2c_init(SysBusDevice *sbd)
> {
> DeviceState *dev = DEVICE(sbd);
> VersatileI2CState *s = VERSATILE_I2C(dev);
> - i2c_bus *bus;
> + I2CBus *bus;
>
> bus = i2c_init_bus(dev, "i2c");
> s->bitbang = bitbang_i2c_init(bus);
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index a327d71..3639a6d 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -236,7 +236,7 @@ static void pc_init1(QEMUMachineInitArgs *args,
> }
>
> if (pci_enabled && acpi_enabled) {
> - i2c_bus *smbus;
> + I2CBus *smbus;
>
> smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt, first_cpu, 1);
> /* TODO: Populate SPD eeprom data. */
> diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
> index e639357..1a93afd 100644
> --- a/hw/isa/vt82c686.c
> +++ b/hw/isa/vt82c686.c
> @@ -369,8 +369,8 @@ static int vt82c686b_pm_initfn(PCIDevice *dev)
> return 0;
> }
>
> -i2c_bus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> - qemu_irq sci_irq)
> +I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> + qemu_irq sci_irq)
> {
> PCIDevice *dev;
> VT686PMState *s;
> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
> index 9ef3a97..e1551aa 100644
> --- a/hw/mips/mips_fulong2e.c
> +++ b/hw/mips/mips_fulong2e.c
> @@ -276,7 +276,7 @@ static void mips_fulong2e_init(QEMUMachineInitArgs *args)
> qemu_irq *cpu_exit_irq;
> PCIBus *pci_bus;
> ISABus *isa_bus;
> - i2c_bus *smbus;
> + I2CBus *smbus;
> int i;
> DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
> MIPSCPU *cpu;
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index 05c8771..ac5ec44 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -900,7 +900,7 @@ void mips_malta_init(QEMUMachineInitArgs *args)
> qemu_irq *isa_irq;
> qemu_irq *cpu_exit_irq;
> int piix4_devfn;
> - i2c_bus *smbus;
> + I2CBus *smbus;
> int i;
> DriveInfo *dinfo;
> DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
> diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h
> index bb9a1dd..5c1820f 100644
> --- a/include/hw/arm/exynos4210.h
> +++ b/include/hw/arm/exynos4210.h
> @@ -97,7 +97,7 @@ typedef struct Exynos4210State {
> MemoryRegion dram1_mem;
> MemoryRegion boot_secondary;
> MemoryRegion bootreg_mem;
> - i2c_bus *i2c_if[EXYNOS4210_I2C_NUMBER];
> + I2CBus *i2c_if[EXYNOS4210_I2C_NUMBER];
> } Exynos4210State;
>
> void exynos4210_write_secondary(ARMCPU *cpu,
> diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
> index 188cda8..b9655ee 100644
> --- a/include/hw/arm/omap.h
> +++ b/include/hw/arm/omap.h
> @@ -765,7 +765,7 @@ void omap_mmc_handlers(struct omap_mmc_s *s, qemu_irq ro,
> qemu_irq cover);
> void omap_mmc_enable(struct omap_mmc_s *s, int enable);
>
> /* omap_i2c.c */
> -i2c_bus *omap_i2c_bus(DeviceState *omap_i2c);
> +I2CBus *omap_i2c_bus(DeviceState *omap_i2c);
>
> # define cpu_is_omap310(cpu) (cpu->mpu_model == omap310)
> # define cpu_is_omap1510(cpu) (cpu->mpu_model == omap1510)
> diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h
> index 7ca330a..c507906 100644
> --- a/include/hw/arm/pxa.h
> +++ b/include/hw/arm/pxa.h
> @@ -116,7 +116,7 @@ void pxa27x_register_keypad(PXA2xxKeyPadState *kp,
> typedef struct PXA2xxI2CState PXA2xxI2CState;
> PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base,
> qemu_irq irq, uint32_t page_size);
> -i2c_bus *pxa2xx_i2c_bus(PXA2xxI2CState *s);
> +I2CBus *pxa2xx_i2c_bus(PXA2xxI2CState *s);
>
> typedef struct PXA2xxI2SState PXA2xxI2SState;
> typedef struct PXA2xxFIrState PXA2xxFIrState;
> diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h
> index 461392f..9df987b 100644
> --- a/include/hw/i2c/i2c.h
> +++ b/include/hw/i2c/i2c.h
> @@ -50,18 +50,18 @@ struct I2CSlave
> uint8_t address;
> };
>
> -i2c_bus *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(i2c_bus *bus);
> -int i2c_start_transfer(i2c_bus *bus, uint8_t address, int recv);
> -void i2c_end_transfer(i2c_bus *bus);
> -void i2c_nack(i2c_bus *bus);
> -int i2c_send(i2c_bus *bus, uint8_t data);
> -int i2c_recv(i2c_bus *bus);
> +int i2c_bus_busy(I2CBus *bus);
> +int i2c_start_transfer(I2CBus *bus, uint8_t address, int recv);
> +void i2c_end_transfer(I2CBus *bus);
> +void i2c_nack(I2CBus *bus);
> +int i2c_send(I2CBus *bus, uint8_t data);
> +int i2c_recv(I2CBus *bus);
>
> #define FROM_I2C_SLAVE(type, dev) DO_UPCAST(type, i2c, dev)
>
> -DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr);
> +DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr);
>
> /* wm8750.c */
> void wm8750_data_req_set(DeviceState *dev,
> diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h
> index e3069bf..926603f 100644
> --- a/include/hw/i2c/pm_smbus.h
> +++ b/include/hw/i2c/pm_smbus.h
> @@ -2,7 +2,7 @@
> #define PM_SMBUS_H
>
> typedef struct PMSMBus {
> - i2c_bus *smbus;
> + I2CBus *smbus;
> MemoryRegion io;
>
> uint8_t smb_stat;
> diff --git a/include/hw/i2c/smbus.h b/include/hw/i2c/smbus.h
> index d764d75..63f0cc4 100644
> --- a/include/hw/i2c/smbus.h
> +++ b/include/hw/i2c/smbus.h
> @@ -66,18 +66,18 @@ struct SMBusDevice {
> };
>
> /* Master device commands. */
> -void smbus_quick_command(i2c_bus *bus, uint8_t addr, int read);
> -uint8_t smbus_receive_byte(i2c_bus *bus, uint8_t addr);
> -void smbus_send_byte(i2c_bus *bus, uint8_t addr, uint8_t data);
> -uint8_t smbus_read_byte(i2c_bus *bus, uint8_t addr, uint8_t command);
> -void smbus_write_byte(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t
> data);
> -uint16_t smbus_read_word(i2c_bus *bus, uint8_t addr, uint8_t command);
> -void smbus_write_word(i2c_bus *bus, uint8_t addr, uint8_t command, uint16_t
> data);
> -int smbus_read_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t
> *data);
> -void smbus_write_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t
> *data,
> +void smbus_quick_command(I2CBus *bus, uint8_t addr, int read);
> +uint8_t smbus_receive_byte(I2CBus *bus, uint8_t addr);
> +void smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data);
> +uint8_t smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command);
> +void smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t
> data);
> +uint16_t smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command);
> +void smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_t
> data);
> +int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t
> *data);
> +void smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t
> *data,
> int len);
>
> -void smbus_eeprom_init(i2c_bus *smbus, int nb_eeprom,
> +void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom,
> const uint8_t *eeprom_spd, int size);
>
> #endif
> diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h
> index 4a68b35..9e4a0e4 100644
> --- a/include/hw/i386/ich9.h
> +++ b/include/hw/i386/ich9.h
> @@ -20,7 +20,7 @@ int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx);
> PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin);
> void ich9_lpc_pm_init(PCIDevice *pci_lpc);
> PCIBus *ich9_d2pbr_init(PCIBus *bus, int devfn, int sec_bus);
> -i2c_bus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
> +I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
>
> #define ICH9_CC_SIZE (16 * 1024) /* 16KB */
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 3e1e81b..9010246 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -165,9 +165,9 @@ void ioapic_init_gsi(GSIState *gsi_state, const char
> *parent_name);
>
> /* acpi_piix.c */
>
> -i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> - qemu_irq sci_irq, qemu_irq smi_irq,
> - int kvm_enabled, FWCfgState *fw_cfg);
> +I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> + qemu_irq sci_irq, qemu_irq smi_irq,
> + int kvm_enabled, FWCfgState *fw_cfg);
> void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
>
> /* hpet.c */
> diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h
> index 6ef876d..471b5e9 100644
> --- a/include/hw/isa/vt82c686.h
> +++ b/include/hw/isa/vt82c686.h
> @@ -5,7 +5,7 @@
> ISABus *vt82c686b_init(PCIBus * bus, int devfn);
> void vt82c686b_ac97_init(PCIBus *bus, int devfn);
> void vt82c686b_mc97_init(PCIBus *bus, int devfn);
> -i2c_bus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> - qemu_irq sci_irq);
> +I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
> + qemu_irq sci_irq);
>
> #endif
> diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> index 4524496..a2eb749 100644
> --- a/include/qemu/typedefs.h
> +++ b/include/qemu/typedefs.h
> @@ -42,7 +42,7 @@ typedef struct QemuConsole QemuConsole;
> typedef struct CharDriverState CharDriverState;
> typedef struct MACAddr MACAddr;
> typedef struct NetClientState NetClientState;
> -typedef struct i2c_bus i2c_bus;
> +typedef struct I2CBus I2CBus;
> typedef struct ISABus ISABus;
> typedef struct ISADevice ISADevice;
> typedef struct SMBusDevice SMBusDevice;
> --
> 1.8.4.5
>
>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH 01/11] i2c: Rename i2c_bus to I2CBus,
Peter Crosthwaite <=