From baa16e912c72001290384dd1a7c767a44675b77a Mon Sep 17 00:00:00 2001
From: leo <leo@NetBSD.org>
Date: Wed, 30 Jul 1997 15:43:23 +0000
Subject: [PATCH] Rename lpt to lp on some places to avoid botches between
 files.isa and files.atari.

---
 sys/arch/atari/conf/ATARITT     |  4 ++--
 sys/arch/atari/conf/BOOTX       |  4 ++--
 sys/arch/atari/conf/FALCON      |  4 ++--
 sys/arch/atari/conf/GENERIC     |  4 ++--
 sys/arch/atari/conf/HADES       |  4 ++--
 sys/arch/atari/conf/files.atari |  8 +++----
 sys/arch/atari/dev/lpt.c        | 40 ++++++++++++++++-----------------
 7 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/sys/arch/atari/conf/ATARITT b/sys/arch/atari/conf/ATARITT
index ae06e104f042..658f7a2695cc 100644
--- a/sys/arch/atari/conf/ATARITT
+++ b/sys/arch/atari/conf/ATARITT
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ATARITT,v 1.22 1997/05/07 00:23:43 lukem Exp $
+#	$NetBSD: ATARITT,v 1.23 1997/07/30 15:43:23 leo Exp $
 #
 # ATARI-TT
 #
@@ -114,4 +114,4 @@ ite*	at grfcc1		# second tty
 grfcc2	at grfbus0		# third graphics driver
 ite*	at grfcc2		# third tty
 nvr0	at mainbus0		# nvram driver
-lpt0	at mainbus0		# centronics printer
+lp0	at mainbus0		# centronics printer
diff --git a/sys/arch/atari/conf/BOOTX b/sys/arch/atari/conf/BOOTX
index 9cc6e42f0c60..b0f543cee618 100644
--- a/sys/arch/atari/conf/BOOTX
+++ b/sys/arch/atari/conf/BOOTX
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BOOTX,v 1.15 1997/05/07 00:23:45 lukem Exp $
+#	$NetBSD: BOOTX,v 1.16 1997/07/30 15:43:24 leo Exp $
 #
 # BOOTX
 #
@@ -108,6 +108,6 @@ ite*	at grfcc1		# second tty
 grfcc2	at grfbus0		# third graphics driver
 ite*	at grfcc2		# third tty
 nvr0	at mainbus0		# nvram driver
-lpt0	at mainbus0		# centronics printer
+lp0	at mainbus0		# centronics printer
 idec0	at mainbus0		# IDE bus
 ide*	at idec? drive ?	# ... and drives
diff --git a/sys/arch/atari/conf/FALCON b/sys/arch/atari/conf/FALCON
index f36c8f31185f..71c3065e22b1 100644
--- a/sys/arch/atari/conf/FALCON
+++ b/sys/arch/atari/conf/FALCON
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: FALCON,v 1.21 1997/05/07 00:23:46 lukem Exp $
+#	$NetBSD: FALCON,v 1.22 1997/07/30 15:43:25 leo Exp $
 #
 # ATARI-FALCON
 #
@@ -102,6 +102,6 @@ zs0	at mainbus0		# Serial support through 8530
 grfcc1	at grfbus0		# second graphics driver
 ite*	at grfcc1		# second tty
 nvr0	at mainbus0		# nvram driver
-lpt0	at mainbus0		# centronics printer
+lp0	at mainbus0		# centronics printer
 idec0	at mainbus0		# IDE bus
 ide*	at idec? drive ?	# ... and drives
diff --git a/sys/arch/atari/conf/GENERIC b/sys/arch/atari/conf/GENERIC
index 4539f32266c3..8dba85fe1196 100644
--- a/sys/arch/atari/conf/GENERIC
+++ b/sys/arch/atari/conf/GENERIC
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC,v 1.32 1997/06/02 20:40:57 leo Exp $
+#	$NetBSD: GENERIC,v 1.33 1997/07/30 15:43:26 leo Exp $
 #
 # Generic atari
 #
@@ -135,7 +135,7 @@ fd1	at fdc0 unit 1		# external floppy drive
 ser0	at mainbus0		# Serial support through 68901 (modem1)
 zs0	at mainbus0		# Serial support through 8530
 nvr0	at mainbus0		# nvram driver
-lpt0	at mainbus0		# centronics printer
+lp0	at mainbus0		# centronics printer
 
 ch*	at scsibus? target ? lun ?	# SCSI changer
 ss*	at scsibus? target ? lun ?	# SCSI scanner
diff --git a/sys/arch/atari/conf/HADES b/sys/arch/atari/conf/HADES
index 03c2f69cd33e..a15fbac49bf5 100644
--- a/sys/arch/atari/conf/HADES
+++ b/sys/arch/atari/conf/HADES
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: HADES,v 1.9 1997/05/07 00:23:47 lukem Exp $
+#	$NetBSD: HADES,v 1.10 1997/07/30 15:43:27 leo Exp $
 #
 # Medusa-Hades
 #
@@ -100,7 +100,7 @@ hdfd0	at fdc0 unit 0		# builtin Hades-type floppy drive
 hdfd1	at fdc0 unit 1		# 2nd Hades-type floppy drive
 zs0	at mainbus0		# Serial support through 8530
 nvr0	at mainbus0		# nvram driver
-lpt0	at mainbus0		# centronics printer
+lp0	at mainbus0		# centronics printer
 grfet0	at grfbus0		# ET4000 consoles
 ite*	at grfet0
 grfet1	at grfbus0
