Date: Tue, 5 Oct 2004 22:55:50 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 62714 for review Message-ID: <200410052255.i95MtofW086396@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=62714 Change 62714 by peter@peter_daintree on 2004/10/05 22:55:18 IFC @62713 Affected files ... .. //depot/projects/hammer/UPDATING#60 integrate .. //depot/projects/hammer/bin/rm/rm.1#6 integrate .. //depot/projects/hammer/bin/rm/rm.c#8 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#8 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#8 integrate .. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#5 integrate .. //depot/projects/hammer/etc/Makefile#31 integrate .. //depot/projects/hammer/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/hammer/lib/libc/gen/err.3#2 integrate .. //depot/projects/hammer/sbin/dumpon/Makefile#3 integrate .. //depot/projects/hammer/sbin/dumpon/dumpon.8#6 integrate .. //depot/projects/hammer/sbin/dumpon/dumpon.c#4 integrate .. //depot/projects/hammer/share/man/man3/sysexits.3#5 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#27 integrate .. //depot/projects/hammer/share/man/man4/ath.4#16 integrate .. //depot/projects/hammer/share/man/man4/vlan.4#6 integrate .. //depot/projects/hammer/share/misc/pci_vendors#12 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#114 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/hammer/sys/boot/common/help.common#10 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#17 integrate .. //depot/projects/hammer/sys/cam/cam_periph.h#4 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#12 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#15 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#22 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#15 integrate .. //depot/projects/hammer/sys/conf/NOTES#69 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdTable.c#7 integrate .. //depot/projects/hammer/sys/dev/cy/cy.c#12 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#11 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#16 integrate .. //depot/projects/hammer/sys/dev/rp/rpvar.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/umct.c#8 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#10 integrate .. //depot/projects/hammer/sys/fs/unionfs/union.h#5 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#15 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#58 integrate .. //depot/projects/hammer/sys/kern/init_main.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#42 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#67 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#12 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#31 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#50 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#27 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#13 integrate .. //depot/projects/hammer/sys/kern/tty.c#28 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#36 integrate .. //depot/projects/hammer/sys/net/ethernet.h#5 integrate .. //depot/projects/hammer/sys/net/route.h#12 integrate .. //depot/projects/hammer/sys/net/rtsock.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#37 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#22 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#29 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#17 integrate .. //depot/projects/hammer/sys/pci/agp_amd64.c#3 integrate .. //depot/projects/hammer/sys/sys/_task.h#3 integrate .. //depot/projects/hammer/sys/sys/interrupt.h#10 integrate .. //depot/projects/hammer/sys/sys/param.h#48 integrate .. //depot/projects/hammer/sys/sys/proc.h#67 integrate .. //depot/projects/hammer/sys/sys/resourcevar.h#13 integrate .. //depot/projects/hammer/sys/sys/runq.h#2 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#10 integrate .. //depot/projects/hammer/sys/sys/taskqueue.h#6 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#29 integrate .. //depot/projects/hammer/tools/tools/ath/80211watch.c#1 branch .. //depot/projects/hammer/tools/tools/ath/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/Makefile#37 integrate .. //depot/projects/hammer/usr.bin/su/su.1#8 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi.c#13 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.8#7 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.c#5 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.h#9 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#9 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#18 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#16 integrate Differences ... ==== //depot/projects/hammer/UPDATING#60 (text+ko) ==== @@ -54,13 +54,12 @@ and pf. 20040928: - If enabled, the default is now to run named in a chroot + If named is enabled, the default is now to run it in a chroot "sandbox." For users with existing configurations in /etc/namedb the migration should be simple. Upgrade your world as usual, then after installworld but before mergemaster do the following: - /etc/rc.d/syslogd stop If named is running: /etc/rc.d/named stop cd /etc mv namedb namedb.bak @@ -71,7 +70,7 @@ cd /var/named/etc/namedb /bin/sh make-localhost rm -f localhost-v6.rev localhost.rev - /etc/rc.d/syslogd start + /etc/rc.d/syslogd restart /etc/rc.d/named start If you are using a custom configuration, or if you have @@ -1940,4 +1939,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.368 2004/10/03 10:08:12 des Exp $ +$FreeBSD: src/UPDATING,v 1.369 2004/10/04 20:11:34 dougb Exp $ ==== //depot/projects/hammer/bin/rm/rm.1#6 (text+ko) ==== @@ -29,9 +29,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.29 2004/07/02 21:04:19 ru Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.31 2004/10/04 19:03:44 des Exp $ .\" -.Dd January 28, 1999 +.Dd October 4, 2004 .Dt RM 1 .Os .Sh NAME @@ -111,9 +111,10 @@ utility removes symbolic links, not the files referenced by the links. .Pp It is an error to attempt to remove the files -.Dq .\& +.Pa / , +.Pa .\& or -.Dq .. . +.Pa .. . .Pp When the utility is called as .Nm unlink , ==== //depot/projects/hammer/bin/rm/rm.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.47 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.50 2004/10/04 19:24:28 des Exp $"); #include <sys/stat.h> #include <sys/param.h> @@ -62,6 +62,7 @@ int check(char *, char *, struct stat *); void checkdot(char **); +void checkslash(char **); void rm_file(char **); int rm_overwrite(char *, struct stat *); void rm_tree(char **); @@ -70,9 +71,9 @@ /* * rm -- * This rm is different from historic rm's, but is expected to match - * POSIX 1003.2 behavior. The most visible difference is that -f + * POSIX 1003.2 behavior. The most visible difference is that -f * has two specific effects now, ignore non-existent files and force - * file removal. + * file removal. */ int main(int argc, char *argv[]) @@ -140,6 +141,8 @@ } checkdot(argv); + if (getenv("POSIXLY_CORRECT") == NULL) + checkslash(argv); uid = geteuid(); if (*argv) { @@ -434,7 +437,7 @@ else { /* * If it's not a symbolic link and it's unwritable and we're - * talking to a terminal, ask. Symbolic links are excluded + * talking to a terminal, ask. Symbolic links are excluded * because their permissions are meaningless. Check stdin_ok * first because we may not have stat'ed the file. * Also skip this check if the -P option was specified because @@ -453,7 +456,7 @@ modep + 1, modep[9] == ' ' ? "" : " ", user_from_uid(sp->st_uid, 0), group_from_gid(sp->st_gid, 0), - *flagsp ? flagsp : "", *flagsp ? " " : "", + *flagsp ? flagsp : "", *flagsp ? " " : "", path); free(flagsp); } @@ -465,6 +468,27 @@ return (first == 'y' || first == 'Y'); } +#define ISSLASH(a) ((a)[0] == '/' && (a)[1] == '\0') +void +checkslash(char **argv) +{ + char **t, **u; + int complained; + + complained = 0; + for (t = argv; *t;) { + if (ISSLASH(*t)) { + if (!complained++) + warnx("\"/\" may not be removed"); + eval = 1; + for (u = t; u[0] != NULL; ++u) + u[0] = u[1]; + } else { + ++t; + } + } +} + #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) void checkdot(char **argv) ==== //depot/projects/hammer/contrib/groff/tmac/doc.tmac#8 (text+ko) ==== @@ -6156,7 +6156,7 @@ . \}\}\} . el \{\ . tm1 "Usage: .An {-nosplit | -split} -. tm1 .An author_name ... (#\n[.c]) +. tm1 " .An author_name ... (#\n[.c]) . \}\} . . if \n[doc-in-authors-section] \{\ ==== //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#8 (text+ko) ==== @@ -1677,8 +1677,6 @@ .Lb libcurses .It Li libedit .Lb libedit -.It Li libedit -.Lb libedit .It Li libevent .Lb libevent .It Li libform ==== //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.6 2004/08/31 18:04:34 mlaier Exp $"); +__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.7 2004/10/05 08:26:34 mlaier Exp $"); #include <sys/types.h> #include <sys/ioctl.h> @@ -656,8 +656,16 @@ while (1) { np = pcap_dispatch(hpcap, PCAP_NUM_PKTS, dump_packet, (u_char *)dpcap); - if (np < 0) + if (np < 0) { +#ifdef __FreeBSD__ + if (errno == ENXIO) { + logmsg(LOG_ERR, + "Device not/no longer configured"); + break; + } +#endif logmsg(LOG_NOTICE, "%s", pcap_geterr(hpcap)); + } if (gotsig_close) break; ==== //depot/projects/hammer/etc/Makefile#31 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.333 2004/09/30 10:24:24 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.334 2004/10/05 13:03:08 ru Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -197,7 +197,7 @@ .else mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \ -p ${DESTDIR}/var/named - ln -fhs ${DESTDIR}/var/named/etc/namedb ${DESTDIR}/etc/namedb + ln -fhs /var/named/etc/namedb ${DESTDIR}/etc/namedb .endif .endif .if !defined(NO_SENDMAIL) ==== //depot/projects/hammer/etc/etc.sparc64/ttys#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.6 2003/10/24 15:44:08 simokawa Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.7 2004/10/04 03:39:52 kensmith Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -48,8 +48,9 @@ #ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyu0 "/usr/libexec/getty std.9600" vt100 on secure -ttyu1 "/usr/libexec/getty std.9600" vt100 on secure +# Requires device 'uart' be enabled. +ttyu0 "/usr/libexec/getty std.9600" vt100 off secure +ttyu1 "/usr/libexec/getty std.9600" vt100 off secure ttyu2 "/usr/libexec/getty std.9600" vt100 off secure ttyu3 "/usr/libexec/getty std.9600" vt100 off secure # Dumb console ==== //depot/projects/hammer/lib/libc/gen/err.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)err.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.19 2002/08/05 06:49:58 mike Exp $ +.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.20 2004/10/04 14:04:37 jkoshy Exp $ .\" .Dd March 6, 1999 .Dt ERR 3 @@ -158,6 +158,10 @@ .Fn verrx functions do not return, but exit with the value of the argument .Fa eval . +It is recommended that the standard values defined in +.Xr sysexits 3 +be used for the value of +.Fa eval . The .Fn err_set_exit function can be used to specify a function which is called before @@ -209,7 +213,8 @@ .Xr exit 3 , .Xr fmtmsg 3 , .Xr printf 3 , -.Xr strerror 3 +.Xr strerror 3 , +.Xr sysexits 3 .Sh HISTORY The .Fn err ==== //depot/projects/hammer/sbin/dumpon/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sbin/dumpon/Makefile,v 1.9 2004/02/23 20:13:51 johan Exp $ +# $FreeBSD: src/sbin/dumpon/Makefile,v 1.10 2004/10/03 23:39:14 des Exp $ PROG= dumpon -WARNS?= 4 +WARNS?= 6 MAN= dumpon.8 .include <bsd.prog.mk> ==== //depot/projects/hammer/sbin/dumpon/dumpon.8#6 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)swapon.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.30 2004/07/18 09:57:47 maxim Exp $ +.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.32 2004/10/03 23:38:49 des Exp $ .\" .Dd May 12, 1995 .Dt DUMPON 8 @@ -44,8 +44,8 @@ .Sh DESCRIPTION The .Nm -utility is used to specify a device where the kernel can save a crash dump in -the case of a panic. +utility is used to specify a device where the kernel can save a crash +dump in the case of a panic. .Pp Calls to .Nm @@ -56,14 +56,22 @@ variable in the boot time configuration file .Pa /etc/rc.conf . .Pp -For most systems the size of the specified dump device must be at least -the size of physical memory. -Even though an additional header is added to the dump, -the BIOS for a platform typically holds back some memory, so it is not usually +For most systems the size of the specified dump device must be at +least the size of physical memory. +Even though an additional header is added to the dump, the BIOS for a +platform typically holds back some memory, so it is not usually necessary to size the dump device larger than the actual amount of RAM available in the machine. .Pp The +.Nm +utility will refuse to enable a dump device which is smaller than the +total amount of physical memory as reported by the +.Va hw.physmem +.Xr sysctl 8 +variable. +.Pp +The .Fl v flag causes .Nm ==== //depot/projects/hammer/sbin/dumpon/dumpon.c#4 (text+ko) ==== @@ -39,54 +39,86 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.19 2004/04/09 19:58:27 markm Exp $"); +__FBSDID("$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.22 2004/10/04 06:54:19 des Exp $"); + +#include <sys/param.h> +#include <sys/disk.h> +#include <sys/sysctl.h> #include <err.h> +#include <fcntl.h> +#include <paths.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> -#include <fcntl.h> -#include <paths.h> #include <string.h> +#include <sysexits.h> #include <unistd.h> -#include <sys/param.h> -#include <sys/disk.h> -#include <sysexits.h> + +static int verbose; + +static void +usage(void) +{ + fprintf(stderr, "%s\n%s\n", + "usage: dumpon [-v] special_file", + " dumpon [-v] off"); + exit(EX_USAGE); +} + +static void +check_size(int fd, const char *fn) +{ + int name[] = { CTL_HW, HW_PHYSMEM }; + size_t namelen = sizeof name / sizeof *name; + unsigned long physmem; + size_t len = sizeof physmem; + off_t mediasize; -void usage(void) __dead2; + if (sysctl(name, namelen, &physmem, &len, NULL, 0) != 0) + err(EX_OSERR, "can't get memory size"); + if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) != 0) + err(EX_OSERR, "%s: can't get size", fn); + if ((uintmax_t)mediasize < (uintmax_t)physmem) { + if (verbose) + printf("%s is smaller than physical memory\n", fn); + exit(EX_IOERR); + } +} int main(int argc, char *argv[]) { - int ch, verbose, rv; + int ch; int i, fd; u_int u; - verbose = rv = 0; while ((ch = getopt(argc, argv, "v")) != -1) switch((char)ch) { case 'v': verbose = 1; break; - case '?': default: usage(); } + + argc -= optind; argv += optind; - if (!argv[0] || argv[1]) + if (argc != 1) usage(); - if (strcmp(argv[0], "off")) { + if (strcmp(argv[0], "off") != 0) { fd = open(argv[0], O_RDONLY); if (fd < 0) err(EX_OSFILE, "%s", argv[0]); + check_size(fd, argv[0]); u = 0; i = ioctl(fd, DIOCSKERNELDUMP, &u); u = 1; i = ioctl(fd, DIOCSKERNELDUMP, &u); if (i == 0 && verbose) printf("kernel dumps on %s\n", argv[0]); - } else { fd = open(_PATH_DEVNULL, O_RDONLY); if (fd < 0) @@ -101,12 +133,3 @@ exit (0); } - -void -usage(void) -{ - fprintf(stderr, - "usage: dumpon [-v] special_file\n" - " dumpon [-v] off\n"); - exit(EX_USAGE); -} ==== //depot/projects/hammer/share/man/man3/sysexits.3#5 (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/share/man/man3/sysexits.3,v 1.13 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man3/sysexits.3,v 1.14 2004/10/04 14:04:37 jkoshy Exp $ .\" .\" " .Dd March 31, 1996 @@ -127,6 +127,7 @@ The numerical values corresponding to the symbolical ones are given in parenthesis for easy reference. .Sh SEE ALSO +.Xr err 3 , .Xr exit 3 , .Xr style 9 .Sh HISTORY ==== //depot/projects/hammer/share/man/man4/acpi.4#27 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.39 2004/07/07 19:57:14 ru Exp $ +.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.40 2004/10/05 20:42:16 njl Exp $ .\" .Dd June 30, 2004 .Dt ACPI 4 @@ -318,20 +318,22 @@ The ACPI CA code will still know about the avoided region. .Sh OVERRIDING YOUR BIOS BYTECODE -ACPI interprets bytecode named AML, ACPI Machine Language, provided by the BIOS -vendor as a memory image at boot time. -Sometimes, the AML code contains -a problem that does not appear in the Microsoft implementation. -So we provide a way to override it with your own AML code. +ACPI interprets bytecode named AML +(ACPI Machine Language) +provided by the BIOS vendor as a memory image at boot time. +Sometimes, the AML code contains a bug that does not appear when parsed +by the Microsoft implementation. +.Fx +provides a way to override it with your own AML code to workaround +or debug such problems. +Note that all AML in your DSDT and any SSDT tables is overridden. .Pp -In order to load your AML code, -you must edit +In order to load your AML code, you must edit .Pa /boot/loader.conf -and -include the following lines. +and include the following lines. .Bd -literal -offset indent acpi_dsdt_load="YES" -acpi_dsdt_name="/boot/acpi_dsdt.aml" #You may change the name. +acpi_dsdt_name="/boot/acpi_dsdt.aml" # You may change this name. .Ed .Pp In order to prepare your AML code, you will need the ==== //depot/projects/hammer/share/man/man4/ath.4#16 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.21 2004/08/26 00:26:52 simon Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.22 2004/10/05 19:27:40 imp Exp $ .\"/ .Dd August 26, 2004 .Dt ATH 4 @@ -323,3 +323,11 @@ .Pp The driver does not fully enable power-save operation of the chip; consequently power use is suboptimal. +.Pp +The driver honors the regulatory domain programmed into the EEPROM of a +device and does not support overriding this setting. +This is done to insure compliance with local regulatory agencies when +operating as an access point. +Unfortunately this also means that devices purchased for use in one locale +may not be usable in another. +Changes are planned to remove this restriction when operating in station mode. ==== //depot/projects/hammer/share/man/man4/vlan.4#6 (text+ko) ==== @@ -23,15 +23,16 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.14 2004/05/27 11:12:07 yar Exp $ +.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.16 2004/10/04 15:54:56 yar Exp $ .\" -.Dd May 26, 2004 +.Dd October 4, 2004 .Dt VLAN 4 .Os .Sh NAME .Nm vlan .Nd IEEE 802.1Q VLAN network interface .Sh SYNOPSIS +.Cd device miibus .Cd device vlan .\" .Sh DESCRIPTION @@ -164,6 +165,7 @@ use and calculates the appropriate frame MTU based on the capabilities of the parent interface. .Sh SEE ALSO +.Xr miibus 4 , .Xr ifconfig 8 .Sh BUGS No 802.1Q features except VLAN tagging are implemented. ==== //depot/projects/hammer/share/misc/pci_vendors#12 (text+ko) ==== @@ -1,4 +1,4 @@ -; $FreeBSD: src/share/misc/pci_vendors,v 1.31 2004/08/30 15:50:50 sheldonh Exp $ +; $FreeBSD: src/share/misc/pci_vendors,v 1.32 2004/10/05 20:10:35 sheldonh Exp $ ; ; Automatically generated by src/tools/tools/pciid/mk_pci_vendors.pl ; (with the -l option), using the following source lists: @@ -160,7 +160,7 @@ 4150 Radeon 9600 Series (V350) 4151 Radeon 9600 (RV350) 4152 Radeon 9600 XT (V350) - 4153 Radeon 9550 + 4153 ??? Radeon 9550 4158 Mach32 (68800AX) 4164 Radeon 9500 Series (R300) - Secondary 4167 Fire GL Z1 AGP/Pro Secondary Video Accelerator (128 MB, 4P) @@ -168,7 +168,7 @@ 4170 Radeon 9600 Series - Secondary 4171 Radeon 9600 (RV350) - Secondary 4172 RV360 Radeon 9600 XT - Secondary - 4173 Radeon 9550 - Secondary + 4173 ??? Radeon 9550 - Secondary 4242 R200AIW All-In-Wonder 8500DV 4243 Radeon 8500 DV OHCI FireWire Controller 4336 Radeon Mobility U1 @@ -180,26 +180,27 @@ 4348 ??? OHCI USB Controller #2 4349 ??? ATA Controller 434C ??? LPC Controller + 434D ??? Modem device 4353 ??? SMBus Controller 4354 Mach64 CT (215CT222) 4358 210888CX Mach64 CX 4554 Mach64 ET 4654 Mach64 VT 113-4008-103 4742 ATI GTC (GT-C2U2) ATI 3D Rage Pro Turbo AGP 2X - 4744 Rage 3D Pro AGP 1x (BGA Package) + 4744 Rage 3D Pro AGP 2x Rage 3D Pro AGP 2x 4747 Rage 3D Pro 4749 Rage Pro Turbo PCI ATI ALL IN WONDER PRO (8MB) 474C Rage XC PCI-66 474D Rage XL AGP 2x 474E Rage XC AGP 2x 474F Rage XL PCI-66 - 4750 Rage 3D Pro PCI Graphics Accelerator + 4750 Rage 3D Pro PCI (PQFP Package) 4751 Rage 3D Pro PCI (PQFP Package, Limited 3D) 4752 Rage XL PCI 4753 Rage XC PCI 4754 Mach 64 GT Rage 3D II Graphics Accelerator 4755 Rage 3D II+ [Mach64 GTB] - 4756 Rage 3D IIC PCI [Mach64 GT IIC] (PQFP Package) + 4756 Rage 3D IIC PCI 21sr2qua12 Graphics Accelerator 4757 Rage 3D IIC AGP (BGA Package) 4758 210888GX Mach 64 GX (WinTurbo) 4759 Rage 3D IIC @@ -293,7 +294,7 @@ 516B Radeon R200 Qk 516C Radeon 8500 / 8500LE 516D Radeon 9100 Series (R200) - Secondary - 5245 Rage 128 GL PCI + 5245 215R46ASA22 Rage 128 GL PCI 5246 Rage 128 GL AGP 2x Rage Fury 16/32MB 5247 Rage 128 RG 524B Rage 128 VR RK PCI @@ -325,8 +326,8 @@ 5940 Radeon 9200 Pro (RV280) - Secondary 5941 RV280 ATI Radeon 9200 - Secondary 5960 Radeon 9200 Pro (RV280) - 5961 RV280LE-8X ATI RADEON 9200 - 5964 Radeon 9200 SE Series (RV280) + 5961 213rtizua43 ATI RADEON 9200 + 5964 Radeon 9200 Radeon 9200 SE Series 5C61 ??? Mobility Radeon 9200 5C63 RV280 (M9+) Mobility Radeon 9200 5D44 Radeon 9200 SE Series - Secondary (RV280) @@ -492,7 +493,7 @@ 004E ATM Controller (14104E00) 004F ATM Controller (14104F00) 0050 ATM Controller (14105000) - 0053 25 MBit ATM controller + 0053 85h9533 25 MBit ATM controller 0057 MPEG PCI Bridge 005C i82557B 10/100 PCI Ethernet Adapter 005D 05J3506 TCP/IP networking device @@ -772,8 +773,17 @@ 102E Olivetti Advanced Technology 102F Toshiba America 0009 r4x00 CPU Bridge + 000A TX3927 CPU Bridge? 0020 Meteor 155 ATM PCI Adapter - 0181 TX4925 TX4925 Integrated MIPS Processor + 0030 TC35815CF PCI 10/100 Mbit Ethernet Controller + 0031 TX4938 Integrated 10/100 Mbit Ethernet Controller + 0105 TC86C001FG GOKU-S Bus Master IDE Controller + 0106 TC86C001FG GOKU-S USB Host Controller + 0107 TC86C001FG GOKU-S USB Device Controller + 0108 TC86C001FG GOKU-S I2C Bus/SIO/GPIO Controller + 0180 TX4927 MIPS Processor + 0181 TX4925 MIPS RISC PCI Controller (PCIC) + 0182 TX4937 MIPS RISC PCI Controller (PCIC) 1030 TMC Research 1031 miro Computer Products AG 5601 MiroVIDEO DC20 Video I/O & JPEG @@ -880,10 +890,11 @@ 0962 SiS962 LPC Bridge 0963 SiS963 PCI to ISA Bridge (LPC Bridge) 0964 SiS964 LPC Bridge + 1039 VEN_1039&DEV_6306&SUBSYS_63061039&REV_2A 3602 SiS83C602 EIDE Controller 5107 SiS5107 Hot Docking Controller 5300 SiS540 PCI Display Adapter - 5315 SiS550/1/2 GUI Accelerator + 5315 SiS530/1/2 GUI Accelerator 5401 SiS5401 486 PCI Chipset 5511 SiS5511/5512 PCI/ISA System Memory Controller 5513 SiS5513 EIDE Controller (A,B step) @@ -921,7 +932,7 @@ 103B Tatung Corp. Of America 103C Hewlett-Packard Company 1005 A4977A Visialize EG - 1008 Donner GFX + 1008 Donner GFX 001 100A hpVisualizeFX Hewlett-Packard VisualizeFX Series Video 1028 Tachyon TL Fibre Channel Adapter 1029 HPFC-5200B Tachyon XL2 Fibre Channel Adapter @@ -1098,7 +1109,7 @@ 104D Sony Corporation 8009 CXD1947 i.LINK FireWire PCI Host Controller 8039 CXD3222 OHCI i.LINK (IEEE 1394) PCI Host Ctrlr - 8056 Rockwell HCF 56K Modem + 8056 0x127a Rockwell HCF 56K Modem 808A Memory Stick Controller 104E Oak Technology Inc 0017 OTI-64017 @@ -1107,7 +1118,7 @@ 0111 OTI-64111 Spitfire 0217 OTI-64217 0317 OTI-64317 - 0611 OTI-610 + 0611 OTI-610 T9741 104F Co-Time Computer Ltd. 104F iatca8392 Multi I/O 1050 Winbond Electronics Corp. @@ -1136,7 +1147,7 @@ 1055 Standard Microsystems Corp (Was: EFAR Microsystems) 0810 EFAR 486 host Bridge 0922 Pentium/p54c host Bridge - 0926 EFAR PCI to ISA Bridge + 0926 I donīt know pentium 133 intel everex setpnot mx ISA Bridge 9130 SLC90E66 Victory66 UDMA66 EIDE Controller (??) 9460 SLC90E66 Victory66 PCI to ISA Bridge 9461 SLC90E66 Victory66 UDMA66 EIDE Controller @@ -1177,6 +1188,8 @@ 3373 PDC20378? FastTrak RAID Controller 3375 PDC20375(??) FastTrak SATA150 TX2plus Controller 3376 PDC20376 FastTrak 376 SATA/RAID Controller + 3574 Promise SATAII150 579 (tm) IDE Controller + 3D18 Promise SATAII150 518 (tm) IDE Controller 4D30 PDC20267 FastTrack100 EIDE Controller 4D33 PDC20246 FastTrak Ultra ATA RAID controller 4D38 PDC20262 FastTrak66 EIDE Controller @@ -1431,6 +1444,7 @@ 8001 Schizo PCI Bus Module A000 UltraSPARC IIi Sabre A001 UltraSPARC IIe Hummingbird + ABBA CE (Cassini Ethernet) 10/100/1000 Ethernet adapter 108F Systemsoft Corporation 1090 Encore Computer Corporation 1091 Intergraph Corporation @@ -1447,7 +1461,7 @@ 0550 Viper V550 08D4 Supra 2260 WinModem 094C SupraExpress 56i Pro SupraExpress 56i Pro - 09C8 SUP2760 SupraExpress 56i Pro VCC + 09C8 SUP2761 SupraExpress 56i Pro VCC 1002 ?? ?? 1092 Viper V330 6120 Maximum DVD @@ -1722,7 +1736,7 @@ 9201 3C920B-EMB Integrated Fast Ethernet Controller 9202 3C920B-EMB-WNM Integrated Fast Ethernet Controller 9210 3C920B-EMB-WNM Integrated Fast Ethernet Controller - 9800 3C980-TX Fast EtherLink XL Server Adapter + 9800 3C980-TX Fast EtherLink XL Server Adapter2 9805 3C980-TX 10/100baseTX NIC [Python-T] 9902 3CR990-TX-95 EtherLink 10/100 PCI with 3XP Processor 9903 3CR990-TX-97 EtherLink 10/100 PCI with 3XP Processor @@ -2070,26 +2084,26 @@ 0302 GeForce FX 5800 [NV30.3] 0308 Quadro FX 2000 [NV30GL.1] 0309 Quadro FX 1000 [NV30GL.2] - 030A ??? ICE FX 2000 + 030A NV30GL ICE FX 2000 0311 GeForce FX 5600 Ultra [NV31.1] 0312 GeForce FX 5600 [NV31.2] 0313 NV31? ??? 0314 GeForce FX 5600XT [NV31.4] 0318 NV31GL.1 ??? 0319 NV31GL.2 ??? - 031A ??? NVIDIA GeForce FX Go 5600 - 031B ??? NVIDIA GeForce FX Go 5650 + 031A NV31GL NVIDIA NV31GL + 031B NV31GL NVIDIA NV31GL 0321 GeForce FX 5200 Ultra [NV34.2] 0322 GeForce FX 5200 [NV34.3] 0323 GeForce FX 5200LE [NV34.3] - 0324 ??? NVIDIA GeForce FX Go 5200 + 0324 NV31 NVIDIA NV31GL 0325 ??? GeForce FX Go 5250 0326 GeForce FX 5500 [NV34.6] 0327 GeForce FX 5100 [NV34.7] 0328 GeForce FX Go 5200 32M/64M 032A Quadro NVS 280 [NV34GL.3] 032B Quadro FX 500 [NV34GL.4] - 032C ??? NVIDIA GeForce FX Go 5300 + 032C NV34GL NVIDIA NV34GL 032D GeForce FX Go5100 [NV34M] 032F NV34GL ??? 0330 GeForce FX 5900 Ultra [NV35.0] @@ -2186,7 +2200,7 @@ 3FC0 RME Digi96 3FC1 RME Digi96/8 3FC2 RME Digi 96/8 Pro - 3FC3 RME Digi96/8 Pad + 3FC3 RME Digi96/8 Pad RME Digi96/8 Pad 3FC4 RME Digi9652 Hammerfall 5343 Seamont SC100 Security Adapter 8130 Durango PMC Virtex-II Bridge, XC2V1000-4FG456C @@ -2252,9 +2266,9 @@ 9502 INIC-950P Ultrawide SCSI controller 9700 Fast Wide SCSI Controller 1102 Creative Labs - 0002 EMU10000 Sound Blaster Live! (Also Live! 5.1) + 0002 EMU10000 Sound Blaster Live! (Also Live! 5.1) - OEM from DELL - CT4780 0003 EMU8008 AWE64D OEM (CT4600) - 0004 EMU10K2 Audio Chipset (SB Audigy Series) + 0004 SoundBlaster Audigy 2 Audigy 2 Audio Processor 0006 emu10k1x Soundblaster Live! 5.1 0007 CA0106-DAT Audigy LS 1017 Banshee 3D Blaster Banshee PCI CT6760 @@ -2263,7 +2277,7 @@ 7002 EMU10000 Game Port 7003 EMU10K2 Audigy Gameport 7004 SBLive! Value Gameport - 7005 Audigy LS Series Game Port + 7005 ??? Audigy LS Series Game Port 8064 SB0100 (SBLive! 5.1 OEM) 8938 EV1938 Sound 9838 Ectiva EV1938 @@ -2492,13 +2506,14 @@ 2340 4 Port Fast Ethernet Adapter 2400 2400 ATM adapter 1113 Accton Technology Corporation - 1211 EN-1207D Fast Ethernet Adapter + 1211 SMC EN5030B Fast Ethernet Adapter 1216 EN-5251 Based Fast Ethernet Adapter 1217 EN-1217 Ethernet Adapter 5105 10Mbps Network card 9211 EN-1207D Fast Ethernet Adapter - 9511 en5251be + 9511 en5251be a 1114 Atmel Corp. + 0506 AT76C506 802.11b Wireless Network Adaptor 1115 Dupont Pixel Systems Ltd 1116 Media 100 Inc (Was: Data Translation) 0022 DT3001 @@ -2896,6 +2911,7 @@ 1174 Bridgeport Machines 1175 Mitron Computer Inc. 1176 SBE Inc + 8474 CN8474A Conexant Multichannel Synchronous Communications Controller (MUSYCC) 1177 Silicon Engineering 1178 Alfa Inc AFA1 Fast Ethernet Adapter @@ -2918,8 +2934,8 @@ 0617 ToPIC100 PCI to CardBus Bridge with ZV support 0618 CPU to PCI and PCI to ISA Bridge 0701 vt82c693 PCI Communication Device - 0805 SD Card Controller Type A - 0D01 FIR Port Type-DO + 0805 VEN_117&DEV_0805&SUBSYS_0001117&REV_03 SD Card Controller + 0D01 0x0d011170 FIR Port Type-DO 13A8 XR17C158/154/152 Multi-channel PCI UART 117A A-Trend Technology 117B LG Electronics Inc. @@ -2949,6 +2965,7 @@ 1340 DFE-690TXD CardBus Fast Ethernet Adapter 1561 DRP-32TXD CardBus PC Card 3065 14001186 D-Link DFE-500Tx PCI fast Ethernet adapter Rev.A + 3106 DFE 530TX rev 8 Fast Ethernet Adapter 3300 D-Link Air Wireless Network (DWL-510) IEEE 802.11b PCI card 4000 DL2000 Gigabit Ethernet Adapter 4001 DFE-650TX D Link Fast Ethernet PCMCIA Card @@ -3050,6 +3067,8 @@ 4620 GT-64120 System Controller for R5000 & R7000 (64-bit PCI) 4801 GT-48001 8-port Switched Ethernet Controller 4809 GT-48300 4-port (2.4Gb each) Crossbar Switch + 5040 88SX5040 4-port SATA I PCI-X Controller + 5041 88SX504 4-port SATA I PCI-X Controller 5080 RocketRAID 182x SATA Controller 5081 RocketRAID 182x SATA Controller 6320 GT-64130/131 System Controller for PowerPC Processors @@ -3127,9 +3146,9 @@ 0420 CardBus 56k Modem 0440 LT Winmodem 56k Data+Fax+Voice+DSVD 0441 LT WinModem 56k Data+Fax - 0442 1646T00 Agere Sv92p-t00 56K v.92 - 0443 LT Winmodem - 0444 LT Winmodem + 0442 3866925 Agere Sv92p-t00 56K v.92 + 0443 LT Winmodem sv92p2 + 0444 LT Winmodem 845G 0445 LT Winmodem 0446 LT Winmodem 0447 LT Winmodem @@ -3139,7 +3158,7 @@ 044B LT Winmodem 044C LT Winmodem 044D LT Winmodem - 044E lucent 1646T00 LT WinModem 56k Data+Fax + 044E lucent 1646T00 LT WinModem 56k Data+Fax or Agere F-1156IV/A3 044F 90094-1 LT V.90+DSL WildFire Modem 0450 1456VQH19R-1(INT) LT Winmodem 56K 0451 LT Winmodem LT WinModem 56k Data+Fax+Voice+DSVD @@ -3156,13 +3175,13 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410052255.i95MtofW086396>