On Fri, Jun 28, 2019 at 12:39:52PM +0200, Gerd Hoffmann wrote: > From: BALATON Zoltan <bala...@eik.bme.hu> > > The bitbang i2c implementation is also useful for other device models > such as DDC in display controllers. Move the header to include/hw/i2c/ > to allow it to be used from other device models and adjust users of > this include. This also reverts commit 2b4c1125ac which is no longer > needed. > > Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu> > Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> > Tested-by: Philippe Mathieu-Daudé <phi...@redhat.com> > Acked-by: Corey Minyard <cminy...@mvista.com> > Message-id: > 5d1fe4db846ab9be4b77ddb0d43cc74cd200a003.1561028123.git.bala...@eik.bme.hu > Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
ppc parts
Acked-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> {hw => include/hw}/i2c/bitbang_i2c.h | 2 ++
> include/hw/i2c/i2c.h | 2 --
> include/hw/i2c/ppc4xx_i2c.h | 2 +-
> hw/i2c/bitbang_i2c.c | 2 +-
> hw/i2c/ppc4xx_i2c.c | 1 -
> hw/i2c/versatile_i2c.c | 2 +-
> 6 files changed, 5 insertions(+), 6 deletions(-)
> rename {hw => include/hw}/i2c/bitbang_i2c.h (80%)
>
> diff --git a/hw/i2c/bitbang_i2c.h b/include/hw/i2c/bitbang_i2c.h
> similarity index 80%
> rename from hw/i2c/bitbang_i2c.h
> rename to include/hw/i2c/bitbang_i2c.h
> index 9443021710d7..3a7126d5dee8 100644
> --- a/hw/i2c/bitbang_i2c.h
> +++ b/include/hw/i2c/bitbang_i2c.h
> @@ -3,6 +3,8 @@
>
> #include "hw/i2c/i2c.h"
>
> +typedef struct bitbang_i2c_interface bitbang_i2c_interface;
> +
> #define BITBANG_I2C_SDA 0
> #define BITBANG_I2C_SCL 1
>
> diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h
> index 8e236f7bb428..75c5bd638bb9 100644
> --- a/include/hw/i2c/i2c.h
> +++ b/include/hw/i2c/i2c.h
> @@ -81,8 +81,6 @@ uint8_t i2c_recv(I2CBus *bus);
>
> DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr);
>
> -typedef struct bitbang_i2c_interface bitbang_i2c_interface;
> -
> /* lm832x.c */
> void lm832x_key_event(DeviceState *dev, int key, int state);
>
> diff --git a/include/hw/i2c/ppc4xx_i2c.h b/include/hw/i2c/ppc4xx_i2c.h
> index aa2a2bf9dec2..8437bf070b8b 100644
> --- a/include/hw/i2c/ppc4xx_i2c.h
> +++ b/include/hw/i2c/ppc4xx_i2c.h
> @@ -28,7 +28,7 @@
> #define PPC4XX_I2C_H
>
> #include "hw/sysbus.h"
> -#include "hw/i2c/i2c.h"
> +#include "hw/i2c/bitbang_i2c.h"
>
> #define TYPE_PPC4xx_I2C "ppc4xx-i2c"
> #define PPC4xx_I2C(obj) OBJECT_CHECK(PPC4xxI2CState, (obj), TYPE_PPC4xx_I2C)
> diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c
> index 5dfc72d9d7b7..3cb0509b0200 100644
> --- a/hw/i2c/bitbang_i2c.c
> +++ b/hw/i2c/bitbang_i2c.c
> @@ -12,7 +12,7 @@
>
> #include "qemu/osdep.h"
> #include "hw/hw.h"
> -#include "bitbang_i2c.h"
> +#include "hw/i2c/bitbang_i2c.h"
> #include "hw/sysbus.h"
> #include "qemu/module.h"
>
> diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c
> index d606d3dbeb81..5fb4f86c38f1 100644
> --- a/hw/i2c/ppc4xx_i2c.c
> +++ b/hw/i2c/ppc4xx_i2c.c
> @@ -30,7 +30,6 @@
> #include "cpu.h"
> #include "hw/hw.h"
> #include "hw/i2c/ppc4xx_i2c.h"
> -#include "bitbang_i2c.h"
>
> #define PPC4xx_I2C_MEM_SIZE 18
>
> diff --git a/hw/i2c/versatile_i2c.c b/hw/i2c/versatile_i2c.c
> index e07be9890c8a..24b6e36b6d52 100644
> --- a/hw/i2c/versatile_i2c.c
> +++ b/hw/i2c/versatile_i2c.c
> @@ -23,7 +23,7 @@
>
> #include "qemu/osdep.h"
> #include "hw/sysbus.h"
> -#include "bitbang_i2c.h"
> +#include "hw/i2c/bitbang_i2c.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
