[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 2/5] i2c: Move the bus class to i2c.h
From: |
Linus Walleij |
Subject: |
[Qemu-arm] [PATCH 2/5] i2c: Move the bus class to i2c.h |
Date: |
Tue, 27 Feb 2018 11:49:00 +0100 |
From: Corey Minyard <address@hidden>
Some devices need access to it.
Signed-off-by: Corey Minyard <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Linus Walleij <address@hidden>
---
hw/i2c/core.c | 17 -----------------
include/hw/i2c/i2c.h | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/hw/i2c/core.c b/hw/i2c/core.c
index 9a54b61c1dbd..cfccefca3d6c 100644
--- a/hw/i2c/core.c
+++ b/hw/i2c/core.c
@@ -10,30 +10,13 @@
#include "qemu/osdep.h"
#include "hw/i2c/i2c.h"
-typedef struct I2CNode I2CNode;
-
-struct I2CNode {
- I2CSlave *elt;
- QLIST_ENTRY(I2CNode) next;
-};
-
#define I2C_BROADCAST 0x00
-struct I2CBus {
- BusState qbus;
- QLIST_HEAD(, I2CNode) current_devs;
- uint8_t saved_address;
- bool broadcast;
-};
-
static Property i2c_props[] = {
DEFINE_PROP_UINT8("address", struct I2CSlave, address, 0),
DEFINE_PROP_END_OF_LIST(),
};
-#define TYPE_I2C_BUS "i2c-bus"
-#define I2C_BUS(obj) OBJECT_CHECK(I2CBus, (obj), TYPE_I2C_BUS)
-
static const TypeInfo i2c_bus_info = {
.name = TYPE_I2C_BUS,
.parent = TYPE_BUS,
diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h
index 8fd449f645f0..d727379b487a 100644
--- a/include/hw/i2c/i2c.h
+++ b/include/hw/i2c/i2c.h
@@ -56,6 +56,23 @@ struct I2CSlave {
uint8_t address;
};
+#define TYPE_I2C_BUS "i2c-bus"
+#define I2C_BUS(obj) OBJECT_CHECK(I2CBus, (obj), TYPE_I2C_BUS)
+
+typedef struct I2CNode I2CNode;
+
+struct I2CNode {
+ I2CSlave *elt;
+ QLIST_ENTRY(I2CNode) next;
+};
+
+struct I2CBus {
+ BusState qbus;
+ QLIST_HEAD(, I2CNode) current_devs;
+ uint8_t saved_address;
+ bool broadcast;
+};
+
I2CBus *i2c_init_bus(DeviceState *parent, const char *name);
void i2c_set_slave_address(I2CSlave *dev, uint8_t address);
int i2c_bus_busy(I2CBus *bus);
--
2.14.3
- [Qemu-arm] [PATCH 0/5] Versatile Express SiI9022 emulation, Linus Walleij, 2018/02/27
- [Qemu-arm] [PATCH 2/5] i2c: Move the bus class to i2c.h,
Linus Walleij <=
- [Qemu-arm] [PATCH 3/5] hw/i2c-ddc: Do not fail writes, Linus Walleij, 2018/02/27
- [Qemu-arm] [PATCH 1/5] i2c: Fix some brace style issues, Linus Walleij, 2018/02/27
- [Qemu-arm] [PATCH 4/5] hw/sii9022: Add support for Silicon Image SII9022, Linus Walleij, 2018/02/27
- [Qemu-arm] [PATCH 5/5] arm/vexpress: Add proper display connector emulation, Linus Walleij, 2018/02/27
- Re: [Qemu-arm] [PATCH 0/5] Versatile Express SiI9022 emulation, Peter Maydell, 2018/02/27