svn commit: r276214 - in head: . include lib share/man/man4 share/mk sys/conf sys/dev/ieee488 tools/build/mk tools/build/options

Poul-Henning Kamp phk at FreeBSD.org
Thu Dec 25 20:15:16 UTC 2014 

Author: phk
Date: Thu Dec 25 20:15:13 2014
New Revision: 276214
URL: https://svnweb.freebsd.org/changeset/base/276214

Log:
  Deorbit the IEEE-488/GPIB support.

Deleted:
  head/share/man/man4/gpib.4
  head/share/man/man4/pcii.4
  head/share/man/man4/tnt4882.4
  head/sys/dev/ieee488/ibfoo.c
  head/sys/dev/ieee488/ibfoo_int.h
  head/sys/dev/ieee488/pcii.c
  head/sys/dev/ieee488/tnt4882.c
  head/sys/dev/ieee488/tnt4882.h
  head/sys/dev/ieee488/ugpib.h
  head/sys/dev/ieee488/upd7210.c
  head/sys/dev/ieee488/upd7210.h
  head/tools/build/options/WITHOUT_GPIB
Modified:
  head/ObsoleteFiles.inc
  head/include/Makefile
  head/lib/Makefile
  head/share/man/man4/Makefile
  head/share/mk/src.opts.mk
  head/sys/conf/NOTES
  head/sys/conf/files
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Dec 25 19:22:02 2014	(r276213)
+++ head/ObsoleteFiles.inc	Thu Dec 25 20:15:13 2014	(r276214)
@@ -38,6 +38,29 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20141226: Remove gpib/ieee488
+OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
+OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
+OLD_FILES+=usr/include/dev/ieee488/ugpib.h
+OLD_FILES+=usr/include/dev/ieee488/upd7210.h
+OLD_DIRS+=usr/include/dev/ieee488
+OLD_FILES+=usr/include/gpib/gpib.h
+OLD_DIRS+=usr/include/gpib
+OLD_FILES+=usr/lib/libgpib.a
+OLD_FILES+=usr/lib/libgpib_p.a
+OLD_FILES+=usr/lib/libgpib.so
+OLD_LIBS+=usr/lib/libgpib.so.3
+OLD_FILES+=usr/lib/libgpib_p.a
+OLD_FILES+=share/man/man4/pcii.4.gz
+OLD_FILES+=share/man/man4/gpib.4.gz
+OLD_FILES+=share/man/man4/tnt4882.4.gz
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_FILES+=usr/lib32/libgpib.a
+OLD_FILES+=usr/lib32/libgpib_p.a
+OLD_FILES+=usr/lib32/libgpib.so
+OLD_LIBS+=usr/lib32/libgpib.so.3
+.endif
+
 # 20141224: libxo moved to /lib
 OLD_LIBS+=usr/lib/libxo.so.0
 # 20141223: remove in6_gif.h, in_gif.h and if_stf.h

Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile	Thu Dec 25 19:22:02 2014	(r276213)
+++ head/include/Makefile	Thu Dec 25 20:15:13 2014	(r276214)
@@ -42,7 +42,7 @@ LDIRS=	bsm cam geom net net80211 netgrap
 LSUBDIRS=	cam/ata cam/scsi \
 	dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \
 	dev/hwpmc \
-	dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \
+	dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/nvme \
 	dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \
 	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/cuse \
@@ -63,10 +63,6 @@ LSUBSUBDIRS=	dev/mpt/mpilib
 _dev_powermac_nvram=	dev/powermac_nvram
 .endif
 
-.if ${MK_GPIB} != "no"
-_dev_ieee488=	dev/ieee488
-.endif
-
 .if ${MK_GSSAPI} != "no"
 SUBDIR+=	gssapi
 INCS+=		gssapi.h

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Thu Dec 25 19:22:02 2014	(r276213)
+++ head/lib/Makefile	Thu Dec 25 20:15:13 2014	(r276214)
@@ -52,7 +52,6 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libfetch \
 	libfigpar \
 	libgeom \
-	${_libgpib} \
 	libgpio \
 	${_libgssapi} \
 	${_librpcsec_gss} \
@@ -195,10 +194,6 @@ _cuse=		libcuse
 _libelftc=	libelftc
 .endif
 
-.if ${MK_GPIB} != "no"
-_libgpib=	libgpib
-.endif
-
 .if ${MK_GSSAPI} != "no"
 _libgssapi=	libgssapi
 _librpcsec_gss=	librpcsec_gss

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile	Thu Dec 25 19:22:02 2014	(r276213)
+++ head/share/man/man4/Makefile	Thu Dec 25 20:15:13 2014	(r276214)
@@ -156,7 +156,6 @@ MAN=	aac.4 \
 	geom_uncompress.4 \
 	geom_uzip.4 \
 	gif.4 \
