 @@ -1,14 +1,14 @@
-/* $NetBSD: gpio.h,v 1.6 2009/09/25 19:37:03 mbalmer Exp $ */
+/* $NetBSD: gpio.h,v 1.7 2009/09/25 20:27:50 mbalmer Exp $ */
 /*	$OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $	*/
 /*
  * Copyright (c) 2009 Marc Balmer <marc@msys.ch>
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -29,27 +29,27 @@
 /* GPIO pin configuration flags */
 #define GPIO_PIN_INPUT		0x0001	/* input direction */
 #define GPIO_PIN_OUTPUT		0x0002	/* output direction */
 #define GPIO_PIN_INOUT		0x0004	/* bi-directional */
 #define GPIO_PIN_OPENDRAIN	0x0008	/* open-drain output */
 #define GPIO_PIN_PUSHPULL	0x0010	/* push-pull output */
 #define GPIO_PIN_TRISTATE	0x0020	/* output disabled */
 #define GPIO_PIN_PULLUP		0x0040	/* internal pull-up enabled */
 #define GPIO_PIN_PULLDOWN	0x0080	/* internal pull-down enabled */
 #define GPIO_PIN_INVIN		0x0100	/* invert input */
 #define GPIO_PIN_INVOUT		0x0200	/* invert output */
 #define GPIO_PIN_USER		0x0400	/* user != 0 can access */
-#define GPIO_PIN_PULSE		0x0800	/* pulse in hardware */
+#define GPIO_PIN_PULSATE	0x0800	/* pulsate in hardware */
 #define GPIO_PIN_SET		0x8000	/* set for securelevel access */
 /* GPIO controller description */
 struct gpio_info {
 	int gpio_npins;		/* total number of pins available */
 };
 /* GPIO pin request (read/write/toggle) */
 struct gpio_req {
 	char gp_name[GPIOMAXNAME];	/* pin name */
 	int gp_pin;			/* pin number */
 	int gp_value;			/* value */
 };

 @@ -1,14 +1,14 @@
-.\" $NetBSD: gpioctl.8,v 1.6 2009/09/25 19:37:03 mbalmer Exp $
+.\" $NetBSD: gpioctl.8,v 1.7 2009/09/25 20:27:50 mbalmer Exp $
 .\"
 .\" Copyright (c) 2009 Marc Balmer <marc@msys.ch>
 .\" Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
 .\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 @@ -127,28 +127,28 @@ bi-directional
 open-drain output
 .It pp
 push-pull output
 .It tri
 tri-state (output disabled)
 .It pu
 internal pull-up enabled
 .It pd
 internal pull-down enabled
 .It iin
 invert input
 .It iout
 invert output
-.It pulse
+.It pulsate
-pulse output
+pulsate output at a hardware-defined frequency and duty cycle
 .El
 .Pp
 Note that not all the flags may be supported by the particular GPIO controller.
 .Pp
 When executed with only the
 .Xr gpio 4
 device name as argument,
 .Nm
 reads information about the
 .Tn GPIO
 device and displays it.
 At securelevel 0 the number of physically available pins is displayed,
 at higher securelevels the number of configured (set) pins is displayed.

 @@ -1,14 +1,14 @@
-/* $NetBSD: gpioctl.c,v 1.7 2009/09/25 19:37:03 mbalmer Exp $ */
+/* $NetBSD: gpioctl.c,v 1.8 2009/09/25 20:27:50 mbalmer Exp $ */
 /*
  * Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -57,27 +57,27 @@ const struct bitstr {
 	unsigned int mask;
 	const char *string;
 } pinflags[] = {
 	{ GPIO_PIN_INPUT, "in" },
 	{ GPIO_PIN_OUTPUT, "out" },
 	{ GPIO_PIN_INOUT, "inout" },
 	{ GPIO_PIN_OPENDRAIN, "od" },
 	{ GPIO_PIN_PUSHPULL, "pp" },
 	{ GPIO_PIN_TRISTATE, "tri" },
 	{ GPIO_PIN_PULLUP, "pu" },
 	{ GPIO_PIN_PULLDOWN, "pd" },
 	{ GPIO_PIN_INVIN, "iin" },
 	{ GPIO_PIN_INVOUT, "iout" },
-	{ GPIO_PIN_PULSE, "pulse" },
+	{ GPIO_PIN_PULSATE, "pulsate" },
 	{ 0, NULL },
 };
 int
 main(int argc, char *argv[])
+{
 	const struct bitstr *bs;
 	int pin, ch, n, fl = 0, value = 0;
 	const char *errstr;
 	char *ep;
 	int ga_offset = -1;
 	u_int32_t ga_mask = 0;
 	long lval;