1 files changed, 13 insertions, 28 deletions

diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index c007bb88a33d..7b154316fe1e 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/if_ed.c
@@ -1550,12 +1550,14 @@ ed_probe_Novell(isa_dev)
 	struct isa_device *isa_dev;
 {
 	struct ed_softc *sc = &ed_softc[isa_dev->id_unit];
+	int     nports;
 
-#ifndef PC98
-	isa_dev->id_maddr = 0;
-#endif
-	return ed_probe_Novell_generic(sc, isa_dev->id_iobase, 
+	nports = ed_probe_Novell_generic(sc, isa_dev->id_iobase, 
 				       isa_dev->id_unit, isa_dev->id_flags);
+	if (nports)
+		isa_dev->id_maddr = 0;
+
+	return (nports);
 }
 
 #if NCARD > 0
@@ -2740,13 +2742,8 @@ ed_init(xsc)
 	/*
 	 * Copy out our station address
 	 */
-#ifdef PC98
-		for (i = 0; i < ETHER_ADDR_LEN; ++i)
-			outb(sc->nic_addr + ED_P1_PAR(i), sc->arpcom.ac_enaddr[i]);
-#else
-		for (i = 0; i < ETHER_ADDR_LEN; ++i)
-			outb(sc->nic_addr + ED_P1_PAR0 + i, sc->arpcom.ac_enaddr[i]);
-#endif
+	for (i = 0; i < ETHER_ADDR_LEN; ++i)
+		outb(sc->nic_addr + ED_P1_PAR(i), sc->arpcom.ac_enaddr[i]);
 
 	/*
 	 * Set Current Page pointer to next_packet (initialized above)
@@ -3673,6 +3670,7 @@ ed_pio_readmem(sc, src, dst, amount)
 		insw(sc->asic_addr + ED_NOVELL_DATA, dst, amount / 2);
 	} else
 		insb(sc->asic_addr + ED_NOVELL_DATA, dst, amount);
+
 #ifdef PC98
 	if (sc->type == ED_TYPE98_LPC)
 		LPCT_1d0_OFF();
@@ -4184,13 +4182,9 @@ ed_setrcr(sc)
 		/*
 		 * Reconfigure the multicast filter.
 		 */
-#ifdef PC98
-			for (i = 0; i < 8; i++)
-				outb(sc->nic_addr + ED_P1_MAR(i), 0xff);
-#else
-			for (i = 0; i < 8; i++)
-				outb(sc->nic_addr + ED_P1_MAR0 + i, 0xff);
-#endif
+		for (i = 0; i < 8; i++)
+			outb(sc->nic_addr + ED_P1_MAR(i), 0xff);
+
 		/*
 		 * And turn on promiscuous mode. Also enable reception of
 		 * runts and packets with CRC & alignment errors.
@@ -4214,13 +4208,9 @@ ed_setrcr(sc)
 			/*
 			 * Set multicast filter on chip.
 			 */
-#ifdef PC98
 			for (i = 0; i < 8; i++)
 				outb(sc->nic_addr + ED_P1_MAR(i), ((u_char *) mcaf)[i]);
-#else
-			for (i = 0; i < 8; i++)
-				outb(sc->nic_addr + ED_P1_MAR0 + i, ((u_char *) mcaf)[i]);
-#endif
+
 			/* Set page 0 registers */
 			outb(sc->nic_addr + ED_P0_CR, sc->cr_proto | ED_CR_STP);
 
@@ -4231,13 +4221,8 @@ ed_setrcr(sc)
 			 * Initialize multicast address hashing registers to
 			 * not accept multicasts.
 			 */
-#ifdef PC98
 			for (i = 0; i < 8; ++i)
 				outb(sc->nic_addr + ED_P1_MAR(i), 0x00);
-#else
-			for (i = 0; i < 8; ++i)
-				outb(sc->nic_addr + ED_P1_MAR0 + i, 0x00);
-#endif
 
 			/* Set page 0 registers */
 			outb(sc->nic_addr + ED_P0_CR, sc->cr_proto | ED_CR_STP);