Commit d718b747 authored by BALATON Zoltan's avatar BALATON Zoltan Committed by Gerd Hoffmann
Browse files

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 2b4c1125 which is no longer
needed.

Signed-off-by: default avatarBALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: default avatarCorey Minyard <cminyard@mvista.com>
Message-id: 5d1fe4db846ab9be4b77ddb0d43cc74cd200a003.1561028123.git.balaton@eik.bme.hu
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 474f3938

hw/i2c/bitbang_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

hw/i2c/ppc4xx_i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -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

hw/i2c/versatile_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

hw/i2c/bitbang_i2c.h→include/hw/i2c/bitbang_i2c.h

+2 −0
Original line number Diff line number Diff line
@@ -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

include/hw/i2c/i2c.h

+0 −2
Original line number Diff line number Diff line
@@ -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);