remove basically incorrect interrupt configuration code.

clean up config output, less output and on one line.
- per discussion with Theo

1 files changed, 3 insertions, 24 deletions

diff --git a/sys/arch/powerpc/mac/if_gm.c b/sys/arch/powerpc/mac/if_gm.c
index 82dffae6b01..73cc75a60bc 100644
--- a/sys/arch/powerpc/mac/if_gm.c
+++ b/sys/arch/powerpc/mac/if_gm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gm.c,v 1.5 2000/07/08 19:53:13 rahnds Exp $	*/
+/*	$OpenBSD: if_gm.c,v 1.6 2000/10/16 01:51:08 drahn Exp $	*/
 /*	$NetBSD: if_gm.c,v 1.2 2000/03/04 11:17:00 tsubai Exp $	*/
 
 /*-
@@ -234,7 +234,6 @@ gmac_attach(parent, self, aux)
 	}
 #endif
 
-#if 0
 	if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin,
 	    pa->pa_intrline, &ih)) {
 		printf(": unable to map interrupt\n");
@@ -249,26 +248,6 @@ gmac_attach(parent, self, aux)
 		printf("\n");
 		return;
 	}
-#endif 
-#if 1
-	sprintf(intrstrbuf, "irq %d\n", pa->pa_intrline);
-	intrstr = intrstrbuf;
-	/*
-	if (pci_intr_establish(pa->pa_pc, pa->pa_intrline, IPL_NET,
-	* Someone explain how to get the interrupt line correctly from the
-	* pci info? pa_intrline returns 60, not 1 like the hardware expects
-	* on uni-north G4 system.
-	*/
-	if (pci_intr_establish(pa->pa_pc, pa->pa_intrline, IPL_NET,
-		gmac_intr, sc, "gmac") == NULL)
-	{
-		printf(": unable to establish interrupt");
-		if (intrstr)
-			printf(" at %x", pa->pa_intrline);
-		printf("\n");
-		return;
-	}
-#endif 
 
 	/* Setup packet buffers and dma descriptors. */
 	p = malloc((NRXBUF + NTXBUF) * 2048 + 3 * 0x800, M_DEVBUF, M_NOWAIT);
@@ -320,8 +299,8 @@ gmac_attach(parent, self, aux)
 	}
 #endif /* __OpenBSD__ */
 
-	printf(": Ethernet address %s\n", ether_sprintf(laddr));
-	printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr);
+	printf(": %s", intrstr);
+	printf(": address %s\n", ether_sprintf(laddr));
 
 	gmac_reset(sc);
 	gmac_init_mac(sc);