i2c: Move bitbang_i2c.h to include/hw/i2c/
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 <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Corey Minyard <cminyard@mvista.com>
Message-id: 5d1fe4db846ab9be4b77ddb0d43cc74cd200a003.1561028123.git.balaton@eik.bme.hu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
474f3938d7
commit
d718b7475b
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "bitbang_i2c.h"
|
#include "hw/i2c/bitbang_i2c.h"
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
#include "qemu/module.h"
|
#include "qemu/module.h"
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/i2c/ppc4xx_i2c.h"
|
#include "hw/i2c/ppc4xx_i2c.h"
|
||||||
#include "bitbang_i2c.h"
|
|
||||||
|
|
||||||
#define PPC4xx_I2C_MEM_SIZE 18
|
#define PPC4xx_I2C_MEM_SIZE 18
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
#include "bitbang_i2c.h"
|
#include "hw/i2c/bitbang_i2c.h"
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
#include "qemu/module.h"
|
#include "qemu/module.h"
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
|
|
||||||
#include "hw/i2c/i2c.h"
|
#include "hw/i2c/i2c.h"
|
||||||
|
|
||||||
|
typedef struct bitbang_i2c_interface bitbang_i2c_interface;
|
||||||
|
|
||||||
#define BITBANG_I2C_SDA 0
|
#define BITBANG_I2C_SDA 0
|
||||||
#define BITBANG_I2C_SCL 1
|
#define BITBANG_I2C_SCL 1
|
||||||
|
|
|
@ -81,8 +81,6 @@ uint8_t i2c_recv(I2CBus *bus);
|
||||||
|
|
||||||
DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr);
|
DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr);
|
||||||
|
|
||||||
typedef struct bitbang_i2c_interface bitbang_i2c_interface;
|
|
||||||
|
|
||||||
/* lm832x.c */
|
/* lm832x.c */
|
||||||
void lm832x_key_event(DeviceState *dev, int key, int state);
|
void lm832x_key_event(DeviceState *dev, int key, int state);
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#define PPC4XX_I2C_H
|
#define PPC4XX_I2C_H
|
||||||
|
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
#include "hw/i2c/i2c.h"
|
#include "hw/i2c/bitbang_i2c.h"
|
||||||
|
|
||||||
#define TYPE_PPC4xx_I2C "ppc4xx-i2c"
|
#define TYPE_PPC4xx_I2C "ppc4xx-i2c"
|
||||||
#define PPC4xx_I2C(obj) OBJECT_CHECK(PPC4xxI2CState, (obj), TYPE_PPC4xx_I2C)
|
#define PPC4xx_I2C(obj) OBJECT_CHECK(PPC4xxI2CState, (obj), TYPE_PPC4xx_I2C)
|
||||||
|
|
Loading…
Reference in a new issue