diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-01 19:11:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-01 19:11:53 +0100 |
| commit | 0094908375d280c1a4e8b932d8b133a41fb3bdf8 (patch) | |
| tree | f7baae2279aadc7f1825c211827da147af4a95f0 /include/hw | |
| parent | 7d0e02405fc02a181319b1ab8681d2f72246b7c6 (diff) | |
| parent | 263807f4e85e94f2d4e988d61d2fc0319b1dd36b (diff) | |
| download | qemu-0094908375d280c1a4e8b932d8b133a41fb3bdf8.zip qemu-0094908375d280c1a4e8b932d8b133a41fb3bdf8.tar.gz qemu-0094908375d280c1a4e8b932d8b133a41fb3bdf8.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190628-pull-request' into staging
vga: ati fixes, add ati vgabios.
# gpg: Signature made Fri 28 Jun 2019 11:39:32 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20190628-pull-request:
ati-vga: switch to vgabios-ati.bin
seabios: add ati vgabios binary
seabios: add config for ati vgabios
ati-vga: Fixes to offset and pitch registers
ati-vga: Implement DDC and EDID info from monitor
i2c: Move bitbang_i2c.h to include/hw/i2c/
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/i2c/bitbang_i2c.h | 14 | ||||
| -rw-r--r-- | include/hw/i2c/i2c.h | 2 | ||||
| -rw-r--r-- | include/hw/i2c/ppc4xx_i2c.h | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/include/hw/i2c/bitbang_i2c.h b/include/hw/i2c/bitbang_i2c.h new file mode 100644 index 0000000..3a7126d --- /dev/null +++ b/include/hw/i2c/bitbang_i2c.h @@ -0,0 +1,14 @@ +#ifndef BITBANG_I2C_H +#define BITBANG_I2C_H + +#include "hw/i2c/i2c.h" + +typedef struct bitbang_i2c_interface bitbang_i2c_interface; + +#define BITBANG_I2C_SDA 0 +#define BITBANG_I2C_SCL 1 + +bitbang_i2c_interface *bitbang_i2c_init(I2CBus *bus); +int bitbang_i2c_set(bitbang_i2c_interface *i2c, int line, int level); + +#endif diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 8e236f7..75c5bd6 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -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); diff --git a/include/hw/i2c/ppc4xx_i2c.h b/include/hw/i2c/ppc4xx_i2c.h index aa2a2bf..8437bf0 100644 --- a/include/hw/i2c/ppc4xx_i2c.h +++ b/include/hw/i2c/ppc4xx_i2c.h @@ -28,7 +28,7 @@ #define PPC4XX_I2C_H #include "hw/sysbus.h" -#include "hw/i2c/i2c.h" +#include "hw/i2c/bitbang_i2c.h" #define TYPE_PPC4xx_I2C "ppc4xx-i2c" #define PPC4xx_I2C(obj) OBJECT_CHECK(PPC4xxI2CState, (obj), TYPE_PPC4xx_I2C) |