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

Documentation/ABI/testing/sysfs-bus-iio +2 −0
drivers/iio/industrialio-core.c +1 −0
include/uapi/linux/iio/types.h +1 −0
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
1564	1564	What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw
1565	1565	What: /sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw
1566	1566	What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw
	1567	+What: /sys/bus/iio/devices/iio:deviceX/in_concentration_o2_raw
	1568	+What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_o2_raw
1567	1569	What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw
1568	1570	What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
1569	1571	KernelVersion: 4.3

drivers/iio/industrialio-core.c+1−0

@@ -133,6 +133,7 @@ static const char * const iio_modifier_names[] = { · 132 unmodified lines
133	133	[IIO_MOD_PM10] = "pm10",
134	134	[IIO_MOD_ETHANOL] = "ethanol",
135	135	[IIO_MOD_H2] = "h2",
	136	+ [IIO_MOD_O2] = "o2",
136	137	};
137	138
138	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	94	IIO_MOD_PM10,
95	95	IIO_MOD_ETHANOL,
96	96	IIO_MOD_H2,
	97	+ IIO_MOD_O2,
97	98	};
98	99
99	100	enum 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	119	[IIO_MOD_PM2P5] = "pm2p5",
120	120	[IIO_MOD_PM4] = "pm4",
121	121	[IIO_MOD_PM10] = "pm10",
	122	+ [IIO_MOD_O2] = "o2",
122	123	};
123	124
124	125	static 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	212	case IIO_MOD_PM2P5:
212	213	case IIO_MOD_PM4:
213	214	case IIO_MOD_PM10:
	215	+ case IIO_MOD_O2:
214	216	break;
215	217	default:
216	218	return false;