History

iio: add IIO_MOD_O2 modifier

Add modifier IIO_MOD_O2 for O2 concentration reporting

Matt Ranostay committed 6 years ago

Commit 4ffa22f1 parent bc752d24 files · +6 −0Browse files

Unified · Split

4 files
  1. Documentation/ABI/testing/sysfs-bus-iio +2 −0
  2. drivers/iio/industrialio-core.c +1 −0
  3. include/uapi/linux/iio/types.h +1 −0
  4. tools/iio/iio_event_monitor.c +2 −0
Documentation/ABI/testing/sysfs-bus-iio+2−0
@@ -1564,6 +1564,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentration_ethanol_raw · 1563 unmodified lines
1564What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw1564What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw
1565What: /sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw1565What: /sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw
1566What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw1566What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw
1567What: /sys/bus/iio/devices/iio:deviceX/in_concentration_o2_raw
1568What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_o2_raw
1567What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw1569What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw
1568What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw1570What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
1569KernelVersion: 4.31571KernelVersion: 4.3
drivers/iio/industrialio-core.c+1−0
@@ -133,6 +133,7 @@ static const char * const iio_modifier_names[] = { · 132 unmodified lines
133 [IIO_MOD_PM10] = "pm10",133 [IIO_MOD_PM10] = "pm10",
134 [IIO_MOD_ETHANOL] = "ethanol",134 [IIO_MOD_ETHANOL] = "ethanol",
135 [IIO_MOD_H2] = "h2",135 [IIO_MOD_H2] = "h2",
136 [IIO_MOD_O2] = "o2",
136};137};
137 138
138/* relies on pairs of these shared then separate */139/* relies on pairs of these shared then separate */
include/uapi/linux/iio/types.h+1−0
@@ -94,6 +94,7 @@ enum iio_modifier { · 93 unmodified lines
94 IIO_MOD_PM10,94 IIO_MOD_PM10,
95 IIO_MOD_ETHANOL,95 IIO_MOD_ETHANOL,
96 IIO_MOD_H2,96 IIO_MOD_H2,
97 IIO_MOD_O2,
97};98};
98 99
99enum iio_event_type {100enum iio_event_type {
tools/iio/iio_event_monitor.c+2−0
@@ -119,6 +119,7 @@ static const char * const iio_modifier_names[] = { · 118 unmodified lines
119 [IIO_MOD_PM2P5] = "pm2p5",119 [IIO_MOD_PM2P5] = "pm2p5",
120 [IIO_MOD_PM4] = "pm4",120 [IIO_MOD_PM4] = "pm4",
121 [IIO_MOD_PM10] = "pm10",121 [IIO_MOD_PM10] = "pm10",
122 [IIO_MOD_O2] = "o2",
122};123};
123 124
124static bool event_is_known(struct iio_event_data *event)125static bool event_is_known(struct iio_event_data *event)
@@ -211,6 +212,7 @@ static bool event_is_known(struct iio_event_data *event) · 86 unmodified lines
211 case IIO_MOD_PM2P5:212 case IIO_MOD_PM2P5:
212 case IIO_MOD_PM4:213 case IIO_MOD_PM4:
213 case IIO_MOD_PM10:214 case IIO_MOD_PM10:
215 case IIO_MOD_O2:
214 break;216 break;
215 default:217 default:
216 return false;218 return false;