patch-2.1.92 linux/drivers/isdn/hisax/hisax.h

Next file: linux/drivers/isdn/hisax/hscx.c
Previous file: linux/drivers/isdn/hisax/hfc_2bs0.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.91/linux/drivers/isdn/hisax/hisax.h linux/drivers/isdn/hisax/hisax.h
@@ -1,52 +1,59 @@
-/* $Id: hisax.h,v 1.13 1997/04/06 22:54:12 keil Exp $
+/* $Id: hisax.h,v 2.14 1998/02/11 17:28:04 keil Exp $
 
  *   Basic declarations, defines and prototypes
  *
  * $Log: hisax.h,v $
- * Revision 1.13  1997/04/06 22:54:12  keil
- * Using SKB's
+ * Revision 2.14  1998/02/11 17:28:04  keil
+ * Niccy PnP/PCI support
  *
- * Revision 1.12  1997/03/23 21:45:45  keil
- * Add support for ELSA PCMCIA
+ * Revision 2.13  1998/02/09 18:46:02  keil
+ * Support for Sedlbauer PCMCIA (Marcus Niemann)
  *
- * Revision 1.11  1997/02/11 01:36:02  keil
- * New Param structure
+ * Revision 2.12  1998/02/03 23:31:30  keil
+ * add AMD7930 support
  *
- * Revision 1.10  1997/02/09 00:23:52  keil
- * new interface handling, one interface per card
+ * Revision 2.11  1998/02/02 13:33:00  keil
+ * New card support
  *
- * Revision 1.9  1997/01/27 23:18:44  keil
- * prototype for releasestack_isdnl3
+ * Revision 2.10  1997/11/08 21:37:52  keil
+ * new l1 init;new Compaq card
  *
- * Revision 1.8  1997/01/27 16:02:37  keil
- * new cards, callc timers, HZDELAY macro, HiSax_getrev prototype
+ * Revision 2.9  1997/11/06 17:09:09  keil
+ * New 2.1 init code
  *
- * Revision 1.7  1997/01/21 22:22:14  keil
- * changes for 2.0; Elsa Quickstep support
+ * Revision 2.8  1997/10/29 19:04:13  keil
+ * new L1; changes for 2.1
  *
- * Revision 1.6  1997/01/04 13:48:28  keil
- * primitiv for MDL_REMOVE added
+ * Revision 2.7  1997/10/10 20:56:47  fritz
+ * New HL interface.
  *
- * Revision 1.5  1996/12/08 19:49:19  keil
- * Monitor channel support
+ * Revision 2.6  1997/09/11 17:25:51  keil
+ * Add new cards
  *
- * Revision 1.4  1996/11/18 15:35:39  keil
- * some changes for ELSA cards
+ * Revision 2.5  1997/08/03 14:36:31  keil
+ * Implement RESTART procedure
  *
- * Revision 1.3  1996/11/05 19:37:23  keil
- * using config.h
+ * Revision 2.4  1997/07/31 19:25:20  keil
+ * PTP_DATA_LINK support
  *
- * Revision 1.2  1996/10/27 22:21:52  keil
- * CallFlags for broadcast messages
+ * Revision 2.3  1997/07/31 11:50:17  keil
+ * ONE TEI and FIXED TEI handling
  *
- * Revision 1.1  1996/10/13 20:03:46  keil
- * Initial revision
+ * Revision 2.2  1997/07/30 17:13:02  keil
+ * more changes for 'One TEI per card'
  *
+ * Revision 2.1  1997/07/27 21:45:13  keil
+ * new main structures
  *
+ * Revision 2.0  1997/06/26 11:06:27  keil
+ * New card and L1 interface.
+ * Eicon.Diehl Diva and Dynalink IS64PH support
+ *
+ * old changes removed KKe
  *
  */
-#include <linux/module.h>
 #include <linux/config.h>
+#include <linux/module.h>
 #include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -64,140 +71,136 @@
 #include <linux/wait.h>
 #include <linux/isdnif.h>
 #include <linux/tty.h>
+#include <linux/init.h>
 
