From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:33867 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752078AbcJPCOC (ORCPT ); Sat, 15 Oct 2016 22:14:02 -0400 Received: by mail-pf0-f196.google.com with SMTP id 128so10109366pfz.1 for ; Sat, 15 Oct 2016 19:13:42 -0700 (PDT) Date: Sun, 16 Oct 2016 10:13:33 +0800 From: Eva Rachel Retuya To: Jonathan Cameron Cc: linux-iio@vger.kernel.org, outreachy-kernel@googlegroups.com, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net Subject: Re: [PATCH] tools: iio: iio_generic_buffer: add -A to force-enable all channels Message-ID: <20161016021332.GB2406@Socrates-DK> References: <1476440319-11124-1-git-send-email-eraretuya@gmail.com> <80bfc9a1-592e-3f8b-3a72-ea7259a74469@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <80bfc9a1-592e-3f8b-3a72-ea7259a74469@kernel.org> Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On Sat, Oct 15, 2016 at 03:27:22PM +0100, Jonathan Cameron wrote: > On 14/10/16 11:18, Eva Rachel Retuya wrote: > > If attribute/s is/are already enabled (by default or via scripts or > > manual interaction), issuing -a will fail to enable the channels thereby > > one has to manually disable the said attribute/s before proceeding with > > auto-enabling. > > > > Add a command-line option -A to force-activate all channels regardless > > of their current state. > > > > Suggested-by: Alison Schofield > > Signed-off-by: Eva Rachel Retuya > Seems like a useful addition with minimal 'cost'. > > Applied, though there was some fuzz due to a recent patch making > sure the ? was in the argument list, so please check I didn't mess > it up! It looks fine, thanks! Eva > > Applied to the togreg branch of iio.git - initially pushed out as > testing for the autobuilders to play with it. > > Thanks, > > Jonathan > > --- > > tools/iio/iio_generic_buffer.c | 17 ++++++++++++----- > > 1 file changed, 12 insertions(+), 5 deletions(-) > > > > diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c > > index f39c0e9..84c9888 100644 > > --- a/tools/iio/iio_generic_buffer.c > > +++ b/tools/iio/iio_generic_buffer.c > > @@ -247,6 +247,7 @@ void print_usage(void) > > fprintf(stderr, "Usage: generic_buffer [options]...\n" > > "Capture, convert and output data from IIO device buffer\n" > > " -a Auto-activate all available channels\n" > > + " -A Force-activate ALL channels\n" > > " -c Do n conversions\n" > > " -e Disable wait for event (new data)\n" > > " -g Use trigger-less mode\n" > > @@ -347,16 +348,22 @@ int main(int argc, char **argv) > > int noevents = 0; > > int notrigger = 0; > > char *dummy; > > + int force = 0; > > > > struct iio_channel_info *channels = NULL; > > > > register_cleanup(); > > > > - while ((c = getopt_long(argc, argv, "ac:egl:n:N:t:T:w:", longopts, NULL)) != -1) { > > + while ((c = getopt_long(argc, argv, "aAc:egl:n:N:t:T:w:", longopts, > > + NULL)) != -1) { > > switch (c) { > > case 'a': > > autochannels = AUTOCHANNELS_ENABLED; > > break; > > + case 'A': > > + autochannels = AUTOCHANNELS_ENABLED; > > + force = 1; > > + break; > > case 'c': > > errno = 0; > > num_loops = strtoul(optarg, &dummy, 10); > > @@ -519,15 +526,15 @@ int main(int argc, char **argv) > > "diag %s\n", dev_dir_name); > > goto error; > > } > > - if (num_channels && autochannels == AUTOCHANNELS_ENABLED) { > > + if ((num_channels && autochannels == AUTOCHANNELS_ENABLED) && !force) { > > fprintf(stderr, "Auto-channels selected but some channels " > > "are already activated in sysfs\n"); > > fprintf(stderr, "Proceeding without activating any channels\n"); > > } > > > > - if (!num_channels && autochannels == AUTOCHANNELS_ENABLED) { > > - fprintf(stderr, > > - "No channels are enabled, enabling all channels\n"); > > + if ((!num_channels && autochannels == AUTOCHANNELS_ENABLED) || > > + ((autochannels == AUTOCHANNELS_ENABLED) && force)) { > > + fprintf(stderr, "Enabling all channels\n"); > > > > ret = enable_disable_all_channels(dev_dir_name, 1); > > if (ret) { > > >