Date: 09 Feb 1999 01:41:37 +0100 From: Dag-Erling Smorgrav <des@flood.ping.uio.no> To: hackers@FreeBSD.ORG Cc: Nicolas Souchu <nsouch@teaser.fr>, Mike Smith <mike@smith.net.au>, Bill Fenner <fenner@parc.xerox.com>, wpaul@FreeBSD.ORG, jkh@FreeBSD.ORG Subject: Re: Regarding tcpdump and plip Message-ID: <xzpww1scsse.fsf@flood.ping.uio.no> In-Reply-To: Dag-Erling Smorgrav's message of "08 Feb 1999 22:59:57 %2B0100" References: <xzp90e9brl4.fsf@flood.ping.uio.no> <199902080148.RAA09054@dingo.cdrom.com> <19990208195855.56187@breizh.prism.uvsq.fr> <xzpsocg63t5.fsf@flood.ping.uio.no> <19990208222829.53422@breizh.prism.uvsq.fr> <xzpk8xs5zfm.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
Dag-Erling Smorgrav <des@flood.ping.uio.no> writes:
> Don't worry, I've patched GENERIC, LINT, files.i386 and the PicoBSD
> kernels, and removed lpt.c and lpt.4. I'll still have to track down
> references to the driver in the documentation though.
Hmm, there were quite a few. I'd forgotten a handful of man pages, the
userconfig device list, and the man4.i386 Makefile. I have a LINT
build running to check that I didn't break anything.
I didn't touch any of the PC98 stuff; I'll leave that up to Kato.
Patches are attached. If noone objects loudly, I'll commit them and
cvs rm src/sys/i386/isa/lpt.c and src/share/man4/man4.i386/lpt.4
tomorrow. I'd also like to remove src/sys/i386/isa/lptreg.h, but it's
referenced by the rdp driver (which should be ported to ppbus by Joerg
or someone else who has an RTL8002 or RTL8012 handy for testing)
DES
--
Dag-Erling Smorgrav - des@flood.ping.uio.no
Index: src/release/picobsd/isp/conf/PICOBSD
===================================================================
RCS file: /home/ncvs/src/release/picobsd/isp/conf/PICOBSD,v
retrieving revision 1.8
diff -u -r1.8 PICOBSD
--- PICOBSD 1999/01/18 10:17:31 1.8
+++ PICOBSD 1999/02/08 04:21:10
@@ -104,7 +104,11 @@
device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000
device cy1 at isa? tty irq 11 iomem 0xd6000 iosiz 0x2000
-device lpt0 at isa? port? tty irq 7
+device ppc0 at isa? port? net irq 7
+controller ppbus0
+device nlpt0 at ppbus?
+device plip0 at ppbus?
+device ppi0 at ppbus?
# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
Index: src/release/picobsd/net/conf/PICOBSD
===================================================================
RCS file: /home/ncvs/src/release/picobsd/net/conf/PICOBSD,v
retrieving revision 1.8
diff -u -r1.8 PICOBSD
--- PICOBSD 1999/01/19 23:12:27 1.8
+++ PICOBSD 1999/02/08 04:23:49
@@ -68,7 +68,11 @@
device sio2 at isa? disable port "IO_COM3" tty irq 5
device sio3 at isa? disable port "IO_COM4" tty irq 9
-device lpt0 at isa? port? tty irq 7
+device ppc0 at isa? port? net irq 7
+controller ppbus0
+device nlpt0 at ppbus?
+device plip0 at ppbus?
+device ppi0 at ppbus?
# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
Index: src/release/picobsd/router/conf/PICOBSD
===================================================================
RCS file: /home/ncvs/src/release/picobsd/router/conf/PICOBSD,v
retrieving revision 1.11
diff -u -r1.11 PICOBSD
--- PICOBSD 1999/01/18 10:17:35 1.11
+++ PICOBSD 1999/02/08 23:55:28
@@ -70,7 +70,11 @@
device sio2 at isa? disable port "IO_COM3" tty irq 5
device sio3 at isa? disable port "IO_COM4" tty irq 9
-#device lpt0 at isa? port? tty irq 7
+#device ppc0 at isa? port? net irq 7
+#controller ppbus0
+#device nlpt0 at ppbus?
+#device plip0 at ppbus?
+#device ppi0 at ppbus?
# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
Index: src/share/man/man4/man4.i386/Makefile
===================================================================
RCS file: /home/ncvs/src/share/man/man4/man4.i386/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- Makefile 1999/02/07 05:40:13 1.96
+++ Makefile 1999/02/08 23:44:01
@@ -3,7 +3,7 @@
MAN4= adv.4 adw.4 aha.4 ahb.4 ahc.4 aic.4 apm.4 ar.4 asc.4 atkbd.4 \
atkbdc.4 ax.4 bktr.4 bt.4 cs.4 cx.4 cy.4 de.4 \
dgb.4 dpt.4 ed.4 el.4 en.4 ep.4 ex.4 fdc.4 fe.4 fxp.4 gsc.4 ie.4 \
- io.4 joy.4 keyboard.4 labpc.4 le.4 lnc.4 lp.4 lpt.4 matcd.4 mcd.4 \
+ io.4 joy.4 keyboard.4 labpc.4 le.4 lnc.4 lp.4 matcd.4 mcd.4 \
mem.4 meteor.4 mouse.4 mse.4 mtio.4 mx.4 ncr.4 npx.4 \
pcf.4 pcm.4 pcvt.4 perfmon.4 pn.4 pnp.4 ppc.4 psm.4 \
rdp.4 rl.4 sb.4 scd.4 screen.4 si.4 sio.4 \
@@ -46,8 +46,7 @@
MLINKS+= labpc.4 ../labpc.4
MLINKS+= le.4 ../le.4
MLINKS+= lnc.4 ../lnc.4
-MLINKS+= lp.4 ../lp.4
-MLINKS+= lpt.4 ../lpt.4
+MLINKS+= lp.4 ../lp.4 lp.4 plip.4 lp.4 ../plip.4
MLINKS+= matcd.4 ../matcd.4
MLINKS+= mcd.4 ../mcd.4
MLINKS+= mem.4 kmem.4 mem.4 ../mem.4 mem.4 ../kmem.4
Index: src/share/man/man4/man4.i386/lp.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/man4.i386/lp.4,v
retrieving revision 1.7
diff -u -r1.7 lp.4
--- lp.4 1998/10/22 14:12:55 1.7
+++ lp.4 1999/02/08 23:58:35
@@ -43,7 +43,7 @@
.Nm ifconfig lp0
.Ar myaddress hisaddress
.Op Fl link0
-.Cd "device lpt0 at isa? port? tty irq 7"
+.Cd "device plip0 at ppbus?"
.Sh DESCRIPTION
The
.Nm
@@ -53,29 +53,21 @@
input: hence there is no requirement for special bidirectional hardware
and any standard AT-compatible printer port with working interrupts may be used.
.Pp
-The
-.Nm
-driver is implemented as an integral part of the
-.Nm lpt
-driver, and will automatically be present in a kernel configured with
-Internet support and at least one
-.Nm lpt
-device. During the boot process, for each
-.Nm lpt
-printer device which is probed and has an interrupt assigned, a corresponding
+During the boot process, for each
+.Nm ppc
+device which is probed and has an interrupt assigned, a corresponding
.Nm
network device is created. Available devices are announced with a message
such as:
.Dl lp0: TCP/IP capable interface
.Pp
-Initially, the
-.Nm lpt
-device is active for printing and the network interface is inactive; however,
-once the corresponding
+Configuring an
.Nm
-device has been configured 'up' with
+device with
.Xr ifconfig 8
-printing is disabled until the network interface is configured 'down'.
+causes the corresponding
+.Nm ppc
+device to be reserved for PLIP until the network interface is configured 'down'.
.Pp
The communication protocol is selected by the
.Cm link0
@@ -219,7 +211,8 @@
specially (although the data lines are restored to the zero, idle
state to avoid spuriously indicating the start of the next packet).
.Sh SEE ALSO
-.Xr lpt 4 ,
+.Xr ppbus 4 ,
+.Xr ppc 4 ,
.Xr ifconfig 8 .
.Sh BUGS
Busy-waiting loops are used while handshaking bytes, (and worse still when
Index: src/share/man/man4/man4.i386/rdp.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/man4.i386/rdp.4,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rdp.4
--- rdp.4 1998/12/21 18:01:15 1.1.1.1
+++ rdp.4 1999/02/08 23:39:12
@@ -77,7 +77,7 @@
might help in diagnosing the reason. Since the RTL 8002 requires
the availability of a working interrupt for the printer adapter (unlike
the
-.Xr lpt 4
+.Xr ppc 4
driver), the
.Nm
driver fails to attach if the ethernet adapter cannot assert an
@@ -90,8 +90,8 @@
driver internally sets a flag so it gets probed very early. This way,
it is possible to configure both, an
.Nm
-driver as well as an
-.Xr lpt 4
+driver as well as a
+.Xr ppc 4
driver into the same kernel. If no RTL 8002 hardware is present, probing
will eventually detect the printer driver.
.Sh DIAGNOSTICS
@@ -121,15 +121,15 @@
hardware is likely to be wedged, and is being reset.
.Pp
.Sh SEE ALSO
-.Xr lpt 4 ,
+.Xr ppc 4 ,
.Xr ifconfig 8
.Sh AUTHORS
This driver was written by
.ie t J\(:org Wunsch,
.el Joerg Wunsch,
based on RealTek's packet driver for the RTL 8002, as well as on some
-description of the successor chip, RTL 8012, RealTek was gratefully
-providing.
+description of the successor chip, RTL 8012, gracefully provided by
+RealTek.
.Sh BUGS
There are certainly many of them.
.Pp
Index: src/sys/i386/conf/GENERIC
===================================================================
RCS file: /home/ncvs/src/sys/i386/conf/GENERIC,v
retrieving revision 1.146
diff -u -r1.146 GENERIC
--- GENERIC 1999/02/04 22:34:23 1.146
+++ GENERIC 1999/02/09 00:00:15
@@ -145,7 +145,13 @@
device sio2 at isa? disable port "IO_COM3" tty irq 5
device sio3 at isa? disable port "IO_COM4" tty irq 9
-device lpt0 at isa? port? tty irq 7
+# Parallell port
+device ppc0 at isa? port? net irq 7
+constroller ppbus0
+device nlpt0 at ppbus?
+device plip0 at ppbus?
+device ppi0 at ppbus?
+#controller vpo0 at ppbus?
# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
Index: src/sys/i386/conf/LINT
===================================================================
RCS file: /home/ncvs/src/sys/i386/conf/LINT,v
retrieving revision 1.550
diff -u -r1.550 LINT
--- LINT 1999/02/07 20:33:05 1.550
+++ LINT 1999/02/08 23:45:12
@@ -1113,19 +1113,11 @@
disk fd1 at fdc0 drive 1
#
-# Other standard PC hardware: `lpt', `mse', `sio', etc.
+# Other standard PC hardware: `mse', `sio', etc.
#
-# lpt: printer port
-# lpt specials:
-# The port may be specified as ?. This will cause the
-# driver to scan the BIOS port list.
-# The irq clause may be omitted. This will force the port
-# into polling mode.
# mse: Logitech and ATI InPort bus mouse ports
# sio: serial ports (see sio(4))
-device lpt0 at isa? port? tty irq 7
-device lpt1 at isa? port "IO_LPT3" tty irq 5
device mse0 at isa? port 0x23c tty irq 5
device sio0 at isa? port "IO_COM1" tty flags 0x10 irq 4
@@ -1813,7 +1805,7 @@
# vpo Iomega Zip Drive
# Requires SCSI disk support ('scbus' and 'da'), best
# performance is achieved with ports in EPP 1.9 mode.
-# nlpt Parallel Printer, use _instead_ of lpt0
+# nlpt Parallel Printer
# plip Parallel network interface
# ppi General-purpose I/O ("Geek Port")
# pps Pulse per second Timing Interface
Index: src/sys/i386/conf/files.i386
===================================================================
RCS file: /home/ncvs/src/sys/i386/conf/files.i386,v
retrieving revision 1.220
diff -u -r1.220 files.i386
--- files.i386 1999/01/20 03:29:52 1.220
+++ files.i386 1999/02/08 04:10:12
@@ -146,7 +146,6 @@
i386/isa/istallion.c optional stli device-driver
i386/isa/joy.c optional joy device-driver
i386/isa/loran.c optional loran device-driver
-i386/isa/lpt.c optional lpt device-driver
i386/isa/labpc.c optional labpc device-driver
i386/isa/mcd.c optional mcd device-driver
i386/isa/mse.c optional mse device-driver
Index: src/sys/i386/i386/userconfig.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/i386/userconfig.c,v
retrieving revision 1.129
diff -u -r1.129 userconfig.c
--- userconfig.c 1999/02/04 10:36:57 1.129
+++ userconfig.c 1999/02/08 23:36:52
@@ -391,6 +391,7 @@
{"vr", "VIA Rhine/Rhine II ethernet adapter", FLG_FIXED, CLS_NETWORK},
{"wb", "Winbond W89C840F ethernet adapter", FLG_FIXED, CLS_NETWORK},
{"xl", "3COM 3C90x PCI ethernet adapter", FLG_FIXED, CLS_NETWORK},
+{"rdp", "RealTek RTL8002 Pocket Ethernet", 0, CLS_NETWORK},
{"sio", "8250/16450/16550 Serial port", 0, CLS_COMMS},
{"cx", "Cronyx/Sigma multiport sync/async adapter",0, CLS_COMMS},
@@ -401,7 +402,6 @@
{"si", "Specialix SI/XIO async adapter", 0, CLS_COMMS},
{"stl", "Stallion EasyIO/Easy Connection 8/32 async adapter",0, CLS_COMMS},
{"stli", "Stallion intelligent async adapter" ,0, CLS_COMMS},
-{"lpt", "Parallel printer port", 0, CLS_COMMS},
{"ppc", "Parallel Port chipset", 0, CLS_COMMS},
{"gp", "National Instruments AT-GPIB/TNT driver", 0, CLS_COMMS},
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpww1scsse.fsf>