-#define PH_ACTIVATE   1
-#define PH_DATA       2
-#define PH_DEACTIVATE 3
-
-#define MDL_ASSIGN       4
-#define DL_UNIT_DATA     5
-#define SC_STARTUP       6
-#define CC_ESTABLISH     7
-#define DL_ESTABLISH     8
-#define DL_DATA          9
-#define CC_S_STATUS_ENQ  10
-
-#define CC_CONNECT       15
-#define CC_CONNECT_ACKNOWLEDGE 16
-#define CO_EOF                 17
-#define SC_DISCONNECT          18
-#define CO_DTMF                19
-#define DL_RELEASE             20
-#define DL_FLUSH               21
-
-#define CO_ALARM               22
-#define CC_REJECT              23
-
-#define CC_SETUP_REQ           24
-#define CC_SETUP_CNF           25
-#define CC_SETUP_IND           26
-#define CC_SETUP_RSP           27
-#define CC_SETUP_COMPLETE_IND  28
-
-#define CC_DISCONNECT_REQ      29
-#define CC_DISCONNECT_IND      30
-
-#define CC_RELEASE_CNF         31
-#define CC_RELEASE_IND         32
-#define CC_RELEASE_REQ         33
-
-#define CC_REJECT_REQ          34
-
-#define CC_PROCEEDING_IND      35
-
-#define CC_DLRL                36
-#define CC_DLEST               37
-
-#define CC_ALERTING_REQ        38
-#define CC_ALERTING_IND        39
-
-#define DL_STOP                40
-#define DL_START               41
-
-#define MDL_NOTEIPROC          46
-
-#define LC_ESTABLISH           47
-#define LC_RELEASE             48
-
-#define PH_REQUEST_PULL        49
-#define PH_PULL_ACK            50
-#define	PH_DATA_PULLED	       51
-#define CC_INFO_CHARGE         52
-
-#define CC_MORE_INFO           53
-#define CC_IGNORE              54
-
-#define MDL_REMOVE             56
-#define MDL_VERIFY             57
-
-#define CC_T303                60
-#define CC_T304                61
-#define CC_T305                62
-#define CC_T308_1              64
-#define CC_T308_2              65
-#define CC_T310                66
-#define CC_T313                67
-#define CC_T318                68
-#define CC_T319                69
-
-#define CC_NOSETUP_RSP_ERR     70
-#define CC_SETUP_ERR           71
-#define CC_CONNECT_ERR         72
-#define CC_RELEASE_ERR         73
-
-/*
- * Message-Types
- */
-
-#define MT_ALERTING            0x01
-#define MT_CALL_PROCEEDING     0x02
-#define MT_CONNECT             0x07
-#define MT_CONNECT_ACKNOWLEDGE 0x0f
-#define MT_PROGRESS            0x03
-#define MT_SETUP               0x05
-#define MT_SETUP_ACKNOWLEDGE   0x0d
-#define MT_RESUME              0x26
-#define MT_RESUME_ACKNOWLEDGE  0x2e
-#define MT_RESUME_REJECT       0x22
-#define MT_SUSPEND             0x25
-#define MT_SUSPEND_ACKNOWLEDGE 0x2d
-#define MT_SUSPEND_REJECT      0x21
-#define MT_USER_INFORMATION    0x20
-#define MT_DISCONNECT          0x45
-#define MT_RELEASE             0x4d
-#define MT_RELEASE_COMPLETE    0x5a
-#define MT_RESTART             0x46
-#define MT_RESTART_ACKNOWLEDGE 0x4e
-#define MT_SEGMENT             0x60
-#define MT_CONGESTION_CONTROL  0x79
-#define MT_INFORMATION         0x7b
-#define MT_FACILITY            0x62
-#define MT_NOTIFY              0x6e
-#define MT_STATUS              0x7d
-#define MT_STATUS_ENQUIRY      0x75
-
-#define IE_CAUSE               0x08
-
-struct HscxIoctlArg {
-	int channel;
-	int mode;
-	int transbufsize;
-};
+#define PH_ACTIVATE_REQ	0x0010
+#define PH_ACTIVATE_CNF	0x0011
+#define PH_ACTIVATE_IND	0x0012
+#define PH_DEACTIVATE_REQ 0x0020
+#define PH_DEACTIVATE_CNF 0x0021
+#define PH_DEACTIVATE_IND 0x0022
+#define PH_DEACT_REQ	0x0024
+#define PH_DEACT_CNF	0x0025
+#define PH_DEACT_IND	0x0026
+#define PH_DEACT_ACK	0x0027
+#define PH_TESTLOOP_REQ	0x0030
+#define PH_PAUSE_CNF	0x0035
+#define PH_PAUSE_IND	0x0036
+#define PH_PULL_REQ	0x0038
+#define PH_PULL_CNF	0x0039
+#define	PH_PULL_IND	0x003A
+#define PH_DATA_REQ	0x0040
+#define PH_DATA_IND	0x0042
+
+#define PH_INFO3_REQ	0x0008
+#define PH_INFO2_IND	0x000A
+#define PH_ENABLE_REQ	0x0004
+#define PH_RSYNC_IND	0x0006
+#define PH_RESET_REQ	0x0000
+#define PH_RESET_IND	0x0002
+#define PH_POWERUP_CNF	0x0003
+#define PH_ACTIV_REQ	0x000C
+#define PH_I4_P8_IND	0x000D
+#define PH_I4_P10_IND	0x000F
+
+#define MDL_ASSIGN_REQ	0x0050
+#define MDL_ASSIGN_IND	0x0052
+#define MDL_REMOVE_REQ	0x0054
+#define MDL_ERROR_REQ	0x0058
+#define MDL_ERROR_IND	0x005A
+#define CARD_AUX_IND	0x005E
+
+#define DL_UNIT_DATA	6
+#define CC_ESTABLISH	7
+#define DL_ESTABLISH	8
+#define DL_DATA		9
+
+#define CC_CONNECT	15
+#define DL_RELEASE	20
+#define DL_FLUSH	21
+
+#define CC_REJECT	23
+
+#define CC_SETUP_REQ	24
+#define CC_SETUP_CNF	25
+#define CC_SETUP_IND	26
+#define CC_SETUP_RSP	27
+#define CC_SETUP_COMPLETE_IND	28
+
+#define CC_DISCONNECT_REQ	29
+#define CC_DISCONNECT_IND	30
+
+#define CC_RELEASE_CNF	31
+#define CC_RELEASE_IND	32
+#define CC_RELEASE_REQ	33
+
+#define CC_REJECT_REQ	34
+
+#define CC_PROCEEDING_IND	35
+
+#define CC_DLRL		36
+#define CC_DLEST	37
+
+#define CC_ALERTING_REQ	38
+#define CC_ALERTING_IND	39
+
+#define DL_STOP		40
+#define DL_START	41
+
+#define MDL_INFO_SETUP	42
+#define MDL_INFO_CONN	43
+#define MDL_INFO_REL	44
+#define MDL_NOTEIPROC	46
+
+#define LC_ESTABLISH	47
+#define LC_RELEASE	48
+
+#define CC_INFO_CHARGE	52
+
+#define CC_MORE_INFO	53
+#define CC_IGNORE	54
+#define CC_RESTART	55
+
+
+#define CC_T303		60
+#define CC_T304		61
+#define CC_T305		62
+#define CC_T308_1	64
+#define CC_T308_2	65
+#define CC_T310		66
+#define CC_T313		67
+#define CC_T318		68
+#define CC_T319		69
+
+#define CC_NOSETUP_RSP_ERR	70
+#define CC_SETUP_ERR		71
+#define CC_CONNECT_ERR		72
+#define CC_RELEASE_ERR		73
+
+#define CARD_RESET	0x1001
+#define CARD_SETIRQ	0x1002
+#define CARD_INIT	0x1003
+#define CARD_RELEASE	0x1004
+#define CARD_TEST	0x1005
 
 #ifdef __KERNEL__
 
