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 <amsfield22@xxxxxxxxx>
> > Signed-off-by: Eva Rachel Retuya <eraretuya@xxxxxxxxx>
> 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 <n> 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) {
> >
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
