@@ -43,10 +43,21 @@ struct PropertyInfo {
ObjectPropertyRelease *release;
};
+/**
+ * struct OnOffAutoBit - OnOffAuto storage with 64 elements.
+ * @on_bits: Bitmap of elements with "on".
+ * @auto_bits: Bitmap of elements with "auto".
+ */
+typedef struct OnOffAutoBit {
+ uint32_t on_bits;
+ uint32_t auto_bits;
+} OnOffAutoBit;
+
/*** qdev-properties.c ***/
extern const PropertyInfo qdev_prop_bit;
+extern const PropertyInfo qdev_prop_on_off_auto_bit;
extern const PropertyInfo qdev_prop_bit64;
extern const PropertyInfo qdev_prop_bool;
extern const PropertyInfo qdev_prop_enum;
@@ -86,6 +97,13 @@ extern const PropertyInfo qdev_prop_link;
.set_default = true, \
.defval.u = (bool)_defval)
+#define DEFINE_PROP_ON_OFF_AUTO_BIT(_name, _state, _field, _bit, _defval) \
+ DEFINE_PROP(_name, _state, _field, qdev_prop_on_off_auto_bit, \
+ OnOffAutoBit, \
+ .bitnr = (_bit), \
+ .set_default = true, \
+ .defval.i = (OnOffAuto)_defval)
+
#define DEFINE_PROP_UNSIGNED(_name, _state, _field, _defval, _prop, _type) \
DEFINE_PROP(_name, _state, _field, _prop, _type, \
.set_default = true, \
@@ -133,7 +133,8 @@ const PropertyInfo qdev_prop_enum = {
static uint32_t qdev_get_prop_mask(Property *prop)
{
- assert(prop->info == &qdev_prop_bit);
+ assert(prop->info == &qdev_prop_bit ||
+ prop->info == &qdev_prop_on_off_auto_bit);
return 0x1 << prop->bitnr;
}
@@ -183,6 +184,69 @@ const PropertyInfo qdev_prop_bit = {
.set_default_value = set_default_value_bool,
};
+static void prop_get_on_off_auto_bit(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ Property *prop = opaque;
+ OnOffAutoBit *p = object_field_prop_ptr(obj, prop);
+ int value;
+ uint32_t mask = qdev_get_prop_mask(prop);
+
+ if (p->auto_bits & mask) {
+ value = ON_OFF_AUTO_AUTO;
+ } else if (p->on_bits & mask) {
+ value = ON_OFF_AUTO_ON;
+ } else {
+ value = ON_OFF_AUTO_OFF;
+ }
+
+ visit_type_enum(v, name, &value, &OnOffAuto_lookup, errp);
+}
+
+static void prop_set_on_off_auto_bit(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ Property *prop = opaque;
+ OnOffAutoBit *p = object_field_prop_ptr(obj, prop);
+ bool bool_value;
+ int value;
+ uint32_t mask = qdev_get_prop_mask(prop);
+
+ if (visit_type_bool(v, name, &bool_value, NULL)) {
+ value = bool_value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
+ } else if (!visit_type_enum(v, name, &value, &OnOffAuto_lookup, errp)) {
+ return;
+ }
+
+ switch (value) {
+ case ON_OFF_AUTO_AUTO:
+ p->on_bits &= ~mask;
+ p->auto_bits |= mask;
+ break;
+
+ case ON_OFF_AUTO_ON:
+ p->on_bits |= mask;
+ p->auto_bits &= ~mask;
+ break;
+
+ case ON_OFF_AUTO_OFF:
+ p->on_bits &= ~mask;
+ p->auto_bits &= ~mask;
+ break;
+ }
+}
+
+const PropertyInfo qdev_prop_on_off_auto_bit = {
+ .name = "OnOffAuto",
+ .description = "on/off/auto",
+ .enum_table = &OnOffAuto_lookup,
+ .get = prop_get_on_off_auto_bit,
+ .set = prop_set_on_off_auto_bit,
+ .set_default_value = qdev_propinfo_set_default_value_enum,
+};
+
/* Bit64 */
static uint64_t qdev_get_prop_mask64(Property *prop)
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- include/hw/qdev-properties.h | 18 ++++++++++++ hw/core/qdev-properties.c | 66 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 1 deletion(-)