From b645ff7fc39403c84e28d53858c74885fd739020 Mon Sep 17 00:00:00 2001
From: Julian Elischer <julian@FreeBSD.org>
Date: Mon, 18 Jan 1999 21:23:47 +0000
Subject: [PATCH] Fix screwed up previous commit. Obviously no-one is using
 this card on ISA as the interrupts were NOT being handled.

---
 sys/dev/sr/if_sr.c     | 13 +++++++++----
 sys/dev/sr/if_sr_isa.c | 13 +++++++++----
 sys/i386/isa/if_sr.c   | 13 +++++++++----
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 4dfa40dbc82a..baa3d18e7167 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.18 1999/01/12 01:17:00 eivind Exp $
+ * $Id: if_sr.c,v 1.19 1999/01/18 07:55:02 julian Exp $
  */
 
 /*
@@ -860,15 +860,20 @@ srattach(struct sr_hardc *hc)
 }
 
 /*
- * Get the ISA interrupts
+ * N2 Interrupt Service Routine.
+ * Get the ISA interrupts.
+ * 
+ * First figure out which SCA gave the interrupt.
+ * 
  */
-void
-srintr(void * cookie)
+static void
+srintr(int init)
 { 
 	struct sr_hardc *hc; 
 
 	hc = &sr_hardc[unit];
 	srintr_hc(hc);
+
 	return; 
 }
 
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 4dfa40dbc82a..baa3d18e7167 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.18 1999/01/12 01:17:00 eivind Exp $
+ * $Id: if_sr.c,v 1.19 1999/01/18 07:55:02 julian Exp $
  */
 
 /*
@@ -860,15 +860,20 @@ srattach(struct sr_hardc *hc)
 }
 
 /*
- * Get the ISA interrupts
+ * N2 Interrupt Service Routine.
+ * Get the ISA interrupts.
+ * 
+ * First figure out which SCA gave the interrupt.
+ * 
  */
-void
-srintr(void * cookie)
+static void
+srintr(int init)
 { 
 	struct sr_hardc *hc; 
 
 	hc = &sr_hardc[unit];
 	srintr_hc(hc);
+
 	return; 
 }
 
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index 4dfa40dbc82a..baa3d18e7167 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.18 1999/01/12 01:17:00 eivind Exp $
+ * $Id: if_sr.c,v 1.19 1999/01/18 07:55:02 julian Exp $
  */
 
 /*
@@ -860,15 +860,20 @@ srattach(struct sr_hardc *hc)
 }
 
 /*
- * Get the ISA interrupts
+ * N2 Interrupt Service Routine.
+ * Get the ISA interrupts.
+ * 
+ * First figure out which SCA gave the interrupt.
+ * 
  */
-void
-srintr(void * cookie)
+static void
+srintr(int init)
 { 
 	struct sr_hardc *hc; 
 
 	hc = &sr_hardc[unit];
 	srintr_hc(hc);
+
 	return; 
 }