upgrade isdn4bsd from version 0.71 to the just released version 0.81

6 files changed, 89 insertions, 29 deletions

diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index c76daa6..3863d79 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.598 1999/05/14 03:57:24 obrien Exp $
+#	$Id: LINT,v 1.599 1999/05/18 12:55:11 roger 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
@@ -1773,7 +1773,9 @@ device iicsmb0	at iicbus?
 controller pcf0	at isa? port 0x320 irq 5
 
 # ISDN4BSD section
-
+#
+# see /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
+#
 # i4b passive ISDN cards support (isic - I4b Siemens Isdn Chipset driver)
 # note that the ``options'' and ``device'' lines must BOTH be defined !
 #
@@ -1804,6 +1806,10 @@ options USR_STI
 options ITKIX1
 #device isic0 at isa? port 0x398 irq 10 flags 18
 #
+# ELSA PCC-16
+options "ELSA_PCC16"
+#device isic0 at isa? port 0x360 irq 10 flags 19
+#
 # PnP-Cards:
 # ----------
 #
@@ -1838,6 +1844,10 @@ options ELSA_QS1ISA
 options ELSA_QS1PCI
 #device  isic0
 #
+# AVM Fritz!Card PCI
+options "AVM_A1_PCI" 
+#device  isic0
+#
 # PCMCIA-Cards:
 # -------------
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index c76daa6..3863d79 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.598 1999/05/14 03:57:24 obrien Exp $
+#	$Id: LINT,v 1.599 1999/05/18 12:55:11 roger 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
@@ -1773,7 +1773,9 @@ device iicsmb0	at iicbus?
 controller pcf0	at isa? port 0x320 irq 5
 
 # ISDN4BSD section
-
+#
+# see /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
+#
 # i4b passive ISDN cards support (isic - I4b Siemens Isdn Chipset driver)
 # note that the ``options'' and ``device'' lines must BOTH be defined !
 #
@@ -1804,6 +1806,10 @@ options USR_STI
 options ITKIX1
 #device isic0 at isa? port 0x398 irq 10 flags 18
 #
+# ELSA PCC-16
+options "ELSA_PCC16"
+#device isic0 at isa? port 0x360 irq 10 flags 19
+#
 # PnP-Cards:
 # ----------
 #
@@ -1838,6 +1844,10 @@ options ELSA_QS1ISA
 options ELSA_QS1PCI
 #device  isic0
 #
+# AVM Fritz!Card PCI
+options "AVM_A1_PCI" 
+#device  isic0
+#
 # PCMCIA-Cards:
 # -------------
 #
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 1553c5c..205912e 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.112 1999/04/24 21:46:56 peter Exp $
+#	$Id: options.i386,v 1.113 1999/05/09 13:10:49 peter Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -138,6 +138,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
 # -------------------------------
 # isdn4bsd: passive ISA PnP cards
 # -------------------------------
diff --git a/sys/i386/include/i4b_debug.h b/sys/i386/include/i4b_debug.h
index ad6cccf..628a65e 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.15 1999/02/14 09:45:02 hm Exp $ 
+ *	$Id: i4b_debug.h,v 1.18 1999/04/28 14:50:55 hm Exp $ 
  *
