| Message ID | 20191115144355.975-19-warthog618@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add support for bias flags and SET_CONFIG | expand |
On Fri, Nov 15, 2019 at 10:43:54PM +0800, Kent Gibson wrote: > Add support for bias flags to applicable tools - gpioget, gpioset, and > gpiomon. > > Signed-off-by: Kent Gibson <warthog618@gmail.com> > --- > tools/gpioget.c | 24 ++++++++++++++++++++---- > tools/gpiomon.c | 28 ++++++++++++++++++++++------ > tools/gpioset.c | 26 +++++++++++++++++++++----- > 3 files changed, 63 insertions(+), 15 deletions(-) > > diff --git a/tools/gpioget.c b/tools/gpioget.c > index 196ebeb..025811a 100644 > --- a/tools/gpioget.c > +++ b/tools/gpioget.c > @@ -17,10 +17,13 @@ static const struct option longopts[] = { > { "help", no_argument, NULL, 'h' }, > { "version", no_argument, NULL, 'v' }, > { "active-low", no_argument, NULL, 'l' }, > + { "pull-down", no_argument, NULL, 'D' }, > + { "pull-up", no_argument, NULL, 'U' }, > + { "bias-disable", no_argument, NULL, 'B' }, > { GETOPT_NULL_LONGOPT }, > }; > > -static const char *const shortopts = "+hvl"; > +static const char *const shortopts = "+hvlDUB"; > > static void print_help(void) > { > @@ -32,6 +35,9 @@ static void print_help(void) > printf(" -h, --help:\t\tdisplay this message and exit\n"); > printf(" -v, --version:\tdisplay the version and exit\n"); > printf(" -l, --active-low:\tset the line active state to low\n"); > + printf(" -D, --pull-down:\tenable internal pull-down\n"); > + printf(" -U, --pull-up:\tenable internal pull-up\n"); > + printf(" -B, --bias-disable:\tdisable internal bias\n"); > } > > int main(int argc, char **argv) > @@ -39,6 +45,7 @@ int main(int argc, char **argv) > unsigned int *offsets, i, num_lines; > int *values, optc, opti, rv; > bool active_low = false; > + int flags = 0; > char *device, *end; > > for (;;) { > @@ -56,6 +63,15 @@ int main(int argc, char **argv) > case 'l': > active_low = true; > break; > + case 'D': > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN; > + break; > + case 'U': > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP; > + break; > + case 'B': > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE; > + break; > case '?': > die("try %s --help", get_progname()); > default: > @@ -86,9 +102,9 @@ int main(int argc, char **argv) > die("invalid GPIO offset: %s", argv[i + 1]); > } > Nuts - this is wrong - it should be using the CTXLESS flags, not the LINE_REQUEST flags. That applies to all three of the tools changed. I forgot to propagate the last minute CTXLESS changes to the tools. And unfortunately we don't have test cases for the tools :-(. I've got a fix in my github branch that I will incorporate into v2. I'm also wondering if it would be preferable to replace the individual bias command line flags with a single bias parameter, e.g. --bias=pull-up I've coded that in my github branch as well, if you would care to compare. Let me know if you'd like a v2, otherwise I'll hold off for a few days in case something else crops up. Cheers, Kent.
sob., 16 lis 2019 o 16:40 Kent Gibson <warthog618@gmail.com> napisał(a): > > On Fri, Nov 15, 2019 at 10:43:54PM +0800, Kent Gibson wrote: > > Add support for bias flags to applicable tools - gpioget, gpioset, and > > gpiomon. > > > > Signed-off-by: Kent Gibson <warthog618@gmail.com> > > --- > > tools/gpioget.c | 24 ++++++++++++++++++++---- > > tools/gpiomon.c | 28 ++++++++++++++++++++++------ > > tools/gpioset.c | 26 +++++++++++++++++++++----- > > 3 files changed, 63 insertions(+), 15 deletions(-) > > > > diff --git a/tools/gpioget.c b/tools/gpioget.c > > index 196ebeb..025811a 100644 > > --- a/tools/gpioget.c > > +++ b/tools/gpioget.c > > @@ -17,10 +17,13 @@ static const struct option longopts[] = { > > { "help", no_argument, NULL, 'h' }, > > { "version", no_argument, NULL, 'v' }, > > { "active-low", no_argument, NULL, 'l' }, > > + { "pull-down", no_argument, NULL, 'D' }, > > + { "pull-up", no_argument, NULL, 'U' }, > > + { "bias-disable", no_argument, NULL, 'B' }, > > { GETOPT_NULL_LONGOPT }, > > }; > > > > -static const char *const shortopts = "+hvl"; > > +static const char *const shortopts = "+hvlDUB"; > > > > static void print_help(void) > > { > > @@ -32,6 +35,9 @@ static void print_help(void) > > printf(" -h, --help:\t\tdisplay this message and exit\n"); > > printf(" -v, --version:\tdisplay the version and exit\n"); > > printf(" -l, --active-low:\tset the line active state to low\n"); > > + printf(" -D, --pull-down:\tenable internal pull-down\n"); > > + printf(" -U, --pull-up:\tenable internal pull-up\n"); > > + printf(" -B, --bias-disable:\tdisable internal bias\n"); > > } > > > > int main(int argc, char **argv) > > @@ -39,6 +45,7 @@ int main(int argc, char **argv) > > unsigned int *offsets, i, num_lines; > > int *values, optc, opti, rv; > > bool active_low = false; > > + int flags = 0; > > char *device, *end; > > > > for (;;) { > > @@ -56,6 +63,15 @@ int main(int argc, char **argv) > > case 'l': > > active_low = true; > > break; > > + case 'D': > > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN; > > + break; > > + case 'U': > > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP; > > + break; > > + case 'B': > > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE; > > + break; > > case '?': > > die("try %s --help", get_progname()); > > default: > > @@ -86,9 +102,9 @@ int main(int argc, char **argv) > > die("invalid GPIO offset: %s", argv[i + 1]); > > } > > > > Nuts - this is wrong - it should be using the CTXLESS flags, not the > LINE_REQUEST flags. That applies to all three of the tools changed. > I forgot to propagate the last minute CTXLESS changes to the tools. > And unfortunately we don't have test cases for the tools :-(. But we do![1] > I've got a fix in my github branch that I will incorporate into v2. > > I'm also wondering if it would be preferable to replace the individual > bias command line flags with a single bias parameter, e.g. --bias=pull-up > I've coded that in my github branch as well, if you would care to > compare. > > Let me know if you'd like a v2, otherwise I'll hold off for a few days > in case something else crops up. Let me review the rest before that, I'll do this tomorrow. Bart > > Cheers, > Kent. [1] https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/tree/tools/gpio-tools-test.bats
On Sun, Nov 17, 2019 at 01:18:26PM +0100, Bartosz Golaszewski wrote: > sob., 16 lis 2019 o 16:40 Kent Gibson <warthog618@gmail.com> napisał(a): > > > > On Fri, Nov 15, 2019 at 10:43:54PM +0800, Kent Gibson wrote: > > > Add support for bias flags to applicable tools - gpioget, gpioset, and > > > gpiomon. > > > > > > Signed-off-by: Kent Gibson <warthog618@gmail.com> > > > --- > > > tools/gpioget.c | 24 ++++++++++++++++++++---- > > > tools/gpiomon.c | 28 ++++++++++++++++++++++------ > > > tools/gpioset.c | 26 +++++++++++++++++++++----- > > > 3 files changed, 63 insertions(+), 15 deletions(-) > > > > > > diff --git a/tools/gpioget.c b/tools/gpioget.c > > > index 196ebeb..025811a 100644 > > > --- a/tools/gpioget.c > > > +++ b/tools/gpioget.c > > > @@ -17,10 +17,13 @@ static const struct option longopts[] = { > > > { "help", no_argument, NULL, 'h' }, > > > { "version", no_argument, NULL, 'v' }, > > > { "active-low", no_argument, NULL, 'l' }, > > > + { "pull-down", no_argument, NULL, 'D' }, > > > + { "pull-up", no_argument, NULL, 'U' }, > > > + { "bias-disable", no_argument, NULL, 'B' }, > > > { GETOPT_NULL_LONGOPT }, > > > }; > > > > > > -static const char *const shortopts = "+hvl"; > > > +static const char *const shortopts = "+hvlDUB"; > > > > > > static void print_help(void) > > > { > > > @@ -32,6 +35,9 @@ static void print_help(void) > > > printf(" -h, --help:\t\tdisplay this message and exit\n"); > > > printf(" -v, --version:\tdisplay the version and exit\n"); > > > printf(" -l, --active-low:\tset the line active state to low\n"); > > > + printf(" -D, --pull-down:\tenable internal pull-down\n"); > > > + printf(" -U, --pull-up:\tenable internal pull-up\n"); > > > + printf(" -B, --bias-disable:\tdisable internal bias\n"); > > > } > > > > > > int main(int argc, char **argv) > > > @@ -39,6 +45,7 @@ int main(int argc, char **argv) > > > unsigned int *offsets, i, num_lines; > > > int *values, optc, opti, rv; > > > bool active_low = false; > > > + int flags = 0; > > > char *device, *end; > > > > > > for (;;) { > > > @@ -56,6 +63,15 @@ int main(int argc, char **argv) > > > case 'l': > > > active_low = true; > > > break; > > > + case 'D': > > > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN; > > > + break; > > > + case 'U': > > > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP; > > > + break; > > > + case 'B': > > > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE; > > > + break; > > > case '?': > > > die("try %s --help", get_progname()); > > > default: > > > @@ -86,9 +102,9 @@ int main(int argc, char **argv) > > > die("invalid GPIO offset: %s", argv[i + 1]); > > > } > > > > > > > Nuts - this is wrong - it should be using the CTXLESS flags, not the > > LINE_REQUEST flags. That applies to all three of the tools changed. > > I forgot to propagate the last minute CTXLESS changes to the tools. > > And unfortunately we don't have test cases for the tools :-(. > > But we do![1] > Damn - I missed that. I'll see about adding some cases for the bias flags for v2. Kent. > > I've got a fix in my github branch that I will incorporate into v2. > > > > I'm also wondering if it would be preferable to replace the individual > > bias command line flags with a single bias parameter, e.g. --bias=pull-up > > I've coded that in my github branch as well, if you would care to > > compare. > > > > Let me know if you'd like a v2, otherwise I'll hold off for a few days > > in case something else crops up. > > Let me review the rest before that, I'll do this tomorrow. > > Bart > > > > > Cheers, > > Kent. > > [1] https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/tree/tools/gpio-tools-test.bats
On Sun, Nov 17, 2019 at 08:28:01PM +0800, Kent Gibson wrote: > On Sun, Nov 17, 2019 at 01:18:26PM +0100, Bartosz Golaszewski wrote: > > sob., 16 lis 2019 o 16:40 Kent Gibson <warthog618@gmail.com> napisał(a): > > > > > > On Fri, Nov 15, 2019 at 10:43:54PM +0800, Kent Gibson wrote: > > > > Add support for bias flags to applicable tools - gpioget, gpioset, and > > > > gpiomon. > > > > > > > > Signed-off-by: Kent Gibson <warthog618@gmail.com> > > > > --- > > > > tools/gpioget.c | 24 ++++++++++++++++++++---- > > > > tools/gpiomon.c | 28 ++++++++++++++++++++++------ > > > > tools/gpioset.c | 26 +++++++++++++++++++++----- > > > > 3 files changed, 63 insertions(+), 15 deletions(-) > > > > > > > > diff --git a/tools/gpioget.c b/tools/gpioget.c > > > > index 196ebeb..025811a 100644 > > > > --- a/tools/gpioget.c > > > > +++ b/tools/gpioget.c > > > > @@ -17,10 +17,13 @@ static const struct option longopts[] = { > > > > { "help", no_argument, NULL, 'h' }, > > > > { "version", no_argument, NULL, 'v' }, > > > > { "active-low", no_argument, NULL, 'l' }, > > > > + { "pull-down", no_argument, NULL, 'D' }, > > > > + { "pull-up", no_argument, NULL, 'U' }, > > > > + { "bias-disable", no_argument, NULL, 'B' }, > > > > { GETOPT_NULL_LONGOPT }, > > > > }; > > > > > > > > -static const char *const shortopts = "+hvl"; > > > > +static const char *const shortopts = "+hvlDUB"; > > > > > > > > static void print_help(void) > > > > { > > > > @@ -32,6 +35,9 @@ static void print_help(void) > > > > printf(" -h, --help:\t\tdisplay this message and exit\n"); > > > > printf(" -v, --version:\tdisplay the version and exit\n"); > > > > printf(" -l, --active-low:\tset the line active state to low\n"); > > > > + printf(" -D, --pull-down:\tenable internal pull-down\n"); > > > > + printf(" -U, --pull-up:\tenable internal pull-up\n"); > > > > + printf(" -B, --bias-disable:\tdisable internal bias\n"); > > > > } > > > > > > > > int main(int argc, char **argv) > > > > @@ -39,6 +45,7 @@ int main(int argc, char **argv) > > > > unsigned int *offsets, i, num_lines; > > > > int *values, optc, opti, rv; > > > > bool active_low = false; > > > > + int flags = 0; > > > > char *device, *end; > > > > > > > > for (;;) { > > > > @@ -56,6 +63,15 @@ int main(int argc, char **argv) > > > > case 'l': > > > > active_low = true; > > > > break; > > > > + case 'D': > > > > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN; > > > > + break; > > > > + case 'U': > > > > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP; > > > > + break; > > > > + case 'B': > > > > + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE; > > > > + break; > > > > case '?': > > > > die("try %s --help", get_progname()); > > > > default: > > > > @@ -86,9 +102,9 @@ int main(int argc, char **argv) > > > > die("invalid GPIO offset: %s", argv[i + 1]); > > > > } > > > > > > > > > > Nuts - this is wrong - it should be using the CTXLESS flags, not the > > > LINE_REQUEST flags. That applies to all three of the tools changed. > > > I forgot to propagate the last minute CTXLESS changes to the tools. > > > And unfortunately we don't have test cases for the tools :-(. > > > > But we do![1] > > > > Damn - I missed that. I'll see about adding some cases for the bias > flags for v2. > I've pushed some tests for the tools bias and drive options to my github branch. I will include them in v2. They use the --bias/--drive forms as that is what is currently at the HEAD, but it is trivial to change them to the distinct flag versions if you prefer that. Cheers, Kent. > > > > I've got a fix in my github branch that I will incorporate into v2. > > > > > > I'm also wondering if it would be preferable to replace the individual > > > bias command line flags with a single bias parameter, e.g. --bias=pull-up > > > I've coded that in my github branch as well, if you would care to > > > compare. > > > > > > Let me know if you'd like a v2, otherwise I'll hold off for a few days > > > in case something else crops up. > > > > Let me review the rest before that, I'll do this tomorrow. > > > > Bart > > > > > > > > Cheers, > > > Kent. > > > > [1] https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/tree/tools/gpio-tools-test.bats
diff --git a/tools/gpioget.c b/tools/gpioget.c index 196ebeb..025811a 100644 --- a/tools/gpioget.c +++ b/tools/gpioget.c @@ -17,10 +17,13 @@ static const struct option longopts[] = { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'v' }, { "active-low", no_argument, NULL, 'l' }, + { "pull-down", no_argument, NULL, 'D' }, + { "pull-up", no_argument, NULL, 'U' }, + { "bias-disable", no_argument, NULL, 'B' }, { GETOPT_NULL_LONGOPT }, }; -static const char *const shortopts = "+hvl"; +static const char *const shortopts = "+hvlDUB"; static void print_help(void) { @@ -32,6 +35,9 @@ static void print_help(void) printf(" -h, --help:\t\tdisplay this message and exit\n"); printf(" -v, --version:\tdisplay the version and exit\n"); printf(" -l, --active-low:\tset the line active state to low\n"); + printf(" -D, --pull-down:\tenable internal pull-down\n"); + printf(" -U, --pull-up:\tenable internal pull-up\n"); + printf(" -B, --bias-disable:\tdisable internal bias\n"); } int main(int argc, char **argv) @@ -39,6 +45,7 @@ int main(int argc, char **argv) unsigned int *offsets, i, num_lines; int *values, optc, opti, rv; bool active_low = false; + int flags = 0; char *device, *end; for (;;) { @@ -56,6 +63,15 @@ int main(int argc, char **argv) case 'l': active_low = true; break; + case 'D': + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN; + break; + case 'U': + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP; + break; + case 'B': + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE; + break; case '?': die("try %s --help", get_progname()); default: @@ -86,9 +102,9 @@ int main(int argc, char **argv) die("invalid GPIO offset: %s", argv[i + 1]); } - rv = gpiod_ctxless_get_value_multiple(device, offsets, values, - num_lines, active_low, - "gpioget"); + rv = gpiod_ctxless_get_value_multiple_ext(device, offsets, values, + num_lines, active_low, flags, + "gpioget"); if (rv < 0) die_perror("error reading GPIO values"); diff --git a/tools/gpiomon.c b/tools/gpiomon.c index 9a1843b..5779718 100644 --- a/tools/gpiomon.c +++ b/tools/gpiomon.c @@ -26,12 +26,15 @@ static const struct option longopts[] = { { "silent", no_argument, NULL, 's' }, { "rising-edge", no_argument, NULL, 'r' }, { "falling-edge", no_argument, NULL, 'f' }, + { "pull-down", no_argument, NULL, 'D' }, + { "pull-up", no_argument, NULL, 'U' }, + { "bias-disable", no_argument, NULL, 'B' }, { "line-buffered", no_argument, NULL, 'b' }, { "format", required_argument, NULL, 'F' }, { GETOPT_NULL_LONGOPT }, }; -static const char *const shortopts = "+hvln:srfbF:"; +static const char *const shortopts = "+hvln:srfDUBbF:"; static void print_help(void) { @@ -47,6 +50,9 @@ static void print_help(void) printf(" -s, --silent:\t\tdon't print event info\n"); printf(" -r, --rising-edge:\tonly process rising edge events\n"); printf(" -f, --falling-edge:\tonly process falling edge events\n"); + printf(" -D, --pull-down:\tenable internal pull-down\n"); + printf(" -U, --pull-up:\tenable internal pull-up\n"); + printf(" -B, --bias-disable:\tdisable internal bias\n"); printf(" -b, --line-buffered:\tset standard output as line buffered\n"); printf(" -F, --format=FMT\tspecify custom output format\n"); printf("\n"); @@ -244,6 +250,7 @@ int main(int argc, char **argv) { unsigned int offsets[GPIOD_LINE_BULK_MAX_LINES], num_lines = 0, offset; bool active_low = false, watch_rising = false, watch_falling = false; + int flags = 0; struct timespec timeout = { 10, 0 }; int optc, opti, rv, i, event_type; struct mon_ctx ctx; @@ -266,6 +273,15 @@ int main(int argc, char **argv) case 'l': active_low = true; break; + case 'D': + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN; + break; + case 'U': + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP; + break; + case 'B': + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE; + break; case 'n': ctx.events_wanted = strtoul(optarg, &end, 10); if (*end != '\0') @@ -320,11 +336,11 @@ int main(int argc, char **argv) ctx.sigfd = make_signalfd(); - rv = gpiod_ctxless_event_monitor_multiple(argv[0], event_type, - offsets, num_lines, - active_low, "gpiomon", - &timeout, poll_callback, - event_callback, &ctx); + rv = gpiod_ctxless_event_monitor_multiple_ext( + argv[0], event_type, offsets, + num_lines, active_low, flags, "gpiomon", + &timeout, poll_callback, + event_callback, &ctx); if (rv) die_perror("error waiting for events"); diff --git a/tools/gpioset.c b/tools/gpioset.c index d9977a7..8855eb0 100644 --- a/tools/gpioset.c +++ b/tools/gpioset.c @@ -27,10 +27,13 @@ static const struct option longopts[] = { { "sec", required_argument, NULL, 's' }, { "usec", required_argument, NULL, 'u' }, { "background", no_argument, NULL, 'b' }, + { "pull-down", no_argument, NULL, 'D' }, + { "pull-up", no_argument, NULL, 'U' }, + { "bias-disable", no_argument, NULL, 'B' }, { GETOPT_NULL_LONGOPT }, }; -static const char *const shortopts = "+hvlm:s:u:b"; +static const char *const shortopts = "+hvlm:s:u:bDUB"; static void print_help(void) { @@ -42,6 +45,9 @@ static void print_help(void) printf(" -h, --help:\t\tdisplay this message and exit\n"); printf(" -v, --version:\tdisplay the version and exit\n"); printf(" -l, --active-low:\tset the line active state to low\n"); + printf(" -D, --pull-down:\tenable internal pull-down\n"); + printf(" -U, --pull-up:\tenable internal pull-up\n"); + printf(" -B, --bias-disable:\tdisable internal bias\n"); printf(" -m, --mode=[exit|wait|time|signal] (defaults to 'exit'):\n"); printf(" tell the program what to do after setting values\n"); printf(" -s, --sec=SEC:\tspecify the number of seconds to wait (only valid for --mode=time)\n"); @@ -182,7 +188,7 @@ int main(int argc, char **argv) { const struct mode_mapping *mode = &modes[MODE_EXIT]; unsigned int *offsets, num_lines, i; - int *values, rv, optc, opti; + int *values, rv, optc, opti, flags = 0; struct callback_data cbdata; bool active_low = false; char *device, *end; @@ -204,6 +210,15 @@ int main(int argc, char **argv) case 'l': active_low = true; break; + case 'D': + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN; + break; + case 'U': + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP; + break; + case 'B': + flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE; + break; case 'm': mode = parse_mode(optarg); if (!mode) @@ -268,9 +283,10 @@ int main(int argc, char **argv) die("invalid offset: %s", argv[i + 1]); } - rv = gpiod_ctxless_set_value_multiple(device, offsets, values, - num_lines, active_low, "gpioset", - mode->callback, &cbdata); + rv = gpiod_ctxless_set_value_multiple_ext( + device, offsets, values, + num_lines, active_low, flags, "gpioset", + mode->callback, &cbdata); if (rv < 0) die_perror("error setting the GPIO line values");
Add support for bias flags to applicable tools - gpioget, gpioset, and gpiomon. Signed-off-by: Kent Gibson <warthog618@gmail.com> --- tools/gpioget.c | 24 ++++++++++++++++++++---- tools/gpiomon.c | 28 ++++++++++++++++++++++------ tools/gpioset.c | 26 +++++++++++++++++++++----- 3 files changed, 63 insertions(+), 15 deletions(-)