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 --- hw/display/Kconfig | 5 ++ hw/display/Makefile.objs | 1 + hw/display/i2c-ddc.c | 127 +++++++++++++++++++++++++++++++++++++++++++ hw/display/sii9022.c | 2 +- hw/display/sm501.c | 2 +- hw/i2c/Kconfig | 5 -- hw/i2c/Makefile.objs | 1 - hw/i2c/i2c-ddc.c | 127 ------------------------------------------- include/hw/display/i2c-ddc.h | 40 ++++++++++++++ include/hw/display/xlnx_dp.h | 2 +- include/hw/i2c/i2c-ddc.h | 40 -------------- 11 files changed, 176 insertions(+), 176 deletions(-) create mode 100644 hw/display/i2c-ddc.c delete mode 100644 hw/i2c/i2c-ddc.c create mode 100644 include/hw/display/i2c-ddc.h delete mode 100644 include/hw/i2c/i2c-ddc.h diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 72be57a403..c236cd2d0a 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -1,3 +1,8 @@ +config DDC + bool + depends on I2C + select EDID + config EDID bool diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index dbd453ab1b..650031f725 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -1,3 +1,4 @@ +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 diff --git a/hw/display/i2c-ddc.c b/hw/display/i2c-ddc.c new file mode 100644 index 0000000000..9fe5403a92 --- /dev/null +++ b/hw/display/i2c-ddc.c @@ -0,0 +1,127 @@ +/* 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 . + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "qemu/log.h" +#include "hw/i2c/i2c.h" +#include "hw/display/i2c-ddc.h" + +#ifndef DEBUG_I2CDDC +#define DEBUG_I2CDDC 0 +#endif + +#define DPRINTF(fmt, ...) do { \ + if (DEBUG_I2CDDC) { \ + qemu_log("i2c-ddc: " fmt , ## __VA_ARGS__); \ + } \ +} while (0) + +static void i2c_ddc_reset(DeviceState *ds) +{ + I2CDDCState *s = I2CDDC(ds); + + s->firstbyte = false; + s->reg = 0; +} + +static int i2c_ddc_event(I2CSlave *i2c, enum i2c_event event) +{ + I2CDDCState *s = I2CDDC(i2c); + + if (event == I2C_START_SEND) { + s->firstbyte = true; + } + + return 0; +} + +static uint8_t i2c_ddc_rx(I2CSlave *i2c) +{ + I2CDDCState *s = I2CDDC(i2c); + + int value; + value = s->edid_blob[s->reg % sizeof(s->edid_blob)]; + s->reg++; + return value; +} + +static int i2c_ddc_tx(I2CSlave *i2c, uint8_t data) +{ + I2CDDCState *s = I2CDDC(i2c); + if (s->firstbyte) { + s->reg = data; + s->firstbyte = false; + DPRINTF("[EDID] Written new pointer: %u\n", data); + return 0; + } + + /* Ignore all writes */ + s->reg++; + return 0; +} + +static void i2c_ddc_init(Object *obj) +{ + I2CDDCState *s = I2CDDC(obj); + + qemu_edid_generate(s->edid_blob, sizeof(s->edid_blob), &s->edid_info); +} + +static const VMStateDescription vmstate_i2c_ddc = { + .name = TYPE_I2CDDC, + .version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_BOOL(firstbyte, I2CDDCState), + VMSTATE_UINT8(reg, I2CDDCState), + VMSTATE_END_OF_LIST() + } +}; + +static Property i2c_ddc_properties[] = { + DEFINE_EDID_PROPERTIES(I2CDDCState, edid_info), + DEFINE_PROP_END_OF_LIST(), +}; + +static void i2c_ddc_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + I2CSlaveClass *isc = I2C_SLAVE_CLASS(oc); + + dc->reset = i2c_ddc_reset; + dc->vmsd = &vmstate_i2c_ddc; + dc->props = i2c_ddc_properties; + isc->event = i2c_ddc_event; + isc->recv = i2c_ddc_rx; + isc->send = i2c_ddc_tx; +} + +static TypeInfo i2c_ddc_info = { + .name = TYPE_I2CDDC, + .parent = TYPE_I2C_SLAVE, + .instance_size = sizeof(I2CDDCState), + .instance_init = i2c_ddc_init, + .class_init = i2c_ddc_class_init +}; + +static void ddc_register_devices(void) +{ + type_register_static(&i2c_ddc_info); +} + +type_init(ddc_register_devices); diff --git a/hw/display/sii9022.c b/hw/display/sii9022.c index 9994385c35..9c36e4c17e 100644 --- a/hw/display/sii9022.c +++ b/hw/display/sii9022.c @@ -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 diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 2122291308..1e2709b2d0 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -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" diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index 820b24de5b..78a2008e3a 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -5,11 +5,6 @@ config SMBUS_EEPROM bool depends on I2C -config DDC - bool - depends on I2C - select EDID - config VERSATILE_I2C bool select I2C diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index 5f76b6a990..d7073a401f 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -1,6 +1,5 @@ common-obj-$(CONFIG_I2C) += core.o smbus_slave.o smbus_master.o common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o -common-obj-$(CONFIG_DDC) += i2c-ddc.o common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o common-obj-$(CONFIG_ACPI_X86_ICH) += smbus_ich9.o common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o diff --git a/hw/i2c/i2c-ddc.c b/hw/i2c/i2c-ddc.c deleted file mode 100644 index 7aa8727771..0000000000 --- a/hw/i2c/i2c-ddc.c +++ /dev/null @@ -1,127 +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 . - */ - -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "qemu/log.h" -#include "hw/i2c/i2c.h" -#include "hw/i2c/i2c-ddc.h" - -#ifndef DEBUG_I2CDDC -#define DEBUG_I2CDDC 0 -#endif - -#define DPRINTF(fmt, ...) do { \ - if (DEBUG_I2CDDC) { \ - qemu_log("i2c-ddc: " fmt , ## __VA_ARGS__); \ - } \ -} while (0) - -static void i2c_ddc_reset(DeviceState *ds) -{ - I2CDDCState *s = I2CDDC(ds); - - s->firstbyte = false; - s->reg = 0; -} - -static int i2c_ddc_event(I2CSlave *i2c, enum i2c_event event) -{ - I2CDDCState *s = I2CDDC(i2c); - - if (event == I2C_START_SEND) { - s->firstbyte = true; - } - - return 0; -} - -static uint8_t i2c_ddc_rx(I2CSlave *i2c) -{ - I2CDDCState *s = I2CDDC(i2c); - - int value; - value = s->edid_blob[s->reg % sizeof(s->edid_blob)]; - s->reg++; - return value; -} - -static int i2c_ddc_tx(I2CSlave *i2c, uint8_t data) -{ - I2CDDCState *s = I2CDDC(i2c); - if (s->firstbyte) { - s->reg = data; - s->firstbyte = false; - DPRINTF("[EDID] Written new pointer: %u\n", data); - return 0; - } - - /* Ignore all writes */ - s->reg++; - return 0; -} - -static void i2c_ddc_init(Object *obj) -{ - I2CDDCState *s = I2CDDC(obj); - - qemu_edid_generate(s->edid_blob, sizeof(s->edid_blob), &s->edid_info); -} - -static const VMStateDescription vmstate_i2c_ddc = { - .name = TYPE_I2CDDC, - .version_id = 1, - .fields = (VMStateField[]) { - VMSTATE_BOOL(firstbyte, I2CDDCState), - VMSTATE_UINT8(reg, I2CDDCState), - VMSTATE_END_OF_LIST() - } -}; - -static Property i2c_ddc_properties[] = { - DEFINE_EDID_PROPERTIES(I2CDDCState, edid_info), - DEFINE_PROP_END_OF_LIST(), -}; - -static void i2c_ddc_class_init(ObjectClass *oc, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(oc); - I2CSlaveClass *isc = I2C_SLAVE_CLASS(oc); - - dc->reset = i2c_ddc_reset; - dc->vmsd = &vmstate_i2c_ddc; - dc->props = i2c_ddc_properties; - isc->event = i2c_ddc_event; - isc->recv = i2c_ddc_rx; - isc->send = i2c_ddc_tx; -} - -static TypeInfo i2c_ddc_info = { - .name = TYPE_I2CDDC, - .parent = TYPE_I2C_SLAVE, - .instance_size = sizeof(I2CDDCState), - .instance_init = i2c_ddc_init, - .class_init = i2c_ddc_class_init -}; - -static void ddc_register_devices(void) -{ - type_register_static(&i2c_ddc_info); -} - -type_init(ddc_register_devices); diff --git a/include/hw/display/i2c-ddc.h b/include/hw/display/i2c-ddc.h new file mode 100644 index 0000000000..c29443c5af --- /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 26b759cd44..45a805033a 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 c29443c5af..0000000000 --- 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.2.3