Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Feb 2020 04:53:27 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r357394 - in head: . share/man/man4 share/man/man9 sys/conf sys/dev/ppbus sys/modules sys/modules/vpo
Message-ID:  <202002020453.0124rRIo052363@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Sun Feb  2 04:53:27 2020
New Revision: 357394
URL: https://svnweb.freebsd.org/changeset/base/357394

Log:
  Remove vpo.4
  
  The Parallel Port SCSI adapter was interesting for 100MB ZIP drives, but is no
  longer used or maintained. Remove it from the tree.
  
  The Parallel Port microsequencer (microseq.9) is now mostly unused in the tree,
  but remains. PPI still refrences it, but doesn't use its full functionality.
  
  Relnotes: Yes
  Reviewed by: rgrimes@, Ihor Antonov
  Discussed on: arch@
  Differential Revision:  https://reviews.freebsd.org/D23389

Deleted:
  head/share/man/man4/vpo.4
  head/sys/dev/ppbus/immio.c
  head/sys/dev/ppbus/vpo.c
  head/sys/dev/ppbus/vpoio.c
  head/sys/dev/ppbus/vpoio.h
  head/sys/modules/vpo/Makefile
Modified:
  head/ObsoleteFiles.inc
  head/share/man/man4/Makefile
  head/share/man/man4/ppbus.4
  head/share/man/man9/microseq.9
  head/sys/conf/NOTES
  head/sys/conf/files
  head/sys/conf/options
  head/sys/modules/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Sun Feb  2 04:52:28 2020	(r357393)
+++ head/ObsoleteFiles.inc	Sun Feb  2 04:53:27 2020	(r357394)
@@ -36,6 +36,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20200127: vpo removed
+OLD_FILES+=usr/share/man/man4/imm.4.gz
+OLD_FILES+=usr/share/man/man4/vpo.4.gz
+
 # 20200104: gcc libssp removed
 OLD_FILES+=usr/include/ssp/ssp.h
 OLD_FILES+=usr/include/ssp/stdio.h

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile	Sun Feb  2 04:52:28 2020	(r357393)
+++ head/share/man/man4/Makefile	Sun Feb  2 04:53:27 2020	(r357394)
@@ -553,7 +553,6 @@ MAN=	aac.4 \
 	${_vmd.4} \
 	${_vmm.4} \
 	${_vmx.4} \
-	vpo.4 \
 	vr.4 \
 	vt.4 \
 	vte.4 \
@@ -740,7 +739,6 @@ MLINKS+=vge.4 if_vge.4
 MLINKS+=vlan.4 if_vlan.4
 MLINKS+=vxlan.4 if_vxlan.4
 MLINKS+=${_vmx.4} ${_if_vmx.4}
-MLINKS+=vpo.4 imm.4
 MLINKS+=vr.4 if_vr.4
 MLINKS+=vte.4 if_vte.4
 MLINKS+=${_vtnet.4} ${_if_vtnet.4}

Modified: head/share/man/man4/ppbus.4
==============================================================================
--- head/share/man/man4/ppbus.4	Sun Feb  2 04:52:28 2020	(r357393)
+++ head/share/man/man4/ppbus.4	Sun Feb  2 04:53:27 2020	(r357394)
@@ -33,8 +33,6 @@
 .Sh SYNOPSIS
 .Cd "device ppbus"
 .Pp
-.Cd "device vpo"
-.Pp
 .Cd "device lpt"
 .Cd "device plip"
 .Cd "device ppi"
@@ -66,8 +64,6 @@ and non-standard software:
 .Pp
 .Bl -column "Driver" -compact
 .It Em Driver Ta Em Description
-.It Sy vpo Ta "VPI0 parallel to Adaptec AIC-7110 SCSI controller driver" .
-It uses standard and non-standard parallel port accesses.
 .It Sy ppi Ta "Parallel port interface for general I/O"
 .It Sy pps Ta "Pulse per second Timing Interface"
 .It Sy lpbb Ta "Philips official parallel port I2C bit-banging interface"
@@ -336,22 +332,11 @@ operation (opcodes are described in
 .Xr microseq 9 ) .
 Standard I/O operations are implemented at ppbus level whereas basic I/O
 operations and microseq language are coded at adapter level for efficiency.
-.Pp
-As an example, the
-.Xr vpo 4
-driver uses microsequences to implement:
-.Bl -bullet -offset indent
-.It
-a modified version of the NIBBLE transfer mode
-.It
-various I/O sequences to initialize, select and allocate the peripheral
-.El
 .Sh SEE ALSO
 .Xr lpt 4 ,
 .Xr plip 4 ,
 .Xr ppc 4 ,
 .Xr ppi 4 ,
-.Xr vpo 4
 .Sh HISTORY
 The
 .Nm

