The last part of the ether_sprint -> %6D change.

Sorry for the delay.
(%D is for hexdumping.)

10 files changed, 36 insertions, 37 deletions

diff --git a/sys/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c
index 3cd586a..0f03f54 100644
--- a/sys/i386/isa/if_eg.c
+++ b/sys/i386/isa/if_eg.c
@@ -27,7 +27,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_eg.c,v 1.9 1995/12/10 13:38:38 phk Exp $
+ * $Id: if_eg.c,v 1.10 1995/12/15 00:54:09 bde Exp $
  */
 
 /* To do:
@@ -399,9 +399,8 @@ egattach (struct isa_device *id)
 	}
 	bcopy(&sc->eg_pcb[2], sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN);
 
-	printf("eg%d: address %s, type=3COM 3c505 (v%d.%02d, %dk)\n",
-	    id->id_unit,
-	    ether_sprintf(sc->sc_arpcom.ac_enaddr),
+	printf("eg%d: address %6D, type=3COM 3c505 (v%d.%02d, %dk)\n",
+	    id->id_unit, sc->sc_arpcom.ac_enaddr, ":",
 	    sc->eg_rom_major, sc->eg_rom_minor, sc->eg_ram);
 
 	sc->kdc.kdc_description = "Ethernet adapter: 3Com 3C505";
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 837a5f1..c7b4aba 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $Id: if_el.c,v 1.20 1995/12/10 13:38:39 phk Exp $
+ * $Id: if_el.c,v 1.21 1995/12/15 00:54:10 bde Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -166,7 +166,7 @@ el_probe(struct isa_device *idev)
 		outb(base+EL_GPBL,i);
 		station_addr[i] = inb(base+EL_EAW);
 	}
-	dprintf(("Address is %s\n",ether_sprintf(station_addr)));
+	dprintf(("Address is %6D\n",station_addr, ":"));
 
 	/* If the vendor code is ok, return a 1.  We'll assume that
 	 * whoever configured this system is right about the IRQ.
@@ -238,8 +238,8 @@ el_attach(struct isa_device *idev)
 	}
 
 	/* Print out some information for the user */
-	printf("el%d: 3c501 address %s\n",idev->id_unit,
-	  ether_sprintf(sc->arpcom.ac_enaddr));
+	printf("el%d: 3c501 address %6D\n",idev->id_unit,
+	  sc->arpcom.ac_enaddr, ":");
 
 	/* Finally, attach to bpf filter if it is present. */
 #if NBPFILTER > 0
@@ -553,8 +553,8 @@ void elintr(int unit)
 		insb(base+EL_BUF,sc->el_pktbuf,len);
 		outb(base+EL_RBC,0);
 		outb(base+EL_AC,EL_AC_RX);
-		dprintf(("%s-->",ether_sprintf(sc->el_pktbuf+6)));
-		dprintf(("%s\n",ether_sprintf(sc->el_pktbuf)));
+		dprintf(("%6D-->",sc->el_pktbuf+6,":"));
+		dprintf(("%6D\n",sc->el_pktbuf,":"));
 
 		/* Pass data up to upper levels */
 		len -= sizeof(struct ether_header);
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index c5016f3..e57334c 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.36 1995/12/10 13:38:41 phk Exp $
+ *  $Id: if_ep.c,v 1.37 1995/12/15 00:54:11 bde Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -408,7 +408,7 @@ epattach(is)
 	GO_WINDOW(2);
 	outw(BASE + EP_W2_ADDR_0 + (i * 2), ntohs(p[i]));
     }
-    printf(" address %s", ether_sprintf(sc->arpcom.ac_enaddr));
+    printf(" address %6D", sc->arpcom.ac_enaddr, ":");
 
     /*
      * Write IRQ value to board
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 1a3b2b6..5e141c5 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -1125,8 +1125,8 @@ fe_attach ( struct isa_device *isa_dev )
 	fe_setlinkaddr( sc );
 
 	/* Print additional info when attached.  */
-	printf( "fe%d: address %s, type %s\n", sc->sc_unit,
-		ether_sprintf( sc->sc_enaddr ), sc->typestr );
+	printf( "fe%d: address %6D, type %s\n", sc->sc_unit,
+		sc->sc_enaddr, ":" , sc->typestr );
 #if FE_DEBUG >= 3
 	{
 		int buf, txb, bbw, sbw, ram;
@@ -1301,8 +1301,8 @@ fe_init ( int unit )
 	  || ( sc->sc_enaddr[ 0 ] == 0x00
 	    && sc->sc_enaddr[ 1 ] == 0x00
 	    && sc->sc_enaddr[ 2 ] == 0x00 ) ) {
-		log( LOG_ERR, "fe%d: invalid station address (%s)\n",
-			sc->sc_unit, ether_sprintf( sc->sc_enaddr ) );
+		log( LOG_ERR, "fe%d: invalid station address (%6D)\n",
+			sc->sc_unit, sc->sc_enaddr, ":" );
 		return;
 	}
 #endif
@@ -2314,9 +2314,9 @@ fe_get_packet ( struct fe_softc * sc, u_short len )
 		 * We found an error (of this driver.)
 		 */
 		log( LOG_WARNING,
-			"fe%d: got an unwanted packet, dst = %s\n",
+			"fe%d: got an unwanted packet, dst = %6D\n",
 			sc->sc_unit,
-			ether_sprintf( eh->ether_dhost ) );
+			eh->ether_dhost , ":" );
 		m_freem( m );
 		return 0;
 	}
@@ -2526,8 +2526,8 @@ fe_mcaf ( struct fe_softc *sc )
 		}
 		index = fe_hash( enm->enm_addrlo );
 #if FE_DEBUG >= 4