- *      last edit-date: [Sun Feb 14 10:37:58 1999]
+ *      last edit-date: [Wed Apr 28 16:50:36 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -169,9 +169,14 @@ extern unsigned int i4b_l4_debug;
 #define L4_DIALST	0x0008		/* network driver dial states	*/
 #define L4_IPRDBG	0x0010		/* ipr driver debug messages	*/
 #define L4_RBCHDBG	0x0020		/* rbch driver debug messages	*/
-
-#define L4_DEBUG_MAX	0x003f		/* all messages on	*/
-#define L4_DEBUG_ERR	(L4_ERR)
+#define L4_ISPDBG	0x0040		/* isp driver debug messages	*/
+#define L4_TELDBG	0x0080		/* tel driver debug messages	*/
+#define L4_TINADBG	0x0100		/* tina driver debug messages	*/
+#define L4_TINAMSG	0x0200		/* tina driver messages		*/
+#define L4_TINAERR	0x0400		/* tina driver error messages	*/
+
+#define L4_DEBUG_MAX	0x07ff		/* all messages on	*/
+#define L4_DEBUG_ERR	(L4_ERR | L4_TINADBG |  L4_TINAMSG | L4_TINAERR)
 
 #ifndef L4_DEBUG_DEFAULT
 #ifdef DO_I4B_MAXDEBUG
diff --git a/sys/i386/include/i4b_ioctl.h b/sys/i386/include/i4b_ioctl.h
index 21560a8..b7289a8 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.69 1999/03/01 09:04:15 hm Exp $ 
+ *	$Id: i4b_ioctl.h,v 1.106 1999/05/19 08:51:14 hm Exp $ 
  *
- *      last edit-date: [Mon Mar  1 10:01:15 1999]
+ *      last edit-date: [Wed May 19 10:56:56 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -46,7 +46,7 @@
  *	version and release number for isdn4bsd package
  *---------------------------------------------------------------------------*/
 #define	VERSION		0		/* version number	*/
-#define	REL		71		/* release number	*/
+#define	REL		81		/* release number	*/
 #define STEP		0		/* release step		*/
 
 /*---------------------------------------------------------------------------*
@@ -74,7 +74,9 @@
 #define CTRL_UNKNOWN	0		/* unknown controller type	*/
 #define CTRL_PASSIVE	1		/* passive ISDN controller cards*/
 #define CTRL_DAIC	2		/* Diehl active controller cards*/
-#define	CTRL_NUMTYPES	3		/* number of controller types */
+#define CTRL_TINADD	3		/* Stollmann Tina-dd active card*/
+#define CTRL_AVMB1	4		/* AVM B1 active card		*/
+#define	CTRL_NUMTYPES	5		/* number of controller types	*/
 
 /*---------------------------------------------------------------------------*
  *	card types for CTRL_PASSIVE 
@@ -100,6 +102,7 @@
 #define	CARD_TYPEP_ELSAMLMCALL	17	/* ELSA MicroLink MCall		*/
 #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			*/
 
 /*
  * in case you add support for more cards, please update:
@@ -110,7 +113,7 @@
  * and adjust CARD_TYPEP_MAX below.
  */
 
-#define CARD_TYPEP_MAX		19	/* max type */
+#define CARD_TYPEP_MAX		20	/* max type */
 
 /*---------------------------------------------------------------------------*
  *	card types for CTRL_DAIC
@@ -170,19 +173,17 @@ typedef	unsigned int cause_t;		/* 32 bit unsigned int	*/
 /*---------------------------------------------------------------------------*
  *	The shorthold algorithm to use
  *---------------------------------------------------------------------------*/
-typedef enum msg_shorthold_algorithm {
-	msg_alg__fix_unit_size,	/* timeout algorithm for fix unit charging */
-	msg_alg__var_unit_size	/* timeout algorithm for variable unit charging */
-} msg_shorthold_algorithm_t;
+#define SHA_FIXU	0    /* timeout algorithm for fix unit charging */
+#define SHA_VARU	1    /* timeout algorithm for variable unit charging */
  
 /*---------------------------------------------------------------------------*
  *	The shorthold data struct
  *---------------------------------------------------------------------------*/
 typedef struct {
-	msg_shorthold_algorithm_t shorthold_algorithm;	/* shorthold algorithm to use */
-	int	unitlen_time;	/* length of a charging unit		*/
-	int	idle_time;	/* time without activity on b ch	*/
-	int	earlyhup_time;	/* safety area at end of unit		*/
+	int	shorthold_algorithm;	/* shorthold algorithm to use	*/
+	int	unitlen_time;		/* length of a charging unit	*/
+	int	idle_time;		/* time without activity on b ch*/
+	int	earlyhup_time;		/* safety area at end of unit	*/
 } msg_shorthold_t;
 
 
@@ -274,6 +275,7 @@ typedef struct {
 #define MSG_PDEACT_IND		'm'
 #define	MSG_NEGCOMP_IND		'n'
 #define	MSG_IFSTATE_CHANGED_IND	'o'
+#define MSG_DIALOUTNUMBER_IND	'p'
 	int		cdid;		/* call descriptor id		*/
 } msg_hdr_t;
 
@@ -349,6 +351,17 @@ typedef struct {
 } msg_dialout_ind_t;
 
 /*---------------------------------------------------------------------------*
+ *	dial a number
+ *---------------------------------------------------------------------------*/
+typedef struct {
+	msg_hdr_t	header;		/* common header	*/
+	int		driver;		/* driver type		*/
+	int		driver_unit;	/* driver unit number	*/
+	int		cmdlen;		/* length of string	*/
+	char		cmd[TELNO_MAX];	/* the number to dial	*/	
+} msg_dialoutnumber_ind_t;
+
+/*---------------------------------------------------------------------------*
  *	idle timeout disconnect sent indication
  *		kernel has sent disconnect request because of b-ch idle
  *---------------------------------------------------------------------------*/
@@ -541,6 +554,7 @@ typedef struct {
 #define  DSTAT_TFAIL	1		/* transient failure */
 #define  DSTAT_PFAIL	2		/* permanent failure */
 #define  DSTAT_INONLY	3		/* no outgoing dials allowed */
+	cause_t		cause;		/* exact i4b cause */
 } msg_dialout_resp_t;
 
 #define	I4B_DIALOUT_RESP	_IOW('4', 5, msg_dialout_resp_t)
diff --git a/sys/i386/include/i4b_tel_ioctl.h b/sys/i386/include/i4b_tel_ioctl.h
index 52f08cc..3df673b 100644
--- a/sys/i386/include/i4b_tel_ioctl.h
+++ b/sys/i386/include/i4b_tel_ioctl.h
@@ -27,20 +27,24 @@
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
  *
- *	$Id: i4b_tel_ioctl.h,v 1.7 1999/02/16 10:40:18 hm Exp $ 
+ *	$Id: i4b_tel_ioctl.h,v 1.9 1999/04/21 10:06:32 hm Exp $ 
  *
- *      last edit-date: [Sun Feb 14 10:39:19 1999]
+ *      last edit-date: [Wed Apr 21 11:00:02 1999]
  *
  *---------------------------------------------------------------------------*/
 
 #ifndef _I4B_TEL_IOCTL_H_
 #define _I4B_TEL_IOCTL_H_
 
-/* supported audio format conversions for /dev/i4btelXX devices */
+/*===========================================================================*
+ *	/dev/i4btel<n> devices (audio data)
+ *===========================================================================*/
+ 
+/* supported audio format conversions */
 
-#define CVT_NONE	0		/* no format conversion	*/
-#define CVT_ALAW2ULAW	1		/* kernel A-law, userland mu-law */
-#define CVT_ALAW_CANON	2		/* kernel A-law, userland canonical A-law */
+#define CVT_NONE	0		/* no A-law/u-law conversion     */
+#define CVT_ALAW2ULAW	1		/* ISDN line: A-law, user: u-law */
+#define CVT_ULAW2ALAW	2		/* ISDN line: u-law, user: A-law */
       
 /*---------------------------------------------------------------------------*
  *	get / set audio format 
@@ -50,4 +54,20 @@
 #define	I4B_TEL_SETAUDIOFMT	_IOW('A', 1, int)
 #define	I4B_TEL_EMPTYINPUTQUEUE	_IOW('A', 2, int)
 
+/*===========================================================================*
+ *	/dev/i4bteld<n> devices (dialer interface)
+ *===========================================================================*/
+
+/* dialer commands */
+
+#define CMD_DIAL        'D'     /* dial the following number string */
+#define CMD_HUP         'H'     /* hangup */
+
+/* dialer responses */
+
+#define RSP_CONN        '0'     /* connect */
+#define RSP_BUSY        '1'     /* busy */
+#define RSP_HUP         '2'     /* hangup */
+#define RSP_NOA         '3'     /* no answer */
+
 #endif /* _I4B_TEL_IOCTL_H_ */