Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Remove daic(4), it has never been functional.



details:   https://anonhg.NetBSD.org/src/rev/ad53d1d57748
branches:  trunk
changeset: 433530:ad53d1d57748
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Sep 19 13:58:26 2018 +0000

description:
Remove daic(4), it has never been functional.

ok martin@

diffstat:

 distrib/sets/lists/base/mi      |     4 +-
 distrib/sets/lists/debug/mi     |     4 +-
 distrib/sets/lists/man/mi       |    14 +-
 share/man/man4/Makefile         |     4 +-
 share/man/man4/daic.4           |    95 ---
 sys/conf/files                  |     7 +-
 sys/dev/DEVNAMES                |     3 +-
 sys/dev/ic/daic.c               |  1068 ---------------------------------------
 sys/dev/ic/daicreg.h            |   156 -----
 sys/dev/ic/daicvar.h            |   120 ----
 sys/dev/isa/daic_isa.c          |   142 -----
 sys/dev/isa/files.isa           |     4 +-
 usr.sbin/isdn/Makefile          |     4 +-
 usr.sbin/isdn/daicctl/Makefile  |     7 -
 usr.sbin/isdn/daicctl/daicctl.1 |    51 -
 usr.sbin/isdn/daicctl/daicctl.h |    40 -
 usr.sbin/isdn/daicctl/debug.c   |    48 -
 usr.sbin/isdn/daicctl/dnload.c  |   102 ---
 usr.sbin/isdn/daicctl/istat.c   |   195 -------
 usr.sbin/isdn/daicctl/main.c    |   178 ------
 usr.sbin/isdn/daicctl/xlog.c    |   249 ---------
 21 files changed, 18 insertions(+), 2477 deletions(-)

diffs (truncated from 2688 to 300 lines):

diff -r 543f5cbc641c -r ad53d1d57748 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Wed Sep 19 07:54:11 2018 +0000
+++ b/distrib/sets/lists/base/mi        Wed Sep 19 13:58:26 2018 +0000
@@ -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
diff -r 543f5cbc641c -r ad53d1d57748 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi       Wed Sep 19 07:54:11 2018 +0000
+++ b/distrib/sets/lists/debug/mi       Wed Sep 19 13:58:26 2018 +0000
@@ -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
diff -r 543f5cbc641c -r ad53d1d57748 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Wed Sep 19 07:54:11 2018 +0000
+++ b/distrib/sets/lists/man/mi Wed Sep 19 13:58:26 2018 +0000
@@ -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
diff -r 543f5cbc641c -r ad53d1d57748 share/man/man4/Makefile
--- a/share/man/man4/Makefile   Wed Sep 19 07:54:11 2018 +0000
+++ b/share/man/man4/Makefile   Wed Sep 19 13:58:26 2018 +0000
@@ -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+=  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
diff -r 543f5cbc641c -r ad53d1d57748 share/man/man4/daic.4
--- a/share/man/man4/daic.4     Wed Sep 19 07:54:11 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-.\" $NetBSD: daic.4,v 1.10 2008/04/30 13:10:53 martin Exp $
-.\"
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Martin Husemann <martin%NetBSD.org@localhost>.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 30, 1998
-.Dt DAIC 4
-.Os
-.Sh NAME
-.Nm daic
-.Nd isdn4bsd driver for EICON.Diehl active ISDN cards
-.Sh SYNOPSIS
-.Cd "daic0 at isa? iomem 0xd8000 irq 10"
-.Sh DESCRIPTION
-The
-.Nm
-driver supports the old Diehl active cards:
-.Em S, SX, SXn, SCOM
-and
-.Em QUADRO .
-.Pp
-For a
-.Em QUADRO
-card, the driver will detect the board type and use
-all four ports, each attached as a controller of its own to the
-isdn4bsd system, which can be listed using the daicctl utility.
-.Pp
-The
-.Nm
-driver interfaces the ISDN card to the ISDN4BSD kernel subsystem.
-All lower layer ISDN control is handled by the card. This should
-allow you to run any national ISDN protocol delivered by EICON.Diehl
-for your card, but the driver has only been tested with the DSS1
-protocol and some parts of the cards interface are ISDN protocol
-dependent.
-.Pp
-The
-.Nm
-driver is written to conform to the software interface documented
-by Diehl in their
-.Nm ISDN-Karten Benutzerhandbuch
-from 1992.
-.Sh MICROCODE DOWNLOAD
-Every active card needs its own operating software before it can
-work. You have to download this to the card before using it with
-isdn4bsd. Use the daicctl utility to do this, i.e. call
-.Nm "daicctl -d te_etsi.sx 1"
-to download the file
-.Nm te_etsi.sx
-to controller number 1. Use
-.Nm "daicctl -l"
-to list all available controllers (and ports). You have to select the
-correct ISDN protocol file for your ISDN interface, see the Diehl documentation
-for details.
-.Pp
-The cards bootstrap process involves another file, which is independent
-of the card type you use and the protocol you run. It is called
-.Nm download.bin
-in current versions of the Diehl software distribution and has to be
-copied to the kernel compile directory under
-.Nm dev/microcode/daic
-and converted into a header file used when compiling the kernel by running
-.Nm make
-in that directory. Your kernel compile will fail and remind you of this
-if you forget to do this. Due to copyright restrictions we cannot distribute
-the driver with this file integrated. But if you own a card, you do have
-the file (or can get it from the Diehl web server).
-.Sh SEE ALSO
-.Xr daicctl 1
-.Sh BUGS
-The driver is not yet finished.
diff -r 543f5cbc641c -r ad53d1d57748 sys/conf/files
--- a/sys/conf/files    Wed Sep 19 07:54:11 2018 +0000
+++ b/sys/conf/files    Wed Sep 19 13:58:26 2018 +0000
@@ -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/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
diff -r 543f5cbc641c -r ad53d1d57748 sys/dev/DEVNAMES
--- a/sys/dev/DEVNAMES  Wed Sep 19 07:54:11 2018 +0000
+++ b/sys/dev/DEVNAMES  Wed Sep 19 13:58:26 2018 +0000
@@ -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 @@
 cy82c693               MI
 cypide                 MI
 cz                     MI
-#daic                  MI
 dbcool                 MI
 dbri                   sparc
 dcm                    hp300
diff -r 543f5cbc641c -r ad53d1d57748 sys/dev/ic/daic.c
--- a/sys/dev/ic/daic.c Wed Sep 19 07:54:11 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1068 +0,0 @@
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin%NetBSD.org@localhost>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: daic.c,v 1.32 2015/08/30 09:46:57 martin Exp $");
-
-/*
- * daic.c: MI driver for Diehl active ISDN cards (S, SX, SXn, SCOM, QUADRO)
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>



Home | Main Index | Thread Index | Old Index