o Merge with Linux 2.1.99.

 o Fix ancient bug in the ELF loader making ldd crash.
 o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.

1 files changed, 195 insertions, 771 deletions

diff --git a/drivers/isdn/hisax/avm_a1.c b/drivers/isdn/hisax/avm_a1.c
index e6c775546..464bc33fd 100644
--- a/drivers/isdn/hisax/avm_a1.c
+++ b/drivers/isdn/hisax/avm_a1.c
@@ -1,4 +1,4 @@
-/* $Id: avm_a1.c,v 1.6 1997/04/13 19:54:07 keil Exp $
+/* $Id: avm_a1.c,v 2.7 1998/02/02 13:29:37 keil Exp $
 
  * avm_a1.c     low level stuff for AVM A1 (Fritz) isdn cards
  *
@@ -6,6 +6,30 @@
  *
  *
  * $Log: avm_a1.c,v $
+ * Revision 2.7  1998/02/02 13:29:37  keil
+ * fast io
+ *
+ * Revision 2.6  1998/01/13 23:09:46  keil
+ * really disable timer
+ *
+ * Revision 2.5  1998/01/02 06:50:29  calle
+ * Perodic timer of A1 now disabled, no need for linux driver.
+ *
+ * Revision 2.4  1997/11/08 21:35:42  keil
+ * new l1 init
+ *
+ * Revision 2.3  1997/11/06 17:13:32  keil
+ * New 2.1 init code
+ *
+ * Revision 2.2  1997/10/29 18:55:48  keil
+ * changes for 2.1.60 (irq2dev_map)
+ *
+ * Revision 2.1  1997/07/27 21:47:13  keil
+ * new interface structures
+ *
+ * Revision 2.0  1997/06/26 11:02:48  keil
+ * New Layer and card interface
+ *
  * Revision 1.6  1997/04/13 19:54:07  keil
  * Change in IRQ check delay for SMP
  *
@@ -27,17 +51,20 @@
  *
  */
 #define __NO_VERSION__
-#include "siemens.h"
 #include "hisax.h"
-#include "avm_a1.h"
+#include "isac.h"
+#include "hscx.h"
 #include "isdnl1.h"
-#include <linux/kernel_stat.h>
 
 extern const char *CardType[];
-const char *avm_revision = "$Revision: 1.6 $";
+const char *avm_revision = "$Revision: 2.7 $";
+
+#define	 AVM_A1_STAT_ISAC	0x01
+#define	 AVM_A1_STAT_HSCX	0x02
+#define	 AVM_A1_STAT_TIMER	0x04
 
-#define byteout(addr,val) outb_p(val,addr)
-#define bytein(addr) inb_p(addr)
+#define byteout(addr,val) outb(val,addr)
+#define bytein(addr) inb(addr)
 
 static inline u_char
 readreg(unsigned int adr, u_char off)
@@ -55,906 +82,303 @@ writereg(unsigned int adr, u_char off, u_char data)
 static inline void
 read_fifo(unsigned int adr, u_char * data, int size)
 {
-	insb(adr - 0x400, data, size);
+	insb(adr, data, size);
 }
 
 static void
 write_fifo(unsigned int adr, u_char * data, int size)
 {
-	outsb(adr - 0x400, data, size);
-}
-
-static inline void
-waitforCEC(int adr)
-{
-	int to = 50;
-
-	while ((readreg(adr, HSCX_STAR) & 0x04) && to) {
-		udelay(1);
-		to--;
-	}
-	if (!to)
-		printk(KERN_WARNING "AVM A1: waitforCEC timeout\n");
+	outsb(adr, data, size);
 }
 
+/* Interface functions */
 
-static inline void
-waitforXFW(int adr)
-{
-	int to = 50;
-
-	while ((!(readreg(adr, HSCX_STAR) & 0x44) == 0x40) && to) {
-		udelay(1);
-		to--;
-	}
-	if (!to)
-		printk(KERN_WARNING "AVM A1: waitforXFW timeout\n");
-}
-
-static inline void
-writehscxCMDR(int adr, u_char data)
+static u_char
+ReadISAC(struct IsdnCardState *cs, u_char offset)
 {
-	long flags;
-
-	save_flags(flags);
-	cli();
-	waitforCEC(adr);
-	writereg(adr, HSCX_CMDR, data);
-	restore_flags(flags);
+	return (readreg(cs->hw.avm.isac, offset));
 }
 
-/*
- * fast interrupt here
- */
-
 static void
-hscxreport(struct IsdnCardState *sp, int hscx)
+WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value)
 {
-	printk(KERN_DEBUG "HSCX %d\n", hscx);
-	printk(KERN_DEBUG "ISTA %x\n", readreg(sp->hscx[hscx], HSCX_ISTA));
-	printk(KERN_DEBUG "STAR %x\n", readreg(sp->hscx[hscx], HSCX_STAR));
-	printk(KERN_DEBUG "EXIR %x\n", readreg(sp->hscx[hscx], HSCX_EXIR));
+	writereg(cs->hw.avm.isac, offset, value);
 }
 
-void
-avm_a1_report(struct IsdnCardState *sp)
-{
-	printk(KERN_DEBUG "ISAC\n");
-	printk(KERN_DEBUG "ISTA %x\n", readreg(sp->isac, ISAC_ISTA));
-	printk(KERN_DEBUG "STAR %x\n", readreg(sp->isac, ISAC_STAR));
-	printk(KERN_DEBUG "EXIR %x\n", readreg(sp->isac, ISAC_EXIR));
-	hscxreport(sp, 0);
-	hscxreport(sp, 1);
-}
-
-/*
- * HSCX stuff goes here
- */
-
 static void
