From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.19.201]:44067 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754805AbaFNPGU (ORCPT ); Sat, 14 Jun 2014 11:06:20 -0400 Message-ID: <539C6561.2090507@kernel.org> Date: Sat, 14 Jun 2014 16:08:17 +0100 From: Jonathan Cameron MIME-Version: 1.0 To: Peter Meerwald , linux-iio@vger.kernel.org Subject: Re: [PATCH v2 07/12] staging:iio: Update iio_event_monitor program References: <1402549229-4449-1-git-send-email-pmeerw@pmeerw.net> <1402549229-4449-8-git-send-email-pmeerw@pmeerw.net> In-Reply-To: <1402549229-4449-8-git-send-email-pmeerw@pmeerw.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On 12/06/14 06:00, Peter Meerwald wrote: > add types recently added > > Signed-off-by: Peter Meerwald Applied to the togreg branch of iio.git Thanks, > --- > drivers/staging/iio/Documentation/iio_event_monitor.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/staging/iio/Documentation/iio_event_monitor.c b/drivers/staging/iio/Documentation/iio_event_monitor.c > index 3a9b000..cb35a97 100644 > --- a/drivers/staging/iio/Documentation/iio_event_monitor.c > +++ b/drivers/staging/iio/Documentation/iio_event_monitor.c > @@ -46,6 +46,9 @@ static const char * const iio_chan_type_name_spec[] = { > [IIO_TIMESTAMP] = "timestamp", > [IIO_CAPACITANCE] = "capacitance", > [IIO_ALTVOLTAGE] = "altvoltage", > + [IIO_CCT] = "cct", > + [IIO_PRESSURE] = "pressure", > + [IIO_HUMIDITYRELATIVE] = "humidityrelative", > }; > > static const char * const iio_ev_type_text[] = { > @@ -70,6 +73,8 @@ static const char * const iio_modifier_names[] = { > [IIO_MOD_LIGHT_IR] = "ir", > [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", > + [IIO_MOD_LIGHT_IR] = "ir", > [IIO_MOD_LIGHT_CLEAR] = "clear", > [IIO_MOD_LIGHT_RED] = "red", > [IIO_MOD_LIGHT_GREEN] = "green", > @@ -100,6 +105,9 @@ static bool event_is_known(struct iio_event_data *event) > case IIO_TIMESTAMP: > case IIO_CAPACITANCE: > case IIO_ALTVOLTAGE: > + case IIO_CCT: > + case IIO_PRESSURE: > + case IIO_HUMIDITYRELATIVE: > break; > default: > return false; > @@ -114,6 +122,8 @@ static bool event_is_known(struct iio_event_data *event) > case IIO_MOD_LIGHT_IR: > case IIO_MOD_ROOT_SUM_SQUARED_X_Y: > case IIO_MOD_SUM_SQUARED_X_Y_Z: > + case IIO_MOD_LIGHT_BOTH: > + case IIO_MOD_LIGHT_IR: > case IIO_MOD_LIGHT_CLEAR: > case IIO_MOD_LIGHT_RED: > case IIO_MOD_LIGHT_GREEN: >