Module Name: src
Committed By: sevan
Date: Wed Jul 18 23:10:28 UTC 2018
Modified Files:
src/sys/arch/arm/sunxi: sun4i_emac.c
src/sys/arch/dreamcast/dev/g2: if_mbe_g2.c
src/sys/arch/mips/sibyte/dev: sbmac.c
src/sys/arch/next68k/next68k: nextrom.c
src/sys/dev/ic: dwc_gmac.c
src/sys/dev/pci: if_kse.c if_ti.c if_vge.c if_vr.c
Log Message:
Be consistent among ethernet drivers on the convention for printing ethernet
addresses.
NFC
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sun4i_emac.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mips/sibyte/dev/sbmac.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/next68k/next68k/nextrom.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/dwc_gmac.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/if_kse.c
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/pci/if_ti.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/if_vge.c
cvs rdiff -u -r1.124 -r1.125 src/sys/dev/pci/if_vr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sun4i_emac.c
diff -u src/sys/arch/arm/sunxi/sun4i_emac.c:1.4 src/sys/arch/arm/sunxi/sun4i_emac.c:1.5
--- src/sys/arch/arm/sunxi/sun4i_emac.c:1.4 Tue Jun 26 06:47:58 2018
+++ src/sys/arch/arm/sunxi/sun4i_emac.c Wed Jul 18 23:10:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_emac.c,v 1.4 2018/06/26 06:47:58 msaitoh Exp $ */
+/* $NetBSD: sun4i_emac.c,v 1.5 2018/07/18 23:10:27 sevan Exp $ */
/*-
* Copyright (c) 2013-2017 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sun4i_emac.c,v 1.4 2018/06/26 06:47:58 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun4i_emac.c,v 1.5 2018/07/18 23:10:27 sevan Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -333,7 +333,7 @@ sun4i_emac_attach(device_t parent, devic
enaddr[4] = a0 >> 8;
enaddr[5] = a0 >> 0;
}
- aprint_normal_dev(self, "Ethernet address: %s\n", ether_sprintf(enaddr));
+ aprint_normal_dev(self, "Ethernet address %s\n", ether_sprintf(enaddr));
snprintf(ifp->if_xname, IFNAMSIZ, EMAC_IFNAME, device_unit(self));
ifp->if_softc = sc;
Index: src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c
diff -u src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c:1.8 src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c:1.9
--- src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c:1.8 Tue Jul 19 15:52:30 2011
+++ src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c Wed Jul 18 23:10:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mbe_g2.c,v 1.8 2011/07/19 15:52:30 dyoung Exp $ */
+/* $NetBSD: if_mbe_g2.c,v 1.9 2018/07/18 23:10:27 sevan Exp $ */
/*
* Copyright (c) 2002 Christian Groessler
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mbe_g2.c,v 1.8 2011/07/19 15:52:30 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mbe_g2.c,v 1.9 2018/07/18 23:10:27 sevan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,7 +171,7 @@ mbe_g2_detect(bus_space_tag_t iot, bus_s
mb86965_read_eeprom(iot, ioh, eeprom);
memcpy(enaddr, eeprom, ETHER_ADDR_LEN);
- DPRINTF("Ethernet address: %s\n", ether_sprintf(enaddr));
+ DPRINTF("Ethernet address %s\n", ether_sprintf(enaddr));
/* Make sure we got a valid station address. */
if ((enaddr[0] & 0x03) != 0x00 ||
Index: src/sys/arch/mips/sibyte/dev/sbmac.c
diff -u src/sys/arch/mips/sibyte/dev/sbmac.c:1.50 src/sys/arch/mips/sibyte/dev/sbmac.c:1.51
--- src/sys/arch/mips/sibyte/dev/sbmac.c:1.50 Tue Jun 26 06:47:59 2018
+++ src/sys/arch/mips/sibyte/dev/sbmac.c Wed Jul 18 23:10:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sbmac.c,v 1.50 2018/06/26 06:47:59 msaitoh Exp $ */
+/* $NetBSD: sbmac.c,v 1.51 2018/07/18 23:10:27 sevan Exp $ */
/*
* Copyright 2000, 2001, 2004
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.50 2018/06/26 06:47:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.51 2018/07/18 23:10:27 sevan Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -2303,7 +2303,7 @@ sbmac_attach(device_t parent, device_t s
*/
aprint_normal(": Ethernet%s\n",
sc->sbm_pass3_dma ? ", using unaligned tx DMA" : "");
- aprint_normal_dev(self, "Ethernet address: %s\n", ether_sprintf(eaddr));
+ aprint_normal_dev(self, "Ethernet address %s\n", ether_sprintf(eaddr));
/*
Index: src/sys/arch/next68k/next68k/nextrom.c
diff -u src/sys/arch/next68k/next68k/nextrom.c:1.26 src/sys/arch/next68k/next68k/nextrom.c:1.27
--- src/sys/arch/next68k/next68k/nextrom.c:1.26 Thu Mar 8 03:12:02 2018
+++ src/sys/arch/next68k/next68k/nextrom.c Wed Jul 18 23:10:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nextrom.c,v 1.26 2018/03/08 03:12:02 mrg Exp $ */
+/* $NetBSD: nextrom.c,v 1.27 2018/07/18 23:10:27 sevan Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextrom.c,v 1.26 2018/03/08 03:12:02 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextrom.c,v 1.27 2018/07/18 23:10:27 sevan Exp $");
#include "opt_ddb.h"
#include "opt_serial.h"
@@ -354,7 +354,7 @@ next68k_bootargs(unsigned char **args)
*/
{
int j;
- ROM_PUTS("Ethernet address: ");
+ ROM_PUTS("Ethernet address ");
for (j = 0; j < 6; j++) {
RELOC(rom_enetaddr[j], uint8_t) =
MONRELOC(uint8_t *, MG_clientetheraddr)[j];
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.51 src/sys/dev/ic/dwc_gmac.c:1.52
--- src/sys/dev/ic/dwc_gmac.c:1.51 Sat Jun 30 16:27:48 2018
+++ src/sys/dev/ic/dwc_gmac.c Wed Jul 18 23:10:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.51 2018/06/30 16:27:48 jmcneill Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.52 2018/07/18 23:10:27 sevan Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.51 2018/06/30 16:27:48 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.52 2018/07/18 23:10:27 sevan Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -191,7 +191,7 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
if (dwc_gmac_reset(sc) != 0)
return ENXIO; /* not much to cleanup, haven't attached yet */
dwc_gmac_write_hwaddr(sc, enaddr);
- aprint_normal_dev(sc->sc_dev, "Ethernet address: %s\n",
+ aprint_normal_dev(sc->sc_dev, "Ethernet address %s\n",
ether_sprintf(enaddr));
/*
Index: src/sys/dev/pci/if_kse.c
diff -u src/sys/dev/pci/if_kse.c:1.32 src/sys/dev/pci/if_kse.c:1.33
--- src/sys/dev/pci/if_kse.c:1.32 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_kse.c Wed Jul 18 23:10:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kse.c,v 1.32 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_kse.c,v 1.33 2018/07/18 23:10:28 sevan Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.32 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.33 2018/07/18 23:10:28 sevan Exp $");
#include <sys/param.h>
@@ -404,7 +404,7 @@ kse_attach(device_t parent, device_t sel
enaddr[3] = i; enaddr[2] = i >> 8;
i = CSR_READ_2(sc, MARH);
enaddr[1] = i; enaddr[0] = i >> 8;
- printf("%s: Ethernet address: %s\n",
+ printf("%s: Ethernet address %s\n",
device_xname(sc->sc_dev), ether_sprintf(enaddr));
/*
Index: src/sys/dev/pci/if_ti.c
diff -u src/sys/dev/pci/if_ti.c:1.104 src/sys/dev/pci/if_ti.c:1.105
--- src/sys/dev/pci/if_ti.c:1.104 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_ti.c Wed Jul 18 23:10:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.104 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_ti.c,v 1.105 2018/07/18 23:10:28 sevan Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.104 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.105 2018/07/18 23:10:28 sevan Exp $");
#include "opt_inet.h"
@@ -1727,7 +1727,7 @@ ti_attach(device_t parent, device_t self
/*
* A Tigon chip was detected. Inform the world.
*/
- aprint_normal_dev(self, "Ethernet address: %s\n",ether_sprintf(eaddr));
+ aprint_normal_dev(self, "Ethernet address %s\n",ether_sprintf(eaddr));
sc->sc_dmat = pa->pa_dmat;
Index: src/sys/dev/pci/if_vge.c
diff -u src/sys/dev/pci/if_vge.c:1.63 src/sys/dev/pci/if_vge.c:1.64
--- src/sys/dev/pci/if_vge.c:1.63 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_vge.c Wed Jul 18 23:10:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.63 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_vge.c,v 1.64 2018/07/18 23:10:28 sevan Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.63 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.64 2018/07/18 23:10:28 sevan Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -938,7 +938,7 @@ vge_attach(device_t parent, device_t sel
eaddr[4] = val & 0xff;
eaddr[5] = val >> 8;
- aprint_normal_dev(self, "Ethernet address: %s\n",
+ aprint_normal_dev(self, "Ethernet address %s\n",
ether_sprintf(eaddr));
/*
Index: src/sys/dev/pci/if_vr.c
diff -u src/sys/dev/pci/if_vr.c:1.124 src/sys/dev/pci/if_vr.c:1.125
--- src/sys/dev/pci/if_vr.c:1.124 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_vr.c Wed Jul 18 23:10:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.124 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_vr.c,v 1.125 2018/07/18 23:10:28 sevan Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.124 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.125 2018/07/18 23:10:28 sevan Exp $");
@@ -1622,7 +1622,7 @@ vr_attach(device_t parent, device_t self
/*
* A Rhine chip was detected. Inform the world.
*/
- aprint_normal_dev(self, "Ethernet address: %s\n", ether_sprintf(eaddr));
+ aprint_normal_dev(self, "Ethernet address %s\n", ether_sprintf(eaddr));
memcpy(sc->vr_enaddr, eaddr, ETHER_ADDR_LEN);