-#undef DEBUG_MAGIC
-
-#define MAX_DFRAME_LEN	3072
+#define MAX_DFRAME_LEN	260
 #define HSCX_BUFMAX	4096
 #define MAX_DATA_SIZE	(HSCX_BUFMAX - 4)
-#define MAX_DATA_MEM    (HSCX_BUFMAX * 2)
+#define MAX_DATA_MEM	(HSCX_BUFMAX + 64)
+#define RAW_BUFMAX	(((HSCX_BUFMAX*6)/5) + 5)
 #define MAX_HEADER_LEN	4
 #define MAX_WINDOW	8
+#define MAX_MON_FRAME	32
+
+/* #define I4L_IRQ_FLAG SA_INTERRUPT */
+#define I4L_IRQ_FLAG    0
 
 /*
  * Statemachine
  */
+
 struct Fsm {
 	int *jumpmatrix;
 	int state_count, event_count;
@@ -226,73 +229,107 @@
 };
 
 struct L3Timer {
-	struct PStack *st;
+	struct l3_process *pc;
 	struct timer_list tl;
 	int event;
 };
 
+#define FLG_L1_ACTIVATING	1
+#define FLG_L1_ACTIVATED	2
+#define FLG_L1_DEACTTIMER	3
+#define FLG_L1_ACTTIMER		4
+#define FLG_L1_T3RUN		5
+#define FLG_L1_PULL_REQ		6
+
 struct Layer1 {
 	void *hardware;
-	int hscx;
+	struct BCState *bcs;
 	struct PStack **stlistp;
-	int act_state;
+	int Flags;
+	struct FsmInst l1m;
+	struct FsmTimer	timer;
 	void (*l1l2) (struct PStack *, int, void *);
 	void (*l1man) (struct PStack *, int, void *);
-	int hscxmode, hscxchannel, requestpull;
+	void (*l1tei) (struct PStack *, int, void *);
+	int mode, bc;
 };
 
+#define GROUP_TEI	127
+#define TEI_SAPI	63
+#define CTRL_SAPI	0
+#define PACKET_NOACK	250
+
+/* Layer2 Flags */
+
+#define FLG_LAPB	0
+#define FLG_LAPD	1
+#define FLG_ORIG	2
+#define FLG_MOD128	3
+#define FLG_PEND_REL	4
+#define FLG_L3_INIT	5 
+#define FLG_T200_RUN	6 
+#define FLG_ACK_PEND	7
+#define FLG_REJEXC	8
+#define FLG_OWN_BUSY	9
+#define FLG_PEER_BUSY	10
+#define FLG_DCHAN_BUSY	11
+
 struct Layer2 {
-	int sap, tei, ces;
-	int extended, laptype;
-	int uihsize, ihsize;
+	int tei;
+	int tei_wanted;
+	int sap;
+	int maxlen;
+	unsigned int flag;
 	int vs, va, vr;
-	struct sk_buff_head i_queue;
-	int window, orig;
-	int rejexp;
-	int debug;
-	struct sk_buff *windowar[MAX_WINDOW];
+	int rc;
+	int window;
 	int sow;
-	struct FsmInst l2m;
+	struct sk_buff *windowar[MAX_WINDOW];
+	struct sk_buff_head i_queue;
+	struct sk_buff_head ui_queue;
 	void (*l2l1) (struct PStack *, int, void *);
-	void (*l2l1discardq) (struct PStack *, int, void *, int);
 	void (*l2man) (struct PStack *, int, void *);
 	void (*l2l3) (struct PStack *, int, void *);
 	void (*l2tei) (struct PStack *, int, void *);
-	struct FsmTimer t200_timer, t203_timer;
-	int t200, n200, t203;
-	int rc, t200_running;
+	struct FsmInst l2m;
+	struct FsmTimer t200, t203;
+	int T200, N200, T203;
+	int debug;
 	char debug_id[32];
 };
 
 struct Layer3 {
-	void (*l3l4) (struct PStack *, int, void *);
+	void (*l3l4) (struct l3_process *, int, void *);
 	void (*l3l2) (struct PStack *, int, void *);
-	int state, callref;
-	struct L3Timer timer;
-	int t303, t304, t305, t308, t310, t313, t318, t319;
-	int n_t303;
+	struct l3_process *proc;
+	struct l3_process *global;
+	int N303;
 	int debug;
-	int channr;
 };
 
