* [PATCH v2 0/2] tools: iio: iio_generic_buffer: -A option code cleanups
@ 2016-10-20 9:19 Eva Rachel Retuya
2016-10-20 9:19 ` [PATCH v2 1/2] tools: iio: iio_generic_buffer: rename and change type of force variable Eva Rachel Retuya
2016-10-20 9:19 ` [PATCH v2 2/2] tools: iio: iio_generic_buffer: drop unneeded parentheses Eva Rachel Retuya
0 siblings, 2 replies; 5+ messages in thread
From: Eva Rachel Retuya @ 2016-10-20 9:19 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, knaack.h, lars, pmeerw, Eva Rachel Retuya
Address Peter's comments:
https://marc.info/?l=linux-iio&m=147673895620791&w=2
Change in v2:
* Update force_autochannels to true/false instead of 1/0.
Eva Rachel Retuya (2):
tools: iio: iio_generic_buffer: rename and change type of force
variable
tools: iio: iio_generic_buffer: drop unneeded parentheses
tools/iio/iio_generic_buffer.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] tools: iio: iio_generic_buffer: rename and change type of force variable
2016-10-20 9:19 [PATCH v2 0/2] tools: iio: iio_generic_buffer: -A option code cleanups Eva Rachel Retuya
@ 2016-10-20 9:19 ` Eva Rachel Retuya
2016-10-22 15:20 ` Jonathan Cameron
2016-10-20 9:19 ` [PATCH v2 2/2] tools: iio: iio_generic_buffer: drop unneeded parentheses Eva Rachel Retuya
1 sibling, 1 reply; 5+ messages in thread
From: Eva Rachel Retuya @ 2016-10-20 9:19 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, knaack.h, lars, pmeerw, Eva Rachel Retuya
Replace the type of 'force' flag from int to bool and at the same time
rename it to 'force_autochannels' for better readability.
Suggested-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Signed-off-by: Eva Rachel Retuya <eraretuya@gmail.com>
---
tools/iio/iio_generic_buffer.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c
index 31ddd3a..8ef39ae 100644
--- a/tools/iio/iio_generic_buffer.c
+++ b/tools/iio/iio_generic_buffer.c
@@ -348,7 +348,7 @@ int main(int argc, char **argv)
int noevents = 0;
int notrigger = 0;
char *dummy;
- int force = 0;
+ bool force_autochannels = false;
struct iio_channel_info *channels = NULL;
@@ -362,7 +362,7 @@ int main(int argc, char **argv)
break;
case 'A':
autochannels = AUTOCHANNELS_ENABLED;
- force = 1;
+ force_autochannels = true;
break;
case 'c':
errno = 0;
@@ -526,14 +526,15 @@ int main(int argc, char **argv)
"diag %s\n", dev_dir_name);
goto error;
}
- if ((num_channels && autochannels == AUTOCHANNELS_ENABLED) && !force) {
+ if ((num_channels && autochannels == AUTOCHANNELS_ENABLED) &&
+ !force_autochannels) {
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) ||
- ((autochannels == AUTOCHANNELS_ENABLED) && force)) {
+ ((autochannels == AUTOCHANNELS_ENABLED) && force_autochannels)) {
fprintf(stderr, "Enabling all channels\n");
ret = enable_disable_all_channels(dev_dir_name, 1);
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] tools: iio: iio_generic_buffer: drop unneeded parentheses
2016-10-20 9:19 [PATCH v2 0/2] tools: iio: iio_generic_buffer: -A option code cleanups Eva Rachel Retuya
2016-10-20 9:19 ` [PATCH v2 1/2] tools: iio: iio_generic_buffer: rename and change type of force variable Eva Rachel Retuya
@ 2016-10-20 9:19 ` Eva Rachel Retuya
2016-10-22 15:20 ` Jonathan Cameron
1 sibling, 1 reply; 5+ messages in thread
From: Eva Rachel Retuya @ 2016-10-20 9:19 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, knaack.h, lars, pmeerw, Eva Rachel Retuya
Remove extra parentheses introduced in commit <73e176a tools: iio:
iio_generic_buffer: add -A to force-enable all channels>.
Suggested-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Signed-off-by: Eva Rachel Retuya <eraretuya@gmail.com>
---
tools/iio/iio_generic_buffer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c
index 8ef39ae..f0c6f54 100644
--- a/tools/iio/iio_generic_buffer.c
+++ b/tools/iio/iio_generic_buffer.c
@@ -526,7 +526,7 @@ 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_autochannels) {
fprintf(stderr, "Auto-channels selected but some channels "
"are already activated in sysfs\n");
@@ -534,7 +534,7 @@ int main(int argc, char **argv)
}
if ((!num_channels && autochannels == AUTOCHANNELS_ENABLED) ||
- ((autochannels == AUTOCHANNELS_ENABLED) && force_autochannels)) {
+ (autochannels == AUTOCHANNELS_ENABLED && force_autochannels)) {
fprintf(stderr, "Enabling all channels\n");
ret = enable_disable_all_channels(dev_dir_name, 1);
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] tools: iio: iio_generic_buffer: rename and change type of force variable
2016-10-20 9:19 ` [PATCH v2 1/2] tools: iio: iio_generic_buffer: rename and change type of force variable Eva Rachel Retuya
@ 2016-10-22 15:20 ` Jonathan Cameron
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Cameron @ 2016-10-22 15:20 UTC (permalink / raw)
To: Eva Rachel Retuya, linux-iio; +Cc: knaack.h, lars, pmeerw
On 20/10/16 10:19, Eva Rachel Retuya wrote:
> Replace the type of 'force' flag from int to bool and at the same time
> rename it to 'force_autochannels' for better readability.
>
> Suggested-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
> Signed-off-by: Eva Rachel Retuya <eraretuya@gmail.com>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.
Thanks,
Jonathan
> ---
> tools/iio/iio_generic_buffer.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c
> index 31ddd3a..8ef39ae 100644
> --- a/tools/iio/iio_generic_buffer.c
> +++ b/tools/iio/iio_generic_buffer.c
> @@ -348,7 +348,7 @@ int main(int argc, char **argv)
> int noevents = 0;
> int notrigger = 0;
> char *dummy;
> - int force = 0;
> + bool force_autochannels = false;
>
> struct iio_channel_info *channels = NULL;
>
> @@ -362,7 +362,7 @@ int main(int argc, char **argv)
> break;
> case 'A':
> autochannels = AUTOCHANNELS_ENABLED;
> - force = 1;
> + force_autochannels = true;
> break;
> case 'c':
> errno = 0;
> @@ -526,14 +526,15 @@ int main(int argc, char **argv)
> "diag %s\n", dev_dir_name);
> goto error;
> }
> - if ((num_channels && autochannels == AUTOCHANNELS_ENABLED) && !force) {
> + if ((num_channels && autochannels == AUTOCHANNELS_ENABLED) &&
> + !force_autochannels) {
> 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) ||
> - ((autochannels == AUTOCHANNELS_ENABLED) && force)) {
> + ((autochannels == AUTOCHANNELS_ENABLED) && force_autochannels)) {
> fprintf(stderr, "Enabling all channels\n");
>
> ret = enable_disable_all_channels(dev_dir_name, 1);
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] tools: iio: iio_generic_buffer: drop unneeded parentheses
2016-10-20 9:19 ` [PATCH v2 2/2] tools: iio: iio_generic_buffer: drop unneeded parentheses Eva Rachel Retuya
@ 2016-10-22 15:20 ` Jonathan Cameron
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Cameron @ 2016-10-22 15:20 UTC (permalink / raw)
To: Eva Rachel Retuya, linux-iio; +Cc: knaack.h, lars, pmeerw
On 20/10/16 10:19, Eva Rachel Retuya wrote:
> Remove extra parentheses introduced in commit <73e176a tools: iio:
> iio_generic_buffer: add -A to force-enable all channels>.
>
> Suggested-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
> Signed-off-by: Eva Rachel Retuya <eraretuya@gmail.com>
Applied, thanks,
Jonathan
> ---
> tools/iio/iio_generic_buffer.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c
> index 8ef39ae..f0c6f54 100644
> --- a/tools/iio/iio_generic_buffer.c
> +++ b/tools/iio/iio_generic_buffer.c
> @@ -526,7 +526,7 @@ 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_autochannels) {
> fprintf(stderr, "Auto-channels selected but some channels "
> "are already activated in sysfs\n");
> @@ -534,7 +534,7 @@ int main(int argc, char **argv)
> }
>
> if ((!num_channels && autochannels == AUTOCHANNELS_ENABLED) ||
> - ((autochannels == AUTOCHANNELS_ENABLED) && force_autochannels)) {
> + (autochannels == AUTOCHANNELS_ENABLED && force_autochannels)) {
> fprintf(stderr, "Enabling all channels\n");
>
> ret = enable_disable_all_channels(dev_dir_name, 1);
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-22 15:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-20 9:19 [PATCH v2 0/2] tools: iio: iio_generic_buffer: -A option code cleanups Eva Rachel Retuya
2016-10-20 9:19 ` [PATCH v2 1/2] tools: iio: iio_generic_buffer: rename and change type of force variable Eva Rachel Retuya
2016-10-22 15:20 ` Jonathan Cameron
2016-10-20 9:19 ` [PATCH v2 2/2] tools: iio: iio_generic_buffer: drop unneeded parentheses Eva Rachel Retuya
2016-10-22 15:20 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.