From 0ae5489036007ed231e772d07b4845e1c768e0de Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Fri, 8 Apr 1994 17:16:39 +0000
Subject: [PATCH] Return correct values from edintr().

---
 sys/arch/i386/isa/if_ed.c | 12 ++++++++++--
 sys/dev/isa/if_ed.c       | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/sys/arch/i386/isa/if_ed.c b/sys/arch/i386/isa/if_ed.c
index d5243451326b..f0f239cc95c6 100644
--- a/sys/arch/i386/isa/if_ed.c
+++ b/sys/arch/i386/isa/if_ed.c
@@ -13,7 +13,7 @@
  * Currently supports the Western Digital/SMC 8003 and 8013 series, the 3Com
  * 3c503, the NE1000 and NE2000, and a variety of similar clones.
  *
- *	$Id: if_ed.c,v 1.40 1994/04/07 06:50:41 mycroft Exp $
+ *	$Id: if_ed.c,v 1.41 1994/04/08 17:16:39 mycroft Exp $
  */
 
 #include "bpfilter.h"
@@ -1574,8 +1574,12 @@ edintr(sc)
 	/* Set NIC to page 0 registers. */
 	outb(sc->nic_addr + ED_P0_CR, ED_CR_STA | sc->ed_cr_rd2);
 
+	isr = inb(sc->nic_addr + ED_P0_ISR);
+	if (!isr)
+		return 0;
+
 	/* Loop until there are no more new interrupts. */
-	while (isr = inb(sc->nic_addr + ED_P0_ISR)) {
+	for (;;) {
 		/*
 		 * Reset all the bits that we are 'acknowledging' by writing a
 		 * '1' to each bit position that was set.
@@ -1741,6 +1745,10 @@ edintr(sc)
 			(void) inb(sc->nic_addr + ED_P0_CNTR1);
 			(void) inb(sc->nic_addr + ED_P0_CNTR2);
 		}
+
+		isr = inb(sc->nic_addr + ED_P0_ISR);
+		if (!isr)
+			return 1;
 	}
 }
  
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index d5243451326b..f0f239cc95c6 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -13,7 +13,7 @@
  * Currently supports the Western Digital/SMC 8003 and 8013 series, the 3Com
  * 3c503, the NE1000 and NE2000, and a variety of similar clones.
  *
- *	$Id: if_ed.c,v 1.40 1994/04/07 06:50:41 mycroft Exp $
+ *	$Id: if_ed.c,v 1.41 1994/04/08 17:16:39 mycroft Exp $
  */
 
 #include "bpfilter.h"
@@ -1574,8 +1574,12 @@ edintr(sc)
 	/* Set NIC to page 0 registers. */
 	outb(sc->nic_addr + ED_P0_CR, ED_CR_STA | sc->ed_cr_rd2);
 
+	isr = inb(sc->nic_addr + ED_P0_ISR);
+	if (!isr)
+		return 0;
+
 	/* Loop until there are no more new interrupts. */
-	while (isr = inb(sc->nic_addr + ED_P0_ISR)) {
+	for (;;) {
 		/*
 		 * Reset all the bits that we are 'acknowledging' by writing a
 		 * '1' to each bit position that was set.
@@ -1741,6 +1745,10 @@ edintr(sc)
 			(void) inb(sc->nic_addr + ED_P0_CNTR1);
 			(void) inb(sc->nic_addr + ED_P0_CNTR2);
 		}
+
+		isr = inb(sc->nic_addr + ED_P0_ISR);
+		if (!isr)
+			return 1;
 	}
 }