-	gpib.4 \
 	gpio.4 \
 	gpioiic.4 \
 	gpioled.4 \
@@ -372,7 +371,6 @@ MAN=	aac.4 \
 	pci.4 \
 	pcib.4 \
 	pcic.4 \
-	pcii.4 \
 	pcm.4 \
 	pcn.4 \
 	${_pf.4} \
@@ -495,7 +493,6 @@ MAN=	aac.4 \
 	ti.4 \
 	timecounters.4 \
 	tl.4 \
-	tnt4882.4 \
 	${_tpm.4} \
 	trm.4 \
 	tty.4 \

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Thu Dec 25 19:22:02 2014	(r276213)
+++ head/share/mk/src.opts.mk	Thu Dec 25 20:15:13 2014	(r276214)
@@ -85,7 +85,6 @@ __DEFAULT_YES_OPTIONS = \
     GDB \
     GNU \
     GNU_GREP_COMPAT \
-    GPIB \
     GPIO \
     GPL_DTC \
     GROFF \

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Thu Dec 25 19:22:02 2014	(r276213)
+++ head/sys/conf/NOTES	Thu Dec 25 20:15:13 2014	(r276214)
@@ -2354,19 +2354,6 @@ options		SND_PCM_64
 options		SND_OLDSTEREO
 
 #
-# IEEE-488 hardware:
-# pcii:		PCIIA cards (uPD7210 based isa cards)
-# tnt4882:	National Instruments PCI-GPIB card.
-
-device	pcii
-hint.pcii.0.at="isa"
-hint.pcii.0.port="0x2e1"
-hint.pcii.0.irq="5"
-hint.pcii.0.drq="1"
-
-device	tnt4882
-
-#
 # Miscellaneous hardware:
 #
 # scd: Sony CD-ROM using proprietary (non-ATAPI) interface

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Thu Dec 25 19:22:02 2014	(r276213)
+++ head/sys/conf/files	Thu Dec 25 20:15:13 2014	(r276214)
@@ -1448,10 +1448,6 @@ dev/ida/ida_eisa.c		optional ida eisa
 dev/ida/ida_pci.c		optional ida pci
 dev/ie/if_ie.c			optional ie isa nowerror
 dev/ie/if_ie_isa.c		optional ie isa
-dev/ieee488/ibfoo.c		optional pcii | tnt4882
-dev/ieee488/pcii.c		optional pcii
-dev/ieee488/tnt4882.c		optional tnt4882
-dev/ieee488/upd7210.c		optional pcii | tnt4882
 dev/iicbus/ad7418.c		optional ad7418
 dev/iicbus/ds133x.c		optional ds133x
 dev/iicbus/ds1374.c		optional ds1374

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Dec 25 19:22:02 2014	(r276213)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Dec 25 20:15:13 2014	(r276214)
@@ -1331,26 +1331,6 @@ OLD_FILES+=usr/share/man/man1/gdbserver.
 OLD_FILES+=usr/share/man/man1/kgdb.1.gz
 .endif
 
-.if ${MK_GPIB} == no
-OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
-OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
-OLD_FILES+=usr/include/dev/ieee488/ugpib.h
-OLD_FILES+=usr/include/dev/ieee488/upd7210.h
-OLD_DIRS+=usr/include/dev/ieee488
-OLD_FILES+=usr/include/gpib/gpib.h
-OLD_DIRS+=usr/include/gpib
-OLD_FILES+=usr/lib/libgpib.a
-OLD_FILES+=usr/lib/libgpib.so
-OLD_LIBS+=usr/lib/libgpib.so.3
-OLD_FILES+=usr/lib/libgpib_p.a
-.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
-OLD_FILES+=usr/lib32/libgpib.a
-OLD_FILES+=usr/lib32/libgpib.so
-OLD_LIBS+=usr/lib32/libgpib.so.3
-OLD_FILES+=usr/lib32/libgpib_p.a
-.endif
-.endif
-
 .if ${MK_GPIO} == no
 OLD_FILES+=usr/sbin/gpioctl
 OLD_FILES+=usr/share/man/man8/gpioctl.8.gz
@@ -3703,7 +3683,6 @@ OLD_FILES+=usr/lib/libformw_p.a
 OLD_FILES+=usr/lib/libgcc_p.a
 OLD_FILES+=usr/lib/libgeom_p.a
 OLD_FILES+=usr/lib/libgnuregex_p.a
-OLD_FILES+=usr/lib/libgpib_p.a
 OLD_FILES+=usr/lib/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/libhdb_p.a

More information about the svn-src-head mailing list