From: Jonathan Cameron <jic23@cam.ac.uk>
To: michael.hennerich@analog.com
Cc: linux-iio@vger.kernel.org,
device-drivers-devel@blackfin.uclinux.org, drivers@analog.com
Subject: Re: [PATCH 08/12] iio: ad7291: fix channel mapping for event enables
Date: Wed, 31 Aug 2011 12:34:57 +0100 [thread overview]
Message-ID: <4E5E1C61.2030603@cam.ac.uk> (raw)
In-Reply-To: <1314788260-5791-8-git-send-email-michael.hennerich@analog.com>
On 08/31/11 11:57, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
Pretty closely tied to the previous patch on the channel mapping, but as things
will at least build in between its fine to have it here I guess.
>
>
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
merged.
> ---
> drivers/staging/iio/adc/ad7291.c | 24 ++++++++++++------------
> 1 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
> index b365a74..1a2fa66 100644
> --- a/drivers/staging/iio/adc/ad7291.c
> +++ b/drivers/staging/iio/adc/ad7291.c
> @@ -100,7 +100,7 @@ struct ad7291_chip_info {
> struct regulator *reg;
> u16 int_vref_mv;
> u16 command;
> - u8 c_mask; /* Active voltage channels for events */
> + u16 c_mask; /* Active voltage channels for events */
> struct mutex state_lock;
> };
>
> @@ -380,7 +380,7 @@ static int ad7291_read_event_config(struct iio_dev *indio_dev,
> switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
> case IIO_VOLTAGE:
> if (chip->c_mask &
> - (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code)))
> + (1 << (15 - IIO_EVENT_CODE_EXTRACT_NUM(event_code))))
> return 1;
> else
> return 0;
> @@ -411,19 +411,19 @@ static int ad7291_write_event_config(struct iio_dev *indio_dev,
>
> switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {
> case IIO_VOLTAGE:
> - if ((!state) && (chip->c_mask &
> - (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code))))
> - chip->c_mask &=
> - ~(1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code));
> - else if (state && (!(chip->c_mask &
> - (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code)))))
> - chip->c_mask |=
> - (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code));
> + if ((!state) && (chip->c_mask & (1 << (15 -
> + IIO_EVENT_CODE_EXTRACT_NUM(event_code)))))
> + chip->c_mask &= ~(1 << (15 - IIO_EVENT_CODE_EXTRACT_NUM
> + (event_code)));
> + else if (state && (!(chip->c_mask & (1 << (15 -
> + IIO_EVENT_CODE_EXTRACT_NUM(event_code))))))
> + chip->c_mask |= (1 << (15 - IIO_EVENT_CODE_EXTRACT_NUM
> + (event_code)));
> else
> break;
>
> regval &= ~AD7291_AUTOCYCLE;
> - regval |= ((u16)chip->c_mask << 8);
> + regval |= chip->c_mask;
> if (chip->c_mask) /* Enable autocycle? */
> regval |= AD7291_AUTOCYCLE;
>
> @@ -460,7 +460,7 @@ static int ad7291_read_raw(struct iio_dev *indio_dev,
> case IIO_VOLTAGE:
> mutex_lock(&chip->state_lock);
> /* If in autocycle mode drop through */
> - if (chip->command & 0x1) {
> + if (chip->command & AD7291_AUTOCYCLE) {
> mutex_unlock(&chip->state_lock);
> return -EBUSY;
> }
next prev parent reply other threads:[~2011-08-31 11:26 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-31 10:57 [PATCH 01/12] iio: ad7291: fix channel mapping michael.hennerich
2011-08-31 10:57 ` [PATCH 02/12] iio: ad7291: Fix typos, change kconfig description and file header michael.hennerich
2011-08-31 11:18 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 03/12] iio: ad7291: Fix AD7291_T_SENSE_MASK michael.hennerich
2011-08-31 11:19 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 04/12] iio: ad7291: Add regulator, reference voltage and scale handling michael.hennerich
2011-08-31 11:22 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 05/12] iio: ad7291: don't swab results twice and introduce more register defines michael.hennerich
2011-08-31 11:28 ` Jonathan Cameron
2011-08-31 11:49 ` Hennerich, Michael
2011-08-31 12:01 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 06/12] iio: ad7291: fix mask bit generation michael.hennerich
2011-08-31 11:29 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 07/12] iio: ad7291: introduce IIO_EVENT_CODE_EXTRACT_CHAN_TYPE and use accordingly michael.hennerich
2011-08-31 11:33 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 08/12] iio: ad7291: fix channel mapping for event enables michael.hennerich
2011-08-31 11:34 ` Jonathan Cameron [this message]
2011-08-31 10:57 ` [PATCH 09/12] iio: core: fix IIO_EVENT_CODE_EXTRACT_DIR definition michael.hennerich
2011-08-31 11:15 ` Jonathan Cameron
2011-08-31 12:01 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 10/12] iio: ad7192: return len and fix out of range checking michael.hennerich
2011-08-31 11:37 ` Jonathan Cameron
2011-08-31 11:47 ` Hennerich, Michael
2011-08-31 11:59 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 11/12] iio: ad7291: reset device and setup irq before it is enabled michael.hennerich
2011-08-31 11:39 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 12/12] iio: ad7192: add temp_scale attribute, change module description michael.hennerich
2011-08-31 11:52 ` Jonathan Cameron
2011-08-31 11:14 ` [PATCH 01/12] iio: ad7291: fix channel mapping 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=4E5E1C61.2030603@cam.ac.uk \
--to=jic23@cam.ac.uk \
--cc=device-drivers-devel@blackfin.uclinux.org \
--cc=drivers@analog.com \
--cc=linux-iio@vger.kernel.org \
--cc=michael.hennerich@analog.com \
/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).