projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
23f93cd
)
iio: Add missing modifier names to core
author
Peter Meerwald
<pmeerw@pmeerw.net>
Sat, 20 Jun 2015 21:52:30 +0000
(23:52 +0200)
committer
Jonathan Cameron
<jic23@kernel.org>
Sun, 21 Jun 2015 09:45:39 +0000
(10:45 +0100)
some are documented, others are in iio_event_monitor.c which
was recently moved from staging
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/industrialio-core.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/iio/industrialio-core.c
b/drivers/iio/industrialio-core.c
index 3524b0de872110d31442060a109c5c4243a3f0cf..d8051cdcbdc2212fe6e069c3bf60db0f2431aa58 100644
(file)
--- a/
drivers/iio/industrialio-core.c
+++ b/
drivers/iio/industrialio-core.c
@@
-81,6
+81,14
@@
static const char * const iio_modifier_names[] = {
[IIO_MOD_X] = "x",
[IIO_MOD_Y] = "y",
[IIO_MOD_Z] = "z",
+ [IIO_MOD_X_AND_Y] = "x&y",
+ [IIO_MOD_X_AND_Z] = "x&z",
+ [IIO_MOD_Y_AND_Z] = "y&z",
+ [IIO_MOD_X_AND_Y_AND_Z] = "x&y&z",
+ [IIO_MOD_X_OR_Y] = "x|y",
+ [IIO_MOD_X_OR_Z] = "x|z",
+ [IIO_MOD_Y_OR_Z] = "y|z",
+ [IIO_MOD_X_OR_Y_OR_Z] = "x|y|z",
[IIO_MOD_ROOT_SUM_SQUARED_X_Y] = "sqrt(x^2+y^2)",
[IIO_MOD_SUM_SQUARED_X_Y_Z] = "x^2+y^2+z^2",
[IIO_MOD_LIGHT_BOTH] = "both",
This page took
0.024832 seconds
and
5
git commands to generate.