Modified: head/share/man/man9/microseq.9
==============================================================================
--- head/share/man/man9/microseq.9	Sun Feb  2 04:52:28 2020	(r357393)
+++ head/share/man/man9/microseq.9	Sun Feb  2 04:53:27 2020	(r357394)
@@ -51,7 +51,7 @@ efficient code
 Before using microsequences, you are encouraged to look at
 .Xr ppc 4
 microsequencer implementation and an example of how using it in
-.Xr vpo 4 .
+.Xr ppi 4 .
 .Sh PPBUS register model
 .Ss Background
 The parallel port model chosen for ppbus is the PC parallel port model.
@@ -477,7 +477,7 @@ executed at ppbus layer.
 .Sh SEE ALSO
 .Xr ppbus 4 ,
 .Xr ppc 4 ,
-.Xr vpo 4
+.Xr ppi 4
 .Sh HISTORY
 The
 .Nm

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Sun Feb  2 04:52:28 2020	(r357393)
+++ head/sys/conf/NOTES	Sun Feb  2 04:53:27 2020	(r357394)
@@ -2358,9 +2358,6 @@ device		syr827		# Silergy Corp. DC/DC regulator
 # are automatically probed and attached when found.
 #
 # Supported devices:
-# vpo	Iomega Zip Drive
-#	Requires SCSI disk support ('scbus' and 'da'), best
-#	performance is achieved with ports in EPP 1.9 mode.
 # lpt	Parallel Printer
 # plip	Parallel network interface
 # ppi	General-purpose I/O ("Geek Port") + IEEE1284 I/O
@@ -2378,7 +2375,6 @@ options 	DEBUG_1284	# IEEE1284 signaling protocol debu
 options 	PERIPH_1284	# Makes your computer act as an IEEE1284
 				# compliant peripheral
 options 	DONTPROBE_1284	# Avoid boot detection of PnP parallel devices
-options 	VP0_DEBUG	# ZIP/ZIP+ debug
 options 	LPT_DEBUG	# Printer driver debug
 options 	PPC_DEBUG	# Parallel chipset level debug
 options 	PLIP_DEBUG	# Parallel network IP interface debug
@@ -2389,7 +2385,6 @@ device		ppc
 hint.ppc.0.at="isa"
 hint.ppc.0.irq="7"
 device		ppbus
-device		vpo
 device		lpt
 device		plip
 device		ppi

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Sun Feb  2 04:52:28 2020	(r357393)
+++ head/sys/conf/files	Sun Feb  2 04:53:27 2020	(r357394)
@@ -2672,7 +2672,6 @@ dev/pms/RefTisa/tisa/sassata/sata/host/ossasat.c	optio
 dev/pms/RefTisa/tisa/sassata/sata/host/sathw.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/ppbus/if_plip.c		optional plip
-dev/ppbus/immio.c		optional vpo
 dev/ppbus/lpbb.c		optional lpbb
 dev/ppbus/lpt.c			optional lpt
 dev/ppbus/pcfclock.c		optional pcfclock
@@ -2683,8 +2682,6 @@ dev/ppbus/ppbconf.c		optional ppbus
 dev/ppbus/ppbus_if.m		optional ppbus
 dev/ppbus/ppi.c			optional ppi
 dev/ppbus/pps.c			optional pps
-dev/ppbus/vpo.c			optional vpo
-dev/ppbus/vpoio.c		optional vpo
 dev/ppc/ppc.c			optional ppc
 dev/ppc/ppc_acpi.c		optional ppc acpi
 dev/ppc/ppc_isa.c		optional ppc isa

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Sun Feb  2 04:52:28 2020	(r357393)
+++ head/sys/conf/options	Sun Feb  2 04:53:27 2020	(r357394)
@@ -569,7 +569,6 @@ TI_JUMBO_HDRSPLIT	opt_ti.h
 # with 'make CC="cc -DDEBUG"'.
 CLUSTERDEBUG		opt_debug_cluster.h
 DEBUG_1284		opt_ppb_1284.h
-VP0_DEBUG		opt_vpo.h
 LPT_DEBUG		opt_lpt.h
 PLIP_DEBUG		opt_plip.h
 LOCKF_DEBUG		opt_debug_lockf.h

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Sun Feb  2 04:52:28 2020	(r357393)
+++ head/sys/modules/Makefile	Sun Feb  2 04:53:27 2020	(r357394)
@@ -372,7 +372,6 @@ SUBDIR=	\
 	${_vmd} \
 	${_vmm} \
 	${_vmware} \
-	${_vpo} \
 	vr \
 	vte \
 	${_wbwd} \
@@ -558,7 +557,6 @@ _hwpmc_mips74k=	hwpmc_mips74k
 	${MACHINE_CPUARCH} != "mips" && ${MACHINE_CPUARCH} != "powerpc" && \
 	${MACHINE_CPUARCH} != "riscv"
 _syscons=	syscons
-_vpo=		vpo
 .endif
 
 .if ${MACHINE_CPUARCH} != "mips"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002020453.0124rRIo052363>