diff --git a/sys/arch/atari/conf/files.atari b/sys/arch/atari/conf/files.atari
index c65975cfcb83..56d3a3d83065 100644
--- a/sys/arch/atari/conf/files.atari
+++ b/sys/arch/atari/conf/files.atari
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: files.atari,v 1.40 1997/06/04 14:34:02 leo Exp $
+#	$NetBSD: files.atari,v 1.41 1997/07/30 15:43:28 leo Exp $
 
 maxpartitions 16
 
@@ -35,9 +35,9 @@ attach	zs at mainbus
 file	arch/atari/dev/zs.c		zs needs-count
 
 # printer
-device lpt
-attach	lpt at mainbus
-file	arch/atari/dev/lpt.c		lpt needs-flag
+device lp
+attach	lp at mainbus
+file	arch/atari/dev/lpt.c		lp needs-flag
 
 # memory disk
 file	arch/atari/dev/md_root.c	memory_disk_hooks
diff --git a/sys/arch/atari/dev/lpt.c b/sys/arch/atari/dev/lpt.c
index f911632613b4..7182059c0e67 100644
--- a/sys/arch/atari/dev/lpt.c
+++ b/sys/arch/atari/dev/lpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt.c,v 1.10 1996/12/26 23:25:15 leo Exp $ */
+/*	$NetBSD: lpt.c,v 1.11 1997/07/30 15:43:37 leo Exp $ */
 
 /*
  * Copyright (c) 1996 Leo Weppelman
@@ -107,10 +107,10 @@ struct lpt_softc {
 #define	NOT_READY()	(MFP->mf_gpip & IO_PBSY)
 
 /* {b,c}devsw[] function prototypes */
-dev_type_open(lptopen);
-dev_type_close(lptclose);
-dev_type_write(lptwrite);
-dev_type_ioctl(lptioctl);
+dev_type_open(lpopen);
+dev_type_close(lpclose);
+dev_type_write(lpwrite);
+dev_type_ioctl(lpioctl);
 
 static void lptwakeup __P((void *arg));
 static int pushbytes __P((struct lpt_softc *));
@@ -122,20 +122,20 @@ int lpthwintr __P((struct lpt_softc *, int));
 /*
  * Autoconfig stuff
  */
-static void lptattach __P((struct device *, struct device *, void *));
-static int  lptmatch __P((struct device *, struct cfdata *, void *));
+static void lpattach __P((struct device *, struct device *, void *));
+static int  lpmatch __P((struct device *, struct cfdata *, void *));
 
-struct cfattach lpt_ca = {
-	sizeof(struct lpt_softc), lptmatch, lptattach
+struct cfattach lp_ca = {
+	sizeof(struct lpt_softc), lpmatch, lpattach
 };
 
-struct cfdriver lpt_cd = {
+struct cfdriver lp_cd = {
 	NULL, "lpt", DV_DULL, NULL, 0
 };
 
 /*ARGSUSED*/
 static	int
-lptmatch(pdp, cfp, auxp)
+lpmatch(pdp, cfp, auxp)
 struct	device	*pdp;
 struct	cfdata	*cfp;
 void		*auxp;
@@ -147,7 +147,7 @@ void		*auxp;
 
 /*ARGSUSED*/
 static void
-lptattach(pdp, dp, auxp)
+lpattach(pdp, dp, auxp)
 struct	device *pdp, *dp;
 void	*auxp;
 {
@@ -166,7 +166,7 @@ void	*auxp;
  * Reset the printer, then wait until it's selected and not busy.
  */
 int
-lptopen(dev, flag, mode, p)
+lpopen(dev, flag, mode, p)
 	dev_t		dev;
 	int		flag, mode;
 	struct proc	*p;
@@ -178,9 +178,9 @@ lptopen(dev, flag, mode, p)
 	int			spin;
 	int			sps;
 
-	if (unit >= lpt_cd.cd_ndevs)
+	if (unit >= lp_cd.cd_ndevs)
 		return ENXIO;
-	sc = lpt_cd.cd_devs[unit];
+	sc = lp_cd.cd_devs[unit];
 	if (!sc)
 		return ENXIO;
 
@@ -244,14 +244,14 @@ lptwakeup(arg)
  * Close the device, and free the local line buffer.
  */
 int
-lptclose(dev, flag, mode, p)
+lpclose(dev, flag, mode, p)
 	dev_t		dev;
 	int		flag;
 	int		mode;
 	struct proc	*p;
 {
 	int		 unit = LPTUNIT(dev);
-	struct lpt_softc *sc = lpt_cd.cd_devs[unit];
+	struct lpt_softc *sc = lp_cd.cd_devs[unit];
 	int		 sps;
 
 	if (sc->sc_count)
@@ -333,12 +333,12 @@ pushbytes(sc)
  * chars moved to the output queue.
  */
 int
-lptwrite(dev, uio, flags)
+lpwrite(dev, uio, flags)
 	dev_t		dev;
 	struct uio	*uio;
 	int		flags;
 {
-	struct lpt_softc *sc = lpt_cd.cd_devs[LPTUNIT(dev)];
+	struct lpt_softc *sc = lp_cd.cd_devs[LPTUNIT(dev)];
 	size_t n;
 	int error = 0;
 
@@ -413,7 +413,7 @@ int		  sr;
 }
 
 int
-lptioctl(dev, cmd, data, flag, p)
+lpioctl(dev, cmd, data, flag, p)
 	dev_t		dev;
 	u_long		cmd;
 	caddr_t		data;