-struct Layer4 {
+struct LLInterface {
 	void (*l4l3) (struct PStack *, int, void *);
 	void *userdata;
-	void (*l1writewakeup) (struct PStack *);
-	void (*l2writewakeup) (struct PStack *);
+	void (*l1writewakeup) (struct PStack *, int);
+	void (*l2writewakeup) (struct PStack *, int);
 };
 
+
 struct Management {
+	int	ri;
+	struct FsmInst tei_m;
+	struct FsmTimer t202;
+	int T202, N202, debug;
+	void (*layer) (struct PStack *, int, void *);
 	void (*manl1) (struct PStack *, int, void *);
 	void (*manl2) (struct PStack *, int, void *);
-	void (*teil2) (struct PStack *, int, void *);
 };
 
+
 struct Param {
 	int cause;
 	int loc;
 	int bchannel;
-	int callref;		/* Callreferenz Number */
 	setup_parm setup;	/* from isdnif.h numbers and Serviceindicator */
 	int chargeinfo;		/* Charge Info - only for 1tr6 in
 				 * the moment
@@ -300,39 +337,114 @@
 	int spv;		/* SPV Flag */
 };
 
+
 struct PStack {
 	struct PStack *next;
 	struct Layer1 l1;
 	struct Layer2 l2;
 	struct Layer3 l3;
-	struct Layer4 l4;
+	struct LLInterface lli; 
 	struct Management ma;
-	struct Param *pa;
 	int protocol;		/* EDSS1 or 1TR6 */
 };
 
-struct HscxState {
-	int inuse, init, active;
-	struct IsdnCardState *sp;
-	int hscx, mode;
-	u_char *rcvbuf;		/* B-Channel receive Buffer */
-	int rcvidx;		/* B-Channel receive Buffer Index */
-	struct sk_buff *tx_skb;	/* B-Channel transmit Buffer */
+struct l3_process {
+	int callref;
+	int state;
+	struct L3Timer timer;
+	int N303;
+	int debug;
+	struct Param para;
+	struct Channel *chan;
+	struct PStack *st;
+	struct l3_process *next;
+};
+
+struct hscx_hw {
+	int rcvidx;
+	int count;              /* Current skb sent count */
+	u_char *rcvbuf;         /* B-Channel receive Buffer */
+	struct sk_buff *tx_skb; /* B-Channel transmit Buffer */
+};
+
+struct hfcB_hw {
+	unsigned int *send;
+	int f1;
+	int f2;
+	struct sk_buff *tx_skb; /* B-Channel transmit Buffer */
+};
+
+struct tiger_hw {
+	struct sk_buff *tx_skb; /* B-Channel transmit Buffer */
+	u_int *send;
+	u_int *s_irq;
+	u_int *s_end;
+	u_int *sendp;
+	u_int *rec;
+	int free;
+	u_char *rcvbuf;
+	u_char *sendbuf;
+	u_char *sp;
+	int sendcnt;
+	u_int s_tot;
+	u_int r_bitcnt;
+	u_int r_tot;
+	u_int r_err;
+	u_int r_fcs;
+	u_char r_state;
+	u_char r_one;
+	u_char r_val;
+	u_char s_state;
+};
+
+struct amd7930_hw {
+	u_char *tx_buff;
+	u_char *rv_buff;
+	int rv_buff_in;
+	int rv_buff_out;
+	struct sk_buff *rv_skb;
+	struct hdlc_state *hdlc_state;
+	struct tq_struct tq_rcv;
+	struct tq_struct tq_xmt;
+	struct sk_buff *tx_skb; /* B-Channel transmit Buffer */
+};
+
+#define BC_FLG_INIT	1
+#define BC_FLG_ACTIV	2
+#define BC_FLG_BUSY	3
+#define BC_FLG_NOFRAME	4
+#define BC_FLG_HALF	5
+#define BC_FLG_EMPTY	6
+
+#define L1_MODE_NULL	0
+#define L1_MODE_TRANS	1
+#define L1_MODE_HDLC	2
+
+struct BCState {
+	int channel;
+	int mode;
+	int Flag;
+	struct IsdnCardState *cs;
 	int tx_cnt;		/* B-Channel transmit counter */
-	int count;		/* Current skb sent count */
 	struct sk_buff_head rqueue;	/* B-Channel receive Queue */
-	struct sk_buff_head squeue;	/* B-Channel receive Queue */
+	struct sk_buff_head squeue;	/* B-Channel send Queue */
 	struct PStack *st;
 	struct tq_struct tqueue;
 	int event;
-#ifdef DEBUG_MAGIC
-	int magic;		/* 301270 */
-#endif
+	int  (*BC_SetStack) (struct PStack *, struct BCState *);
+	void (*BC_Close) (struct BCState *);
+	union {
+		struct hscx_hw hscx;
+		struct hfcB_hw hfc;
+		struct tiger_hw tiger;
+		struct amd7930_hw  amd7930;
+	} hw;
 };
 
 struct LcFsm {
-	struct FsmInst lcfi;
 	int type;
+	int delay;
+	struct FsmInst lcfi;
 	struct Channel *ch;
 	void (*lccall) (struct LcFsm *, int, void *);
 	struct PStack *st;
@@ -343,52 +455,209 @@
 };
 
 struct Channel {
-	struct PStack ds, is;
-	struct IsdnCardState *sp;
-	int hscx;
+	struct PStack *b_st, *d_st;
+	struct IsdnCardState *cs;
+	struct BCState *bcs;
 	int chan;
 	int incoming;
 	struct FsmInst fi;
-	struct LcFsm lc_d, lc_b;
-	struct Param para;
+	struct LcFsm *lc_d;
+	struct LcFsm *lc_b;
 	struct FsmTimer drel_timer, dial_timer;
 	int debug;
-#ifdef DEBUG_MAGIC
-	int magic;		/* 301272 */
-#endif
 	int l2_protocol, l2_active_protocol;
-	int l2_primitive, l2_headersize;
 	int data_open;
-	int outcallref;
-	int impair;
+	struct l3_process *proc;
+	setup_parm setup;	/* from isdnif.h numbers and Serviceindicator */
 	int Flags;		/* for remembering action done in l4 */
 	int leased;
 };
 
-struct IsdnCardState {
-#ifdef DEBUG_MAGIC
-	int magic;
-#endif
-	unsigned char typ;
-	unsigned char subtyp;
-	int protocol;
-	unsigned int irq;
+struct elsa_hw {
+	unsigned int base;
+	unsigned int cfg;
+	unsigned int ctrl;
+	unsigned int ale;
+	unsigned int isac;
+	unsigned int itac;
+	unsigned int hscx;
+	unsigned int trig;
+	unsigned int timer;
+	unsigned int counter;
+	unsigned int status;
+	struct timer_list tl;
+	u_char ctrl_reg;
+};	
+
+struct teles3_hw {
+	unsigned int cfg_reg;
+	unsigned int isac;
+	unsigned int hscx[2];
+	unsigned int isacfifo;
+	unsigned int hscxfifo[2];
+};	
+
+struct teles0_hw {
 	unsigned int cfg_reg;
 	unsigned int membase;
+};	
+
+struct avm_hw {
+	unsigned int cfg_reg;
 	unsigned int isac;
 	unsigned int hscx[2];
+	unsigned int isacfifo;
+	unsigned int hscxfifo[2];
 	unsigned int counter;
+};	
+
+struct ix1_hw {
+	unsigned int cfg_reg;
+	unsigned int isac_ale;
+	unsigned int isac;
+	unsigned int hscx_ale;
+	unsigned int hscx;
+};
+
+struct diva_hw {
+	unsigned int cfg_reg;
+	unsigned int ctrl;
+	unsigned int isac_adr;
+	unsigned int isac;
+	unsigned int hscx_adr;
+	unsigned int hscx;
+	unsigned int status;
+	struct timer_list tl;
+	u_char ctrl_reg;
+};	
+
+struct asus_hw {
+	unsigned int cfg_reg;
+	unsigned int adr;
+	unsigned int isac;
+	unsigned int hscx;
+	unsigned int u7;
+	unsigned int pots;
+};
+
+
+struct hfc_hw {
+	unsigned int addr;
+	unsigned int fifosize;
+	unsigned char cirm;
+	unsigned char ctmt;
+	unsigned char cip;
+	u_char isac_spcr;
+	struct timer_list timer;
+};
+
+struct sedl_hw {
+	unsigned int cfg_reg;
+	unsigned int adr;
+	unsigned int isac;
+	unsigned int hscx;
+	unsigned int reset_on;
+	unsigned int reset_off;
+};
+
+struct spt_hw {
+	unsigned int cfg_reg;
+	unsigned int isac;
+	unsigned int hscx[2];
+	unsigned char res_irq;
+};	
+
+struct mic_hw {
+	unsigned int cfg_reg;
+	unsigned int adr;
+	unsigned int isac;
+	unsigned int hscx;
+};
+
+struct njet_hw {
+	unsigned int base;
+	unsigned int isac;
+	unsigned int auxa;
+	unsigned char auxd;
+	unsigned char dmactrl;
+	unsigned char ctrl_reg;
+	unsigned char irqmask0;
+	unsigned char irqstat0;
+	unsigned char last_is0;
+};
+
+struct hfcD_hw {
+	unsigned int addr;
+	unsigned int bfifosize;
+	unsigned int dfifosize;
+	unsigned char cirm;
+	unsigned char ctmt;
+	unsigned char cip;
+	unsigned char conn;
+	unsigned char mst_m;
+	unsigned char int_m1;
+	unsigned char int_m2;
+	unsigned char int_s1;
+	unsigned char sctrl;
+	unsigned char stat;
+	unsigned char fifo;
+	unsigned char f1;
+	unsigned char f2;
+	unsigned int *send;
+	struct timer_list timer;
+};
+
+#define HW_IOM1		0
+#define HW_IPAC		1
+#define FLG_TWO_DCHAN	4
+#define FLG_L1_DBUSY	5
+#define FLG_DBUSY_TIMER 6
+#define FLG_LOCK_ATOMIC 7
+#define HW_MON0_RX_END	8
+#define HW_MON1_RX_END	9
+#define HW_MON0_TX_END	10
+#define HW_MON1_TX_END	11
+
+struct IsdnCardState {
+	unsigned char typ;
+	unsigned char subtyp;
+	int protocol;
+	unsigned int irq;
+	int HW_Flags; 
+	int *busy_flag;
+	union {
+		struct elsa_hw elsa;
+		struct teles0_hw teles0;
+		struct teles3_hw teles3;
+		struct avm_hw avm;
+		struct ix1_hw ix1;
+		struct diva_hw diva;
+		struct asus_hw asus;
+		struct hfc_hw hfc;
+		struct sedl_hw sedl;
+		struct spt_hw spt;
+		struct mic_hw mic;
+		struct njet_hw njet;
+		struct hfcD_hw hfcD;
+		struct ix1_hw niccy;
+	} hw;
 	int myid;
 	isdn_if iif;
 	u_char *status_buf;
 	u_char *status_read;
 	u_char *status_write;
 	u_char *status_end;
-	void (*ph_command) (struct IsdnCardState *, unsigned int);
-	void (*modehscx) (struct HscxState *, int, int);
-	void (*hscx_fill_fifo) (struct HscxState *);
-	void (*isac_fill_fifo) (struct IsdnCardState *);
+	u_char (*readisac) (struct IsdnCardState *, u_char);
+	void   (*writeisac) (struct IsdnCardState *, u_char, u_char);
+	void   (*readisacfifo) (struct IsdnCardState *, u_char *, int);
+	void   (*writeisacfifo) (struct IsdnCardState *, u_char *, int);
+	u_char (*BC_Read_Reg) (struct IsdnCardState *, int, u_char);
+	void   (*BC_Write_Reg) (struct IsdnCardState *, int, u_char, u_char);
+	void   (*BC_Send_Data) (struct BCState *);
+	int    (*cardmsg) (struct IsdnCardState *, int, void *);
+	void   (*l1cmd) (struct IsdnCardState *, int, void *);
 	struct Channel channel[2];
+	struct BCState bcs[2];
 	struct PStack *stlist;
 	u_char *rcvbuf;
 	int rcvidx;
@@ -396,16 +665,20 @@
 	int tx_cnt;
 	int event;
 	struct tq_struct tqueue;
-	int ph_active;
+	struct timer_list dbusytimer;
 	struct sk_buff_head rq, sq; /* D-channel queues */
-	int cardnr;
 	int ph_state;
-	struct PStack *teistack;
-	struct HscxState hs[2];
+	int cardnr;
 	int dlogflag;
 	char *dlogspace;
 	int debug;
-	unsigned int CallFlags;
+	u_char *mon_tx;
+	u_char *mon_rx;
+	int mon_txp;
+	int mon_txc;
+	int mon_rxp;
+	u_char mocr;
+	void   (*setstack_d) (struct PStack *, struct IsdnCardState *);
 };
 
 #define  MON0_RX	1
@@ -419,99 +692,246 @@
 #define  ISDN_CTYPE_PNP		4
 #define  ISDN_CTYPE_A1		5
 #define  ISDN_CTYPE_ELSA	6
-#define  ISDN_CTYPE_ELSA_QS1000	7
+#define  ISDN_CTYPE_ELSA_PNP	7
 #define  ISDN_CTYPE_TELESPCMCIA	8
 #define  ISDN_CTYPE_IX1MICROR2	9
+#define  ISDN_CTYPE_ELSA_PCMCIA	10
+#define  ISDN_CTYPE_DIEHLDIVA	11
+#define  ISDN_CTYPE_ASUSCOM	12
+#define  ISDN_CTYPE_TELEINT	13
+#define  ISDN_CTYPE_TELES3C	14
+#define  ISDN_CTYPE_SEDLBAUER	15
+#define  ISDN_CTYPE_SPORTSTER	16
+#define  ISDN_CTYPE_MIC		17
+#define  ISDN_CTYPE_ELSA_PCI	18
+#define  ISDN_CTYPE_COMPAQ_ISA	19
+#define  ISDN_CTYPE_NETJET	20
+#define  ISDN_CTYPE_TELESPCI	21
+#define  ISDN_CTYPE_SEDLBAUER_PCMCIA	22
+#define  ISDN_CTYPE_AMD7930	23
+#define  ISDN_CTYPE_NICCY	24
 
-#define  ISDN_CTYPE_COUNT	9
+#define  ISDN_CTYPE_COUNT	24
+
+#ifdef ISDN_CHIP_ISAC
+#undef ISDN_CHIP_ISAC
+#endif
+
+#define HISAX_INITFUNC(__arginit) __initfunc(__arginit)
+#define HISAX_INITDATA __initdata
 
 #ifdef	CONFIG_HISAX_16_0
 #define  CARD_TELES0 (1<< ISDN_CTYPE_16_0) | (1<< ISDN_CTYPE_8_0)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
 #else
 #define  CARD_TELES0  0
 #endif
 
 #ifdef	CONFIG_HISAX_16_3
 #define  CARD_TELES3 (1<< ISDN_CTYPE_16_3) | (1<< ISDN_CTYPE_PNP) | \
-		     (1<< ISDN_CTYPE_TELESPCMCIA)
+		     (1<< ISDN_CTYPE_TELESPCMCIA) | (1<< ISDN_CTYPE_COMPAQ_ISA)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
 #else
 #define  CARD_TELES3  0
 #endif
 
 #ifdef	CONFIG_HISAX_AVM_A1
 #define  CARD_AVM_A1 (1<< ISDN_CTYPE_A1)
+#ifndef ISDN_CHIP_ISAC 
+#define ISDN_CHIP_ISAC 1
+#endif
 #else
 #define  CARD_AVM_A1  0
 #endif
 
-#ifdef	CONFIG_HISAX_ELSA_PCC
-#define  CARD_ELSA (1<< ISDN_CTYPE_ELSA) | (1<< ISDN_CTYPE_ELSA_QS1000)
+#ifdef	CONFIG_HISAX_ELSA
+#define  CARD_ELSA (1<< ISDN_CTYPE_ELSA) | (1<< ISDN_CTYPE_ELSA_PNP) | \
+		   (1<< ISDN_CTYPE_ELSA_PCMCIA) | (1<< ISDN_CTYPE_ELSA_PCI)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
+#undef HISAX_INITFUNC
+#define HISAX_INITFUNC(__arginit) __arginit
+#undef HISAX_INITDATA
+#define HISAX_INITDATA
 #else
 #define  CARD_ELSA  0
 #endif
 
-#ifdef	CONFIG_HISAX_ELSA_PCMCIA
-#if CARD_ELSA
-#error "You can't use a ELSA ISA card and a ELSA PCMCIA card with the same driver"
-#else
-#undef CARD_ELSA
-#define CARD_ELSA (1<< ISDN_CTYPE_ELSA_QS1000)
-#endif
-#endif
 
 #ifdef	CONFIG_HISAX_IX1MICROR2
 #define	CARD_IX1MICROR2 (1 << ISDN_CTYPE_IX1MICROR2)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
 #else
 #define CARD_IX1MICROR2 0
 #endif
 
+#ifdef  CONFIG_HISAX_DIEHLDIVA
+#define CARD_DIEHLDIVA (1 << ISDN_CTYPE_DIEHLDIVA)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
+#else
+#define CARD_DIEHLDIVA 0
+#endif
+
+#ifdef  CONFIG_HISAX_ASUSCOM
+#define CARD_ASUSCOM (1 << ISDN_CTYPE_ASUSCOM)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
+#else
+#define CARD_ASUSCOM 0
+#endif
+
+#ifdef  CONFIG_HISAX_TELEINT
+#define CARD_TELEINT (1 << ISDN_CTYPE_TELEINT)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
+#else
+#define CARD_TELEINT 0
+#endif
+
+#ifdef  CONFIG_HISAX_SEDLBAUER
+#define CARD_SEDLBAUER (1 << ISDN_CTYPE_SEDLBAUER) | (1 << ISDN_CTYPE_SEDLBAUER_PCMCIA)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
+#else
+#define CARD_SEDLBAUER 0
+#endif
+
+#ifdef  CONFIG_HISAX_SPORTSTER
+#define CARD_SPORTSTER (1 << ISDN_CTYPE_SPORTSTER)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
+#else
+#define CARD_SPORTSTER 0
+#endif
+
+#ifdef  CONFIG_HISAX_MIC
+#define CARD_MIC (1 << ISDN_CTYPE_MIC)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
+#else
+#define CARD_MIC 0
+#endif
+
+#ifdef  CONFIG_HISAX_NETJET
+#define CARD_NETJET (1 << ISDN_CTYPE_NETJET)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
+#else
+#define CARD_NETJET 0
+#endif
+
+#ifdef	CONFIG_HISAX_TELES3C
+#define  CARD_TELES3C (1<< ISDN_CTYPE_TELES3C)
+#else
+#define  CARD_TELES3C  0
+#endif
+
+#ifdef  CONFIG_HISAX_AMD7930
+#define CARD_AMD7930 (1 << ISDN_CTYPE_AMD7930)
+#else
+#define CARD_AMD7930 0
+#endif
+
+#ifdef	CONFIG_HISAX_NICCY
+#define	CARD_NICCY (1 << ISDN_CTYPE_NICCY)
+#ifndef ISDN_CHIP_ISAC
+#define ISDN_CHIP_ISAC 1
+#endif
+#else
+#define CARD_NICCY 0
+#endif
+
+
 #define  SUPORTED_CARDS  (CARD_TELES0 | CARD_TELES3 | CARD_AVM_A1 | CARD_ELSA \
-			 | CARD_IX1MICROR2)
+			 | CARD_IX1MICROR2 | CARD_DIEHLDIVA | CARD_ASUSCOM \
+			 | CARD_TELEINT | CARD_SEDLBAUER | CARD_SPORTSTER \
+			 | CARD_MIC | CARD_NETJET | CARD_TELES3C | CARD_AMD7930 \
+			 | CARD_NICCY)
+
+#define TEI_PER_CARD 0
+
+#ifdef CONFIG_HISAX_1TR6
+#undef TEI_PER_CARD
+#define TEI_PER_CARD 1
+#endif
+
+#ifdef CONFIG_HISAX_EURO
+#undef TEI_PER_CARD
+#define TEI_PER_CARD 1
+#define HISAX_EURO_SENDCOMPLETE 1
+#ifdef	CONFIG_HISAX_ML
+#undef HISAX_EURO_SENDCOMPLETE
+#endif
+#undef HISAX_DE_AOC
+#ifdef CONFIG_DE_AOC
+#define HISAX_DE_AOC 1
+#endif
+#endif
+
+#if TEI_PER_CARD
+#undef TEI_FIXED
+#endif
+
+#undef PTP_DATA_LINK
+
+#ifdef PTP_DATA_LINK
+#undef TEI_FIXED
+#define TEI_FIXED 0
+#define LAYER2_WATCHING
+#endif
 
 struct IsdnCard {
 	int typ;
 	int protocol;		/* EDSS1 or 1TR6 */
-	unsigned int para[3];
-	struct IsdnCardState *sp;
+	unsigned int para[4];
+	struct IsdnCardState *cs;
 };
 
-
-#define LAPD 0
-#define LAPB 1
-
-void l2down(struct PStack *st, u_char pr, struct sk_buff *skb);
-void l2up(struct PStack *st, u_char pr, struct sk_buff *skb);
-void acceptph(struct PStack *st, struct sk_buff *skb);
 void setstack_isdnl2(struct PStack *st, char *debug_id);
-int HiSax_inithardware(void);
+int HiSax_inithardware(int *);
 void HiSax_closehardware(void);
 
-void setstack_HiSax(struct PStack *st, struct IsdnCardState *sp);
-unsigned int randomces(void);
+void setstack_HiSax(struct PStack *st, struct IsdnCardState *cs);
+unsigned int random_ri(void);
 void setstack_isdnl3(struct PStack *st, struct Channel *chanp);
 void HiSax_addlist(struct IsdnCardState *sp, struct PStack *st);
 void releasestack_isdnl2(struct PStack *st);
 void releasestack_isdnl3(struct PStack *st);
 void HiSax_rmlist(struct IsdnCardState *sp, struct PStack *st);
-void newcallref(struct PStack *st);
 
-int setstack_hscx(struct PStack *st, struct HscxState *hs);
 u_char *findie(u_char * p, int size, u_char ie, int wanted_set);
 int getcallref(u_char * p);
+int newcallref(void);
 
 void FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount);
 void FsmFree(struct Fsm *fsm);
 int FsmEvent(struct FsmInst *fi, int event, void *arg);
 void FsmChangeState(struct FsmInst *fi, int newstate);
 void FsmInitTimer(struct FsmInst *fi, struct FsmTimer *ft);