-hscx_empty_fifo(struct HscxState *hsp, int count)
+ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size)
 {
-	u_char *ptr;
-	struct IsdnCardState *sp = hsp->sp;
-	long flags;
-
-	if ((sp->debug & L1_DEB_HSCX) && !(sp->debug & L1_DEB_HSCX_FIFO))
-		debugl1(sp, "hscx_empty_fifo");
-
-	if (hsp->rcvidx + count > HSCX_BUFMAX) {
-		if (sp->debug & L1_DEB_WARN)
-			debugl1(sp, "hscx_empty_fifo: incoming packet too large");
-		writehscxCMDR(sp->hscx[hsp->hscx], 0x80);
-		hsp->rcvidx = 0;
-		return;
-	}
-	ptr = hsp->rcvbuf + hsp->rcvidx;
-	hsp->rcvidx += count;
-	save_flags(flags);
-	cli();
-	read_fifo(sp->hscx[hsp->hscx], ptr, count);
-	writehscxCMDR(sp->hscx[hsp->hscx], 0x80);
-	restore_flags(flags);
-	if (sp->debug & L1_DEB_HSCX_FIFO) {
-		char tmp[128];
-		char *t = tmp;
-
-		t += sprintf(t, "hscx_empty_fifo %c cnt %d",
-			     hsp->hscx ? 'B' : 'A', count);
-		QuickHex(t, ptr, count);
-		debugl1(sp, tmp);
-	}
+	read_fifo(cs->hw.avm.isacfifo, data, size);
 }
 
 static void
-hscx_fill_fifo(struct HscxState *hsp)
+WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size)
 {
-	struct IsdnCardState *sp = hsp->sp;
-	int more, count;
-	u_char *ptr;
-	long flags;
-
-	if ((sp->debug & L1_DEB_HSCX) && !(sp->debug & L1_DEB_HSCX_FIFO))
-		debugl1(sp, "hscx_fill_fifo");
-
-	if (!hsp->tx_skb)
-		return;
-	if (hsp->tx_skb->len <= 0)
-		return;
-
-	more = (hsp->mode == 1) ? 1 : 0;
-	if (hsp->tx_skb->len > 32) {
-		more = !0;
-		count = 32;
-	} else
-		count = hsp->tx_skb->len;
-
-	waitforXFW(sp->hscx[hsp->hscx]);
-	save_flags(flags);
-	cli();
-	ptr = hsp->tx_skb->data;
-	skb_pull(hsp->tx_skb, count);
-	hsp->tx_cnt -= count;
-	hsp->count += count;
-	write_fifo(sp->hscx[hsp->hscx], ptr, count);
-	writehscxCMDR(sp->hscx[hsp->hscx], more ? 0x8 : 0xa);
-	restore_flags(flags);
-	if (sp->debug & L1_DEB_HSCX_FIFO) {
-		char tmp[128];
-		char *t = tmp;
-
-		t += sprintf(t, "hscx_fill_fifo %c cnt %d",
-			     hsp->hscx ? 'B' : 'A', count);
-		QuickHex(t, ptr, count);
-		debugl1(sp, tmp);
-	}
+	write_fifo(cs->hw.avm.isacfifo, data, size);
 }
 
-static inline void
-hscx_interrupt(struct IsdnCardState *sp, u_char val, u_char hscx)
+static u_char
+ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset)
 {
-	u_char r;
-	struct HscxState *hsp = sp->hs + hscx;
-	struct sk_buff *skb;
-	int count;
-	char tmp[32];
-
-	if (!hsp->init)
-		return;
-
-	if (val & 0x80) {	/* RME */
-
-		r = readreg(sp->hscx[hsp->hscx], HSCX_RSTA);
-		if ((r & 0xf0) != 0xa0) {
-			if (!r & 0x80)
-				if (sp->debug & L1_DEB_WARN)
-					debugl1(sp, "HSCX invalid frame");
-			if ((r & 0x40) && hsp->mode)
-				if (sp->debug & L1_DEB_WARN) {
-					sprintf(tmp, "HSCX RDO mode=%d",
-						hsp->mode);
-					debugl1(sp, tmp);
-				}
-			if (!r & 0x20)
-				if (sp->debug & L1_DEB_WARN)
-					debugl1(sp, "HSCX CRC error");
-			writehscxCMDR(sp->hscx[hsp->hscx], 0x80);
-		} else {
-			count = readreg(sp->hscx[hsp->hscx], HSCX_RBCL) & 0x1f;
-			if (count == 0)
-				count = 32;
-			hscx_empty_fifo(hsp, count);
-			if ((count = hsp->rcvidx - 1) > 0) {
-				if (!(skb = dev_alloc_skb(count)))
-					printk(KERN_WARNING "AVM: receive out of memory\n");
-				else {
-					memcpy(skb_put(skb, count), hsp->rcvbuf, count);
-					skb_queue_tail(&hsp->rqueue, skb);
-				}
-			}
-		}
-		hsp->rcvidx = 0;
-		hscx_sched_event(hsp, HSCX_RCVBUFREADY);
-	}
-	if (val & 0x40) {	/* RPF */
-		hscx_empty_fifo(hsp, 32);
-		if (hsp->mode == 1) {
-			/* receive audio data */
-			if (!(skb = dev_alloc_skb(32)))
-				printk(KERN_WARNING "AVM: receive out of memory\n");
-			else {
-				memcpy(skb_put(skb, 32), hsp->rcvbuf, 32);
-				skb_queue_tail(&hsp->rqueue, skb);
-			}
-			hsp->rcvidx = 0;
-			hscx_sched_event(hsp, HSCX_RCVBUFREADY);
-		}
-	}
-	if (val & 0x10) {	/* XPR */
-		if (hsp->tx_skb)
-			if (hsp->tx_skb->len) {
-				hscx_fill_fifo(hsp);
-				return;
-			} else {
-				SET_SKB_FREE(hsp->tx_skb);
-				dev_kfree_skb(hsp->tx_skb);
-				hsp->count = 0;
-				if (hsp->st->l4.l1writewakeup)
-					hsp->st->l4.l1writewakeup(hsp->st);
-				hsp->tx_skb = NULL;
-			}
-		if ((hsp->tx_skb = skb_dequeue(&hsp->squeue))) {
-			hsp->count = 0;
-			hscx_fill_fifo(hsp);
-		} else
-			hscx_sched_event(hsp, HSCX_XMTBUFREADY);
-	}
+	return (readreg(cs->hw.avm.hscx[hscx], offset));
 }
 
