Date: Sun, 14 Mar 2004 00:32:21 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 48961 for review Message-ID: <200403140832.i2E8WLHC034715@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=48961 Change 48961 by rwatson@rwatson_paprika on 2004/03/14 00:32:04 Integrate netperf_socket: - More 0/NULL fixes. - i386/isa/istallion removed. - i386/isa/stallion removed. - Ethernet attachment now prints ethernt address, so drivers don't have to. Affected files ... .. //depot/projects/netperf_socket/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#6 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#4 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/gx/if_gx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/my/if_my.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/owi/if_owi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#10 integrate .. //depot/projects/netperf_socket/sys/i386/include/asc_ioctl.h#2 delete .. //depot/projects/netperf_socket/sys/i386/include/cdk.h#2 delete .. //depot/projects/netperf_socket/sys/i386/include/ioctl_ctx.h#2 delete .. //depot/projects/netperf_socket/sys/i386/include/wtio.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/README.stl#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/if_el.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/if_le.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/if_rdp.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/istallion.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/stallion.c#3 delete .. //depot/projects/netperf_socket/sys/kern/subr_param.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_de.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcn.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_sf.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_sis.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_ste.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_ti.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_tl.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_wb.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_xl.c#3 integrate .. //depot/projects/netperf_socket/sys/rpc/rpcclnt.h#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/boot/i386/loader/main.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.28 2003/08/25 23:28:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.29 2004/03/14 05:48:04 bde Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -112,7 +112,7 @@ /* * Special handling for PXE and CD booting. */ - if (kargs->bootinfo == NULL) { + if (kargs->bootinfo == 0) { /* * We only want the PXE disk to try to init itself in the below * walk through devsw if we actually booted off of PXE. @@ -177,7 +177,7 @@ new_currdev.d_dev = &biosdisk; /* new-style boot loaders such as pxeldr and cdldr */ - if (kargs->bootinfo == NULL) { + if (kargs->bootinfo == 0) { if ((kargs->bootflags & KARGS_FLAGS_CD) != 0) { /* we are booting from a CD with cdboot */ new_currdev.d_dev = &bioscd; ==== //depot/projects/netperf_socket/sys/conf/files.i386#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.472 2004/03/14 05:31:40 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.473 2004/03/14 06:48:35 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -272,7 +272,6 @@ i386/isa/isa_compat.c optional isa compat_oldisa \ warning "Old ISA driver compatibility shims present." i386/isa/isa_dma.c optional isa -i386/isa/istallion.c optional stli nowerror i386/isa/mse.c optional mse i386/isa/nmi.c standard i386/isa/npx.c optional npx @@ -288,7 +287,6 @@ i386/isa/spic.c optional spic i386/isa/spigot.c count spigot i386/isa/spkr.c optional speaker -i386/isa/stallion.c optional stl nowerror i386/isa/vesa.c optional vga vesa i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux ==== //depot/projects/netperf_socket/sys/conf/files.pc98#4 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.287 2004/03/07 05:38:20 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.288 2004/03/14 06:48:35 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -205,12 +205,10 @@ i386/isa/isa.c optional isa i386/isa/isa_compat.c optional isa compat_oldisa \ warning "Old ISA driver compatibility shims present." -i386/isa/istallion.c optional stli nowerror i386/isa/npx.c optional npx i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spkr.c optional speaker -i386/isa/stallion.c optional stl nowerror i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_locore.s optional compat_linux \ ==== //depot/projects/netperf_socket/sys/dev/an/if_an.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.58 2004/01/10 03:02:04 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.59 2004/03/14 07:12:19 mdodd Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -749,9 +749,6 @@ bcopy((char *)&sc->an_caps.an_oemaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); - printf("an%d: Ethernet address: %6D\n", sc->an_unit, - sc->arpcom.ac_enaddr, ":"); - ifp->if_softc = sc; sc->an_unit = unit; if_initname(ifp, device_get_name(sc->an_dev), ==== //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.6 2004/03/02 05:43:42 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.7 2004/03/14 07:12:20 mdodd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -406,9 +406,6 @@ bfe_get_config(sc); - printf("bfe%d: Ethernet address: %6D\n", unit, - sc->arpcom.ac_enaddr, ":"); - /* Reset the chip and turn on the PHY */ bfe_chip_reset(sc); ==== //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.63 2004/01/13 11:31:09 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.64 2004/03/14 07:12:20 mdodd Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -2309,12 +2309,6 @@ goto fail; } - /* - * A Broadcom chip was detected. Inform the world. - */ - printf("bge%d: Ethernet address: %6D\n", unit, - sc->arpcom.ac_enaddr, ":"); - /* Save ASIC rev. */ sc->bge_chipid = ==== //depot/projects/netperf_socket/sys/dev/cnw/if_cnw.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.13 2003/10/31 18:31:58 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.14 2004/03/14 07:12:20 mdodd Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -1628,8 +1628,6 @@ bus_space_read_1(sc->sc_memt, sc->sc_memh, sc->sc_memoff + CNW_EREG_PA + i); } - device_printf(dev, "Ethernet address: %6D\n", - sc->arpcom.ac_enaddr, ":"); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ==== //depot/projects/netperf_socket/sys/dev/cs/if_cs.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.28 2003/11/04 02:59:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.29 2004/03/14 07:12:20 mdodd Exp $"); /* * @@ -686,10 +686,6 @@ ether_ifattach(ifp, sc->arpcom.ac_enaddr); - if (bootverbose) - if_printf(ifp, "ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - return (0); } ==== //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.226 2004/03/03 07:33:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.227 2004/03/14 07:12:20 mdodd Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -1758,11 +1758,6 @@ ether_ifattach(ifp, sc->arpcom.ac_enaddr); /* device attach does transition from UNCONFIGURED to IDLE state */ - /* - * Print additional info when attached - */ - if_printf(ifp, "address %6D, ", sc->arpcom.ac_enaddr, ":"); - if (sc->type_str && (*sc->type_str != 0)) printf("type %s ", sc->type_str); else ==== //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.129 2003/11/02 20:10:09 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.130 2004/03/14 07:12:21 mdodd Exp $"); /* * Modified from the FreeBSD 1.1.5.1 version by: @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.129 2003/11/02 20:10:09 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.130 2004/03/14 07:12:21 mdodd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -287,9 +287,6 @@ for (i = 0; i < 3; i++) CSR_WRITE_2(sc, EP_W2_ADDR_0 + (i * 2), ntohs(p[i])); - device_printf(sc->dev, "Ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - ifp = &sc->arpcom.ac_if; attached = (ifp->if_softc != 0); ==== //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.47 2003/10/31 18:32:00 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.48 2004/03/14 07:12:21 mdodd Exp $"); /* * Intel EtherExpress Pro/10, Pro/10+ Ethernet driver @@ -271,9 +271,6 @@ */ ether_ifattach(ifp, sc->arpcom.ac_enaddr); - device_printf(sc->dev, "Ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - return(0); } ==== //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.80 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.81 2004/03/14 07:12:21 mdodd Exp $"); /* * @@ -821,8 +821,7 @@ fe_stop(sc); /* Print additional info when attached. */ - device_printf(dev, "address %6D, type %s%s\n", - sc->sc_enaddr, ":" , sc->typestr, + device_printf(dev, "type %s%s\n", sc->typestr, (sc->proto_dlcr4 & FE_D4_DSC) ? ", full duplex" : ""); if (bootverbose) { int buf, txb, bbw, sbw, ram; ==== //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#2 (text+ko) ==== @@ -28,14 +28,14 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.198 2003/11/28 05:28:28 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.199 2004/03/14 07:12:21 mdodd Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.198 2003/11/28 05:28:28 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.199 2004/03/14 07:12:21 mdodd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -758,9 +758,6 @@ sc->arpcom.ac_enaddr[3] = myea[1] >> 8; sc->arpcom.ac_enaddr[4] = myea[2] & 0xff; sc->arpcom.ac_enaddr[5] = myea[2] >> 8; - device_printf(dev, "Ethernet address %6D%s\n", - sc->arpcom.ac_enaddr, ":", - sc->flags & FXP_FLAG_SERIAL_MEDIA ? ", 10Mbps" : ""); if (bootverbose) { device_printf(dev, "PCI IDs: %04x %04x %04x %04x %04x\n", pci_get_vendor(dev), pci_get_device(dev), ==== //depot/projects/netperf_socket/sys/dev/gx/if_gx.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.14 2004/01/18 10:15:48 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gx/if_gx.c,v 1.15 2004/03/14 07:12:21 mdodd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -320,8 +320,6 @@ error = ENXIO; goto fail; } - device_printf(dev, "Ethernet address: %6D\n", - gx->arpcom.ac_enaddr, ":"); /* Allocate the ring buffers. */ gx->gx_rdata = contigmalloc(sizeof(struct gx_ring_data), M_DEVBUF, ==== //depot/projects/netperf_socket/sys/dev/ie/if_ie.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.97 2003/10/31 18:32:02 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.98 2004/03/14 07:12:22 mdodd Exp $"); /* * Intel 82586 Ethernet chip @@ -319,9 +319,6 @@ EVENTHANDLER_REGISTER(shutdown_post_sync, ee16_shutdown, sc, SHUTDOWN_PRI_DEFAULT); - device_printf(sc->dev, "Ethernet address %6D\n", - sc->arpcom.ac_enaddr, ":"); - ether_ifattach(ifp, sc->arpcom.ac_enaddr); return (0); } ==== //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.27 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.28 2004/03/14 07:12:22 mdodd Exp $"); /* * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public @@ -572,11 +572,6 @@ lge_read_eeprom(sc, (caddr_t)&eaddr[2], LGE_EE_NODEADDR_1, 1, 0); lge_read_eeprom(sc, (caddr_t)&eaddr[4], LGE_EE_NODEADDR_2, 1, 0); - /* - * A Level 1 chip was detected. Inform the world. - */ - printf("lge%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->lge_unit = unit; callout_handle_init(&sc->lge_stat_ch); bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/netperf_socket/sys/dev/lnc/if_lnc.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.104 2004/03/03 08:33:34 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.105 2004/03/14 07:12:22 mdodd Exp $"); /* #define DIAGNOSTIC @@ -894,13 +894,11 @@ ether_ifattach(&sc->arpcom.ac_if, sc->arpcom.ac_enaddr); - printf("%s: ", sc->arpcom.ac_if.if_xname); if (sc->nic.ic == LANCE || sc->nic.ic == C_LANCE) - printf("%s (%s)", + if_printf(&sc->arpcom.ac_if, "%s (%s)\n", nic_ident[sc->nic.ident], ic_ident[sc->nic.ic]); else - printf("%s", ic_ident[sc->nic.ic]); - printf(" address %6D\n", sc->arpcom.ac_enaddr, ":"); + if_printf(&sc->arpcom.ac_if, "%s\n", ic_ident[sc->nic.ic]); return (1); } ==== //depot/projects/netperf_socket/sys/dev/my/if_my.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.22 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.23 2004/03/14 07:12:22 mdodd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -961,11 +961,6 @@ for (i = 0; i < ETHER_ADDR_LEN; ++i) eaddr[i] = CSR_READ_1(sc, MY_PAR0 + i); - /* - * A Myson chip was detected. Inform the world. - */ - printf("my%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->my_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.52 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.53 2004/03/14 07:12:22 mdodd Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver @@ -906,11 +906,6 @@ nge_read_eeprom(sc, (caddr_t)&eaddr[2], NGE_EE_NODEADDR + 1, 1, 0); nge_read_eeprom(sc, (caddr_t)&eaddr[0], NGE_EE_NODEADDR + 2, 1, 0); - /* - * A NatSemi chip was detected. Inform the world. - */ - printf("nge%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->nge_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/netperf_socket/sys/dev/owi/if_owi.c#2 (text+ko) ==== @@ -100,7 +100,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/owi/if_owi.c,v 1.4 2003/12/10 15:09:38 bms Exp $"; + "$FreeBSD: src/sys/dev/owi/if_owi.c,v 1.5 2004/03/14 07:12:22 mdodd Exp $"; #endif static void wi_intr(void *); @@ -226,8 +226,6 @@ bcopy((char *)&mac.wi_mac_addr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); - device_printf(dev, "802.11 address: %6D\n", sc->arpcom.ac_enaddr, ":"); - owi_get_id(sc); if_initname(ifp, device_get_name(dev), sc->wi_unit); ==== //depot/projects/netperf_socket/sys/dev/re/if_re.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.17 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.18 2004/03/14 07:12:22 mdodd Exp $"); /* * RealTek 8139C+/8169/8169S/8110S PCI NIC driver @@ -1212,11 +1212,6 @@ } } - /* - * A RealTek chip was detected. Inform the world. - */ - printf("re%d: Ethernet address: %6D\n", unit, eaddr, ":"); - sc->rl_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/netperf_socket/sys/dev/sbni/if_sbni.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.14 2003/10/31 18:32:04 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.15 2004/03/14 07:12:23 mdodd Exp $"); /* * Device driver for Granch SBNI12 leased line adapters @@ -245,8 +245,7 @@ ether_ifattach(ifp, sc->arpcom.ac_enaddr); /* device attach does transition from UNCONFIGURED to IDLE state */ - if_printf(ifp, "speed %ld, address %6D, rxl ", - ifp->if_baudrate, sc->arpcom.ac_enaddr, ":"); + if_printf(ifp, "speed %ld, rxl ", ifp->if_baudrate); if (sc->delta_rxl) printf("auto\n"); else ==== //depot/projects/netperf_socket/sys/dev/sn/if_sn.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.35 2003/12/08 07:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.36 2004/03/14 07:12:23 mdodd Exp $"); /* * This is a driver for SMC's 9000 series of Ethernet adapters. @@ -201,7 +201,6 @@ p[i + 1] = address >> 8; p[i] = address & 0xFF; } - printf(" MAC address %6D\n", sc->arpcom.ac_enaddr, ":"); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ==== //depot/projects/netperf_socket/sys/dev/snc/dp83932.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.12 2003/11/01 23:24:38 brooks Exp $ */ +/* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.13 2004/03/14 07:12:23 mdodd Exp $ */ /* $NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $ */ /* $NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $ */ @@ -162,7 +162,6 @@ camdump(sc); } #endif - device_printf(sc->sc_dev, "address %6D\n", myea, ":"); #ifdef SNCDEBUG device_printf(sc->sc_dev, ==== //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.80 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.81 2004/03/14 07:12:23 mdodd Exp $"); /* * EtherPower II 10/100 Fast Ethernet (SMC 9432 serie) @@ -391,9 +391,6 @@ goto fail; } - /* Display ethernet address ,... */ - device_printf(dev, "address %6D,", sc->sc_macaddr, ":"); - /* board type and ... */ printf(" type "); for(i = 0x2c; i < 0x32; i++) { ==== //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#2 (text+ko) ==== @@ -35,14 +35,14 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.21 2003/10/31 18:32:05 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.22 2004/03/14 07:12:23 mdodd Exp $"); /* * Driver for 3c990 (Typhoon) Ethernet ASIC */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.21 2003/10/31 18:32:05 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.22 2004/03/14 07:12:23 mdodd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,7 +93,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.21 2003/10/31 18:32:05 brooks Exp $"; + "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.22 2004/03/14 07:12:23 mdodd Exp $"; #endif /* @@ -334,9 +334,6 @@ sc->sc_arpcom.ac_enaddr[4] = ((u_int8_t *)&p2)[1]; sc->sc_arpcom.ac_enaddr[5] = ((u_int8_t *)&p2)[0]; - printf("txp%d: Ethernet address %6D\n", unit, - sc->sc_arpcom.ac_enaddr, ":"); - sc->sc_cold = 0; ifmedia_init(&sc->sc_ifmedia, 0, txp_ifmedia_upd, txp_ifmedia_sts); ==== //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.78 2003/12/17 14:23:07 sanpei Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.79 2004/03/14 07:12:23 mdodd Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -730,11 +730,6 @@ */ aue_read_eeprom(sc, (caddr_t)&eaddr, 0, 3, 0); - /* - * A Pegasus chip was detected. Inform the world. - */ - printf("aue%d: Ethernet address: %6D\n", sc->aue_unit, eaddr, ":"); - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ifp = &sc->arpcom.ac_if; ==== //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.10 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.11 2004/03/14 07:12:23 mdodd Exp $"); /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -492,11 +492,6 @@ */ sc->axe_phyaddrs[0] = sc->axe_phyaddrs[1] = 0xFF; - /* - * An ASIX chip was detected. Inform the world. - */ - printf("axe%d: Ethernet address: %6D\n", sc->axe_unit, eaddr, ":"); - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ifp = &sc->arpcom.ac_if; ==== //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.45 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.46 2004/03/14 07:12:23 mdodd Exp $"); /* * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate @@ -510,11 +510,6 @@ */ cue_getmac(sc, &eaddr); - /* - * A CATC chip was detected. Inform the world. - */ - printf("cue%d: Ethernet address: %6D\n", sc->cue_unit, eaddr, ":"); - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ifp = &sc->arpcom.ac_if; ==== //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.52 2003/11/14 11:09:45 johan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.53 2004/03/14 07:12:23 mdodd Exp $"); /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. @@ -475,12 +475,6 @@ sc->kue_mcfilters = malloc(KUE_MCFILTCNT(sc) * ETHER_ADDR_LEN, M_USBDEV, M_NOWAIT); - /* - * A KLSI chip was detected. Inform the world. - */ - printf("kue%d: Ethernet address: %6D\n", sc->kue_unit, - sc->kue_desc.kue_macaddr, ":"); - bcopy(sc->kue_desc.kue_macaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ==== //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.8 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.9 2004/03/14 07:12:23 mdodd Exp $"); /* * RealTek RTL8150 USB to fast ethernet controller driver. @@ -682,9 +682,6 @@ goto error1; } - /* RealTek RTL8150 was detected */ - printf("rue%d: Ethernet address: %6D\n", sc->rue_unit, eaddr, ":"); - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); ifp = &sc->arpcom.ac_if; ==== //depot/projects/netperf_socket/sys/dev/vx/if_vx.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx.c,v 1.48 2003/10/31 18:32:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx.c,v 1.49 2004/03/14 07:12:24 mdodd Exp $"); /* * Created from if_ep.c driver by Fred Gray (fgray@rice.edu) to support @@ -155,8 +155,6 @@ sc->arpcom.ac_enaddr[(i << 1) + 1] = x; } - printf(" address %6D\n", sc->arpcom.ac_enaddr, ":"); - if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; ==== //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#2 (text+ko) ==== @@ -173,7 +173,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/wl/if_wl.c,v 1.57 2003/11/14 19:00:31 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wl/if_wl.c,v 1.58 2004/03/14 07:12:24 mdodd Exp $"); /* @@ -569,8 +569,7 @@ ether_ifattach(ifp, &sc->wl_addr[0]); bcopy(&sc->wl_addr[0], sc->wl_ac.ac_enaddr, WAVELAN_ADDR_SIZE); - printf("%s: address %6D, NWID 0x%02x%02x", ifp->if_xname, - sc->wl_ac.ac_enaddr, ":", sc->nwid[0], sc->nwid[1]); + if_printf(ifp, "NWID 0x%02x%02x", sc->nwid[0], sc->nwid[1]); if (sc->freq24) printf(", Freq %d MHz",sc->freq24); /* 2.4 Gz */ printf("\n"); /* 2.4 Gz */ ==== //depot/projects/netperf_socket/sys/dev/xe/if_xe.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.46 2003/12/08 07:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.47 2004/03/14 07:12:24 mdodd Exp $"); /* * FreeBSD device driver for Xircom CreditCard PCMCIA Ethernet adapters. The @@ -297,7 +297,6 @@ XE_SELECT_PAGE(0x45); DEVPRINTF(1, (dev, "CE2 version = 0x%#02x\n", XE_INB(XE_REV))); } - device_printf(dev, "Ethernet address %6D\n", scp->arpcom.ac_enaddr, ":"); /* Attach the interface */ ether_ifattach(scp->ifp, scp->arpcom.ac_enaddr); ==== //depot/projects/netperf_socket/sys/i386/conf/NOTES#10 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1140 2004/03/14 05:31:40 imp Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1141 2004/03/14 06:48:34 imp Exp $ # # @@ -637,8 +637,6 @@ # digi: Digiboard driver # gsc: Genius GS-4500 hand scanner. # spic: Sony Programmable I/O controller (VAIO notebooks) -# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) -# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on APM # The flags takes the following meaning for apm0: @@ -673,21 +671,6 @@ # is the only thing truly supported, but apparently a fair percentage # of the Vaio extra features are controlled by this device. -# Notes on the Stallion stl and stli drivers: -# See src/i386/isa/README.stl for complete instructions. -# This is version 0.0.5alpha, unsupported by Stallion. -# The stl driver has a secondary IO port hard coded at 0x280. You need -# to change src/i386/isa/stallion.c if you reconfigure this on the boards. -# The "flags" and "msize" settings on the stli driver depend on the board: -# EasyConnection 8/64 ISA: flags 23 msize 0x1000 -# EasyConnection 8/64 EISA: flags 24 msize 0x10000 -# EasyConnection 8/64 MCA: flags 25 msize 0x1000 -# ONboard ISA: flags 4 msize 0x10000 -# ONboard EISA: flags 7 msize 0x10000 -# ONboard MCA: flags 3 msize 0x10000 -# Brumby: flags 2 msize 0x4000 -# Stallion: flags 1 msize 0x10000 - device spigot 1 hint.spigot.0.at="isa" hint.spigot.0.port="0xad6" @@ -721,16 +704,6 @@ device spic hint.spic.0.at="isa" hint.spic.0.port="0x10a0" -device stl -hint.stl.0.at="isa" -hint.stl.0.port="0x2a0" -hint.stl.0.irq="10" -device stli -hint.stli.0.at="isa" -hint.stli.0.port="0x2a0" -hint.stli.0.maddr="0xcc000" -hint.stli.0.flags="23" -hint.stli.0.msize="0x1000" # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu ==== //depot/projects/netperf_socket/sys/i386/isa/if_el.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/isa/if_el.c,v 1.61 2003/10/31 18:32:07 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/if_el.c,v 1.62 2004/03/14 07:12:24 mdodd Exp $"); /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -277,10 +277,6 @@ dprintf(("Attaching interface...\n")); ether_ifattach(ifp, sc->arpcom.ac_enaddr); - /* Print out some information for the user */ - device_printf(dev, "3c501 address %6D\n", - sc->arpcom.ac_enaddr, ":"); - dprintf(("el_attach() finished.\n")); return(0); } ==== //depot/projects/netperf_socket/sys/i386/isa/if_le.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/isa/if_le.c,v 1.77 2003/11/04 14:02:12 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/if_le.c,v 1.78 2004/03/14 07:12:24 mdodd Exp $"); /* * DEC EtherWORKS 2 Ethernet Controllers @@ -352,10 +352,6 @@ ifp->if_init = sc->if_init; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; - if_printf(ifp, "%s ethernet address %6D\n", - sc->le_prodname, - sc->le_ac.ac_enaddr, ":"); - ether_ifattach(ifp, sc->le_ac.ac_enaddr); return 1; ==== //depot/projects/netperf_socket/sys/i386/isa/if_rdp.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403140832.i2E8WLHC034715>