[Midnightbsd-cvs] src [10746] trunk/usr.sbin/gpioctl/gpioctl.c: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10746
          http://svnweb.midnightbsd.org/src/?rev=10746
Author:   laffer1
Date:     2018-06-09 18:13:55 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/usr.sbin/gpioctl/Makefile
    trunk/usr.sbin/gpioctl/gpioctl.8
    trunk/usr.sbin/gpioctl/gpioctl.c

Property Changed:
----------------
    trunk/usr.sbin/gpioctl/gpioctl.8

Modified: trunk/usr.sbin/gpioctl/Makefile
===================================================================
--- trunk/usr.sbin/gpioctl/Makefile	2018-06-09 22:12:25 UTC (rev 10745)
+++ trunk/usr.sbin/gpioctl/Makefile	2018-06-09 22:13:55 UTC (rev 10746)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/gpioctl/Makefile 213238 2010-09-28 03:28:20Z gonzo $
 
 PROG=	gpioctl
 MAN=	gpioctl.8

Modified: trunk/usr.sbin/gpioctl/gpioctl.8
===================================================================
--- trunk/usr.sbin/gpioctl/gpioctl.8	2018-06-09 22:12:25 UTC (rev 10745)
+++ trunk/usr.sbin/gpioctl/gpioctl.8	2018-06-09 22:13:55 UTC (rev 10746)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -25,9 +26,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/gpioctl/gpioctl.8 266096 2014-05-14 23:33:38Z loos $
 .\"
-.Dd May 25, 2011
+.Dd November 7, 2013
 .Dt GPIOCTL 1
 .Os
 .Sh NAME
@@ -36,20 +37,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 +84,8 @@
 .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
@@ -105,6 +108,10 @@
 .Pp
 gpioctl -f /dev/gpioc0 -c 12 IN
 .El
+.Sh SEE ALSO
+.Xr gpio 4
+.Xr gpioiic 4
+.Xr gpioled 4
 .Sh HISTORY
 The
 .Nm


Property changes on: trunk/usr.sbin/gpioctl/gpioctl.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/gpioctl/gpioctl.c
===================================================================
--- trunk/usr.sbin/gpioctl/gpioctl.c	2018-06-09 22:12:25 UTC (rev 10745)
+++ trunk/usr.sbin/gpioctl/gpioctl.c	2018-06-09 22:13:55 UTC (rev 10746)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo at FreeBSD.org>
  * All rights reserved.
@@ -26,10 +27,11 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/gpioctl/gpioctl.c 275500 2014-12-05 07:51:50Z rpaulo $");
 
 #include <fcntl.h>
 #include <getopt.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -43,7 +45,7 @@
 	uint32_t flag;
 };
 
-struct flag_desc gpio_flags[] = {
+static struct flag_desc gpio_flags[] = {
 	{ "IN", GPIO_PIN_INPUT },
 	{ "OUT", GPIO_PIN_OUTPUT },
 	{ "OD", GPIO_PIN_OPENDRAIN },
@@ -63,10 +65,10 @@
 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 +187,7 @@
 	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;
@@ -222,11 +225,8 @@
 	}
 	argv += optind;
 	argc -= optind;
-	for (i = 0; i < argc; i++)
-		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) {