-		log( LOG_INFO, "fe%d: hash(%s) == %d\n",
-			sc->sc_unit, ether_sprintf( enm->enm_addrlo ), index );
+		log( LOG_INFO, "fe%d: hash(%6D) == %d\n",
+			sc->sc_unit, enm->enm_addrlo , ":", index );
 #endif
 
 		filter.data[index >> 3] |= 1 << (index & 7);
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index b825f70..4094ef2 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.30 1995/12/05 02:01:08 davidg Exp $
+ *	$Id: if_ie.c,v 1.31 1995/12/10 13:38:45 phk Exp $
  */
 
 /*
@@ -582,10 +582,10 @@ ieattach(dvp)
   ifp->if_unit = unit;
   ifp->if_name = iedriver.name;
   ifp->if_mtu = ETHERMTU;
-  printf(" <%s R%d> ethernet address %s\n",
+  printf(" <%s R%d> ethernet address %6D\n",
 	 ie_hardware_names[ie_softc[unit].hard_type],
 	 ie_softc[unit].hard_vers + 1,
-	 ether_sprintf(ie->arpcom.ac_enaddr));
+	 ie->arpcom.ac_enaddr, ":");
 
   ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
   ifp->if_output = ether_output;
@@ -1190,8 +1190,8 @@ static void ie_readframe(unit, ie, num)
 
 #ifdef DEBUG
   if(ie_debug & IED_READFRAME) {
-    printf("ie%d: frame from ether %s type %x\n", unit,
-	   ether_sprintf(eh.ether_shost), (unsigned)eh.ether_type);
+    printf("ie%d: frame from ether %6D type %x\n", unit,
+	   eh.ether_shost, ":", (unsigned)eh.ether_type);
   }
   if(ntohs(eh.ether_type) > ETHERTYPE_TRAIL
      && ntohs(eh.ether_type) < (ETHERTYPE_TRAIL + ETHERTYPE_NTRAILER))
diff --git a/sys/i386/isa/if_ix.c b/sys/i386/isa/if_ix.c
index f74db13..b883491 100644
--- a/sys/i386/isa/if_ix.c
+++ b/sys/i386/isa/if_ix.c
@@ -28,7 +28,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_ix.c,v 1.16 1995/12/10 13:38:47 phk Exp $
+ *	$Id: if_ix.c,v 1.17 1995/12/15 00:54:17 bde Exp $
  */
 
 #include "ix.h"
@@ -625,7 +625,7 @@ ixattach(struct isa_device *dvp) {
 		sdl->sdl_slen = 0;
 		bcopy(sc->arpcom.ac_enaddr, LLADDR(sdl), ETHER_ADDRESS_LENGTH);
 	}
-	printf("ix%d: address %s\n", unit, ether_sprintf(sc->arpcom.ac_enaddr));
+	printf("ix%d: address %6D\n", unit, sc->arpcom.ac_enaddr, ":");
 	return(0);
 }
 
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 9973789..73dff3b 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.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_le.c,v 1.27 1995/12/15 00:54:19 bde Exp $
+ * $Id: if_le.c,v 1.28 1996/01/25 23:00:42 joerg Exp $
  */
 
 /*
@@ -396,10 +396,10 @@ le_attach(
     struct ifaddr *ifa = ifp->if_addrlist;
 
     ifp->if_mtu = ETHERMTU;
-    printf("%s%d: %s ethernet address %s\n",
+    printf("%s%d: %s ethernet address %6D\n",
 	   ifp->if_name, ifp->if_unit,
 	   sc->le_prodname,
-	   ether_sprintf(sc->le_ac.ac_enaddr));
+	   sc->le_ac.ac_enaddr, ":");
 
     ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
     ifp->if_output = ether_output;
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 358c12b..aa5cd56 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -1182,10 +1182,10 @@ lnc_attach(struct isa_device * isa_dev)
 	if_attach(&sc->arpcom.ac_if);
 	sc->kdc.kdc_state = DC_IDLE;
 
-	printf("lnc%d: %s, address %s\n",
+	printf("lnc%d: %s, address %6D\n",
 	       isa_dev->id_unit,
 		   sc->kdc.kdc_description,
-	       ether_sprintf(sc->arpcom.ac_enaddr));
+	       sc->arpcom.ac_enaddr, ":");
 
 #if NBPFILTER > 0
 	bpfattach(&sc->bpf, &sc->arpcom.ac_if, DLT_EN10MB, sizeof(struct ether_header));
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index adc1865..797cdaa 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.26 1995/12/13 10:36:03 phk Exp $
+ * $Id: if_ze.c,v 1.27 1995/12/17 21:22:57 phk Exp $
  */
 
 #include "ze.h"
@@ -660,9 +660,9 @@ ze_attach(isa_dev)
 	/*
 	 * Print additional info when attached
 	 */
-	printf("ze%d: address %s, type %s (%dbit), MAU %s\n",
+	printf("ze%d: address %6D, type %s (%dbit), MAU %s\n",
 	       isa_dev->id_unit,
-	       ether_sprintf(sc->arpcom.ac_enaddr), sc->type_str,
+	       sc->arpcom.ac_enaddr, ":", sc->type_str,
 	       sc->memwidth,
 	       sc->mau);
 
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index c75a7ae..36e03f1 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.13 1995/12/05 02:01:18 davidg Exp $
+ *	$Id: if_zp.c,v 1.14 1995/12/13 10:35:36 phk Exp $
  */
 /*-
  * TODO:
@@ -540,7 +540,7 @@ zpattach(isa_dev)
 		bcopy(tmp_addr, sc->arpcom.ac_enaddr, 6);
 	}
 
-	printf(" address %s\n", ether_sprintf(sc->arpcom.ac_enaddr));
+	printf(" address %6D\n", sc->arpcom.ac_enaddr, ":");
 
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;