PERFORCE change 66385 for review
Sam Leffler
sam at FreeBSD.org
Fri Dec 3 21:07:35 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=66385
Change 66385 by sam at sam_ebb on 2004/12/04 05:07:09
IFC @ 66384
Affected files ...
.. //depot/projects/wifi/Makefile.inc1#6 integrate
.. //depot/projects/wifi/bin/sh/jobs.c#2 integrate
.. //depot/projects/wifi/bin/sh/sh.1#3 integrate
.. //depot/projects/wifi/etc/defaults/rc.conf#6 integrate
.. //depot/projects/wifi/lib/libc/gen/getcontext.3#2 integrate
.. //depot/projects/wifi/release/i386/mkisoimages.sh#2 integrate
.. //depot/projects/wifi/sbin/dump/dump.h#2 integrate
.. //depot/projects/wifi/sbin/dump/itime.c#2 integrate
.. //depot/projects/wifi/share/man/man9/EVENTHANDLER.9#1 branch
.. //depot/projects/wifi/share/man/man9/Makefile#3 integrate
.. //depot/projects/wifi/share/man/man9/style.9#2 integrate
.. //depot/projects/wifi/share/zoneinfo/europe#2 integrate
.. //depot/projects/wifi/share/zoneinfo/northamerica#2 integrate
.. //depot/projects/wifi/share/zoneinfo/southamerica#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/gdb_machdep.c#2 integrate
.. //depot/projects/wifi/sys/alpha/include/gdb_machdep.h#2 integrate
.. //depot/projects/wifi/sys/amd64/amd64/gdb_machdep.c#3 integrate
.. //depot/projects/wifi/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/wifi/sys/amd64/include/gdb_machdep.h#2 integrate
.. //depot/projects/wifi/sys/arm/arm/trap.c#5 integrate
.. //depot/projects/wifi/sys/boot/common/loader.8#2 integrate
.. //depot/projects/wifi/sys/boot/efi/libefi/bootinfo.c#2 integrate
.. //depot/projects/wifi/sys/boot/forth/beastie.4th#3 integrate
.. //depot/projects/wifi/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/wifi/sys/boot/i386/libi386/bootinfo.c#2 integrate
.. //depot/projects/wifi/sys/boot/i386/loader/help.i386#2 integrate
.. //depot/projects/wifi/sys/boot/ia64/ski/bootinfo.c#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/boot2/boot.c#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/loader/help.pc98#2 integrate
.. //depot/projects/wifi/sys/boot/powerpc/loader/metadata.c#2 integrate
.. //depot/projects/wifi/sys/boot/sparc64/loader/metadata.c#2 integrate
.. //depot/projects/wifi/sys/coda/coda_vnops.c#3 integrate
.. //depot/projects/wifi/sys/coda/coda_vnops.h#2 integrate
.. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/wifi/sys/compat/linux/linux_file.c#3 integrate
.. //depot/projects/wifi/sys/conf/kern.post.mk#3 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/CHANGES.txt#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acconfig.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acdebug.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acenv.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acevents.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acexcep.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acglobal.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/achware.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acinterp.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/aclocal.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acmacros.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acobject.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acoutput.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acpiosxf.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acpixf.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/actbl2.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/actypes.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/acutils.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/amlcode.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/amlresrc.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/common/adisasm.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dbcmds.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dbexec.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dbinput.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dbutils.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dmwalk.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dsmethod.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dsmthdat.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dsutils.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dswexec.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dswload.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/dswstate.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/evgpe.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/evgpeblk.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/evmisc.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/evregion.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/evrgnini.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/evxface.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exconfig.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exconvrt.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exdump.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exfldio.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exmisc.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exoparg1.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exoparg2.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exprep.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exregion.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exresolv.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exresop.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exstore.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exsystem.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/exutils.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/hwgpe.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/hwregs.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/hwsleep.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/hwtimer.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nsaccess.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nsalloc.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nsdump.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nseval.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nsinit.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nsload.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nsnames.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nssearch.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nsutils.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/nswalk.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/osunixxf.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/psopcode.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/psparse.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/psutils.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/rscalc.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/rsxface.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/tbconvrt.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/tbget.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/tbinstal.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/tbrsdt.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/tbxfroot.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/utalloc.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/utclib.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/utcopy.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/utdelete.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/uteval.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/utglobal.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/utmath.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/utmisc.c#2 integrate
.. //depot/projects/wifi/sys/contrib/dev/acpica/utobject.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_acad.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_cmbat.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_if.m#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#5 integrate
.. //depot/projects/wifi/sys/dev/cp/if_cp.c#2 integrate
.. //depot/projects/wifi/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/wifi/sys/dev/cx/if_cx.c#2 integrate
.. //depot/projects/wifi/sys/dev/drm/drm_os_freebsd.h#2 integrate
.. //depot/projects/wifi/sys/dev/pci/pci.c#4 integrate
.. //depot/projects/wifi/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/wifi/sys/fs/deadfs/dead_vnops.c#3 integrate
.. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#7 integrate
.. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vnops.c#3 integrate
.. //depot/projects/wifi/sys/fs/fifofs/fifo.h#2 integrate
.. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#5 integrate
.. //depot/projects/wifi/sys/fs/hpfs/hpfs.h#3 integrate
.. //depot/projects/wifi/sys/fs/hpfs/hpfs_vfsops.c#4 integrate
.. //depot/projects/wifi/sys/fs/hpfs/hpfs_vnops.c#4 integrate
.. //depot/projects/wifi/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_denode.c#3 integrate
.. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate
.. //depot/projects/wifi/sys/fs/ntfs/ntfs.h#3 integrate
.. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#5 integrate
.. //depot/projects/wifi/sys/fs/ntfs/ntfs_vnops.c#4 integrate
.. //depot/projects/wifi/sys/fs/nullfs/null.h#2 integrate
.. //depot/projects/wifi/sys/fs/nullfs/null_subr.c#2 integrate
.. //depot/projects/wifi/sys/fs/nullfs/null_vfsops.c#4 integrate
.. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#3 integrate
.. //depot/projects/wifi/sys/fs/nwfs/nwfs.h#2 integrate
.. //depot/projects/wifi/sys/fs/nwfs/nwfs_node.c#2 integrate
.. //depot/projects/wifi/sys/fs/nwfs/nwfs_vnops.c#2 integrate
.. //depot/projects/wifi/sys/fs/portalfs/portal.h#2 integrate
.. //depot/projects/wifi/sys/fs/portalfs/portal_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/fs/portalfs/portal_vnops.c#2 integrate
.. //depot/projects/wifi/sys/fs/procfs/procfs_status.c#2 integrate
.. //depot/projects/wifi/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate
.. //depot/projects/wifi/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/wifi/sys/fs/smbfs/smbfs_node.c#2 integrate
.. //depot/projects/wifi/sys/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/wifi/sys/fs/udf/udf_vnops.c#4 integrate
.. //depot/projects/wifi/sys/fs/umapfs/umap.h#2 integrate
.. //depot/projects/wifi/sys/fs/umapfs/umap_vnops.c#2 integrate
.. //depot/projects/wifi/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/wifi/sys/fs/unionfs/union_subr.c#3 integrate
.. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#4 integrate
.. //depot/projects/wifi/sys/gdb/gdb_main.c#2 integrate
.. //depot/projects/wifi/sys/gnu/ext2fs/ext2_extern.h#2 integrate
.. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vnops.c#4 integrate
.. //depot/projects/wifi/sys/i386/i386/gdb_machdep.c#2 integrate
.. //depot/projects/wifi/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/wifi/sys/i386/include/gdb_machdep.h#2 integrate
.. //depot/projects/wifi/sys/ia64/ia64/gdb_machdep.c#2 integrate
.. //depot/projects/wifi/sys/ia64/include/gdb_machdep.h#2 integrate
.. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate
.. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vnops.c#3 integrate
.. //depot/projects/wifi/sys/isofs/cd9660/iso.h#3 integrate
.. //depot/projects/wifi/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/wifi/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/wifi/sys/kern/tty_cons.c#2 integrate
.. //depot/projects/wifi/sys/kern/uipc_domain.c#5 integrate
.. //depot/projects/wifi/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/wifi/sys/kern/vfs_default.c#7 integrate
.. //depot/projects/wifi/sys/kern/vfs_init.c#2 integrate
.. //depot/projects/wifi/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/wifi/sys/kern/vfs_mount.c#6 integrate
.. //depot/projects/wifi/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/wifi/sys/modules/if_gif/Makefile#3 integrate
.. //depot/projects/wifi/sys/netgraph/atm/sscop/ng_sscop_cust.h#4 integrate
.. //depot/projects/wifi/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/hci/ng_hci_misc.c#3 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#3 integrate
.. //depot/projects/wifi/sys/netgraph/netgraph.h#3 integrate
.. //depot/projects/wifi/sys/netgraph/ng_base.c#4 integrate
.. //depot/projects/wifi/sys/netgraph/ng_cisco.c#4 integrate
.. //depot/projects/wifi/sys/netgraph/ng_source.c#3 integrate
.. //depot/projects/wifi/sys/nfs4client/nfs4_vfs_subs.c#2 integrate
.. //depot/projects/wifi/sys/nfs4client/nfs4_vnops.c#4 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_node.c#3 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#4 integrate
.. //depot/projects/wifi/sys/nfsclient/nfsnode.h#3 integrate
.. //depot/projects/wifi/sys/pci/if_pcn.c#2 integrate
.. //depot/projects/wifi/sys/pci/if_pcnreg.h#2 integrate
.. //depot/projects/wifi/sys/posix4/posix4_mib.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/include/gdb_machdep.h#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/gdb_machdep.c#2 integrate
.. //depot/projects/wifi/sys/sys/file.h#3 integrate
.. //depot/projects/wifi/sys/sys/filedesc.h#5 integrate
.. //depot/projects/wifi/sys/sys/mount.h#4 integrate
.. //depot/projects/wifi/sys/sys/reboot.h#2 integrate
.. //depot/projects/wifi/sys/sys/vnode.h#5 integrate
.. //depot/projects/wifi/sys/tools/vnode_if.awk#2 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_extern.h#4 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#7 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#5 integrate
.. //depot/projects/wifi/sys/ufs/ufs/ufs_extern.h#3 integrate
.. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#5 integrate
.. //depot/projects/wifi/tools/regression/netinet/tcpfullwindowrst/Makefile#1 branch
.. //depot/projects/wifi/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t#1 branch
.. //depot/projects/wifi/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/make/Makefile#5 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/make/shell_test#2 delete
.. //depot/projects/wifi/tools/regression/usr.bin/make/shell_test.sh#1 branch
.. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#3 integrate
.. //depot/projects/wifi/usr.bin/make/arch.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/buf.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/buf.h#3 integrate
.. //depot/projects/wifi/usr.bin/make/compat.c#4 integrate
.. //depot/projects/wifi/usr.bin/make/cond.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/dir.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/for.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/hash.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/hash.h#3 integrate
.. //depot/projects/wifi/usr.bin/make/job.c#7 integrate
.. //depot/projects/wifi/usr.bin/make/lst.lib/lstDestroy.c#4 integrate
.. //depot/projects/wifi/usr.bin/make/main.c#7 integrate
.. //depot/projects/wifi/usr.bin/make/make.1#2 integrate
.. //depot/projects/wifi/usr.bin/make/make.c#4 integrate
.. //depot/projects/wifi/usr.bin/make/nonints.h#2 integrate
.. //depot/projects/wifi/usr.bin/make/parse.c#4 integrate
.. //depot/projects/wifi/usr.bin/make/str.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/suff.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/targ.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/var.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/var.h#3 integrate
.. //depot/projects/wifi/usr.bin/make/var_modify.c#3 integrate
Differences ...
==== //depot/projects/wifi/Makefile.inc1#6 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.458 2004/11/23 09:09:47 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.459 2004/12/01 23:23:14 peter Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -415,6 +415,10 @@
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
.endif
.endfor
+.for _dir in usr.sbin/pcvt/keycap usr.bin/lex/lib
+ cd ${.CURDIR}/${_dir}; \
+ ${LIB32MAKE} DESTDIR=${LIB32TMP} obj
+.endfor
.for _dir in lib/libncurses lib/libmagic
cd ${.CURDIR}/${_dir}; \
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
==== //depot/projects/wifi/bin/sh/jobs.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.67 2004/04/06 20:06:51 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.68 2004/12/02 13:12:43 maxim Exp $");
#include <fcntl.h>
#include <signal.h>
@@ -926,7 +926,8 @@
in_dowait--;
if (breakwaitcmd != 0) {
breakwaitcmd = 0;
- return -1;
+ if (pid <= 0)
+ return -1;
}
if (pid <= 0)
return pid;
==== //depot/projects/wifi/bin/sh/sh.1#3 (text+ko) ====
@@ -29,7 +29,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.94 2004/12/02 13:13:27 maxim Exp $
.\"
.Dd July 3, 2004
.Dt SH 1
@@ -269,7 +269,7 @@
If this option is not set,
traps are executed after the child exits,
as specified in
-.St -p1003.2
+.St -p1003.2 .
This nonstandard option is useful for putting guarding shells around
children that block signals.
The surrounding shell may kill the child
==== //depot/projects/wifi/etc/defaults/rc.conf#6 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.232 2004/11/23 20:09:58 mux Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.233 2004/12/01 22:05:50 rees Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -61,7 +61,7 @@
fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails.
background_fsck="YES" # Attempt to run fsck in the background where possible.
background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
-netfs_types="nfs:NFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems.
+netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems.
extra_netfs_types="NO" # List of network extra filesystem types for delayed
# mount at startup (or NO).
==== //depot/projects/wifi/lib/libc/gen/getcontext.3#2 (text+ko) ====
@@ -33,7 +33,7 @@
.\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/gen/getcontext.3,v 1.2 2002/12/04 15:47:41 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/getcontext.3,v 1.3 2004/12/03 14:10:04 rse Exp $
.\"
.Dd September 10, 2002
.Dt GETCONTEXT 3
@@ -68,7 +68,7 @@
Instead, execution continues in the context specified by
.Fa ucp ,
which must have been previously initialized by a call to
-.Fn setcontext ,
+.Fn getcontext ,
.Xr makecontext 3 ,
or by being passed as an argument to a signal handler (see
.Xr sigaction 2 ) .
==== //depot/projects/wifi/release/i386/mkisoimages.sh#2 (text+ko) ====
@@ -4,7 +4,7 @@
# Author: Jordan K Hubbard
# Date: 22 June 2001
#
-# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.11 2004/07/15 09:28:03 murray Exp $
+# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.12 2004/12/01 18:03:18 jhb Exp $
#
# This script is used by release/Makefile to build the (optional) ISO images
# for a FreeBSD release. It is considered architecture dependent since each
@@ -14,9 +14,9 @@
#
# Usage:
#
-# mkisoimages.sh [-[e]b] image-label image-name base-bits-dir [extra-bits-dir]
+# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
#
-# Where -[e]b is passed if the ISO image should be made "bootable" by
+# Where -b is passed if the ISO image should be made "bootable" by
# whatever standards this architecture supports (may be unsupported),
# image-label is the ISO image label, image-name is the filename of the
# resulting ISO image, base-bits-dir contains the image contents and
@@ -28,9 +28,6 @@
if [ "x$1" = "x-b" ]; then
bootable="-b boot/cdboot -no-emul-boot"
shift
-elif [ "x$1" = "x-eb" ]; then
- bootable="-b floppies/boot.flp -c floppies/boot.catalog"
- shift
else
bootable=""
fi
==== //depot/projects/wifi/sbin/dump/dump.h#2 (text+ko) ====
@@ -28,7 +28,7 @@
*
* @(#)dump.h 8.2 (Berkeley) 4/28/95
*
- * $FreeBSD: src/sbin/dump/dump.h,v 1.26 2004/04/13 02:58:06 green Exp $
+ * $FreeBSD: src/sbin/dump/dump.h,v 1.27 2004/12/02 13:56:53 maxim Exp $
*/
/*
@@ -164,13 +164,13 @@
time_t dd_ddate;
};
int nddates; /* number of records (might be zero) */
-int ddates_in; /* we have read the increment file */
struct dumpdates **ddatev; /* the arrayfied version */
void initdumptimes(void);
void getdumptime(void);
void putdumptime(void);
#define ITITERATE(i, ddp) \
- for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i])
+ if (ddatev != NULL) \
+ for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i])
void sig(int signo);
==== //depot/projects/wifi/sbin/dump/itime.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/dump/itime.c,v 1.15 2004/04/09 19:58:27 markm Exp $";
+ "$FreeBSD: src/sbin/dump/itime.c,v 1.16 2004/12/02 13:56:53 maxim Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -60,7 +60,6 @@
SLIST_HEAD(dthead, dumptime) dthead = SLIST_HEAD_INITIALIZER(dthead);
struct dumpdates **ddatev = 0;
int nddates = 0;
-int ddates_in = 0;
static void dumprecout(FILE *, const struct dumpdates *);
static int getrecord(FILE *, struct dumpdates *);
@@ -113,7 +112,6 @@
SLIST_INSERT_HEAD(&dthead, dtwalk, dt_list);
}
- ddates_in = 1;
/*
* arrayify the list, leaving enough room for the additional
* record that we may have to add to the ddate structure
@@ -177,7 +175,6 @@
free((char *)ddatev);
ddatev = 0;
nddates = 0;
- ddates_in = 0;
readdumptimes(df);
if (fseek(df, 0L, 0) < 0)
quit("fseek: %s\n", strerror(errno));
==== //depot/projects/wifi/share/man/man9/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.247 2004/11/24 18:03:52 rwatson Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.248 2004/12/03 14:05:55 jkoshy Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -88,6 +88,7 @@
domain.9 \
driver.9 \
DRIVER_MODULE.9 \
+ EVENTHANDLER.9 \
extattr.9 \
fetch.9 \
g_access.9 \
@@ -448,6 +449,14 @@
domain.9 pffindproto.9 \
domain.9 pffindtype.9
MLINKS+=DRIVER_MODULE.9 MULTI_DRIVER_MODULE.9
+MLINKS+=EVENTHANDLER.9 EVENTHANDLER_DECLARE.9 \
+ EVENTHANDLER.9 EVENTHANDLER_DEREGISTER.9 \
+ EVENTHANDLER.9 eventhandler_deregister.9 \
+ EVENTHANDLER.9 EVENTHANDLER_INVOKE.9 \
+ EVENTHANDLER.9 EVENTHANDLER_REGISTER.9 \
+ EVENTHANDLER.9 eventhandler_register.9 \
+ EVENTHANDLER.9 eventhandler_find_list.9 \
+ EVENTHANDLER.9 eventhandler_prune_list.9
MLINKS+=fetch.9 fubyte.9 \
fetch.9 fuswintr.9 \
fetch.9 fusword.9 \
==== //depot/projects/wifi/share/man/man9/style.9#2 (text+ko) ====
@@ -43,7 +43,7 @@
* Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form).
*
* @(#)style 1.14 (Berkeley) 4/28/95
- * $FreeBSD: src/share/man/man9/style.9,v 1.110 2004/07/03 18:29:24 ru Exp $
+ * $FreeBSD: src/share/man/man9/style.9,v 1.111 2004/12/02 23:20:17 dds Exp $
*/
/*
@@ -86,7 +86,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.110 2004/07/03 18:29:24 ru Exp $");
+__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.111 2004/12/02 23:20:17 dds Exp $");
.Ed
.Pp
Leave another blank line before the header files.
@@ -278,7 +278,7 @@
Separate these identifiers from asterisks using a single space.
.Pp
When declaring variables in structures, declare them sorted by use, then
-by size, and then in alphabetical order.
+by size (largest to smallest), and then in alphabetical order.
The first category normally does not apply, but there are exceptions.
Each one gets its own line.
Try to make the structure
==== //depot/projects/wifi/share/zoneinfo/europe#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)europe 7.88
+# @(#)europe 7.90
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -708,7 +708,7 @@
# see Serbia and Montenegro
# Cyprus
-# See the `asia' file.
+# Please see the `asia' file for Asia/Nicosia.
# Czech Republic
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -1055,6 +1055,11 @@
1:00 Germany CE%sT 1980
1:00 EU CE%sT
+# Georgia
+# Please see the "asia" file for Asia/Tbilisi.
+# Herodotus (Histories, IV.45) says Georgia north of the Phasis (now Rioni)
+# is in Europe. Our reference location Tbilisi is in the Asian part.
+
# Gibraltar
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Gibraltar -0:21:24 - LMT 1880 Aug 2
@@ -1611,7 +1616,7 @@
# From Paul Eggert (2001-05-01):
#
# Actually, Jan Mayen was never occupied by Germany during World War II,
-# so it must have diverged from Oslo time during the war, as Olso was
+# so it must have diverged from Oslo time during the war, as Oslo was
# keeping Berlin time.
#
# <http://home.no.net/janmayen/history.htm> says that the meteorologists
==== //depot/projects/wifi/share/zoneinfo/northamerica#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)northamerica 7.69
+# @(#)northamerica 7.70
# also includes Central America and the Caribbean
# This data is by no means authoritative; if you think you know better,
@@ -1731,6 +1731,15 @@
# to DST--and one more hour on 1999-04-04--when the announcers will have
# returned to Baltimore, which switches on that date.)
+# From Evert van der Veer via Steffen Thorsen (2004-10-28):
+# Cuba is not going back to standard time this year.
+# From Paul Eggert (2004-10-28):
+# http://www.granma.cu/ingles/2004/septiembre/juev30/41medid-i.html
+# says that it's due to a problem at the Antonio Guiteras
+# thermoelectric plant, and says "This October there will be no return
+# to normal hours (after daylight saving time)".
+# For now, let's assume that it's a one-year temporary measure.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Cuba 1928 only - Jun 10 0:00 1:00 D
Rule Cuba 1928 only - Oct 10 0:00 0 S
@@ -1759,8 +1768,9 @@
Rule Cuba 1996 only - Oct 6 0:00s 0 S
Rule Cuba 1997 only - Oct 12 0:00s 0 S
Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
-Rule Cuba 1998 max - Oct lastSun 0:00s 0 S
+Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
Rule Cuba 2000 max - Apr Sun>=1 0:00s 1:00 D
+Rule Cuba 2005 max - Oct lastSun 0:00s 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Havana -5:29:28 - LMT 1890
==== //depot/projects/wifi/share/zoneinfo/southamerica#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)southamerica 7.54
+# @(#)southamerica 7.55
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -671,7 +671,7 @@
# Mato Grosso (MT)
Zone America/Cuiaba -3:44:20 - LMT 1914
-4:00 Brazil AM%sT 2003 Sep 24
- -4:00 - AMT 2004 Oct 4
+ -4:00 - AMT 2004 Oct 1
-4:00 Brazil AM%sT
#
# west Para (PA), Rondonia (RO)
==== //depot/projects/wifi/sys/alpha/alpha/gdb_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.2 2004/12/01 06:40:33 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,7 +59,7 @@
}
void
-gdb_cpu_setreg(int regnum, register_t val)
+gdb_cpu_setreg(int regnum, void *val)
{
switch (regnum) {
}
==== //depot/projects/wifi/sys/alpha/include/gdb_machdep.h#2 (text+ko) ====
@@ -23,7 +23,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.
*
- * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:20 marcel Exp $
+ * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:33 marcel Exp $
*/
#ifndef _MACHINE_GDB_MACHDEP_H_
@@ -46,7 +46,7 @@
}
void *gdb_cpu_getreg(int, size_t *);
-void gdb_cpu_setreg(int, register_t);
+void gdb_cpu_setreg(int, void *);
int gdb_cpu_signal(int, int);
#endif /* !_MACHINE_GDB_MACHDEP_H_ */
==== //depot/projects/wifi/sys/amd64/amd64/gdb_machdep.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.2 2004/11/30 00:55:49 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.3 2004/12/01 06:40:33 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,14 +81,13 @@
}
void
-gdb_cpu_setreg(int regnum, register_t val)
+gdb_cpu_setreg(int regnum, void *val)
{
- val = __bswap64(val);
switch (regnum) {
case GDB_REG_PC:
- kdb_thrctx->pcb_rip = val;
+ kdb_thrctx->pcb_rip = *(register_t *)val;
if (kdb_thread == curthread)
- kdb_frame->tf_rip = val;
+ kdb_frame->tf_rip = *(register_t *)val;
}
}
==== //depot/projects/wifi/sys/amd64/amd64/pmap.c#3 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.509 2004/11/27 06:51:33 das Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.510 2004/12/02 04:06:40 alc Exp $");
/*
* Manages physical address maps.
@@ -318,18 +318,26 @@
/* Return a pointer to the PT slot that corresponds to a VA */
static __inline pt_entry_t *
+pmap_pde_to_pte(pd_entry_t *pde, vm_offset_t va)
+{
+ pt_entry_t *pte;
+
+ pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME);
+ return (&pte[pmap_pte_index(va)]);
+}
+
+/* Return a pointer to the PT slot that corresponds to a VA */
+static __inline pt_entry_t *
pmap_pte(pmap_t pmap, vm_offset_t va)
{
pd_entry_t *pde;
- pt_entry_t *pte;
pde = pmap_pde(pmap, va);
if (pde == NULL || (*pde & PG_V) == 0)
return NULL;
if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */
return ((pt_entry_t *)pde);
- pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME);
- return (&pte[pmap_pte_index(va)]);
+ return (pmap_pde_to_pte(pde, va));
}
@@ -337,7 +345,6 @@
pmap_pte_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *ptepde)
{
pd_entry_t *pde;
- pt_entry_t *pte;
pde = pmap_pde(pmap, va);
if (pde == NULL || (*pde & PG_V) == 0)
@@ -345,8 +352,7 @@
*ptepde = *pde;
if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */
return ((pt_entry_t *)pde);
- pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME);
- return (&pte[pmap_pte_index(va)]);
+ return (pmap_pde_to_pte(pde, va));
}
@@ -1630,9 +1636,9 @@
if (va_next > eva)
va_next = eva;
- for (; sva != va_next; sva += PAGE_SIZE) {
- pte = pmap_pte(pmap, sva);
- if (pte == NULL || *pte == 0)
+ for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++,
+ sva += PAGE_SIZE) {
+ if (*pte == 0)
continue;
anyvalid = 1;
if (pmap_remove_pte(pmap, pte, sva, ptpaddr))
@@ -1722,6 +1728,7 @@
pml4_entry_t *pml4e;
pdp_entry_t *pdpe;
pd_entry_t ptpaddr, *pde;
+ pt_entry_t *pte;
int anychanged;
if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
@@ -1777,14 +1784,11 @@
if (va_next > eva)
va_next = eva;
- for (; sva != va_next; sva += PAGE_SIZE) {
+ for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++,
+ sva += PAGE_SIZE) {
pt_entry_t obits, pbits;
- pt_entry_t *pte;
vm_page_t m;
- pte = pmap_pte(pmap, sva);
- if (pte == NULL)
- continue;
retry:
obits = pbits = *pte;
if (pbits & PG_MANAGED) {
==== //depot/projects/wifi/sys/amd64/include/gdb_machdep.h#2 (text+ko) ====
@@ -23,7 +23,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.
*
- * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:21 marcel Exp $
+ * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:34 marcel Exp $
*/
#ifndef _MACHINE_GDB_MACHDEP_H_
@@ -52,6 +52,6 @@
}
void *gdb_cpu_getreg(int, size_t *);
-void gdb_cpu_setreg(int, register_t);
+void gdb_cpu_setreg(int, void *);
#endif /* !_MACHINE_GDB_MACHDEP_H_ */
==== //depot/projects/wifi/sys/arm/arm/trap.c#5 (text+ko) ====
@@ -82,7 +82,7 @@
#include "opt_ktrace.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.5 2004/11/27 06:51:34 das Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.6 2004/12/02 23:31:48 cognet Exp $");
#include <sys/types.h>
@@ -94,6 +94,7 @@
#include <sys/mutex.h>
#include <sys/syscall.h>
#include <sys/sysent.h>
+#include <sys/signalvar.h>
#ifdef KTRACE
#include <sys/uio.h>
#include <sys/ktrace.h>
==== //depot/projects/wifi/sys/boot/common/loader.8#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.76 2004/10/15 06:44:13 ru Exp $
+.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.77 2004/12/01 04:59:31 scottl Exp $
.\"
.Dd October 15, 2004
.Dt LOADER 8
@@ -352,10 +352,6 @@
Prevents the kernel from initiating a multi-user startup; instead,
a single-user mode will be entered when the kernel has finished
device probing.
-.It Va boot_userconfig
-Requests that the kernel's interactive device configuration program
-be run when the kernel is booted.
-Currently a no-op.
.It Va boot_verbose
Setting this variable causes extra debugging information to be printed
by the kernel during the boot phase.
==== //depot/projects/wifi/sys/boot/efi/libefi/bootinfo.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.10 2004/01/04 23:28:16 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.11 2004/12/01 04:59:31 scottl Exp $");
#include <stand.h>
#include <string.h>
@@ -53,7 +53,6 @@
} howto_names[] = {
{"boot_askname", RB_ASKNAME},
{"boot_cdrom", RB_CDROM},
- {"boot_userconfig", RB_CONFIG},
{"boot_ddb", RB_KDB},
{"boot_gdb", RB_GDB},
{"boot_single", RB_SINGLE},
@@ -86,9 +85,6 @@
case 'a':
howto |= RB_ASKNAME;
break;
- case 'c':
- howto |= RB_CONFIG;
- break;
case 'C':
howto |= RB_CDROM;
break;
==== //depot/projects/wifi/sys/boot/forth/beastie.4th#3 (text+ko) ====
@@ -23,7 +23,7 @@
\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
\ SUCH DAMAGE.
\
-\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.9 2004/10/30 13:45:13 brooks Exp $
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.10 2004/12/01 07:17:57 scottl Exp $
marker task-beastie.4th
@@ -69,7 +69,7 @@
2dup at-xy ." \ / /\" 1+
2dup at-xy ." [36m______[31m( (_ / \______/" 1+
2dup at-xy ." [36m,' ,-----' |" 1+
-at-xy ." `--{__________) [0m" 1+
+at-xy ." `--{__________) [0m"
;
: boring-beastie ( x y -- )
@@ -121,6 +121,8 @@
s" 0" compare 0<> if
false exit
then
+ else
+ drop
then
true
;
@@ -147,6 +149,7 @@
13 6 at-xy ." Welcome to FreeBSD!"
printmenuitem ." Boot FreeBSD [default]" bootkey !
s" arch-i386" environment? if
+ drop
printmenuitem ." Boot FreeBSD with ACPI " bootacpikey !
acpienabled? if
." disabled"
@@ -161,9 +164,10 @@
printmenuitem ." Boot FreeBSD with verbose logging" bootverbosekey !
printmenuitem ." Escape to loader prompt" escapekey !
s" arch-i386" environment? if
+ drop
printmenuitem ." Boot FreeBSD with USB keyboard" bootusbkey !
else
- -2 bootacpikey !
+ -2 bootusbkey !
then
printmenuitem ." Reboot" rebootkey !
menuX @ 20 at-xy
@@ -174,7 +178,6 @@
;
: tkey
- dup
seconds +
begin 1 while
over 0<> if
@@ -202,6 +205,8 @@
s" YES" compare-insensitive 0= if
exit
then
+ else
+ drop
then
beastie-menu
s" autoboot_delay" getenv
@@ -211,7 +216,7 @@
else
0 0 2swap >number drop drop drop
then
- begin true while
+ begin
dup tkey
0 25 at-xy
dup 32 = if nip 0 swap then
@@ -235,6 +240,7 @@
then
dup bootsafekey @ = if
s" arch-i386" environment? if
+ drop
s" acpi_load" unsetenv
s" 1" s" hint.acpi.0.disabled" setenv
s" 1" s" loader.acpi_disabled_by_user" setenv
@@ -260,7 +266,7 @@
exit
then
rebootkey @ = if 0 reboot then
- repeat
+ again
;
previous
==== //depot/projects/wifi/sys/boot/forth/loader.conf#3 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.92 2004/11/07 17:01:08 krion Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.93 2004/12/01 04:59:31 scottl Exp $
##############################################################
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list