Commit 6306cae2 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Gerd Hoffmann
Browse files

i2c-ddc: move it to hw/display 



Move it together with the other EDID code.  hw/i2c should only
include the core and the adapters, not the slaves.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20190325155923.30987-1-pbonzini@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 349ebdd7

hw/display/Kconfig

+5 −0
Original line number Diff line number Diff line 
config DDC

    bool

    depends on I2C

    select EDID



config EDID

    bool

hw/display/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
common-obj-$(CONFIG_DDC) += i2c-ddc.o

common-obj-$(CONFIG_EDID) += edid-generate.o edid-region.o



common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o

hw/i2c/i2c-ddc.c→hw/display/i2c-ddc.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "qemu-common.h"

#include "qemu/log.h"

#include "hw/i2c/i2c.h"

#include "hw/i2c/i2c-ddc.h"

#include "hw/display/i2c-ddc.h"



#ifndef DEBUG_I2CDDC

#define DEBUG_I2CDDC 0

hw/display/sii9022.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "qemu/osdep.h"

#include "qemu-common.h"

#include "hw/i2c/i2c.h"

#include "hw/i2c/i2c-ddc.h"

#include "hw/display/i2c-ddc.h"

#include "trace.h"



#define SII9022_SYS_CTRL_DATA 0x1a

hw/display/sm501.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "hw/sysbus.h"

#include "hw/pci/pci.h"

#include "hw/i2c/i2c.h"

#include "hw/i2c/i2c-ddc.h"

#include "hw/display/i2c-ddc.h"

#include "qemu/range.h"

#include "ui/pixel_ops.h"

#include "qemu/bswap.h"