Cosmetic changes.

Submitted by:	Wolfgang Stnglmeier <wolf@kintaro.cologne.de>

2 files changed, 16 insertions, 9 deletions

diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 494a0fb..c2d6262 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.17 1995/03/16 17:41:20 se Exp $
+ * $Id: if_de.c,v 1.18 1995/03/17 04:27:16 davidg Exp $
  *
  */
 
@@ -35,7 +35,7 @@
  *   board which support DC21040.
  */
 
-#define IF_DE_C_PATCHLEVEL  "pl1 95/03/09"
+#define __IF_DE_C__  "pl2 95/03/21"
 #include "de.h"
 #if NDE > 0
 
@@ -664,17 +664,17 @@ tulip_intr(
     tulip_softc_t *sc)
 {
     tulip_uint32_t csr;
-    int active=0;
+    int progress=0;
 
     while ((csr = *sc->tulip_csrs.csr_status) & (TULIP_STS_NORMALINTR|TULIP_STS_ABNRMLINTR)) {
-	active=1;
+	progress = 1;
 	*sc->tulip_csrs.csr_status = csr & sc->tulip_intrmask;
 
 	if (csr & TULIP_STS_SYSERROR) {
 	    if ((csr & TULIP_STS_ERRORMASK) == TULIP_STS_ERR_PARITY) {
 		TULIP_RESET(sc);
 		tulip_init(sc->tulip_unit);
-		return 1;
+		break;
 	    }
 	}
 	if (csr & TULIP_STS_ABNRMLINTR) {
@@ -689,7 +689,7 @@ tulip_intr(
 	    tulip_start(&sc->tulip_if);
 	}
     }
-    return (active);
+    return (progress);
 }
 
 /*
diff --git a/sys/pci/if_pdq.c b/sys/pci/if_pdq.c
index e4eb42e..561bdd2 100644
--- a/sys/pci/if_pdq.c
+++ b/sys/pci/if_pdq.c
@@ -21,9 +21,16 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_pdq.c,v 1.1 1995/03/14 09:16:04 davidg Exp $
+ * $Id: if_pdq.c,v 1.2 1995/03/17 04:27:17 davidg Exp $
  *
  * $Log: if_pdq.c,v $
+ * Revision 1.2  1995/03/17  04:27:17  davidg
+ * Added a new field to the pci_device struct called pd_shutdown to specify
+ * a device specific shutdown routine for devconf. Assign the value of this
+ * to the kern_devconf struct. Implement a device shutdown routine for if_de
+ * that disables the device. This will stop the device from corrupting memory
+ * after a reboot.
+ *
  * Revision 1.1  1995/03/14  09:16:04  davidg
  * Added support for generic FDDI and the DEC DEFEA and DEFPA FDDI adapters.
  *
@@ -717,14 +724,14 @@ pdq_eisa_attach(
     pdq_eisa_subprobe(sc->sc_iobase, &maddr, &msize, NULL);
     va_csrs = (vm_offset_t) pmap_mapdev(maddr, msize);
     if (va_csrs == (vm_offset_t) 0) {
-	printf("fea%s: mapping of device memory failed\n", sc->sc_if.if_unit);
+	printf("fea%d: mapping of device memory failed\n", sc->sc_if.if_unit);
 	return 0;
     }
 
     sc->sc_pdq = pdq_initialize((void *) va_csrs, "fea", sc->sc_if.if_unit,
 				(void *) sc, PDQ_DEFEA);
     if (sc->sc_pdq == NULL) {
-	printf("fea%s: initialization failed\n", sc->sc_if.if_unit);
+	printf("fea%d: initialization failed\n", sc->sc_if.if_unit);
 	return 0;
     }