patch-2.4.3 linux/drivers/isdn/eicon/fourbri.c

• Lines: 59
• Date: Fri Mar 2 11:12:08 2001
• Orig file: v2.4.2/linux/drivers/isdn/eicon/fourbri.c
• Orig date: Sun Aug 13 10:05:32 2000

diff -u --recursive --new-file v2.4.2/linux/drivers/isdn/eicon/fourbri.c linux/drivers/isdn/eicon/fourbri.c
@@ -3,9 +3,6 @@
  *
  * Copyright (C) Eicon Technology Corporation, 2000.
  *
- * This source file is supplied for the exclusive use with Eicon
- * Technology Corporation's range of DIVA Server Adapters.
- *
  * Eicon File Revision :    1.7  
  *
  * This program is free software; you can redistribute it and/or modify
@@ -67,7 +64,7 @@
 void mem_inc(ADAPTER *a, void *adr);
 
 int Divas4BRIInitPCI(card_t *card, dia_card_t *cfg);
-int fourbri_ISR (card_t* card);
+static int fourbri_ISR (card_t* card);
 
 int FPGA_Download(word, dword, byte *, byte *, int);
 extern byte FPGA_Bytes[];
@@ -113,7 +110,7 @@
 
 	UxCardMemOut(card->hw, &shared[ 8], config->tei);
 	UxCardMemOut(card->hw, &shared[ 9], config->nt2);
-	UxCardMemOut(card->hw, &shared[10], 0);
+	UxCardMemOut(card->hw, &shared[10], config->sig_flags);
 	UxCardMemOut(card->hw, &shared[11], config->watchdog);
 	UxCardMemOut(card->hw, &shared[12], config->permanent);
 	UxCardMemOut(card->hw, &shared[13], config->x_interface);
@@ -561,23 +558,16 @@
 }*/
 
 
-int fourbri_ISR (card_t* card) 
+static int fourbri_ISR (card_t* card) 
 {
-	int served = 0;
 	byte *ctl;
-	byte *reg = UxCardMemAttach(card->hw, DIVAS_REG_MEMORY);
 
-	if (UxCardPortIoIn(card->hw, reg, PLX9054_INTCSR) & 0x80) 
-	{
-		served = 1;
-		card->int_pend  += 1;
-		DivasDpcSchedule(); /* ISR DPC */
+	card->int_pend  += 1;
+	DivasDpcSchedule(); /* ISR DPC */
 
-		ctl = UxCardMemAttach(card->hw, DIVAS_CTL_MEMORY);
-		UxCardMemOut(card->hw, &ctl[MQ_BREG_IRQ_TEST], MQ_IRQ_REQ_OFF);
-		UxCardMemDetach(card->hw, ctl);
-	}
+	ctl = UxCardMemAttach(card->hw, DIVAS_CTL_MEMORY);
+	UxCardMemOut(card->hw, &ctl[MQ_BREG_IRQ_TEST], MQ_IRQ_REQ_OFF);
+	UxCardMemDetach(card->hw, ctl);
 
-	UxCardMemDetach(card->hw, reg);
-	return (served != 0);
+	return (1);
 }