[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/17] hw/i2c: Enable an id for the pca954x devices
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 10/17] hw/i2c: Enable an id for the pca954x devices |
Date: |
Tue, 13 Jun 2023 11:38:15 +0200 |
From: Patrick Venture <venture@google.com>
This allows the devices to be more readily found and specified.
Without setting the name field, they can only be found by device type
name, which doesn't let you specify the second of the same device type
behind a bus.
Tested: Verified that by default the device was findable with the name
'pca954x[77]', for an instance attached at that address.
Signed-off-by: Patrick Venture <venture@google.com>
Reviewed-by: Hao Wu <wuhaotsh@google.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Message-Id: <20230322172136.48010-1-venture@google.com>
[PMD: Fix typo in property name]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/i2c/i2c_mux_pca954x.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c
index 3945de795c..db5db956a6 100644
--- a/hw/i2c/i2c_mux_pca954x.c
+++ b/hw/i2c/i2c_mux_pca954x.c
@@ -20,6 +20,7 @@
#include "hw/i2c/i2c_mux_pca954x.h"
#include "hw/i2c/smbus_slave.h"
#include "hw/qdev-core.h"
+#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
#include "qemu/log.h"
#include "qemu/module.h"
@@ -43,6 +44,8 @@ typedef struct Pca954xState {
bool enabled[PCA9548_CHANNEL_COUNT];
I2CBus *bus[PCA9548_CHANNEL_COUNT];
+
+ char *name;
} Pca954xState;
/*
@@ -181,6 +184,17 @@ static void pca9548_class_init(ObjectClass *klass, void
*data)
s->nchans = PCA9548_CHANNEL_COUNT;
}
+static void pca954x_realize(DeviceState *dev, Error **errp)
+{
+ Pca954xState *s = PCA954X(dev);
+ DeviceState *d = DEVICE(s);
+ if (s->name) {
+ d->id = g_strdup(s->name);
+ } else {
+ d->id = g_strdup_printf("pca954x[%x]", s->parent.i2c.address);
+ }
+}
+
static void pca954x_init(Object *obj)
{
Pca954xState *s = PCA954X(obj);
@@ -197,6 +211,11 @@ static void pca954x_init(Object *obj)
}
}
+static Property pca954x_props[] = {
+ DEFINE_PROP_STRING("name", Pca954xState, name),
+ DEFINE_PROP_END_OF_LIST()
+};
+
static void pca954x_class_init(ObjectClass *klass, void *data)
{
I2CSlaveClass *sc = I2C_SLAVE_CLASS(klass);
@@ -209,9 +228,12 @@ static void pca954x_class_init(ObjectClass *klass, void
*data)
rc->phases.enter = pca954x_enter_reset;
dc->desc = "Pca954x i2c-mux";
+ dc->realize = pca954x_realize;
k->write_data = pca954x_write_data;
k->receive_byte = pca954x_read_byte;
+
+ device_class_set_props(dc, pca954x_props);
}
static const TypeInfo pca954x_info[] = {
--
2.38.1
- [PULL 00/17] Misc patches for 2023-06-13, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 01/17] linux-user, bsd-user: Preserve incoming order of environment variables in the target, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 02/17] cocoa: Fix warnings about invalid prototype declarations, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 03/17] util/cacheflush: Use declarations from <OSCacheControl.h> on Darwin, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 04/17] util/cacheflush: Avoid possible redundant dcache flush on Darwin, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 05/17] accel/hvf: Report HV_DENIED error, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 06/17] target/hppa/meson: Only build int_helper.o with system emulation, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 07/17] target/i386/helper: Remove do_cpu_sipi() stub for user-mode emulation, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 08/17] target/i386/helper: Shuffle do_cpu_init(), Philippe Mathieu-Daudé, 2023/06/13
- [PULL 09/17] target/i386: Rename helper template headers as '.h.inc', Philippe Mathieu-Daudé, 2023/06/13
- [PULL 10/17] hw/i2c: Enable an id for the pca954x devices,
Philippe Mathieu-Daudé <=
- [PULL 11/17] hw/ide/ahci: Remove stray backslash, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 15/17] exec/ram_addr: Return number of dirty pages in cpu_physical_memory_set_dirty_lebitmap(), Philippe Mathieu-Daudé, 2023/06/13
- [PULL 17/17] exec/memory: Introduce RAM_NAMED_FILE flag, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 14/17] hw/char/parallel-isa: Export struct ISAParallelState, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 13/17] hw/char/parallel: Export struct ParallelState, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 12/17] hw/scsi/megasas: Silent GCC duplicated-cond warning, Philippe Mathieu-Daudé, 2023/06/13
- [PULL 16/17] hw/vfio: Add number of dirty pages to vfio_get_dirty_bitmap tracepoint, Philippe Mathieu-Daudé, 2023/06/13
- Re: [PULL 00/17] Misc patches for 2023-06-13, Richard Henderson, 2023/06/14