-int FsmAddTimer(struct FsmTimer *ft, int millisec,
-		int event, void *arg, int where);
+int FsmAddTimer(struct FsmTimer *ft, int millisec, int event,
+	void *arg, int where);
+void FsmRestartTimer(struct FsmTimer *ft, int millisec, int event,
+	void *arg, int where);
 void FsmDelTimer(struct FsmTimer *ft, int where);
-int FsmTimerRunning(struct FsmTimer *ft);
 void jiftime(char *s, long mark);
 
 int HiSax_command(isdn_ctrl * ic);
-int HiSax_writebuf_skb(int id, int chan, struct sk_buff *skb);
+int HiSax_writebuf_skb(int id, int chan, int ack, struct sk_buff *skb);
 void HiSax_putstatus(struct IsdnCardState *csta, char *buf);
 void HiSax_reportcard(int cardnr);
 int QuickHex(char *txt, u_char * p, int cnt);
@@ -520,10 +940,12 @@
 void iecpy(u_char * dest, u_char * iestart, int ieoffset);
 void setstack_transl2(struct PStack *st);
 void releasestack_transl2(struct PStack *st);
-void close_hscxstate(struct HscxState *);
 void setstack_tei(struct PStack *st);
-
-#endif				/* __KERNEL__ */
+void setstack_manager(struct PStack *st);
+#ifdef ISDN_CHIP_ISAC
+void setstack_isac(struct PStack *st, struct IsdnCardState *cs);
+#endif	/* ISDN_CHIP_ISAC */
+#endif	/* __KERNEL__ */
 
 #define HZDELAY(jiffs) {int tout = jiffs; while (tout--) udelay(1000000/HZ);}
 
@@ -533,8 +955,12 @@
 void CallcFree(void);
 int CallcNewChan(struct IsdnCardState *csta);
 void CallcFreeChan(struct IsdnCardState *csta);
+void Isdnl1New(void);
+void Isdnl1Free(void);
 void Isdnl2New(void);
 void Isdnl2Free(void);
 void init_tei(struct IsdnCardState *sp, int protocol);
 void release_tei(struct IsdnCardState *sp);
 char *HiSax_getrev(const char *revision);
+void TeiNew(void);
+void TeiFree(void);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov