updating isdn4bsd to beta version 0.83

8 files changed, 188 insertions, 44 deletions

diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 031b583..d934efd 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.620 1999/07/26 05:47:17 cracauer Exp $
+#	$Id: LINT,v 1.621 1999/08/04 17:29:33 green Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1842,7 +1842,7 @@ options AVM_A1
 options USR_STI
 #device isic0 at isa? port 0x268 irq 5 flags 7
 #
-# ITK ix1 Micro
+# ITK ix1 Micro ( < V.3, non-PnP version )
 options ITKIX1
 #device isic0 at isa? port 0x398 irq 10 flags 18
 #
@@ -1877,6 +1877,18 @@ options DYNALINK
 options ELSA_QS1ISA
 #device	isic0 at isa? port ? irq ?
 #
+# ITK ix1 Micro ( V.3, PnP version )
+options "ITKIX1"
+#device isic0 at isa? port ? irq ?
+#
+# AVM Fritz!Card PnP
+options "AVM_PNP"  
+#device isic0 at isa? port ? irq ?
+#
+# Siemens I-Surf 2.0 
+options "SIEMENS_ISURF2"  
+#device isic0 at isa? port ? irq ?
+#
 # PCI-Cards:
 # ----------
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 031b583..d934efd 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.620 1999/07/26 05:47:17 cracauer Exp $
+#	$Id: LINT,v 1.621 1999/08/04 17:29:33 green Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1842,7 +1842,7 @@ options AVM_A1
 options USR_STI
 #device isic0 at isa? port 0x268 irq 5 flags 7
 #
-# ITK ix1 Micro
+# ITK ix1 Micro ( < V.3, non-PnP version )
 options ITKIX1
 #device isic0 at isa? port 0x398 irq 10 flags 18
 #
@@ -1877,6 +1877,18 @@ options DYNALINK
 options ELSA_QS1ISA
 #device	isic0 at isa? port ? irq ?
 #
+# ITK ix1 Micro ( V.3, PnP version )
+options "ITKIX1"
+#device isic0 at isa? port ? irq ?
+#
+# AVM Fritz!Card PnP
+options "AVM_PNP"  
+#device isic0 at isa? port ? irq ?
+#
+# Siemens I-Surf 2.0 
+options "SIEMENS_ISURF2"  
+#device isic0 at isa? port ? irq ?
+#
 # PCI-Cards:
 # ----------
 #
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 2e9b459..e6c065c 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.254 1999/07/26 07:43:20 phk Exp $
+#	$Id: files.i386,v 1.255 1999/07/29 01:49:17 msmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -335,31 +335,34 @@ i386/linux/linux_stats.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
 i386/linux/linux_util.c		optional	compat_linux
-i4b/layer1/i4b_avm_a1.c		optional	isic
-i4b/layer1/i4b_avm_fritz_pci.c	optional	isic
-i4b/layer1/i4b_avm_fritz_pcmcia.c optional	isic
-i4b/layer1/i4b_bchan.c		optional	isic
-i4b/layer1/i4b_ctx_s0P.c	optional	isic
-i4b/layer1/i4b_drn_ngo.c	optional	isic
-i4b/layer1/i4b_dynalink.c	optional	isic
-i4b/layer1/i4b_elsa_qs1i.c	optional	isic
-i4b/layer1/i4b_elsa_qs1p.c	optional	isic
-i4b/layer1/i4b_hscx.c		optional	isic
-i4b/layer1/i4b_isac.c		optional	isic
-i4b/layer1/i4b_isic.c		optional	isic
-i4b/layer1/i4b_isic_isa.c	optional	isic
-i4b/layer1/i4b_isic_pci.c	optional	isic
-i4b/layer1/i4b_isic_pcmcia.c	optional	isic
-i4b/layer1/i4b_isic_pnp.c	optional	isic
-i4b/layer1/i4b_itk_ix1.c	optional	isic
-i4b/layer1/i4b_l1.c		optional	isic
-i4b/layer1/i4b_l1fsm.c		optional	isic
-i4b/layer1/i4b_sws.c		optional	isic
-i4b/layer1/i4b_tel_s016.c	optional	isic
-i4b/layer1/i4b_tel_s0163.c	optional	isic
-i4b/layer1/i4b_tel_s08.c	optional	isic
-i4b/layer1/i4b_tel_s0P.c	optional	isic
-i4b/layer1/i4b_usr_sti.c	optional	isic
+i4b/layer1/i4b_asuscom_ipac.c	optional	isic	device-driver
+i4b/layer1/i4b_avm_a1.c		optional	isic	device-driver
+i4b/layer1/i4b_avm_fritz_pci.c	optional	isic	device-driver
+i4b/layer1/i4b_avm_fritz_pcmcia.c optional	isic	device-driver
+i4b/layer1/i4b_avm_fritz_pnp.c	optional	isic	device-driver
+i4b/layer1/i4b_bchan.c		optional	isic	device-driver
+i4b/layer1/i4b_ctx_s0P.c	optional	isic	device-driver
+i4b/layer1/i4b_drn_ngo.c	optional	isic	device-driver
+i4b/layer1/i4b_dynalink.c	optional	isic	device-driver
+i4b/layer1/i4b_elsa_qs1i.c	optional	isic	device-driver
+i4b/layer1/i4b_elsa_qs1p.c	optional	isic	device-driver
+i4b/layer1/i4b_hscx.c		optional	isic	device-driver
+i4b/layer1/i4b_isac.c		optional	isic	device-driver
+i4b/layer1/i4b_isic.c		optional	isic	device-driver
+i4b/layer1/i4b_isic_isa.c	optional	isic	device-driver
+i4b/layer1/i4b_isic_pci.c	optional	isic	device-driver
+i4b/layer1/i4b_isic_pcmcia.c	optional	isic	device-driver
+i4b/layer1/i4b_isic_pnp.c	optional	isic	device-driver
+i4b/layer1/i4b_itk_ix1.c	optional	isic	device-driver
+i4b/layer1/i4b_l1.c		optional	isic	device-driver
+i4b/layer1/i4b_l1fsm.c		optional	isic	device-driver
+i4b/layer1/i4b_siemens_isurf.c	optional	isic	device-driver
+i4b/layer1/i4b_sws.c		optional	isic	device-driver
+i4b/layer1/i4b_tel_s016.c	optional	isic	device-driver
+i4b/layer1/i4b_tel_s0163.c	optional	isic	device-driver
+i4b/layer1/i4b_tel_s08.c	optional	isic	device-driver
+i4b/layer1/i4b_tel_s0P.c	optional	isic	device-driver
+i4b/layer1/i4b_usr_sti.c	optional	isic	device-driver
 isa/atkbd_isa.c			optional	atkbd
 isa/atkbdc_isa.c		optional	atkbdc
 isa/psm.c			optional	psm
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index d7cc7b4..d3c9fb7 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.117 1999/06/15 13:14:43 des Exp $
+#	$Id: options.i386,v 1.118 1999/06/22 14:13:36 yokota Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -139,6 +139,7 @@ GUS_IRQ			opt_sound.h
 
 # Video spigot
 SPIGOT_UNSECURE		opt_spigot.h
+
 # -------------------------------
 # isdn4bsd: passive ISA cards
 # -------------------------------
@@ -148,7 +149,7 @@ TEL_S0_16_3		opt_i4b.h
 AVM_A1			opt_i4b.h
 USR_STI			opt_i4b.h
 ITKIX1			opt_i4b.h
-ELSA_PCC16              opt_i4b.h
+ELSA_PCC16		opt_i4b.h
 # -------------------------------
 # isdn4bsd: passive ISA PnP cards
 # -------------------------------
@@ -157,7 +158,10 @@ DRN_NGO                 opt_i4b.h
 TEL_S0_16_3_P		opt_i4b.h
 SEDLBAUER		opt_i4b.h
 DYNALINK		opt_i4b.h
+ASUSCOM_IPAC		opt_i4b.h
 ELSA_QS1ISA		opt_i4b.h
+AVM_PNP			opt_i4b.h
+SIEMENS_ISURF2		opt_i4b.h
 # -------------------------------
 # isdn4bsd: passive PCI cards
 # -------------------------------
@@ -174,6 +178,7 @@ AVM_A1_PCMCIA		opt_i4b.h
 I4B_SMP_WORKAROUND      opt_i4b.h
 # enable VJ compression code for ipr i/f
 IPR_VJ			opt_i4b.h
+
 # -------------------------------
 # oltr: build options
 # -------------------------------
diff --git a/sys/i386/include/i4b_debug.h b/sys/i386/include/i4b_debug.h
index 628a65e..980bb0a 100644
--- a/sys/i386/include/i4b_debug.h
+++ b/sys/i386/include/i4b_debug.h
@@ -27,9 +27,9 @@
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
  *
- *	$Id: i4b_debug.h,v 1.18 1999/04/28 14:50:55 hm Exp $ 
+ *	$Id: i4b_debug.h,v 1.19 1999/05/28 15:03:32 hm Exp $ 
  *
- *      last edit-date: [Wed Apr 28 16:50:36 1999]
+ *      last edit-date: [Fri May 28 16:27:07 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -221,4 +221,54 @@ typedef struct {
 
 #define	I4B_CTL_CLR_HSCXSTAT	_IOW('C', 3, hscxstat_t)
 
+/*---------------------------------------------------------------------------*
+ *	get LAPD/Q.921 statistics
+ *---------------------------------------------------------------------------*/
+typedef struct {
+				/* transmit */
+
+	u_long	tx_i;	/* I 	*/
+	u_long	tx_rr;	/* RR	*/
+	u_long	tx_rnr;	/* RNR 	*/
+	u_long	tx_rej;	/* REJ	*/
+	u_long	tx_sabme;	/* SABME*/
+	u_long	tx_dm;	/* DM	*/
+	u_long	tx_disc;	/* DISC */
+	u_long	tx_ua;	/* UA	*/
+	u_long	tx_frmr;	/* FRMR	*/	
+	u_long	tx_tei;	/* TEI	*/
+
+				/* receive */
+
+	u_long	rx_i;	/* I    */
+	u_long	rx_rr;	/* RR   */
+	u_long	rx_rnr;	/* RNR  */
+	u_long	rx_rej;	/* REJ  */
+	u_long	rx_sabme;	/* SABME*/
+	u_long	rx_tei;	/* TEI	*/
+	u_long	rx_ui;	/* UI	*/
+	u_long	rx_disc;	/* DISC */
+	u_long	rx_xid;	/* XID	*/
+	u_long	rx_dm;	/* DM	*/
+	u_long	rx_ua;	/* UA	*/
+	u_long	rx_frmr;	/* FRMR	*/	
+	
+					/* errors */
+
+	u_long	err_rx_len;	/* incorrect length */
+	u_long	err_rx_badf;	/* bad frame type */
+	u_long	err_rx_bads;	/* bad s frame */
+	u_long	err_rx_badu;	/* bad u frame */
+	u_long	err_rx_badui;	/* bad ui frame */
+} lapdstat_t;
+
+typedef struct {
+	int unit;
+	lapdstat_t lapdstat;
+} l2stat_t;
+
+#define	I4B_CTL_GET_LAPDSTAT	_IOWR('C', 4, l2stat_t)
+
+#define	I4B_CTL_CLR_LAPDSTAT	_IOW('C', 5, int)
+
 /* EOF */
diff --git a/sys/i386/include/i4b_ioctl.h b/sys/i386/include/i4b_ioctl.h
index b7289a8..2f6c753 100644
--- a/sys/i386/include/i4b_ioctl.h
+++ b/sys/i386/include/i4b_ioctl.h
@@ -27,9 +27,9 @@
  *	i4b_ioctl.h - messages kernel <--> userland
  *	-------------------------------------------
  *
- *	$Id: i4b_ioctl.h,v 1.106 1999/05/19 08:51:14 hm Exp $ 
+ *	$Id: i4b_ioctl.h,v 1.125 1999/07/30 07:02:11 hm Exp $ 
  *
- *      last edit-date: [Wed May 19 10:56:56 1999]
+ *      last edit-date: [Fri Jul 30 08:53:47 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -46,7 +46,7 @@
  *	version and release number for isdn4bsd package
  *---------------------------------------------------------------------------*/
 #define	VERSION		0		/* version number	*/
-#define	REL		81		/* release number	*/
+#define	REL		83		/* release number	*/
 #define STEP		0		/* release step		*/
 
 /*---------------------------------------------------------------------------*
@@ -103,7 +103,9 @@
 #define	CARD_TYPEP_ITKIX1	18	/* ITK ix1 micro 		*/
 #define CARD_TYPEP_AVMA1PCI	19	/* AVM FRITZ!CARD PCI		*/
 #define CARD_TYPEP_PCC16	20	/* ELSA PCC-16			*/
-
+#define CARD_TYPEP_AVM_PNP	21	/* AVM FRITZ!CARD PnP		*/
+#define CARD_TYPEP_SIE_ISURF2 	22	/* Siemens I-Surf 2 PnP		*/
+#define CARD_TYPEP_ASUSCOMIPAC	23	/* Asuscom ISDNlink 128 K PnP	*/
 /*
  * in case you add support for more cards, please update:
  *
@@ -113,7 +115,7 @@
  * and adjust CARD_TYPEP_MAX below.
  */
 
-#define CARD_TYPEP_MAX		20	/* max type */
+#define CARD_TYPEP_MAX		23	/* max type */
 
 /*---------------------------------------------------------------------------*
  *	card types for CTRL_DAIC
@@ -175,7 +177,7 @@ typedef	unsigned int cause_t;		/* 32 bit unsigned int	*/
  *---------------------------------------------------------------------------*/
 #define SHA_FIXU	0    /* timeout algorithm for fix unit charging */
 #define SHA_VARU	1    /* timeout algorithm for variable unit charging */
- 
+
 /*---------------------------------------------------------------------------*
  *	The shorthold data struct
  *---------------------------------------------------------------------------*/
@@ -593,14 +595,15 @@ typedef struct {
 
 /*---------------------------------------------------------------------------*
  *	request version and release info from kernel part
+ *	(msg_vr_req_t is also used by tel & rbch drivers)
  *---------------------------------------------------------------------------*/
 typedef struct {
 	int	version;	/* version number */
 	int	release;	/* release number */
 	int	step;		/* release step number */	
 } msg_vr_req_t;
- 
-#define	I4B_VR_REQ		_IOR('4', 9, msg_vr_req_t)
+
+#define I4B_VR_REQ              _IOR('4', 9, msg_vr_req_t)
 
 /*---------------------------------------------------------------------------*
  *	Protocol download to active cards
diff --git a/sys/i386/include/i4b_rbch_ioctl.h b/sys/i386/include/i4b_rbch_ioctl.h
new file mode 100644
index 0000000..97bdb90
--- /dev/null
+++ b/sys/i386/include/i4b_rbch_ioctl.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1999 Hellmuth Michaelis. All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ *---------------------------------------------------------------------------
+ *
+ *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
+ *	------------------------------------------------------
+ *
+ *	$Id: i4b_rbch_ioctl.h,v 1.1 1999/07/09 06:44:00 hm Exp $
+ *
+ *      last edit-date: [Fri Jul  9 08:35:07 1999]
+ *
+ *---------------------------------------------------------------------------*/
+
+#ifndef _I4B_RBCH_IOCTL_H_
+#define _I4B_RBCH_IOCTL_H_
+
+/*---------------------------------------------------------------------------*
+ *	instruct the rbch device to dial the given number
+ *---------------------------------------------------------------------------*/
+
+typedef char telno_t[TELNO_MAX];
+
+#define	I4B_RBCH_DIALOUT	_IOW('R', 1, telno_t)
+
+/*---------------------------------------------------------------------------*
+ *	request version and release info from kernel part
+ *---------------------------------------------------------------------------*/
+
+#define I4B_RBCH_VR_REQ		_IOR('R', 2, msg_vr_req_t)
+
+#endif /* _I4B_RBCH_IOCTL_H_ */
diff --git a/sys/i386/include/i4b_tel_ioctl.h b/sys/i386/include/i4b_tel_ioctl.h
index 3df673b..07fcde8 100644
--- a/sys/i386/include/i4b_tel_ioctl.h
+++ b/sys/i386/include/i4b_tel_ioctl.h
@@ -27,9 +27,9 @@
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
  *
- *	$Id: i4b_tel_ioctl.h,v 1.9 1999/04/21 10:06:32 hm Exp $ 
+ *	$Id: i4b_tel_ioctl.h,v 1.10 1999/07/09 06:44:00 hm Exp $ 
  *
- *      last edit-date: [Wed Apr 21 11:00:02 1999]
+ *      last edit-date: [Fri Jul  9 08:34:28 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -54,6 +54,12 @@
 #define	I4B_TEL_SETAUDIOFMT	_IOW('A', 1, int)
 #define	I4B_TEL_EMPTYINPUTQUEUE	_IOW('A', 2, int)
 
+/*---------------------------------------------------------------------------*
+ *	request version and release info from kernel part
+ *---------------------------------------------------------------------------*/
+
+#define I4B_TEL_VR_REQ		_IOR('A', 3, msg_vr_req_t)
+
 /*===========================================================================*
  *	/dev/i4bteld<n> devices (dialer interface)
  *===========================================================================*/