Module Name: src
Committed By: maxv
Date: Wed Sep 19 13:58:27 UTC 2018
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile
src/sys/conf: files
src/sys/dev: DEVNAMES
src/sys/dev/isa: files.isa
src/usr.sbin/isdn: Makefile
Removed Files:
src/share/man/man4: daic.4
src/sys/dev/ic: daic.c daicreg.h daicvar.h
src/sys/dev/isa: daic_isa.c
src/usr.sbin/isdn/daicctl: Makefile daicctl.1 daicctl.h debug.c
dnload.c istat.c main.c xlog.c
Log Message:
Remove daic(4), it has never been functional.
ok martin@
To generate a diff of this commit:
cvs rdiff -u -r1.1187 -r1.1188 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.264 -r1.265 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1616 -r1.1617 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.666 -r1.667 src/share/man/man4/Makefile
cvs rdiff -u -r1.10 -r0 src/share/man/man4/daic.4
cvs rdiff -u -r1.1207 -r1.1208 src/sys/conf/files
cvs rdiff -u -r1.312 -r1.313 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.32 -r0 src/sys/dev/ic/daic.c
cvs rdiff -u -r1.6 -r0 src/sys/dev/ic/daicreg.h
cvs rdiff -u -r1.12 -r0 src/sys/dev/ic/daicvar.h
cvs rdiff -u -r1.20 -r0 src/sys/dev/isa/daic_isa.c
cvs rdiff -u -r1.169 -r1.170 src/sys/dev/isa/files.isa
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/isdn/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/usr.sbin/isdn/daicctl/Makefile
cvs rdiff -u -r1.11 -r0 src/usr.sbin/isdn/daicctl/daicctl.1
cvs rdiff -u -r1.8 -r0 src/usr.sbin/isdn/daicctl/daicctl.h \
src/usr.sbin/isdn/daicctl/dnload.c
cvs rdiff -u -r1.5 -r0 src/usr.sbin/isdn/daicctl/debug.c
cvs rdiff -u -r1.6 -r0 src/usr.sbin/isdn/daicctl/istat.c
cvs rdiff -u -r1.10 -r0 src/usr.sbin/isdn/daicctl/main.c
cvs rdiff -u -r1.7 -r0 src/usr.sbin/isdn/daicctl/xlog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1187 src/distrib/sets/lists/base/mi:1.1188
--- src/distrib/sets/lists/base/mi:1.1187 Wed Sep 12 19:55:39 2018
+++ src/distrib/sets/lists/base/mi Wed Sep 19 13:58:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1187 2018/09/12 19:55:39 para Exp $
+# $NetBSD: mi,v 1.1188 2018/09/19 13:58:26 maxv Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1657,7 +1657,7 @@
./usr/sbin/cpuctl base-sysutil-bin
./usr/sbin/crash base-sysutil-bin
./usr/sbin/cron base-cron-bin
-./usr/sbin/daicctl base-isdn-bin
+./usr/sbin/daicctl base-obsolete obsolete
./usr/sbin/dbsym base-sysutil-bin binutils
./usr/sbin/ddns-confgen base-bind-bin
./usr/sbin/dev_mkdb base-sysutil-bin
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.264 src/distrib/sets/lists/debug/mi:1.265
--- src/distrib/sets/lists/debug/mi:1.264 Thu Sep 6 06:41:59 2018
+++ src/distrib/sets/lists/debug/mi Wed Sep 19 13:58:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.264 2018/09/06 06:41:59 maxv Exp $
+# $NetBSD: mi,v 1.265 2018/09/19 13:58:26 maxv Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -1042,7 +1042,7 @@
./usr/libdata/debug/usr/sbin/cpuctl.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/crash.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/cron.debug comp-cron-debug debug
-./usr/libdata/debug/usr/sbin/daicctl.debug comp-isdn-debug debug
+./usr/libdata/debug/usr/sbin/daicctl.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/dbsym.debug comp-sysutil-debug binutils,debug
./usr/libdata/debug/usr/sbin/ddns-confgen.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/dev_mkdb.debug comp-sysutil-debug debug
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1616 src/distrib/sets/lists/man/mi:1.1617
--- src/distrib/sets/lists/man/mi:1.1616 Thu Sep 6 14:08:24 2018
+++ src/distrib/sets/lists/man/mi Wed Sep 19 13:58:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1616 2018/09/06 14:08:24 maxv Exp $
+# $NetBSD: mi,v 1.1617 2018/09/19 13:58:27 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -130,7 +130,7 @@
./usr/share/man/cat1/ctfmerge.0 man-util-catman .cat,ctf
./usr/share/man/cat1/cu.0 man-util-catman .cat
./usr/share/man/cat1/cut.0 man-util-catman .cat
-./usr/share/man/cat1/daicctl.0 man-sysutil-catman .cat
+./usr/share/man/cat1/daicctl.0 man-obsolete obsolete
./usr/share/man/cat1/date.0 man-util-catman .cat
./usr/share/man/cat1/db.0 man-util-catman .cat
./usr/share/man/cat1/dc.0 man-util-catman .cat
@@ -1002,7 +1002,7 @@
./usr/share/man/cat4/cy.0 man-sys-catman .cat
./usr/share/man/cat4/cypide.0 man-sys-catman .cat
./usr/share/man/cat4/cz.0 man-sys-catman .cat
-./usr/share/man/cat4/daic.0 man-sys-catman .cat
+./usr/share/man/cat4/daic.0 man-obsolete obsolete
./usr/share/man/cat4/dbCool.0 man-sys-catman .cat
./usr/share/man/cat4/dbcool.0 man-sys-catman .cat
./usr/share/man/cat4/ddb.0 man-sys-catman .cat
@@ -3362,7 +3362,7 @@
./usr/share/man/html1/ctfmerge.html man-util-htmlman html,ctf
./usr/share/man/html1/cu.html man-util-htmlman html
./usr/share/man/html1/cut.html man-util-htmlman html
-./usr/share/man/html1/daicctl.html man-sysutil-htmlman html
+./usr/share/man/html1/daicctl.html man-obsolete obsolete
./usr/share/man/html1/date.html man-util-htmlman html
./usr/share/man/html1/db.html man-util-htmlman html
./usr/share/man/html1/dc.html man-util-htmlman html
@@ -4153,7 +4153,7 @@
./usr/share/man/html4/cy.html man-sys-htmlman html
./usr/share/man/html4/cypide.html man-sys-htmlman html
./usr/share/man/html4/cz.html man-sys-htmlman html
-./usr/share/man/html4/daic.html man-sys-htmlman html
+./usr/share/man/html4/daic.html man-obsolete obsolete
./usr/share/man/html4/dbCool.html man-sys-htmlman html
./usr/share/man/html4/dbcool.html man-sys-htmlman html
./usr/share/man/html4/ddb.html man-sys-htmlman html
@@ -6204,7 +6204,7 @@
./usr/share/man/man1/ctfmerge.1 man-util-man .man,ctf
./usr/share/man/man1/cu.1 man-util-man .man
./usr/share/man/man1/cut.1 man-util-man .man
-./usr/share/man/man1/daicctl.1 man-sysutil-man .man
+./usr/share/man/man1/daicctl.1 man-obsolete obsolete
./usr/share/man/man1/date.1 man-util-man .man
./usr/share/man/man1/db.1 man-util-man .man
./usr/share/man/man1/dc.1 man-util-man .man
@@ -7076,7 +7076,7 @@
./usr/share/man/man4/cy.4 man-sys-man .man
./usr/share/man/man4/cypide.4 man-sys-man .man
./usr/share/man/man4/cz.4 man-sys-man .man
-./usr/share/man/man4/daic.4 man-sys-man .man
+./usr/share/man/man4/daic.4 man-obsolete obsolete
./usr/share/man/man4/dbCool.4 man-sys-man .man
./usr/share/man/man4/dbcool.4 man-sys-man .man
./usr/share/man/man4/ddb.4 man-sys-man .man
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.666 src/share/man/man4/Makefile:1.667
--- src/share/man/man4/Makefile:1.666 Thu Sep 6 05:36:49 2018
+++ src/share/man/man4/Makefile Wed Sep 19 13:58:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.666 2018/09/06 05:36:49 maxv Exp $
+# $NetBSD: Makefile,v 1.667 2018/09/19 13:58:27 maxv Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -145,7 +145,7 @@ MAN += hil.4 hilkbd.4 hilid.4 hilms.4
MAN+= faith.4 gif.4 inet6.4 icmp6.4 ip6.4 ipsec.4 ipsecif.4 stf.4
# ISDN devices
-MAN+= daic.4 isdntrc.4 isdntel.4 isdnbchan.4 ippp.4 irip.4 isdnctl.4 isdn.4 \
+MAN+= isdntrc.4 isdntel.4 isdnbchan.4 ippp.4 irip.4 isdnctl.4 isdn.4 \
ifpci.4 isic.4 iwic.4 isdncapi.4 iavc.4
# onewire bus and devices
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1207 src/sys/conf/files:1.1208
--- src/sys/conf/files:1.1207 Sat Sep 8 14:12:04 2018
+++ src/sys/conf/files Wed Sep 19 13:58:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1207 2018/09/08 14:12:04 christos Exp $
+# $NetBSD: files,v 1.1208 2018/09/19 13:58:27 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1382,11 +1382,6 @@ file dev/ic/isic_l1fsm.c isic|ifpci|ifr
file dev/ic/hscx.c isic
file dev/ic/isic_bchan.c isic
-# (old) Diehl active ISDN cards
-#
-#device daic: isdndev
-#file dev/ic/daic.c daic
-
# AWM B1/T1
# XXX: passive_isdn
device iavc: isdndev, isdncapi, passive_isdn
Index: src/sys/dev/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.312 src/sys/dev/DEVNAMES:1.313
--- src/sys/dev/DEVNAMES:1.312 Fri Jul 27 12:02:26 2018
+++ src/sys/dev/DEVNAMES Wed Sep 19 13:58:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.312 2018/07/27 12:02:26 rkujawa Exp $
+# $NetBSD: DEVNAMES,v 1.313 2018/09/19 13:58:27 maxv Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -328,7 +328,6 @@ cy MI
cy82c693 MI
cypide MI
cz MI
-#daic MI
dbcool MI
dbri sparc
dcm hp300
Index: src/sys/dev/isa/files.isa
diff -u src/sys/dev/isa/files.isa:1.169 src/sys/dev/isa/files.isa:1.170
--- src/sys/dev/isa/files.isa:1.169 Tue Jan 2 00:25:35 2018
+++ src/sys/dev/isa/files.isa Wed Sep 19 13:58:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.169 2018/01/02 00:25:35 christos Exp $
+# $NetBSD: files.isa,v 1.170 2018/09/19 13:58:27 maxv Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -487,8 +487,6 @@ file dev/isa/aps.c aps
# ISDN devices
attach isic at isa with isic_isa
file dev/isa/isic_isa.c isic_isa
-#attach daic at isa with daic_isa
-#file dev/isa/daic_isa.c daic_isa
defflag opt_isicisa.h ISICISA_TEL_S0_8 ISICISA_TEL_S0_16 ISICISA_TEL_S0_16_3
ISICISA_AVM_A1 ISICISA_USR_STI ISICISA_ITKIX1
Index: src/usr.sbin/isdn/Makefile
diff -u src/usr.sbin/isdn/Makefile:1.3 src/usr.sbin/isdn/Makefile:1.4
--- src/usr.sbin/isdn/Makefile:1.3 Wed Mar 6 08:06:40 2002
+++ src/usr.sbin/isdn/Makefile Wed Sep 19 13:58:27 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2002/03/06 08:06:40 martti Exp $
+# $NetBSD: Makefile,v 1.4 2018/09/19 13:58:27 maxv Exp $
-SUBDIR= daicctl dtmfdecode isdnd isdnmonitor isdntel \
+SUBDIR= dtmfdecode isdnd isdnmonitor isdntel \
isdntelctl isdntrace
.include <bsd.subdir.mk>