-/*
- * ISAC stuff goes here
- */
-
 static void
-isac_empty_fifo(struct IsdnCardState *sp, int count)
+WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
 {
-	u_char *ptr;
-	long flags;
-
-	if ((sp->debug & L1_DEB_ISAC) && !(sp->debug & L1_DEB_ISAC_FIFO))
-		if (sp->debug & L1_DEB_ISAC)
-			debugl1(sp, "isac_empty_fifo");
-
-	if ((sp->rcvidx + count) >= MAX_DFRAME_LEN) {
-		if (sp->debug & L1_DEB_WARN) {
-			char tmp[40];
-			sprintf(tmp, "isac_empty_fifo overrun %d",
-				sp->rcvidx + count);
-			debugl1(sp, tmp);
-		}
-		writereg(sp->isac, ISAC_CMDR, 0x80);
-		sp->rcvidx = 0;
-		return;
-	}
-	ptr = sp->rcvbuf + sp->rcvidx;
-	sp->rcvidx += count;
-	save_flags(flags);
-	cli();
-	read_fifo(sp->isac, ptr, count);
-	writereg(sp->isac, ISAC_CMDR, 0x80);
-	restore_flags(flags);
-	if (sp->debug & L1_DEB_ISAC_FIFO) {
-		char tmp[128];
-		char *t = tmp;
-
-		t += sprintf(t, "isac_empty_fifo cnt %d", count);
-		QuickHex(t, ptr, count);
-		debugl1(sp, tmp);
-	}
+	writereg(cs->hw.avm.hscx[hscx], offset, value);
 }
 
