From 6306cae275c7091aa4e785809d956b475bfedab4 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 25 Mar 2019 16:59:23 +0100 Subject: i2c-ddc: move it to hw/display MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move it together with the other EDID code. hw/i2c should only include the core and the adapters, not the slaves. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-id: 20190325155923.30987-1-pbonzini@redhat.com Signed-off-by: Gerd Hoffmann --- include/hw/display/i2c-ddc.h | 40 ++++++++++++++++++++++++++++++++++++++++ include/hw/display/xlnx_dp.h | 2 +- include/hw/i2c/i2c-ddc.h | 40 ---------------------------------------- 3 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 include/hw/display/i2c-ddc.h delete mode 100644 include/hw/i2c/i2c-ddc.h (limited to 'include') diff --git a/include/hw/display/i2c-ddc.h b/include/hw/display/i2c-ddc.h new file mode 100644 index 0000000..c29443c --- /dev/null +++ b/include/hw/display/i2c-ddc.h @@ -0,0 +1,40 @@ +/* A simple I2C slave for returning monitor EDID data via DDC. + * + * Copyright (c) 2011 Linaro Limited + * Written by Peter Maydell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see . + */ + +#ifndef I2C_DDC_H +#define I2C_DDC_H + +#include "hw/display/edid.h" + +/* A simple I2C slave which just returns the contents of its EDID blob. */ +struct I2CDDCState { + /*< private >*/ + I2CSlave i2c; + /*< public >*/ + bool firstbyte; + uint8_t reg; + qemu_edid_info edid_info; + uint8_t edid_blob[128]; +}; + +typedef struct I2CDDCState I2CDDCState; + +#define TYPE_I2CDDC "i2c-ddc" +#define I2CDDC(obj) OBJECT_CHECK(I2CDDCState, (obj), TYPE_I2CDDC) + +#endif /* I2C_DDC_H */ diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index 26b759c..45a8050 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -27,7 +27,7 @@ #include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" #include "hw/display/dpcd.h" -#include "hw/i2c/i2c-ddc.h" +#include "hw/display/i2c-ddc.h" #include "qemu/fifo8.h" #include "qemu/units.h" #include "hw/dma/xlnx_dpdma.h" diff --git a/include/hw/i2c/i2c-ddc.h b/include/hw/i2c/i2c-ddc.h deleted file mode 100644 index c29443c..0000000 --- a/include/hw/i2c/i2c-ddc.h +++ /dev/null @@ -1,40 +0,0 @@ -/* A simple I2C slave for returning monitor EDID data via DDC. - * - * Copyright (c) 2011 Linaro Limited - * Written by Peter Maydell - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, see . - */ - -#ifndef I2C_DDC_H -#define I2C_DDC_H - -#include "hw/display/edid.h" - -/* A simple I2C slave which just returns the contents of its EDID blob. */ -struct I2CDDCState { - /*< private >*/ - I2CSlave i2c; - /*< public >*/ - bool firstbyte; - uint8_t reg; - qemu_edid_info edid_info; - uint8_t edid_blob[128]; -}; - -typedef struct I2CDDCState I2CDDCState; - -#define TYPE_I2CDDC "i2c-ddc" -#define I2CDDC(obj) OBJECT_CHECK(I2CDDCState, (obj), TYPE_I2CDDC) - -#endif /* I2C_DDC_H */ -- cgit v1.1