Date: Sun, 14 Mar 2004 14:25:16 -0800 (PST) From: Juli Mallett <jmallett@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 48983 for review Message-ID: <200403142225.i2EMPGMb043685@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=48983 Change 48983 by jmallett@jmallett_oingo on 2004/03/14 14:24:54 IFC. Affected files ... .. //depot/projects/mips/Makefile.inc1#25 integrate .. //depot/projects/mips/etc/Makefile#15 integrate .. //depot/projects/mips/etc/defaults/rc.conf#18 integrate .. //depot/projects/mips/etc/rc.d/named#5 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 integrate .. //depot/projects/mips/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/mips/sys/boot/pc98/loader/Makefile#5 integrate .. //depot/projects/mips/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/mips/sys/conf/files.i386#22 integrate .. //depot/projects/mips/sys/conf/files.pc98#20 integrate .. //depot/projects/mips/sys/dev/an/if_an.c#13 integrate .. //depot/projects/mips/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/mips/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/mips/sys/dev/cnw/if_cnw.c#7 integrate .. //depot/projects/mips/sys/dev/cs/if_cs.c#6 integrate .. //depot/projects/mips/sys/dev/ed/if_ed.c#10 integrate .. //depot/projects/mips/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/mips/sys/dev/ex/if_ex.c#7 integrate .. //depot/projects/mips/sys/dev/fe/if_fe.c#7 integrate .. //depot/projects/mips/sys/dev/fxp/if_fxp.c#15 integrate .. //depot/projects/mips/sys/dev/gx/if_gx.c#8 integrate .. //depot/projects/mips/sys/dev/ie/if_ie.c#7 integrate .. //depot/projects/mips/sys/dev/lge/if_lge.c#9 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc.c#8 integrate .. //depot/projects/mips/sys/dev/my/if_my.c#11 integrate .. //depot/projects/mips/sys/dev/nge/if_nge.c#11 integrate .. //depot/projects/mips/sys/dev/owi/if_owi.c#3 integrate .. //depot/projects/mips/sys/dev/re/if_re.c#3 integrate .. //depot/projects/mips/sys/dev/sbni/if_sbni.c#6 integrate .. //depot/projects/mips/sys/dev/sn/if_sn.c#8 integrate .. //depot/projects/mips/sys/dev/snc/dp83932.c#8 integrate .. //depot/projects/mips/sys/dev/tx/if_tx.c#9 integrate .. //depot/projects/mips/sys/dev/txp/if_txp.c#8 integrate .. //depot/projects/mips/sys/dev/usb/if_aue.c#10 integrate .. //depot/projects/mips/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/mips/sys/dev/usb/if_cue.c#10 integrate .. //depot/projects/mips/sys/dev/usb/if_kue.c#9 integrate .. //depot/projects/mips/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#20 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#20 integrate .. //depot/projects/mips/sys/dev/usb/uvisor.c#9 integrate .. //depot/projects/mips/sys/dev/vx/if_vx.c#7 integrate .. //depot/projects/mips/sys/dev/wl/if_wl.c#8 integrate .. //depot/projects/mips/sys/dev/xe/if_xe.c#8 integrate .. //depot/projects/mips/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#23 integrate .. //depot/projects/mips/sys/i386/include/cdk.h#2 delete .. //depot/projects/mips/sys/i386/isa/README.stl#2 delete .. //depot/projects/mips/sys/i386/isa/if_el.c#6 integrate .. //depot/projects/mips/sys/i386/isa/if_le.c#9 integrate .. //depot/projects/mips/sys/i386/isa/if_rdp.c#9 integrate .. //depot/projects/mips/sys/i386/isa/istallion.c#8 delete .. //depot/projects/mips/sys/i386/isa/stallion.c#7 delete .. //depot/projects/mips/sys/kern/kern_ntptime.c#6 integrate .. //depot/projects/mips/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/mips/sys/pc98/conf/NOTES#14 integrate .. //depot/projects/mips/sys/pci/if_dc.c#17 integrate .. //depot/projects/mips/sys/pci/if_de.c#9 integrate .. //depot/projects/mips/sys/pci/if_pcn.c#11 integrate .. //depot/projects/mips/sys/pci/if_rl.c#16 integrate .. //depot/projects/mips/sys/pci/if_sf.c#11 integrate .. //depot/projects/mips/sys/pci/if_sis.c#14 integrate .. //depot/projects/mips/sys/pci/if_sk.c#11 integrate .. //depot/projects/mips/sys/pci/if_ste.c#11 integrate .. //depot/projects/mips/sys/pci/if_ti.c#14 integrate .. //depot/projects/mips/sys/pci/if_tl.c#11 integrate .. //depot/projects/mips/sys/pci/if_vr.c#13 integrate .. //depot/projects/mips/sys/pci/if_wb.c#11 integrate .. //depot/projects/mips/sys/pci/if_xl.c#15 integrate .. //depot/projects/mips/usr.bin/finger/extern.h#2 integrate .. //depot/projects/mips/usr.bin/finger/finger.h#2 integrate .. //depot/projects/mips/usr.bin/finger/lprint.c#3 integrate .. //depot/projects/mips/usr.bin/mt/mt.c#3 integrate .. //depot/projects/mips/usr.sbin/Makefile#19 integrate .. //depot/projects/mips/usr.sbin/stallion/Makefile#2 delete .. //depot/projects/mips/usr.sbin/stallion/Makefile.inc#2 delete .. //depot/projects/mips/usr.sbin/stallion/bootcode/2681.sys.uu#2 delete .. //depot/projects/mips/usr.sbin/stallion/bootcode/Makefile#2 delete .. //depot/projects/mips/usr.sbin/stallion/bootcode/cdk.sys.uu#2 delete .. //depot/projects/mips/usr.sbin/stallion/bootcode/stl.4#3 delete .. //depot/projects/mips/usr.sbin/stallion/stlload/Makefile#2 delete .. //depot/projects/mips/usr.sbin/stallion/stlload/stlload.8#2 delete .. //depot/projects/mips/usr.sbin/stallion/stlload/stlload.c#2 delete .. //depot/projects/mips/usr.sbin/stallion/stlstats/Makefile#2 delete .. //depot/projects/mips/usr.sbin/stallion/stlstats/stlstats.8#2 delete .. //depot/projects/mips/usr.sbin/stallion/stlstats/stlstats.c#2 delete Differences ... ==== //depot/projects/mips/Makefile.inc1#25 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.416 2004/03/13 15:46:34 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.417 2004/03/14 16:44:27 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -261,7 +261,7 @@ mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ - -p ${WORLDTMP}/usr/include + -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo ==== //depot/projects/mips/etc/Makefile#15 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.325 2004/03/08 22:03:27 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.326 2004/03/14 17:18:39 ru Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -64,9 +64,6 @@ distribute: cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ - ${DISTDIR}/${DISTRIBUTION}/boot/device.hints distribution: cd ${.CURDIR}; \ @@ -162,6 +159,9 @@ ${DESTDIR}/var/crash cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${FREEBSD} ${DESTDIR}/ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ + ${DESTDIR}/boot/device.hints distrib-dirs: mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ ==== //depot/projects/mips/etc/defaults/rc.conf#18 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.199 2004/03/03 15:21:01 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.200 2004/03/14 19:10:05 dougb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -145,12 +145,9 @@ # named. It may be possible to run named in a sandbox, man security for # details. # -named_rcng="NO" # XXX Temporary. Enable to use new rc - # functionality in support of named. See - # variables below. named_enable="NO" # Run named, the DNS server (or NO). named_program="/usr/sbin/named" # path to named, if you want a different one. -named_flags="-u bind -g bind" # Flags for named +named_flags="-u bind" # Flags for named named_pidfile="/var/run/named/pid" # Pid file named_chrootdir="" # Chroot directory (or "" not to auto-chroot it) named_chroot_autoupdate="YES" # Automatically install/update chrooted ==== //depot/projects/mips/etc/rc.d/named#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/named,v 1.8 2004/01/17 10:59:43 mtm Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.9 2004/03/14 19:10:05 dougb Exp $ # # PROVIDE: named @@ -13,12 +13,9 @@ name="named" rcvar=`set_rcvar` -command="/usr/sbin/${name}" start_precmd="named_precmd" required_dirs="$named_chrootdir" # if it is set, it must exist extra_commands="reload" -nuser=bind -ngroup=bind # If running in a chroot cage, ensure that the appropriate files # exist inside the cage, as well as helper symlinks into the cage @@ -64,28 +61,16 @@ { ln -fs "${named_chrootdir}${named_pidfile}" ${named_pidfile} ln -fs "${named_chrootdir}/var/run/ndc" /var/run/ndc - } named_precmd() { - ! checkyesno named_rcng && return 0 # Is the user using a sandbox? - if [ -z "$named_chrootdir" ]; then - rc_flags="-u $nuser -g $ngroup $rc_flags" - return 0 + if [ -n "$named_chrootdir" ]; then + rc_flags="$rc_flags -t $named_chrootdir" + checkyesno named_chroot_autoupdate && chroot_autoupdate + checkyesno named_symlink_enable && make_symlinks fi - - # Do the following checks only if the user wants them done - checkyesno named_chroot_autoupdate && chroot_autoupdate - - # Make the symlinks only if the user wants them done. - checkyesno named_symlink_enable && make_symlinks - - # Change run_rc_commands()'s internal copy of $named_flags - # - ! checkyesno named_rcng && return - rc_flags="-u $nuser -g $ngroup -t ${named_chrootdir} $rc_flags" } load_rc_config $name ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.688 2004/03/13 16:45:05 hrs Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.689 2004/03/14 08:47:20 hrs Exp $</pubdate> <copyright> <year>2000</year> @@ -215,8 +215,17 @@ <sect3 id="proc"> <title>Platform-Specific Hardware Support</title> - <para></para> - + <para arch="i386">Several old drivers for ISA cards have been removed, + including + the asc driver for GI1904-based hand scanners, + the ctx driver for CORTEX-I Frame Grabber, + the gp driver for National Instruments AT-GPIB and AT-GPIB/TNT boards, + the stl and stli drivers for Stallion Technologies multiport serial + controllers, and the wt driver for Archive/Wangtek cartridge tapes. + They are currently non-functional, and would require a considerable + amount of work to make them work under the new API in 5-CURRENT. + The userland support such as related ioctls and the sasc + utility have also been removed.</para> </sect3> <sect3 id="boot"> @@ -453,9 +462,14 @@ multilabel flag on new filesystems without requiring the use of &man.tunefs.8;.</para> - <para>&man.nologin.8; now support reporting login attempts via + <para>&man.nologin.8; now reports login attempts via &man.syslogd.8;.</para> + <para>&man.nologin.8; has been moved from <filename>/sbin/nologin</filename> + to <filename>/usr/sbin/nologin</filename>, and + <filename>/sbin/nologin</filename> remains as a symbolic link + for backward compatibility.</para> + <para>A bugfix has been applied to NSS support, which fixes problems when using third-party NSS modules (such as <filename role="package">net/nss_ldap</filename>) and groups with large ==== //depot/projects/mips/share/man/man5/rc.conf.5#17 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.206 2004/03/04 08:25:53 mtm Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.207 2004/03/14 19:10:06 dougb Exp $ .\" .Dd March 3, 2002 .Dt RC.CONF 5 @@ -1027,18 +1027,6 @@ .Dq Li YES , these are the flags to pass to .Xr inetd 8 . -.It Va named_rcng -.Pq Vt bool -If set to -.Dq Li YES -use new functionality provided in the -.Pa /etc/rc.d/named -script to facilitate a -.Xr chroot 8 -instance of -.Xr named 8 . -This variable is experimental. -It may be removed or changed in the near future. .It Va named_enable .Pq Vt bool If set to ==== //depot/projects/mips/sys/boot/pc98/loader/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.34 2004/02/13 15:26:22 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.35 2004/03/14 09:41:57 nyan Exp $ PROG= loader.sym INTERNALPROG= @@ -85,7 +85,10 @@ FILES+= ${.CURDIR}/../../i386/loader/loader.rc .endif -DPADD= ${BTXCRT} ${LIBFICL} ${LIBPC98} ${LIBSTAND} -LDADD= ${BTXCRT} ${LIBFICL} ${LIBPC98} -lstand +# XXX crt0.o needs to be first for pxeboot(8) to work +OBJS= ${BTXCRT} + +DPADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBPC98} -lstand .include <bsd.prog.mk> ==== //depot/projects/mips/sys/boot/pc98/loader/main.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.16 2003/09/08 09:11:21 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.17 2004/03/14 09:43:15 nyan 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. @@ -173,7 +173,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/mips/sys/conf/files.i386#22 (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/mips/sys/conf/files.pc98#20 (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/mips/sys/dev/an/if_an.c#13 (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/mips/sys/dev/bfe/if_bfe.c#4 (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/mips/sys/dev/bge/if_bge.c#14 (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/mips/sys/dev/cnw/if_cnw.c#7 (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/mips/sys/dev/cs/if_cs.c#6 (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/mips/sys/dev/ed/if_ed.c#10 (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/mips/sys/dev/ep/if_ep.c#7 (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.131 2004/03/14 08:43:55 ru Exp $"); /* * Modified from the FreeBSD 1.1.5.1 version by: @@ -60,9 +60,6 @@ * <mdodd@FreeBSD.org> */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.129 2003/11/02 20:10:09 imp Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> @@ -287,9 +284,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/mips/sys/dev/ex/if_ex.c#7 (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/mips/sys/dev/fe/if_fe.c#7 (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/mips/sys/dev/fxp/if_fxp.c#15 (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/mips/sys/dev/gx/if_gx.c#8 (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/mips/sys/dev/ie/if_ie.c#7 (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/mips/sys/dev/lge/if_lge.c#9 (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/mips/sys/dev/lnc/if_lnc.c#8 (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/mips/sys/dev/my/if_my.c#11 (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/mips/sys/dev/nge/if_nge.c#11 (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/mips/sys/dev/owi/if_owi.c#3 (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/mips/sys/dev/re/if_re.c#3 (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/mips/sys/dev/sbni/if_sbni.c#6 (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/mips/sys/dev/sn/if_sn.c#8 (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/mips/sys/dev/snc/dp83932.c#8 (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/mips/sys/dev/tx/if_tx.c#9 (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/mips/sys/dev/txp/if_txp.c#8 (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/mips/sys/dev/usb/if_aue.c#10 (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/mips/sys/dev/usb/if_axe.c#4 (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 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403142225.i2EMPGMb043685>