[src/trunk]: src/sys/lib/libsa separate ether_sprintf() from the rest of ethe...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/abee8f4b938a
branches:  trunk
changeset: 544129:abee8f4b938a
user:      drochner <drochner%NetBSD.org@localhost>
date:      Wed Mar 12 16:46:31 2003 +0000

description:
separate ether_sprintf() from the rest of ethernet support -- sometimes
it makes sense to use the former w/o the latter (eg PXE)

diffstat:

 sys/lib/libsa/Makefile        |   4 +-
 sys/lib/libsa/ether.c         |  24 +-------------
 sys/lib/libsa/ether_sprintf.c |  75 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 25 deletions(-)

diffs (139 lines):

diff -r 7a1ef40f84b5 -r abee8f4b938a sys/lib/libsa/Makefile
--- a/sys/lib/libsa/Makefile    Wed Mar 12 16:39:01 2003 +0000
+++ b/sys/lib/libsa/Makefile    Wed Mar 12 16:46:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.52 2003/02/23 23:17:42 simonb Exp $
+#      $NetBSD: Makefile,v 1.53 2003/03/12 16:46:31 drochner Exp $
 
 LIB=   sa
 NOPIC= # defined
@@ -36,7 +36,7 @@
 .endif
 .if (${SA_INCLUDE_NET} == "yes")
 # network routines
-SRCS+= arp.c ether.c in_cksum.c net.c netif.c rpc.c udp.c
+SRCS+= arp.c ether.c ether_sprintf.c in_cksum.c net.c netif.c rpc.c udp.c
 
 # network info services:
 SRCS+= bootp.c rarp.c bootparam.c
diff -r 7a1ef40f84b5 -r abee8f4b938a sys/lib/libsa/ether.c
--- a/sys/lib/libsa/ether.c     Wed Mar 12 16:39:01 2003 +0000
+++ b/sys/lib/libsa/ether.c     Wed Mar 12 16:46:31 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ether.c,v 1.16 2003/03/12 14:51:31 drochner Exp $      */
+/*     $NetBSD: ether.c,v 1.17 2003/03/12 16:46:31 drochner Exp $      */
 
 /*
  * Copyright (c) 1992 Regents of the University of California.
@@ -52,7 +52,6 @@
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
-#include <netinet/ip.h>
 
 #include "stand.h"
 #include "net.h"
@@ -132,24 +131,3 @@
        n -= sizeof(*eh);
        return (n);
 }
-
-/*
- * Convert Ethernet address to printable (loggable) representation.
- */
-static char digits[] = "0123456789abcdef";
-char *
-ether_sprintf(ap)
-        u_char *ap;
-{
-       int i;
-       static char etherbuf[18];
-       char *cp = etherbuf;
-
-       for (i = 0; i < 6; i++) {
-               *cp++ = digits[*ap >> 4];
-               *cp++ = digits[*ap++ & 0xf];
-               *cp++ = ':';
-       }
-       *--cp = 0;
-       return (etherbuf);
-}
diff -r 7a1ef40f84b5 -r abee8f4b938a sys/lib/libsa/ether_sprintf.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/lib/libsa/ether_sprintf.c     Wed Mar 12 16:46:31 2003 +0000
@@ -0,0 +1,75 @@
+/*     $NetBSD: ether_sprintf.c,v 1.1 2003/03/12 16:46:31 drochner Exp $       */
+
+/*
+ * Copyright (c) 1992 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Lawrence Berkeley Laboratory and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#) Header: net.c,v 1.9 93/08/06 19:32:15 leres Exp  (LBL)
+ */
+
+#include <sys/param.h>
+#include <sys/socket.h>
+#ifdef _STANDALONE
+#include <lib/libkern/libkern.h>
+#else
+#include <string.h>
+#endif
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+
+#include "stand.h"
+#include "net.h"
+
+/*
+ * Convert Ethernet address to printable (loggable) representation.
+ */
+static char digits[] = "0123456789abcdef";
+char *
+ether_sprintf(ap)
+        u_char *ap;
+{
+       int i;
+       static char etherbuf[18];
+       char *cp = etherbuf;
+
+       for (i = 0; i < 6; i++) {
+               *cp++ = digits[*ap >> 4];
+               *cp++ = digits[*ap++ & 0xf];
+               *cp++ = ':';
+       }
+       *--cp = 0;
+       return (etherbuf);
+}