From: Jonathan Cameron <jic23@kernel.org>
To: Peter Meerwald <pmeerw@pmeerw.net>, linux-iio@vger.kernel.org
Subject: Re: [PATCH v2 07/12] staging:iio: Update iio_event_monitor program
Date: Sat, 14 Jun 2014 16:08:17 +0100 [thread overview]
Message-ID: <539C6561.2090507@kernel.org> (raw)
In-Reply-To: <1402549229-4449-8-git-send-email-pmeerw@pmeerw.net>
On 12/06/14 06:00, Peter Meerwald wrote:
> add types recently added
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
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:
>
next prev parent reply other threads:[~2014-06-14 15:06 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 5:00 [PATCH v2 00/12] misc IIO cleanup Peter Meerwald
2014-06-12 5:00 ` [PATCH v2 01/12] iio:adc:ad5791: Use BIT() and GENMASK() macros Peter Meerwald
2014-06-14 14:46 ` Jonathan Cameron
2014-06-12 5:00 ` [PATCH v2 02/12] iio:adc:ad5504: " Peter Meerwald
2014-06-14 14:49 ` Jonathan Cameron
2014-06-12 5:00 ` [PATCH v2 03/12] iio:adc:ad7887: " Peter Meerwald
2014-06-14 15:03 ` Jonathan Cameron
2014-06-12 5:00 ` [PATCH v2 04/12] iio:adc:ad7476: Use GENMASK() macro Peter Meerwald
2014-06-14 15:04 ` Jonathan Cameron
2014-06-12 5:00 ` [PATCH v2 05/12] iio:adc:ad7298: Use BIT() and GENMASK() macros Peter Meerwald
2014-06-14 15:04 ` Jonathan Cameron
2014-06-12 5:00 ` [PATCH v2 06/12] iio: Move documentation of iio-trig-sysfs to ABI/testing Peter Meerwald
2014-06-14 15:05 ` Jonathan Cameron
2014-06-12 5:00 ` [PATCH v2 07/12] staging:iio: Update iio_event_monitor program Peter Meerwald
2014-06-14 15:08 ` Jonathan Cameron [this message]
2014-06-12 5:00 ` [PATCH v2 08/12] staging:iio: Fix iio_utils.h function prototypes Peter Meerwald
2014-06-14 15:08 ` Jonathan Cameron
2014-06-12 5:00 ` [PATCH v2 09/12] staging:iio: Fix mention of INDIO_RING_TRIGGERED to INDIO_BUFFER_TRIGGERED Peter Meerwald
2014-06-14 15:08 ` Jonathan Cameron
2014-06-12 5:00 ` [PATCH v2 10/12] staging:iio: Fix error handling in generic_buffer example Peter Meerwald
2014-06-14 15:09 ` Jonathan Cameron
2014-06-12 5:00 ` [PATCH v2 11/12] staging:iio-trig-periodic-rtc: Cleanup Peter Meerwald
2014-06-14 15:11 ` Jonathan Cameron
2014-06-12 5:00 ` [PATCH v2 12/12] staging:iio-trig-periodic-rtc: Allow to reset frequency to 0 Peter Meerwald
2014-06-14 15:12 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=539C6561.2090507@kernel.org \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).