-static void
-isac_fill_fifo(struct IsdnCardState *sp)
-{
-	int count, more;
-	u_char *ptr;
-	long flags;
-
-	if ((sp->debug & L1_DEB_ISAC) && !(sp->debug & L1_DEB_ISAC_FIFO))
-		debugl1(sp, "isac_fill_fifo");
-
-	if (!sp->tx_skb)
-		return;
-
-	count = sp->tx_skb->len;
-	if (count <= 0)
-		return;
-
-	more = 0;
-	if (count > 32) {
-		more = !0;
-		count = 32;
-	}
-	save_flags(flags);
-	cli();
-	ptr = sp->tx_skb->data;
-	skb_pull(sp->tx_skb, count);
-	sp->tx_cnt += count;
-	write_fifo(sp->isac, ptr, count);
-	writereg(sp->isac, ISAC_CMDR, more ? 0x8 : 0xa);
-	restore_flags(flags);
-	if (sp->debug & L1_DEB_ISAC_FIFO) {
-		char tmp[128];
-		char *t = tmp;
-
-		t += sprintf(t, "isac_fill_fifo cnt %d", count);
-		QuickHex(t, ptr, count);
-		debugl1(sp, tmp);
-	}
-}
-
-static void
-ph_command(struct IsdnCardState *sp, unsigned int command)
-{
-	if (sp->debug & L1_DEB_ISAC) {
-		char tmp[32];
-		sprintf(tmp, "ph_command %d", command);
-		debugl1(sp, tmp);
-	}
-	writereg(sp->isac, ISAC_CIX0, (command << 2) | 3);
-}
-
-
-static inline void
-isac_interrupt(struct IsdnCardState *sp, u_char val)
-{
-	u_char exval;
-	struct sk_buff *skb;
-	unsigned int count;
-	char tmp[32];
-
-	if (sp->debug & L1_DEB_ISAC) {
-		sprintf(tmp, "ISAC interrupt %x", val);
-		debugl1(sp, tmp);
-	}
-	if (val & 0x80) {	/* RME */
-		exval = readreg(sp->isac, ISAC_RSTA);
-		if ((exval & 0x70) != 0x20) {
-			if (exval & 0x40)
-				if (sp->debug & L1_DEB_WARN)
-					debugl1(sp, "ISAC RDO");
-			if (!exval & 0x20)
-				if (sp->debug & L1_DEB_WARN)
-					debugl1(sp, "ISAC CRC error");
-			writereg(sp->isac, ISAC_CMDR, 0x80);
-		} else {
-			count = readreg(sp->isac, ISAC_RBCL) & 0x1f;
-			if (count == 0)
-				count = 32;
-			isac_empty_fifo(sp, count);
-			if ((count = sp->rcvidx) > 0) {
-				if (!(skb = alloc_skb(count, GFP_ATOMIC)))
-					printk(KERN_WARNING "AVM: D receive out of memory\n");
-				else {
-					memcpy(skb_put(skb, count), sp->rcvbuf, count);
-					skb_queue_tail(&sp->rq, skb);
-				}
-			}
-		}
-		sp->rcvidx = 0;
-		isac_sched_event(sp, ISAC_RCVBUFREADY);
-	}
-	if (val & 0x40) {	/* RPF */
-		isac_empty_fifo(sp, 32);
-	}
-	if (val & 0x20) {	/* RSC */
-		/* never */
-		if (sp->debug & L1_DEB_WARN)
-			debugl1(sp, "ISAC RSC interrupt");
-	}
-	if (val & 0x10) {	/* XPR */
-		if (sp->tx_skb)
-			if (sp->tx_skb->len) {
-				isac_fill_fifo(sp);
-				goto afterXPR;
-			} else {
-				SET_SKB_FREE(sp->tx_skb);
-				dev_kfree_skb(sp->tx_skb);
-				sp->tx_cnt = 0;
-				sp->tx_skb = NULL;
-			}
-		if ((sp->tx_skb = skb_dequeue(&sp->sq))) {
-			sp->tx_cnt = 0;
-			isac_fill_fifo(sp);
-		} else
-			isac_sched_event(sp, ISAC_XMTBUFREADY);
-	}
-      afterXPR:
-	if (val & 0x04) {	/* CISQ */
-		sp->ph_state = (readreg(sp->isac, ISAC_CIX0) >> 2)
-		    & 0xf;
-		if (sp->debug & L1_DEB_ISAC) {
-			sprintf(tmp, "l1state %d", sp->ph_state);
-			debugl1(sp, tmp);
-		}
-		isac_new_ph(sp);
-	}
-	if (val & 0x02) {	/* SIN */
-		/* never */
-		if (sp->debug & L1_DEB_WARN)
-			debugl1(sp, "ISAC SIN interrupt");
-	}
-	if (val & 0x01) {	/* EXI */
-		exval = readreg(sp->isac, ISAC_EXIR);
-		if (sp->debug & L1_DEB_WARN) {
-			sprintf(tmp, "ISAC EXIR %02x", exval);
-			debugl1(sp, tmp);
-		}
-	}
-}
-
-static inline void
-hscx_int_main(struct IsdnCardState *sp, u_char val)
-{
-
-	u_char exval;
-	struct HscxState *hsp;
-	char tmp[32];
+/*
+ * fast interrupt HSCX stuff goes here
+ */
 
+#define READHSCX(cs, nr, reg) readreg(cs->hw.avm.hscx[nr], reg)
+#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.avm.hscx[nr], reg, data)
+#define READHSCXFIFO(cs, nr, ptr, cnt) read_fifo(cs->hw.avm.hscxfifo[nr], ptr, cnt)
+#define WRITEHSCXFIFO(cs, nr, ptr, cnt) write_fifo(cs->hw.avm.hscxfifo[nr], ptr, cnt)
 
-	if (val & 0x01) {
-		hsp = sp->hs + 1;
-		exval = readreg(sp->hscx[1], HSCX_EXIR);
-		if (exval == 0x40) {
-			if (hsp->mode == 1)
-				hscx_fill_fifo(hsp);
-			else {
-				/* Here we lost an TX interrupt, so
-				   * restart transmitting the whole frame.
-				 */
-				if (hsp->tx_skb) {
-					skb_push(hsp->tx_skb, hsp->count);
-					hsp->tx_cnt += hsp->count;
-					hsp->count = 0;
-				}
-				writehscxCMDR(sp->hscx[hsp->hscx], 0x01);
-				if (sp->debug & L1_DEB_WARN) {
-					sprintf(tmp, "HSCX B EXIR %x Lost TX", exval);
-					debugl1(sp, tmp);
-				}
-			}
-		} else if (sp->debug & L1_DEB_HSCX) {
-			sprintf(tmp, "HSCX B EXIR %x", exval);
-			debugl1(sp, tmp);
-		}
-	}
-	if (val & 0xf8) {
-		if (sp->debug & L1_DEB_HSCX) {
-			sprintf(tmp, "HSCX B interrupt %x", val);
-			debugl1(sp, tmp);
-		}
-		hscx_interrupt(sp, val, 1);
-	}
-	if (val & 0x02) {
-		hsp = sp->hs;
-		exval = readreg(sp->hscx[0], HSCX_EXIR);
-		if (exval == 0x40) {
-			if (hsp->mode == 1)
-				hscx_fill_fifo(hsp);
-			else {
-				/* Here we lost an TX interrupt, so
-				   * restart transmitting the whole frame.
-				 */
-				if (hsp->tx_skb) {
-					skb_push(hsp->tx_skb, hsp->count);
-					hsp->tx_cnt += hsp->count;
-					hsp->count = 0;
-				}
-				writehscxCMDR(sp->hscx[hsp->hscx], 0x01);
-				if (sp->debug & L1_DEB_WARN) {
-					sprintf(tmp, "HSCX A EXIR %x Lost TX", exval);
-					debugl1(sp, tmp);
-				}
-			}
-		} else if (sp->debug & L1_DEB_HSCX) {
-			sprintf(tmp, "HSCX A EXIR %x", exval);
-			debugl1(sp, tmp);
-		}
-	}
-	if (val & 0x04) {
-		exval = readreg(sp->hscx[0], HSCX_ISTA);
-		if (sp->debug & L1_DEB_HSCX) {
-			sprintf(tmp, "HSCX A interrupt %x", exval);
-			debugl1(sp, tmp);
-		}
-		hscx_interrupt(sp, exval, 0);
-	}
-}
+#include "hscx_irq.c"
 
 static void
 avm_a1_interrupt(int intno, void *dev_id, struct pt_regs *regs)
 {
-	struct IsdnCardState *sp;
+	struct IsdnCardState *cs = dev_id;
 	u_char val, sval, stat = 0;
 	char tmp[32];
 
-	sp = (struct IsdnCardState *) dev_id;
-
-	if (!sp) {
+	if (!cs) {
 		printk(KERN_WARNING "AVM A1: Spurious interrupt!\n");
 		return;
 	}
-	while (((sval = bytein(sp->cfg_reg)) & 0xf) != 0x7) {
+	while (((sval = bytein(cs->hw.avm.cfg_reg)) & 0xf) != 0x7) {
 		if (!(sval & AVM_A1_STAT_TIMER)) {
-			byteout(sp->cfg_reg, 0x14);
-			byteout(sp->cfg_reg, 0x18);
-			sval = bytein(sp->cfg_reg);
-		} else if (sp->debug & L1_DEB_INTSTAT) {
+			byteout(cs->hw.avm.cfg_reg, 0x1E);
+			sval = bytein(cs->hw.avm.cfg_reg);
+		} else if (cs->debug & L1_DEB_INTSTAT) {
 			sprintf(tmp, "avm IntStatus %x", sval);
-			debugl1(sp, tmp);
+			debugl1(cs, tmp);
 		}
 		if (!(sval & AVM_A1_STAT_HSCX)) {
-			val = readreg(sp->hscx[1], HSCX_ISTA);
+			val = readreg(cs->hw.avm.hscx[1], HSCX_ISTA);
 			if (val) {
-				hscx_int_main(sp, val);
+				hscx_int_main(cs, val);
 				stat |= 1;
 			}
 		}
 		if (!(sval & AVM_A1_STAT_ISAC)) {
-			val = readreg(sp->isac, ISAC_ISTA);
+			val = readreg(cs->hw.avm.isac, ISAC_ISTA);
 			if (val) {
-				isac_interrupt(sp, val);
+				isac_interrupt(cs, val);
 				stat |= 2;
 			}
 		}
 	}
 	if (stat & 1) {
-		writereg(sp->hscx[0], HSCX_MASK, 0xFF);
-		writereg(sp->hscx[1], HSCX_MASK, 0xFF);
-		writereg(sp->hscx[0], HSCX_MASK, 0x0);
-		writereg(sp->hscx[1], HSCX_MASK, 0x0);
+		writereg(cs->hw.avm.hscx[0], HSCX_MASK, 0xFF);
+		writereg(cs->hw.avm.hscx[1], HSCX_MASK, 0xFF);
+		writereg(cs->hw.avm.hscx[0], HSCX_MASK, 0x0);
+		writereg(cs->hw.avm.hscx[1], HSCX_MASK, 0x0);
 	}
 	if (stat & 2) {
-		writereg(sp->isac, ISAC_MASK, 0xFF);
-		writereg(sp->isac, ISAC_MASK, 0x0);
+		writereg(cs->hw.avm.isac, ISAC_MASK, 0xFF);
+		writereg(cs->hw.avm.isac, ISAC_MASK, 0x0);
 	}
 }
 
-
-static void
-initisac(struct IsdnCardState *sp)
-{
-	unsigned int adr = sp->isac;
-
-	/* 16.3 IOM 2 Mode */
-	writereg(adr, ISAC_MASK, 0xff);
-	writereg(adr, ISAC_ADF2, 0x80);
-	writereg(adr, ISAC_SQXR, 0x2f);
-	writereg(adr, ISAC_SPCR, 0x0);
-	writereg(adr, ISAC_ADF1, 0x2);
-	writereg(adr, ISAC_STCR, 0x70);
-	writereg(adr, ISAC_MODE, 0xc9);
-	writereg(adr, ISAC_TIMR, 0x0);
-	writereg(adr, ISAC_ADF1, 0x0);
-	writereg(adr, ISAC_CMDR, 0x41);
-	writereg(adr, ISAC_CIX0, (1 << 2) | 3);
-	writereg(adr, ISAC_MASK, 0xff);
-	writereg(adr, ISAC_MASK, 0x0);
-}
-
-static void
-modehscx(struct HscxState *hs, int mode, int ichan)
-{
-	struct IsdnCardState *sp = hs->sp;
-	int hscx = hs->hscx;
-
-	if (sp->debug & L1_DEB_HSCX) {
-		char tmp[40];
-		sprintf(tmp, "hscx %c mode %d ichan %d",
-			'A' + hscx, mode, ichan);
-		debugl1(sp, tmp);
-	}
-	hs->mode = mode;
-	writereg(sp->hscx[hscx], HSCX_CCR1, 0x85);
-	writereg(sp->hscx[hscx], HSCX_XAD1, 0xFF);
-	writereg(sp->hscx[hscx], HSCX_XAD2, 0xFF);
-	writereg(sp->hscx[hscx], HSCX_RAH2, 0xFF);
-	writereg(sp->hscx[hscx], HSCX_XBCH, 0x0);
-	writereg(sp->hscx[hscx], HSCX_RLCR, 0x0);
-
-	switch (mode) {
-		case (0):
-			writereg(sp->hscx[hscx], HSCX_CCR2, 0x30);
-			writereg(sp->hscx[hscx], HSCX_TSAX, 0xff);
-			writereg(sp->hscx[hscx], HSCX_TSAR, 0xff);
-			writereg(sp->hscx[hscx], HSCX_XCCR, 7);
-			writereg(sp->hscx[hscx], HSCX_RCCR, 7);
-			writereg(sp->hscx[hscx], HSCX_MODE, 0x84);
-			break;
-		case (1):
-			if (ichan == 0) {
-				writereg(sp->hscx[hscx], HSCX_CCR2, 0x30);
-				writereg(sp->hscx[hscx], HSCX_TSAX, 0x2f);
-				writereg(sp->hscx[hscx], HSCX_TSAR, 0x2f);
-				writereg(sp->hscx[hscx], HSCX_XCCR, 7);
-				writereg(sp->hscx[hscx], HSCX_RCCR, 7);
-			} else {
-				writereg(sp->hscx[hscx], HSCX_CCR2, 0x30);
-				writereg(sp->hscx[hscx], HSCX_TSAX, 0x3);
-				writereg(sp->hscx[hscx], HSCX_TSAR, 0x3);
-				writereg(sp->hscx[hscx], HSCX_XCCR, 7);
-				writereg(sp->hscx[hscx], HSCX_RCCR, 7);
-			}
-			writereg(sp->hscx[hscx], HSCX_MODE, 0xe4);
-			writereg(sp->hscx[hscx], HSCX_CMDR, 0x41);
-			break;
-		case (2):
-			if (ichan == 0) {
-				writereg(sp->hscx[hscx], HSCX_CCR2, 0x30);
-				writereg(sp->hscx[hscx], HSCX_TSAX, 0x2f);
-				writereg(sp->hscx[hscx], HSCX_TSAR, 0x2f);
-				writereg(sp->hscx[hscx], HSCX_XCCR, 7);
-				writereg(sp->hscx[hscx], HSCX_RCCR, 7);
-			} else {
-				writereg(sp->hscx[hscx], HSCX_CCR2, 0x30);
-				writereg(sp->hscx[hscx], HSCX_TSAX, 0x3);
-				writereg(sp->hscx[hscx], HSCX_TSAR, 0x3);
-				writereg(sp->hscx[hscx], HSCX_XCCR, 7);
-				writereg(sp->hscx[hscx], HSCX_RCCR, 7);
-			}
-			writereg(sp->hscx[hscx], HSCX_MODE, 0x8c);
-			writereg(sp->hscx[hscx], HSCX_CMDR, 0x41);
-			break;
-	}
-	writereg(sp->hscx[hscx], HSCX_ISTA, 0x00);
-}
-
 inline static void
-release_ioregs(struct IsdnCard *card, int mask)
+release_ioregs(struct IsdnCardState *cs, int mask)
 {
-	release_region(card->sp->cfg_reg, 8);
+	release_region(cs->hw.avm.cfg_reg, 8);
 	if (mask & 1)
-		release_region(card->sp->isac, 32);
+		release_region(cs->hw.avm.isac + 32, 32);
 	if (mask & 2)
-		release_region(card->sp->isac - 0x400, 1);
+		release_region(cs->hw.avm.isacfifo, 1);
 	if (mask & 4)
-		release_region(card->sp->hscx[0], 32);
+		release_region(cs->hw.avm.hscx[0] + 32, 32);
 	if (mask & 8)
-		release_region(card->sp->hscx[0] - 0x400, 1);
+		release_region(cs->hw.avm.hscxfifo[0], 1);
 	if (mask & 0x10)
-		release_region(card->sp->hscx[1], 32);
+		release_region(cs->hw.avm.hscx[1] + 32, 32);
 	if (mask & 0x20)
-		release_region(card->sp->hscx[1] - 0x400, 1);
+		release_region(cs->hw.avm.hscxfifo[1], 1);
 }
 
-void
-release_io_avm_a1(struct IsdnCard *card)
+static int
+AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 {
-	release_ioregs(card, 0x3f);
+	switch (mt) {
+		case CARD_RESET:
+			return(0);
+		case CARD_RELEASE:
+			release_ioregs(cs, 0x3f);
+			return(0);
+		case CARD_SETIRQ:
+			return(request_irq(cs->irq, &avm_a1_interrupt,
+					I4L_IRQ_FLAG, "HiSax", cs));
+		case CARD_INIT:
+			clear_pending_isac_ints(cs);
+			clear_pending_hscx_ints(cs);
+			initisac(cs);
+			inithscx(cs);
+			return(0);
+		case CARD_TEST:
+			return(0);
+	}
+	return(0);
 }
 
-static void
-clear_pending_ints(struct IsdnCardState *sp)
+__initfunc(int
+setup_avm_a1(struct IsdnCard *card))
 {
-	int val;
-	char tmp[64];
-
-	val = readreg(sp->hscx[1], HSCX_ISTA);
-	sprintf(tmp, "HSCX B ISTA %x", val);
-	debugl1(sp, tmp);
-	if (val & 0x01) {
-		val = readreg(sp->hscx[1], HSCX_EXIR);
-		sprintf(tmp, "HSCX B EXIR %x", val);
-		debugl1(sp, tmp);
-	} else if (val & 0x02) {
-		val = readreg(sp->hscx[0], HSCX_EXIR);
-		sprintf(tmp, "HSCX A EXIR %x", val);
-		debugl1(sp, tmp);
-	}
-	val = readreg(sp->hscx[0], HSCX_ISTA);
-	sprintf(tmp, "HSCX A ISTA %x", val);
-	debugl1(sp, tmp);
-	val = readreg(sp->hscx[1], HSCX_STAR);
-	sprintf(tmp, "HSCX B STAR %x", val);
-	debugl1(sp, tmp);
-	val = readreg(sp->hscx[0], HSCX_STAR);
-	sprintf(tmp, "HSCX A STAR %x", val);
-	debugl1(sp, tmp);
-	val = readreg(sp->isac, ISAC_STAR);
-	sprintf(tmp, "ISAC STAR %x", val);
-	debugl1(sp, tmp);
-	val = readreg(sp->isac, ISAC_MODE);
-	sprintf(tmp, "ISAC MODE %x", val);
-	debugl1(sp, tmp);
-	val = readreg(sp->isac, ISAC_ADF2);
-	sprintf(tmp, "ISAC ADF2 %x", val);
-	debugl1(sp, tmp);
-	val = readreg(sp->isac, ISAC_ISTA);
-	sprintf(tmp, "ISAC ISTA %x", val);
-	debugl1(sp, tmp);
-	if (val & 0x01) {
-		val = readreg(sp->isac, ISAC_EXIR);
-		sprintf(tmp, "ISAC EXIR %x", val);
-		debugl1(sp, tmp);
-	} else if (val & 0x04) {
-		val = readreg(sp->isac, ISAC_CIR0);
-		sprintf(tmp, "ISAC CIR0 %x", val);
-		debugl1(sp, tmp);
-	}
-	writereg(sp->isac, ISAC_MASK, 0);
-	writereg(sp->isac, ISAC_CMDR, 0x41);
-}
-
-int
-initavm_a1(struct IsdnCardState *sp)
-{
-	int ret;
-	int loop = 0;
-	char tmp[40];
-
-	sp->counter = kstat_irqs(sp->irq);
-	sprintf(tmp, "IRQ %d count %d", sp->irq, sp->counter);
-	debugl1(sp, tmp);
-	clear_pending_ints(sp);
-	ret = get_irq(sp->cardnr, &avm_a1_interrupt);
-	if (ret) {
-		initisac(sp);
-		sp->modehscx(sp->hs, 0, 0);
-		sp->modehscx(sp->hs + 1, 0, 0);
-		while (loop++ < 10) {
-			/* At least 1-3 irqs must happen
-			 * (one from HSCX A, one from HSCX B, 3rd from ISAC)
-			 */
-			if (kstat_irqs(sp->irq) > sp->counter)
-				break;
-			current->state = TASK_INTERRUPTIBLE;
-			current->timeout = jiffies + 1;
-			schedule();
-		}
-		sprintf(tmp, "IRQ %d count %d", sp->irq,
-			kstat_irqs(sp->irq));
-		debugl1(sp, tmp);
-		if (kstat_irqs(sp->irq) == sp->counter) {
-			printk(KERN_WARNING
-			       "AVM A1: IRQ(%d) getting no interrupts during init\n",
-			       sp->irq);
-			free_irq(sp->irq, sp);
-			return (0);
-		}
-	}
-	return (ret);
-}
-
-int
-setup_avm_a1(struct IsdnCard *card)
-{
-	u_char val, verA, verB;
-	struct IsdnCardState *sp = card->sp;
+	u_char val;
+	struct IsdnCardState *cs = card->cs;
 	long flags;
 	char tmp[64];
 
 	strcpy(tmp, avm_revision);
-	printk(KERN_NOTICE "HiSax: AVM driver Rev. %s\n", HiSax_getrev(tmp));
-	if (sp->typ != ISDN_CTYPE_A1)
+	printk(KERN_INFO "HiSax: AVM driver Rev. %s\n", HiSax_getrev(tmp));
+	if (cs->typ != ISDN_CTYPE_A1)
 		return (0);
 
-	sp->cfg_reg = card->para[1] + 0x1800;
-	sp->isac = card->para[1] + 0x1400;
-	sp->hscx[0] = card->para[1] + 0x400;
-	sp->hscx[1] = card->para[1] + 0xc00;
-	sp->irq = card->para[0];
-	if (check_region((sp->cfg_reg), 8)) {
+	cs->hw.avm.cfg_reg = card->para[1] + 0x1800;
+	cs->hw.avm.isac = card->para[1] + 0x1400 - 0x20;
+	cs->hw.avm.hscx[0] = card->para[1] + 0x400 - 0x20;
+	cs->hw.avm.hscx[1] = card->para[1] + 0xc00 - 0x20;
+	cs->hw.avm.isacfifo = card->para[1] + 0x1000;
+	cs->hw.avm.hscxfifo[0] = card->para[1];
+	cs->hw.avm.hscxfifo[1] = card->para[1] + 0x800;
+	cs->irq = card->para[0];
+	if (check_region((cs->hw.avm.cfg_reg), 8)) {
 		printk(KERN_WARNING
 		       "HiSax: %s config port %x-%x already in use\n",
 		       CardType[card->typ],
-		       sp->cfg_reg,
-		       sp->cfg_reg + 8);
+		       cs->hw.avm.cfg_reg,
+		       cs->hw.avm.cfg_reg + 8);
 		return (0);
 	} else {
-		request_region(sp->cfg_reg, 8, "avm cfg");
+		request_region(cs->hw.avm.cfg_reg, 8, "avm cfg");
 	}
-	if (check_region((sp->isac), 32)) {
+	if (check_region((cs->hw.avm.isac + 32), 32)) {
 		printk(KERN_WARNING
 		       "HiSax: %s isac ports %x-%x already in use\n",
-		       CardType[sp->typ],
-		       sp->isac,
-		       sp->isac + 32);
-		release_ioregs(card, 0);
+		       CardType[cs->typ],
+		       cs->hw.avm.isac + 32,
+		       cs->hw.avm.isac + 64);
+		release_ioregs(cs, 0);
 		return (0);
 	} else {
-		request_region(sp->isac, 32, "HiSax isac");
+		request_region(cs->hw.avm.isac + 32, 32, "HiSax isac");
 	}
-	if (check_region((sp->isac - 0x400), 1)) {
+	if (check_region((cs->hw.avm.isacfifo), 1)) {
 		printk(KERN_WARNING
 		       "HiSax: %s isac fifo port %x already in use\n",
-		       CardType[sp->typ],
-		       sp->isac - 0x400);
-		release_ioregs(card, 1);
+		       CardType[cs->typ],
+		       cs->hw.avm.isacfifo);
+		release_ioregs(cs, 1);
 		return (0);
 	} else {
-		request_region(sp->isac - 0x400, 1, "HiSax isac fifo");
+		request_region(cs->hw.avm.isacfifo, 1, "HiSax isac fifo");
 	}
-	if (check_region((sp->hscx[0]), 32)) {
+	if (check_region((cs->hw.avm.hscx[0]) + 32, 32)) {
 		printk(KERN_WARNING
 		       "HiSax: %s hscx A ports %x-%x already in use\n",
-		       CardType[sp->typ],
-		       sp->hscx[0],
-		       sp->hscx[0] + 32);
-		release_ioregs(card, 3);
+		       CardType[cs->typ],
+		       cs->hw.avm.hscx[0] + 32,
+		       cs->hw.avm.hscx[0] + 64);
+		release_ioregs(cs, 3);
 		return (0);
 	} else {
-		request_region(sp->hscx[0], 32, "HiSax hscx A");
+		request_region(cs->hw.avm.hscx[0] + 32, 32, "HiSax hscx A");
 	}
-	if (check_region((sp->hscx[0] - 0x400), 1)) {
+	if (check_region(cs->hw.avm.hscxfifo[0], 1)) {
 		printk(KERN_WARNING
 		       "HiSax: %s hscx A fifo port %x already in use\n",
-		       CardType[sp->typ],
-		       sp->hscx[0] - 0x400);
-		release_ioregs(card, 7);
+		       CardType[cs->typ],
+		       cs->hw.avm.hscxfifo[0]);
+		release_ioregs(cs, 7);
 		return (0);
 	} else {
-		request_region(sp->hscx[0] - 0x400, 1, "HiSax hscx A fifo");
+		request_region(cs->hw.avm.hscxfifo[0], 1, "HiSax hscx A fifo");
 	}
-	if (check_region((sp->hscx[1]), 32)) {
+	if (check_region(cs->hw.avm.hscx[1] + 32, 32)) {
 		printk(KERN_WARNING
 		       "HiSax: %s hscx B ports %x-%x already in use\n",
-		       CardType[sp->typ],
-		       sp->hscx[1],
-		       sp->hscx[1] + 32);
-		release_ioregs(card, 0xf);
+		       CardType[cs->typ],
+		       cs->hw.avm.hscx[1] + 32,
+		       cs->hw.avm.hscx[1] + 64);
+		release_ioregs(cs, 0xf);
 		return (0);
 	} else {
-		request_region(sp->hscx[1], 32, "HiSax hscx B");
+		request_region(cs->hw.avm.hscx[1] + 32, 32, "HiSax hscx B");
 	}
-	if (check_region((sp->hscx[1] - 0x400), 1)) {
+	if (check_region(cs->hw.avm.hscxfifo[1], 1)) {
 		printk(KERN_WARNING
 		       "HiSax: %s hscx B fifo port %x already in use\n",
-		       CardType[sp->typ],
-		       sp->hscx[1] - 0x400);
-		release_ioregs(card, 0x1f);
+		       CardType[cs->typ],
+		       cs->hw.avm.hscxfifo[1]);
+		release_ioregs(cs, 0x1f);
 		return (0);
 	} else {
-		request_region(sp->hscx[1] - 0x400, 1, "HiSax hscx B fifo");
+		request_region(cs->hw.avm.hscxfifo[1], 1, "HiSax hscx B fifo");
 	}
 	save_flags(flags);
-	byteout(sp->cfg_reg, 0x0);
+	byteout(cs->hw.avm.cfg_reg, 0x0);
 	sti();
 	HZDELAY(HZ / 5 + 1);
-	byteout(sp->cfg_reg, 0x1);
+	byteout(cs->hw.avm.cfg_reg, 0x1);
 	HZDELAY(HZ / 5 + 1);
-	byteout(sp->cfg_reg, 0x0);
+	byteout(cs->hw.avm.cfg_reg, 0x0);
 	HZDELAY(HZ / 5 + 1);
-	val = sp->irq;
+	val = cs->irq;
 	if (val == 9)
 		val = 2;
-	byteout(sp->cfg_reg + 1, val);
+	byteout(cs->hw.avm.cfg_reg + 1, val);
 	HZDELAY(HZ / 5 + 1);
-	byteout(sp->cfg_reg, 0x0);
+	byteout(cs->hw.avm.cfg_reg, 0x0);
 	HZDELAY(HZ / 5 + 1);
 	restore_flags(flags);
 
-	val = bytein(sp->cfg_reg);
+	val = bytein(cs->hw.avm.cfg_reg);
 	printk(KERN_INFO "AVM A1: Byte at %x is %x\n",
-	       sp->cfg_reg, val);
-	val = bytein(sp->cfg_reg + 3);
+	       cs->hw.avm.cfg_reg, val);
+	val = bytein(cs->hw.avm.cfg_reg + 3);
 	printk(KERN_INFO "AVM A1: Byte at %x is %x\n",
-	       sp->cfg_reg + 3, val);
-	val = bytein(sp->cfg_reg + 2);
+	       cs->hw.avm.cfg_reg + 3, val);
+	val = bytein(cs->hw.avm.cfg_reg + 2);
 	printk(KERN_INFO "AVM A1: Byte at %x is %x\n",
-	       sp->cfg_reg + 2, val);
-	byteout(sp->cfg_reg, 0x14);
-	byteout(sp->cfg_reg, 0x18);
-	val = bytein(sp->cfg_reg);
+	       cs->hw.avm.cfg_reg + 2, val);
+	byteout(cs->hw.avm.cfg_reg, 0x1E);
+	val = bytein(cs->hw.avm.cfg_reg);
 	printk(KERN_INFO "AVM A1: Byte at %x is %x\n",
-	       sp->cfg_reg, val);
-
-	printk(KERN_NOTICE
-	       "HiSax: %s config irq:%d cfg:%x\n",
-	       CardType[sp->typ], sp->irq,
-	       sp->cfg_reg);
-	printk(KERN_NOTICE
-	       "HiSax: isac:%x/%x\n",
-	       sp->isac, sp->isac - 0x400);
-	printk(KERN_NOTICE
-	       "HiSax: hscx A:%x/%x  hscx B:%x/%x\n",
-	       sp->hscx[0], sp->hscx[0] - 0x400,
-	       sp->hscx[1], sp->hscx[1] - 0x400);
-	verA = readreg(sp->hscx[0], HSCX_VSTR) & 0xf;
-	verB = readreg(sp->hscx[1], HSCX_VSTR) & 0xf;
-	printk(KERN_INFO "AVM A1: HSCX version A: %s  B: %s\n",
-	       HscxVersion(verA), HscxVersion(verB));
-	val = readreg(sp->isac, ISAC_RBCH);
-	printk(KERN_INFO "AVM A1: ISAC %s\n",
-	       ISACVersion(val));
-	if ((verA == 0) | (verA == 0xf) | (verB == 0) | (verB == 0xf)) {
+	       cs->hw.avm.cfg_reg, val);
+
+	printk(KERN_INFO
+	       "HiSax: %s config irq:%d cfg:0x%X\n",
+	       CardType[cs->typ], cs->irq,
+	       cs->hw.avm.cfg_reg);
+	printk(KERN_INFO
+	       "HiSax: isac:0x%X/0x%X\n",
+	       cs->hw.avm.isac + 32, cs->hw.avm.isacfifo);
+	printk(KERN_INFO
+	       "HiSax: hscx A:0x%X/0x%X  hscx B:0x%X/0x%X\n",
+	       cs->hw.avm.hscx[0] + 32, cs->hw.avm.hscxfifo[0],
+	       cs->hw.avm.hscx[1] + 32, cs->hw.avm.hscxfifo[1]);
+
+	cs->readisac = &ReadISAC;
+	cs->writeisac = &WriteISAC;
+	cs->readisacfifo = &ReadISACfifo;
+	cs->writeisacfifo = &WriteISACfifo;
+	cs->BC_Read_Reg = &ReadHSCX;
+	cs->BC_Write_Reg = &WriteHSCX;
+	cs->BC_Send_Data = &hscx_fill_fifo;
+	cs->cardmsg = &AVM_card_msg;
+	ISACVersion(cs, "AVM A1:");
+	if (HscxVersion(cs, "AVM A1:")) {
 		printk(KERN_WARNING
 		       "AVM A1: wrong HSCX versions check IO address\n");
-		release_io_avm_a1(card);
+		release_ioregs(cs, 0x3f);
 		return (0);
 	}
-	sp->modehscx = &modehscx;
-	sp->ph_command = &ph_command;
-	sp->hscx_fill_fifo = &hscx_fill_fifo;
-	sp->isac_fill_fifo = &isac_fill_fifo;
 	return (1);
 }