From 1c5decc9ed968de7a8be874423cc23647c997e83 Mon Sep 17 00:00:00 2001
From: sbruno <sbruno@FreeBSD.org>
Date: Tue, 17 Sep 2013 11:48:47 +0000
Subject: Assume that the -f argument is /dev/gpioc0 if it is not passed.

hrs@ provided this verison of the patch and showed me where all the needed
changes were to be made outside of gpioctl.c

Approved by:	re (hrs)
MFC after:	2 weeks
---
 usr.sbin/gpioctl/gpioctl.8 | 10 ++++++----
 usr.sbin/gpioctl/gpioctl.c | 12 +++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'usr.sbin/gpioctl')

diff --git a/usr.sbin/gpioctl/gpioctl.8 b/usr.sbin/gpioctl/gpioctl.8
index ab936a4..c1abb5e 100644
--- a/usr.sbin/gpioctl/gpioctl.8
+++ b/usr.sbin/gpioctl/gpioctl.8
@@ -36,20 +36,20 @@
 .Sh SYNOPSIS
 .Nm
 .Cm -l
-.Fl f Ar ctldev
+.Op Fl f Ar ctldev
 .Op Fl v
 .Nm
 .Cm -t
-.Fl f Ar ctldev
+.Op Fl f Ar ctldev
 .Ar pin
 .Nm
 .Cm -c
-.Fl f Ar ctldev
+.Op Fl f Ar ctldev
 .Ar pin
 .Ar flag
 .Op flag ...
 .Nm
-.Cm -f Ar ctldev
+.Op Cm -f Ar ctldev
 .Ar pin
 .Ar [0|1]
 .Sh DESCRIPTION
@@ -83,6 +83,8 @@ Inverted output pin
 .El
 .It Fl f Ar ctldev
 GPIO controller device to use
+If not specified, defaults to
+.Pa /dev/gpioc0
 .It Fl l
 list available pins
 .It Fl t Ar pin
diff --git a/usr.sbin/gpioctl/gpioctl.c b/usr.sbin/gpioctl/gpioctl.c
index 9d76e1d..e4708a4 100644
--- a/usr.sbin/gpioctl/gpioctl.c
+++ b/usr.sbin/gpioctl/gpioctl.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include <fcntl.h>
 #include <getopt.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -63,10 +64,10 @@ static void
 usage(void)
 {
 	fprintf(stderr, "Usage:\n");
-	fprintf(stderr, "\tgpioctl -f ctldev -l [-v]\n");
-	fprintf(stderr, "\tgpioctl -f ctldev -t pin\n");
-	fprintf(stderr, "\tgpioctl -f ctldev -c pin flag ...\n");
-	fprintf(stderr, "\tgpioctl -f ctldev pin [0|1]\n");
+	fprintf(stderr, "\tgpioctl [-f ctldev] -l [-v]\n");
+	fprintf(stderr, "\tgpioctl [-f ctldev] -t pin\n");
+	fprintf(stderr, "\tgpioctl [-f ctldev] -c pin flag ...\n");
+	fprintf(stderr, "\tgpioctl [-f ctldev] pin [0|1]\n");
 	exit(1);
 }
 
@@ -185,6 +186,7 @@ main(int argc, char **argv)
 	int i;
 	struct gpio_pin pin;
 	struct gpio_req req;
+	char defctlfile[] = _PATH_DEVGPIOC "0";
 	char *ctlfile = NULL;
 	int pinn, pinv, fd, ch;
 	int flags, flag, ok;
@@ -226,7 +228,7 @@ main(int argc, char **argv)
 		printf("%d/%s\n", i, argv[i]);
 
 	if (ctlfile == NULL)
-		fail("No gpioctl device provided\n");
+		ctlfile = defctlfile;
 
 	fd = open(ctlfile, O_RDONLY);
 	if (fd < 0) {
-- 
cgit v1.1