Merge tag 's390-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[tomoyo/tomoyo-test1.git] / tools / iio / iio_event_monitor.c

diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
index 2f45816..0a5c2bb 100644 (file)
--- a/tools/iio/iio_event_monitor.c
+++ b/tools/iio/iio_event_monitor.c
@@ -69,12 +69,15 @@ static const char * const iio_ev_type_text[] = {
        [IIO_EV_TYPE_MAG_ADAPTIVE] = "mag_adaptive",
        [IIO_EV_TYPE_CHANGE] = "change",
        [IIO_EV_TYPE_MAG_REFERENCED] = "mag_referenced",
+       [IIO_EV_TYPE_GESTURE] = "gesture",
 };
 
 static const char * const iio_ev_dir_text[] = {
        [IIO_EV_DIR_EITHER] = "either",
        [IIO_EV_DIR_RISING] = "rising",
-       [IIO_EV_DIR_FALLING] = "falling"
+       [IIO_EV_DIR_FALLING] = "falling",
+       [IIO_EV_DIR_SINGLETAP] = "singletap",
+       [IIO_EV_DIR_DOUBLETAP] = "doubletap",
 };
 
 static const char * const iio_modifier_names[] = {
@@ -122,6 +125,12 @@ static const char * const iio_modifier_names[] = {
        [IIO_MOD_PM4] = "pm4",
        [IIO_MOD_PM10] = "pm10",
        [IIO_MOD_O2] = "o2",
+       [IIO_MOD_LINEAR_X] = "linear_x",
+       [IIO_MOD_LINEAR_Y] = "linear_y",
+       [IIO_MOD_LINEAR_Z] = "linear_z",
+       [IIO_MOD_PITCH] = "pitch",
+       [IIO_MOD_YAW] = "yaw",
+       [IIO_MOD_ROLL] = "roll",
 };
 
 static bool event_is_known(struct iio_event_data *event)
@@ -227,6 +236,7 @@ static bool event_is_known(struct iio_event_data *event)
        case IIO_EV_TYPE_THRESH_ADAPTIVE:
        case IIO_EV_TYPE_MAG_ADAPTIVE:
        case IIO_EV_TYPE_CHANGE:
+       case IIO_EV_TYPE_GESTURE:
                break;
        default:
                return false;
@@ -236,6 +246,8 @@ static bool event_is_known(struct iio_event_data *event)
        case IIO_EV_DIR_EITHER:
        case IIO_EV_DIR_RISING:
        case IIO_EV_DIR_FALLING:
+       case IIO_EV_DIR_SINGLETAP:
+       case IIO_EV_DIR_DOUBLETAP:
        case IIO_EV_DIR_NONE:
                break;
        default: