3 files changed, 66 insertions, 16 deletions

diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index cc2f94d6bc46d..ab61978305b63 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -48,7 +48,7 @@
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
  *	From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp
- *	$Id: lpt.c,v 1.2 1999/02/14 16:19:16 nsouch Exp $
+ *	$Id: lpt.c,v 1.3 1999/04/28 10:51:35 dt Exp $
  */
 
 /*
@@ -206,10 +206,27 @@ static	d_read_t	lptread;
 static	d_ioctl_t	lptioctl;
 
 #define CDEV_MAJOR 16
-static struct cdevsw lpt_cdevsw = 
-	{ lptopen,	lptclose,	lptread,	lptwrite,	/*16*/
-	  lptioctl,	nullstop,	nullreset,	nodevtotty,	/* lpt */
-	  seltrue,	nommap,		nostrat,	LPT_NAME,	NULL,	-1 };
+static struct cdevsw lpt_cdevsw = {
+	/* open */	lptopen,
+	/* close */	lptclose,
+	/* read */	lptread,
+	/* write */	lptwrite,
+	/* ioctl */	lptioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	LPT_NAME,
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 static int
 lpt_request_ppbus(struct lpt_data *sc, int how)
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index d3a09a1b9ba0f..315ea29dafbe4 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.c,v 1.12 1999/02/14 11:59:59 nsouch Exp $
+ *	$Id: ppi.c,v 1.13 1999/04/28 10:51:39 dt Exp $
  *
  */
 #include "ppi.h"
@@ -91,10 +91,27 @@ static	d_write_t	ppiwrite;
 static	d_read_t	ppiread;
 
 #define CDEV_MAJOR 82
-static struct cdevsw ppi_cdevsw = 
-	{ ppiopen,	ppiclose,	ppiread,	ppiwrite,	/* 82 */
-	  ppiioctl,	nullstop,	nullreset,	nodevtotty,
-	  seltrue,	nommap,		nostrat,	"ppi",	NULL,	-1 };
+static struct cdevsw ppi_cdevsw = {
+	/* open */	ppiopen,
+	/* close */	ppiclose,
+	/* read */	ppiread,
+	/* write */	ppiwrite,
+	/* ioctl */	ppiioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"ppi",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 #ifdef PERIPH_1284
 
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 6f80fb040ace6..8fc552867e98a 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: pps.c,v 1.16 1999/04/25 08:58:10 phk Exp $
+ * $Id: pps.c,v 1.17 1999/05/06 22:03:14 peter Exp $
  *
  * This driver implements a draft-mogul-pps-api-02.txt PPS source.
  *
@@ -60,11 +60,27 @@ static	d_close_t	ppsclose;
 static	d_ioctl_t	ppsioctl;
 
 #define CDEV_MAJOR 89
-static struct cdevsw pps_cdevsw = 
-	{ ppsopen,	ppsclose,	noread,		nowrite,
-	  ppsioctl,	nullstop,	nullreset,	nodevtotty,
-	  seltrue,	nommap,		nostrat,	PPS_NAME,
-	  NULL,		-1 };
+static struct cdevsw pps_cdevsw = {
+	/* open */	ppsopen,
+	/* close */	ppsclose,
+	/* read */	noread,
+	/* write */	nowrite,
+	/* ioctl */	ppsioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	nodevtotty,
+	/* poll */	nopoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	PPS_NAME,
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	0,
+	/* maxio */	0,
+	/* bmaj */	-1
+};
 
 
 static struct ppb_device *