Message ID | 20211027050625.1265828-1-f4bug@amsat.org |
---|---|
State | New |
Headers | show |
Series | [v2] hw: Add a 'Sensor devices' qdev category | expand |
ping? On 10/27/21 07:06, Philippe Mathieu-Daudé wrote: > Sensors models are listed in the 'Misc devices' category. > Move them to their own category. > > Reviewed-by: Cédric Le Goater <clg@kaod.org> > Reviewed-by: Hao Wu <wuhaotsh@google.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > v2: Only include hw/sensor/, removed AER915 device from hw/arm/z2.c > --- > include/hw/qdev-core.h | 1 + > hw/sensor/adm1272.c | 1 + > hw/sensor/dps310.c | 1 + > hw/sensor/emc141x.c | 1 + > hw/sensor/max34451.c | 2 ++ > hw/sensor/tmp105.c | 1 + > hw/sensor/tmp421.c | 1 + > softmmu/qdev-monitor.c | 1 + > 8 files changed, 9 insertions(+) > > diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h > index 1bad07002df..2fd6b73bd8b 100644 > --- a/include/hw/qdev-core.h > +++ b/include/hw/qdev-core.h > @@ -26,6 +26,7 @@ typedef enum DeviceCategory { > DEVICE_CATEGORY_SOUND, > DEVICE_CATEGORY_MISC, > DEVICE_CATEGORY_CPU, > + DEVICE_CATEGORY_SENSOR, > DEVICE_CATEGORY_MAX > } DeviceCategory; > > diff --git a/hw/sensor/adm1272.c b/hw/sensor/adm1272.c > index 7310c769be2..2942ac75f90 100644 > --- a/hw/sensor/adm1272.c > +++ b/hw/sensor/adm1272.c > @@ -518,6 +518,7 @@ static void adm1272_class_init(ObjectClass *klass, void *data) > DeviceClass *dc = DEVICE_CLASS(klass); > PMBusDeviceClass *k = PMBUS_DEVICE_CLASS(klass); > > + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); > dc->desc = "Analog Devices ADM1272 Hot Swap controller"; > dc->vmsd = &vmstate_adm1272; > k->write_data = adm1272_write_data; > diff --git a/hw/sensor/dps310.c b/hw/sensor/dps310.c > index d60a18ac41b..1e24a499b38 100644 > --- a/hw/sensor/dps310.c > +++ b/hw/sensor/dps310.c > @@ -208,6 +208,7 @@ static void dps310_class_init(ObjectClass *klass, void *data) > k->send = dps310_tx; > dc->reset = dps310_reset; > dc->vmsd = &vmstate_dps310; > + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); > } > > static const TypeInfo dps310_info = { > diff --git a/hw/sensor/emc141x.c b/hw/sensor/emc141x.c > index 7ce8f4e9794..4202d8f185a 100644 > --- a/hw/sensor/emc141x.c > +++ b/hw/sensor/emc141x.c > @@ -270,6 +270,7 @@ static void emc141x_class_init(ObjectClass *klass, void *data) > DeviceClass *dc = DEVICE_CLASS(klass); > I2CSlaveClass *k = I2C_SLAVE_CLASS(klass); > > + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); > dc->reset = emc141x_reset; > k->event = emc141x_event; > k->recv = emc141x_rx; > diff --git a/hw/sensor/max34451.c b/hw/sensor/max34451.c > index a91d8bd487c..8300bf4ff43 100644 > --- a/hw/sensor/max34451.c > +++ b/hw/sensor/max34451.c > @@ -751,6 +751,8 @@ static void max34451_class_init(ObjectClass *klass, void *data) > ResettableClass *rc = RESETTABLE_CLASS(klass); > DeviceClass *dc = DEVICE_CLASS(klass); > PMBusDeviceClass *k = PMBUS_DEVICE_CLASS(klass); > + > + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); > dc->desc = "Maxim MAX34451 16-Channel V/I monitor"; > dc->vmsd = &vmstate_max34451; > k->write_data = max34451_write_data; > diff --git a/hw/sensor/tmp105.c b/hw/sensor/tmp105.c > index 20564494899..43d79b9eeec 100644 > --- a/hw/sensor/tmp105.c > +++ b/hw/sensor/tmp105.c > @@ -305,6 +305,7 @@ static void tmp105_class_init(ObjectClass *klass, void *data) > DeviceClass *dc = DEVICE_CLASS(klass); > I2CSlaveClass *k = I2C_SLAVE_CLASS(klass); > > + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); > dc->realize = tmp105_realize; > k->event = tmp105_event; > k->recv = tmp105_rx; > diff --git a/hw/sensor/tmp421.c b/hw/sensor/tmp421.c > index a3db57dcb5a..c328978af9c 100644 > --- a/hw/sensor/tmp421.c > +++ b/hw/sensor/tmp421.c > @@ -343,6 +343,7 @@ static void tmp421_class_init(ObjectClass *klass, void *data) > I2CSlaveClass *k = I2C_SLAVE_CLASS(klass); > TMP421Class *sc = TMP421_CLASS(klass); > > + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); > dc->realize = tmp421_realize; > k->event = tmp421_event; > k->recv = tmp421_rx; > diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c > index 4851de51a5c..a411af03c5c 100644 > --- a/softmmu/qdev-monitor.c > +++ b/softmmu/qdev-monitor.c > @@ -164,6 +164,7 @@ static void qdev_print_devinfos(bool show_no_user) > [DEVICE_CATEGORY_SOUND] = "Sound", > [DEVICE_CATEGORY_MISC] = "Misc", > [DEVICE_CATEGORY_CPU] = "CPU", > + [DEVICE_CATEGORY_SENSOR] = "Sensor", > [DEVICE_CATEGORY_MAX] = "Uncategorized", > }; > GSList *list, *elt; >
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 1bad07002df..2fd6b73bd8b 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -26,6 +26,7 @@ typedef enum DeviceCategory { DEVICE_CATEGORY_SOUND, DEVICE_CATEGORY_MISC, DEVICE_CATEGORY_CPU, + DEVICE_CATEGORY_SENSOR, DEVICE_CATEGORY_MAX } DeviceCategory; diff --git a/hw/sensor/adm1272.c b/hw/sensor/adm1272.c index 7310c769be2..2942ac75f90 100644 --- a/hw/sensor/adm1272.c +++ b/hw/sensor/adm1272.c @@ -518,6 +518,7 @@ static void adm1272_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); PMBusDeviceClass *k = PMBUS_DEVICE_CLASS(klass); + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); dc->desc = "Analog Devices ADM1272 Hot Swap controller"; dc->vmsd = &vmstate_adm1272; k->write_data = adm1272_write_data; diff --git a/hw/sensor/dps310.c b/hw/sensor/dps310.c index d60a18ac41b..1e24a499b38 100644 --- a/hw/sensor/dps310.c +++ b/hw/sensor/dps310.c @@ -208,6 +208,7 @@ static void dps310_class_init(ObjectClass *klass, void *data) k->send = dps310_tx; dc->reset = dps310_reset; dc->vmsd = &vmstate_dps310; + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); } static const TypeInfo dps310_info = { diff --git a/hw/sensor/emc141x.c b/hw/sensor/emc141x.c index 7ce8f4e9794..4202d8f185a 100644 --- a/hw/sensor/emc141x.c +++ b/hw/sensor/emc141x.c @@ -270,6 +270,7 @@ static void emc141x_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); I2CSlaveClass *k = I2C_SLAVE_CLASS(klass); + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); dc->reset = emc141x_reset; k->event = emc141x_event; k->recv = emc141x_rx; diff --git a/hw/sensor/max34451.c b/hw/sensor/max34451.c index a91d8bd487c..8300bf4ff43 100644 --- a/hw/sensor/max34451.c +++ b/hw/sensor/max34451.c @@ -751,6 +751,8 @@ static void max34451_class_init(ObjectClass *klass, void *data) ResettableClass *rc = RESETTABLE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass); PMBusDeviceClass *k = PMBUS_DEVICE_CLASS(klass); + + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); dc->desc = "Maxim MAX34451 16-Channel V/I monitor"; dc->vmsd = &vmstate_max34451; k->write_data = max34451_write_data; diff --git a/hw/sensor/tmp105.c b/hw/sensor/tmp105.c index 20564494899..43d79b9eeec 100644 --- a/hw/sensor/tmp105.c +++ b/hw/sensor/tmp105.c @@ -305,6 +305,7 @@ static void tmp105_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); I2CSlaveClass *k = I2C_SLAVE_CLASS(klass); + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); dc->realize = tmp105_realize; k->event = tmp105_event; k->recv = tmp105_rx; diff --git a/hw/sensor/tmp421.c b/hw/sensor/tmp421.c index a3db57dcb5a..c328978af9c 100644 --- a/hw/sensor/tmp421.c +++ b/hw/sensor/tmp421.c @@ -343,6 +343,7 @@ static void tmp421_class_init(ObjectClass *klass, void *data) I2CSlaveClass *k = I2C_SLAVE_CLASS(klass); TMP421Class *sc = TMP421_CLASS(klass); + set_bit(DEVICE_CATEGORY_SENSOR, dc->categories); dc->realize = tmp421_realize; k->event = tmp421_event; k->recv = tmp421_rx; diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 4851de51a5c..a411af03c5c 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -164,6 +164,7 @@ static void qdev_print_devinfos(bool show_no_user) [DEVICE_CATEGORY_SOUND] = "Sound", [DEVICE_CATEGORY_MISC] = "Misc", [DEVICE_CATEGORY_CPU] = "CPU", + [DEVICE_CATEGORY_SENSOR] = "Sensor", [DEVICE_CATEGORY_MAX] = "Uncategorized", }; GSList *list, *elt;