Submitted by: Juha-Matti Liukkonen (Cubical Solutions Ltd) (jml@cubical.fi)

Add a CAPI (hardware independent) driver i4bcapi(4) and hardware driver
iavc (4) to support active CAPI-based BRI and PRI cards (currently AVM
B1 and T1 cards) to isdn4bsd.

3 files changed, 40 insertions, 15 deletions

diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 117c6fd..5f80699 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2323,6 +2323,10 @@ hint.pcf.0.irq="5"
 #	ifpnp - AVM Fritz!Card PnP driver 
 #	itjc  - Siemens ISAC / TJNet Tiger300/320 chipset
 #
+# i4b active ISDN cards support contains the following hardware drivers:
+#
+#	iavc  - AVM B1 PCI, AVM B1 ISA, AVM T1
+#
 # Note that the ``options'' (if given) and ``device'' lines must BOTH
 # be uncommented to enable support for a given card !
 #
@@ -2459,6 +2463,17 @@ device  iwic
 device  itjc
 #
 #---------------------------------------------------------------------------
+#	iavc driver (AVM active cards, needs i4bcapi driver!)
+#
+device	iavc
+#
+# AVM B1 ISA bus (PnP mode not supported!)
+# ----------------------------------------
+hint.iavc.0.at="isa"
+hint.iavc.0.port="0x150"
+hint.iavc.0.irq="5"
+#
+#---------------------------------------------------------------------------
 #	ISDN Protocol Stack - mandatory for all hardware drivers
 #
 # Q.921 / layer 2 - i4b passive cards D channel handling
@@ -2499,9 +2514,12 @@ options 	IPR_LOG=32
 # number of sppp device to be configured
 device		"i4bisppp"	4
 #
-# B-channel inteface to the netgraph subsystem
+# B-channel interface to the netgraph subsystem
 device		"i4bing"	2
 #
+# CAPI driver needed for active ISDN cards (see iavc driver above)
+device		"i4bcapi"
+#
 #---------------------------------------------------------------------------
 
 # Parallel-Port Bus
diff --git a/sys/i386/include/i4b_debug.h b/sys/i386/include/i4b_debug.h
index 26bfa50..d9380f7 100644
--- a/sys/i386/include/i4b_debug.h
+++ b/sys/i386/include/i4b_debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2001 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,11 +27,9 @@
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
  *
- *	$Id: i4b_debug.h,v 1.32 2000/07/24 12:22:08 hm Exp $ 
- *
  * $FreeBSD$
  *
- *      last edit-date: [Wed Oct 18 09:48:16 2000]
+ *      last edit-date: [Mon May 21 10:05:34 2001]
  *
  *---------------------------------------------------------------------------*/
 
@@ -169,13 +167,12 @@ extern unsigned int i4b_l4_debug;
 #define L4_RBCHDBG	0x0020		/* rbch driver debug messages	*/
 #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_INGDBG	0x0800		/* ing driver debug messages	*/
+#define L4_INGDBG	0x0100		/* ing driver debug messages	*/
+#define L4_IAVCDBG	0x0200		/* AVM B1 driver debug messages	*/
+#define L4_CAPIDBG	0x0400		/* CAPI driver debug messages	*/
 
 #define L4_DEBUG_MAX	0x0fff		/* all messages on	*/
-#define L4_DEBUG_ERR	(L4_ERR | L4_TINADBG |  L4_TINAMSG | L4_TINAERR)
+#define L4_DEBUG_ERR	L4_ERR
 
 #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 8070f3e..d357326 100644
--- a/sys/i386/include/i4b_ioctl.h
+++ b/sys/i386/include/i4b_ioctl.h
@@ -29,7 +29,7 @@
  *
  * $FreeBSD$
  *
- *      last edit-date: [Fri Jan 26 13:46:50 2001]
+ *      last edit-date: [Fri May 25 10:04:37 2001]
  *
  *---------------------------------------------------------------------------*/
 
@@ -45,9 +45,9 @@
 /*---------------------------------------------------------------------------*
  *	version and release number for isdn4bsd package
  *---------------------------------------------------------------------------*/
-#define	VERSION		0		/* version number	*/
-#define	REL		96		/* release number	*/
-#define STEP		3		/* release step		*/
+#define	VERSION		1		/* version number	*/
+#define	REL		0		/* release number	*/
+#define STEP		0		/* release step		*/
 
 /*---------------------------------------------------------------------------*
  * date/time format in i4b log messages
@@ -82,7 +82,8 @@
 #define CTRL_DAIC	2		/* Diehl active controller cards*/
 #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	*/
+#define CTRL_CAPI       5               /* cards seen via the CAPI layer*/
+#define	CTRL_NUMTYPES	6		/* number of controller types	*/
 
 /*---------------------------------------------------------------------------*
  *	CTRL_PASSIVE: driver types
@@ -156,6 +157,14 @@
 #define	CARD_TYPEA_DAIC_QUAD	4
 
 /*---------------------------------------------------------------------------*
+ *	card types for CTRL_CAPI
+ *---------------------------------------------------------------------------*/
+#define CARD_TYPEC_CAPI_UNK	0
+#define	CARD_TYPEC_AVM_T1_PCI	1
+#define CARD_TYPEC_AVM_B1_PCI	2
+#define CARD_TYPEC_AVM_B1_ISA	3
+
+/*---------------------------------------------------------------------------*
  *	max length of some strings
  *---------------------------------------------------------------------------*/
 #define TELNO_MAX	41  /* max length of a telephone number (+ '\0')  */
@@ -592,6 +601,7 @@ typedef struct {
 	int	ctrl_type;	/* controller type passive/active	*/
 	int	card_type;	/* brand / version			*/
 	int	tei;		/* tei controller probably has		*/
+        int     nbch;           /* number of b channels provided        */
 } msg_ctrl_info_req_t;
 	
 #define	I4B_CTRL_INFO_REQ	_IOWR('4', 4, msg_ctrl_info_req_t)